Revision 44338 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureAttributeDescriptor.java

View differences:

DefaultFeatureAttributeDescriptor.java
52 52
import org.gvsig.tools.ToolsLocator;
53 53
import org.gvsig.tools.dataTypes.CoercionException;
54 54
import org.gvsig.tools.dataTypes.DataType;
55
import org.gvsig.tools.dataTypes.DataTypeUtils;
56 55
import org.gvsig.tools.dynobject.DynField;
57 56
import org.gvsig.tools.dynobject.DynField_LabelAttribute;
58 57
import org.gvsig.tools.dynobject.DynField_v2;
......
69 68
import org.gvsig.tools.evaluator.Evaluator;
70 69
import org.gvsig.tools.evaluator.EvaluatorData;
71 70
import org.gvsig.tools.evaluator.EvaluatorException;
71
import org.gvsig.tools.i18n.I18nManager;
72 72
import org.gvsig.tools.persistence.PersistenceManager;
73 73
import org.gvsig.tools.persistence.Persistent;
74 74
import org.gvsig.tools.persistence.PersistentState;
......
112 112
    protected boolean allowIndexDuplicateds = true;
113 113

  
114 114
    protected DynObjectValueItem[] availableValues;
115
    protected DynObjectValueItem[] availableValuesFromForeingKey;
116 115
    protected String description;
117 116
    protected Object minValue;
118 117
    protected Object maxValue;
......
778 777
    @Override
779 778
    public DynObjectValueItem[] getAvailableValues() {
780 779
        if( this.availableValues == null ) {
781
            if( this.availableValuesFromForeingKey==null ) {
782
                if( this.isForeingKey() && this.foreingKey.isSelectable() ) {
783
                    this.availableValuesFromForeingKey = this.foreingKey.getAvailableValues(null);
784
                }
785
                return this.availableValuesFromForeingKey;
780
            if( this.isForeingKey() && this.foreingKey.isClosedList() ) {
781
                return this.foreingKey.getAvailableValues(null);
786 782
            }
787 783
        }
788 784
        return this.availableValues;
......
995 991
        }
996 992
        return this.label;
997 993
    }
994
    
995
    @Override
996
    public String getLocalizedLabel() {
997
        if( StringUtils.isBlank(this.label) ) {
998
            return this.getName();
999
        }
1000
        I18nManager i18n = ToolsLocator.getI18nManager();
1001
        return i18n.getTranslation(this.label);
1002
    }
998 1003

  
999 1004
    @Override
1000 1005
    public DynField setLabel(String label) {
......
1014 1019
    }
1015 1020

  
1016 1021
    @Override
1022
    public String getLocalizedShortLabel() {
1023
        if( StringUtils.isBlank(shortLabel) ) {
1024
            return this.getLocalizedLabel();
1025
        }
1026
        I18nManager i18n = ToolsLocator.getI18nManager();
1027
        return i18n.getTranslation(shortLabel);
1028
    }
1029

  
1030
    @Override
1017 1031
    public DynField setGroup(String groupName) {
1018 1032
        this.groupName = groupName;
1019 1033
        return this;

Also available in: Unified diff