Revision 46485 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.swing/org.gvsig.fmap.dal.swing.impl/src/main/java/org/gvsig/fmap/dal/swing/impl/featuretype/FeatureAttributeListCellRendererImpl.java

View differences:

FeatureAttributeListCellRendererImpl.java
6 6
import javax.swing.JList;
7 7
import org.gvsig.fmap.dal.DataManager;
8 8
import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
9
import org.gvsig.fmap.dal.swing.DALSwingLocator;
10
import org.gvsig.fmap.dal.swing.DataSwingManager;
9 11
import org.gvsig.fmap.dal.swing.featuretype.FeatureAttributeListCellRenderer;
10 12
import org.gvsig.tools.swing.api.ToolsSwingLocator;
11 13
import org.gvsig.tools.swing.icontheme.IconTheme;
......
21 23
    {
22 24

  
23 25
    private final IconTheme iconTheme;
24
    private int useLabels;
26
    private Integer useLabels;
27
    private final DataSwingManager dalSwingManager;
25 28

  
26 29
    public FeatureAttributeListCellRendererImpl() {
27 30
        this.iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent();
28
        this.useLabels = DataManager.USE_LABELS_BOTH;
31
        this.useLabels = null;
32
        this.dalSwingManager = DALSwingLocator.getDataSwingManager();
29 33
    }
30 34
    
31 35
    @Override
......
44 48
        String iconName = null;
45 49
        try {
46 50
            if(attrdesc  != null) {
47
                switch (this.useLabels) {
48
                    case DataManager.USE_LABELS_NO:
49
                        theLabel = attrdesc.getName();
50
                        break;
51
                    case DataManager.USE_LABELS_YES:
52
                        if (attrdesc.hasLabel()) {
53
                            theLabel = attrdesc.getLocalizedLabel();
54
                        } else {
51
                if(this.useLabels == null) {
52
                    theLabel = dalSwingManager.getAttributeDescriptorLabel(attrdesc);
53
                } else {
54
                    switch (this.useLabels) {
55
                        case DataManager.USE_LABELS_NO:
55 56
                            theLabel = attrdesc.getName();
56
                        }
57
                        break;
58
                    case DataManager.USE_LABELS_BOTH:
59
                    default:
60
                        if (attrdesc.hasLabel()) {
61
                            theLabel = String.format("%s [%s]", attrdesc.getLocalizedLabel(), attrdesc.getName());
62
                        } else {
63
                            theLabel = attrdesc.getName();
64
                        }
65
                        break;
57
                            break;
58
                        case DataManager.USE_LABELS_YES:
59
                            if (attrdesc.hasLabel()) {
60
                                theLabel = attrdesc.getLocalizedLabel();
61
                            } else {
62
                                theLabel = attrdesc.getName();
63
                            }
64
                            break;
65
                        case DataManager.USE_LABELS_BOTH:
66
                        default:
67
                            if (attrdesc.hasLabel()) {
68
                                theLabel = String.format("%s [%s]", attrdesc.getLocalizedLabel(), attrdesc.getName());
69
                            } else {
70
                                theLabel = attrdesc.getName();
71
                            }
72
                            break;
73
                    }
66 74
                }
67 75
                iconName = attrdesc.getDataType().getIconName();
68 76
            }
......
79 87
    }
80 88

  
81 89
    @Override
82
    public void setUseLabeld(int useLabels) {
90
    public void setUseLabels(Integer useLabels) {
83 91
        this.useLabels = useLabels;
84 92
    }
85 93

  
86 94
    @Override
87
    public int getUseLabels() {
95
    public Integer getUseLabels() {
88 96
        return this.useLabels;
89 97
    }
90 98
    

Also available in: Unified diff