Revision 44259 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.swing/org.gvsig.expressionevaluator.swing.impl/src/main/java/org/gvsig/expressionevaluator/swing/impl/elements/DefaultConstantValueElement.java

View differences:

DefaultConstantValueElement.java
5 5
 */
6 6
package org.gvsig.expressionevaluator.swing.impl.elements;
7 7

  
8
import java.util.Comparator;
8 9
import java.util.Objects;
9 10
import org.gvsig.expressionevaluator.swing.Element.ConstantElement;
10 11
import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
......
12 13
import org.gvsig.expressionevaluator.swing.spi.AbstractElement;
13 14
import org.gvsig.tools.ToolsLocator;
14 15
import org.gvsig.tools.i18n.I18nManager;
16
import org.gvsig.tools.util.LabeledValue;
15 17

  
16 18
/**
17 19
 *
......
21 23
        extends AbstractElement
22 24
        implements ConstantElement {
23 25

  
24
    private final Object value;
25
    private final ExpressionBuilderConfig config;
26
    private final String label;
26 27

  
27
    public DefaultConstantValueElement(ExpressionBuilderConfig config, Object value, String description) {
28
        super(Objects.toString(value, ""), "expressionbuilder-element-constant");
29
        this.value = value;
30
        this.config = config;
28
    public DefaultConstantValueElement(Object value, String label, String description) {
29
        super(Objects.toString(value,""),  value, "expressionbuilder-element-constant");
30
        if( label == null ) {
31
            this.label = Objects.toString(value,"");
32
        } else {
33
            this.label = label;
34
        }
31 35
    }
32 36

  
33 37
    @Override
34
    public Object getValue() {
35
        return value;
38
    public String getLabel() {
39
        return this.label;
36 40
    }
37 41

  
38 42
    @Override
43
    public String getRenderedValue() {
44
        return " "+Utils.repr(this.getValue())+" ";
45
    }
46

  
47
    @Override
39 48
    public String getDescription() {
40 49
        I18nManager i18n = ToolsLocator.getI18nManager();
41 50

  
......
54 63
        return html.toString();
55 64
    }
56 65

  
66
    @Override
67
    public int compareTo(Object other) {
68
        if( !(other instanceof LabeledValue) ) {
69
            return super.compareTo(other);
70
        }
71
        Comparator comparator = Utils.naturalComparator();
72
        return comparator.compare(this.getValue(), ((LabeledValue)other).getValue());
73
    }
74

  
57 75
}

Also available in: Unified diff