Revision 44338 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/searchpanel/DefaultSearchPanel.java
DefaultSearchPanel.java | ||
---|---|---|
120 | 120 |
if (attrdesc == null) { |
121 | 121 |
return "C" + columnIndex; |
122 | 122 |
} |
123 |
return attrdesc.getLabel(); |
|
123 |
return attrdesc.getLocalizedShortLabel();
|
|
124 | 124 |
} |
125 | 125 |
|
126 | 126 |
@Override |
... | ... | |
133 | 133 |
if (attrdesc == null) { |
134 | 134 |
return String.class; |
135 | 135 |
} |
136 |
if( attrdesc.isForeingKey() && attrdesc.getForeingKey().isClosedList() ) { |
|
137 |
return String.class; |
|
138 |
} |
|
136 | 139 |
Class theClass = attrdesc.getDataType().getDefaultClass(); |
137 | 140 |
if( theClass==null ) { |
138 | 141 |
return String.class; |
... | ... | |
150 | 153 |
if (this.features == null) { |
151 | 154 |
return null; |
152 | 155 |
} |
153 |
Feature feature = this.features.get(rowIndex); |
|
154 |
String attrName = this.columnNames.get(columnIndex); |
|
155 | 156 |
try { |
156 |
return feature.get(attrName); |
|
157 |
Feature feature = this.features.get(rowIndex); |
|
158 |
String attrName = this.columnNames.get(columnIndex); |
|
159 |
Object value = feature.get(attrName); |
|
160 |
FeatureAttributeDescriptor attrdesc = this.featureType.getAttributeDescriptor(attrName); |
|
161 |
if (attrdesc != null) { |
|
162 |
if( attrdesc.isForeingKey() && attrdesc.getForeingKey().isClosedList() ) { |
|
163 |
value = attrdesc.getForeingKey().getLabelForValue(value); |
|
164 |
} |
|
165 |
} |
|
166 |
return value; |
|
157 | 167 |
} catch (Throwable th) { |
158 | 168 |
return null; |
159 | 169 |
} |
Also available in: Unified diff