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/SearchFieldController.java
| SearchFieldController.java | ||
|---|---|---|
| 80 | 80 |
int type |
| 81 | 81 |
) {
|
| 82 | 82 |
super( |
| 83 |
ObjectUtils.defaultIfNull(label, attrdesc.getLabel()), |
|
| 83 |
ObjectUtils.defaultIfNull(label, attrdesc.getLocalizedLabel()),
|
|
| 84 | 84 |
ObjectUtils.defaultIfNull(value, attrdesc.getName()) |
| 85 | 85 |
); |
| 86 | 86 |
this.store = store; |
| ... | ... | |
| 95 | 95 |
case Search.OrderedAttribute.TYPE_REGURAL: |
| 96 | 96 |
break; |
| 97 | 97 |
case Search.OrderedAttribute.TYPE_FAVORITE: |
| 98 |
theLabel = "<b>"+theLabel+"</b>";
|
|
| 98 |
theLabel = "<html><b>"+theLabel+"</b></html>";
|
|
| 99 | 99 |
break; |
| 100 | 100 |
case Search.OrderedAttribute.TYPE_RECENT: |
| 101 |
theLabel = "<i><b>"+theLabel+"</b></i>";
|
|
| 101 |
theLabel = "<html><i><b>"+theLabel+"</b></i></html>";
|
|
| 102 | 102 |
break; |
| 103 | 103 |
} |
| 104 | 104 |
return theLabel; |
| ... | ... | |
| 181 | 181 |
this.lblExtraFields.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); |
| 182 | 182 |
|
| 183 | 183 |
this.ddnFields = toolsSwingManager.createDropDown(lblFields); |
| 184 |
this.ddnFields.setVisibleDropdownArrow(false); |
|
| 184 | 185 |
this.ddnRelationalOperators = toolsSwingManager.createDropDown(lblRelationalOperators); |
| 186 |
this.ddnRelationalOperators.setVisibleDropdownArrow(false); |
|
| 185 | 187 |
if (lblLogicalOperators != null) {
|
| 186 | 188 |
this.ddnLogicalOperators = toolsSwingManager.createDropDown(lblLogicalOperators); |
| 189 |
this.ddnLogicalOperators.setVisibleDropdownArrow(false); |
|
| 187 | 190 |
} |
| 188 | 191 |
|
| 189 | 192 |
DefaultComboBoxModel modelRelationalOperators = new DefaultComboBoxModel(); |
| ... | ... | |
| 209 | 212 |
20 |
| 210 | 213 |
); |
| 211 | 214 |
List<ImageIcon>icons = new ArrayList<>(); |
| 212 |
DataTypesManager dataTypeManager = ToolsLocator.getDataTypesManager(); |
|
| 215 |
// DataTypesManager dataTypeManager = ToolsLocator.getDataTypesManager();
|
|
| 213 | 216 |
IconTheme iconTheme = ToolsSwingLocator.getIconThemeManager().getCurrent(); |
| 214 | 217 |
DefaultComboBoxModel model = new DefaultComboBoxModel(); |
| 215 | 218 |
for (Search.OrderedAttribute attr : orderedAttributes) {
|
| ... | ... | |
| 263 | 266 |
final JTree tree = new JTree(); |
| 264 | 267 |
tree.setCellRenderer(new AdvancedAttributeSelectionTreeCellRenderer()); |
| 265 | 268 |
tree.setModel(treeModel); |
| 269 |
try {
|
|
| 270 |
tree.setSelectionRow(1); |
|
| 271 |
} catch(Throwable th) {
|
|
| 272 |
} |
|
| 266 | 273 |
JScrollPane scrollpane = new JScrollPane(tree); |
| 267 | 274 |
scrollpane.setPreferredSize(new Dimension(400, 300)); |
| 268 | 275 |
scrollpane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); |
| ... | ... | |
| 313 | 320 |
String formula = builder.function(DataManager.FUNCTION_FOREING_VALUE, list).toString(); |
| 314 | 321 |
String label = attrdesc.getLabel() + " [" + theStore.getName() + "]"; |
| 315 | 322 |
if (StringUtils.equalsIgnoreCase(storeFullName, this.store.getFullName())) {
|
| 316 |
label = attrdesc.getLabel(); |
|
| 323 |
label = attrdesc.getLocalizedLabel();
|
|
| 317 | 324 |
formula = attrdesc.getName(); |
| 318 | 325 |
} |
| 319 | 326 |
FeatureAttribute attribute = new FeatureAttribute(theStore, attrdesc, label, formula, Search.OrderedAttribute.TYPE_REGURAL); |
Also available in: Unified diff