/ - Diff - Application: gvSIG desktop - gvSIG

Revision 45274

         final List<Object> values = new ArrayList<>();
         final DefaultComboBoxModel model = new DefaultComboBoxModel();
         this.setEnabled(false);
         final FeatureStore theStore = field.getFeatureStore();
         final FeatureQuery query = parameters.getQuery().getCopy(); // theStore.createFeatureQuery();
         final FeatureStore theStore = field.getFeatureStore();
         final FeatureQuery query;
         if (this.store == theStore) {
             query = parameters.getQuery().getCopy(); // theStore.createFeatureQuery();
         } else {
             query = theStore.createFeatureQuery();
+        }
         query.addAttributeName(field.getDescriptor().getName());
         query.setFilter("");
         query.setLimit(updateValuesFeaturesLimit);
-...
             SwingUtilities.invokeLater(new Runnable() {
               @Override
               public void run() {
                 setEnabled(false);
                 cboValue.setModel(model);
                 if (valueAssigned != null) {
                   cboValue.setSelectedItem(valueAssigned);
-...
+      }
       public void setEnabled(boolean enabled) {
         this.ddnFields.setEnabled(enabled);
         if (this.ddnLogicalOperators != null) {
           this.ddnLogicalOperators.setEnabled(enabled);
+        }
         this.ddnRelationalOperators.setEnabled(enabled);
         this.lblExtraFields.setEnabled(enabled);
         this.cboValue.setEnabled(enabled);
           ddnFields.setEnabled(enabled);
           if (ddnLogicalOperators != null) {
               ddnLogicalOperators.setEnabled(enabled);
+          }
           ddnRelationalOperators.setEnabled(enabled);
           lblExtraFields.setEnabled(enabled);
           cboValue.setEnabled(enabled);
+      }
       public String getRelationalOperator() {
-...
+        }
+      }
       public void setValue(Object value) {
         this.cboValue.setSelectedItem(value);
         this.valueAssigned = value;
+      }
         public void setValue(Object value) {
             //this.cboValue.setSelectedItem(value);
             SwingUtilities.invokeLater(new Runnable() {
                 @Override
                 public void run() {
                     DefaultComboBoxModel model = (DefaultComboBoxModel) cboValue.getModel();
                     for (int i = 0; i < model.getSize(); i++) {
                         Object item = model.getElementAt(i);
                         if (item.equals(value)) {
                             cboValue.setSelectedIndex(i);
                             valueAssigned = value;
                             return;
+                        }
+                    }
                     // si no lo encuentra en el modelo lo a?ade
                     final Field field = (Field) ddnFields.getSelectedItem();
                     if (field == null) {
                         return;
                     } else {
                         LabeledValue[] availableValues = field.getDescriptor().getAvailableValues();
                         Map<String, String> availableValuesMap = new HashMap<>();
                         if (availableValues != null) {
                             for (LabeledValue availableValue : availableValues) {
                                 availableValuesMap.put(
                                         Objects.toString(availableValue.getValue()),
                                         availableValue.getLabel()
                                 );
+                            }
+                        }
                         String key;
                         if (value instanceof Date) {
                             DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, Locale.getDefault());
                             df.setLenient(false);
                             key = df.format(value);
                         } else {
                             key = Objects.toString(value);
+                        }
                         String label = availableValuesMap.getOrDefault(key, key);
                         LabeledValueImpl newItem = new LabeledValueImpl(label, value);
                         model.addElement(newItem);
                         cboValue.setSelectedItem(newItem);
                         valueAssigned = newItem;
+                    }
+                }
             });
+        }
       private Field getCurrentField() {
         final Field field = (Field) this.ddnFields.getSelectedItem();

     import org.gvsig.fmap.dal.swing.impl.featurequery.DefaultFeatureQueryCalculatedColumnsPanel;
     import org.gvsig.fmap.dal.swing.featuretype.FeatureAttributesSelectionPanel;
     import org.gvsig.fmap.dal.swing.searchpanel.SearchParameters;
     import org.gvsig.tools.bookmarksandhistory.Bookmark;
     import org.gvsig.tools.bookmarksandhistory.Bookmarks;
     import org.gvsig.tools.bookmarksandhistory.History;
     import org.gvsig.tools.dispose.Disposable;
-...
+                            }
                             clear();
                             put(searchParams);
                             search();
                             break;
+                    }
-...
+                    }
+                }
             });
             if (this.bookmarks.hasBookmark(this.store.getName())) {
                 Bookmark<DefaultSearchParameters> initBookmark = this.bookmarks.get(this.store.getName());
                 DefaultSearchParameters initSearchParams = initBookmark.getValue().getCopy();
                 clear();
                 put(initSearchParams);
+            }
             search();
+        }
-...
         @Override
         public void clear() {
             this.lblMsg.setText("");
             if (this.conditionPanels == null) {
                 return;
+            }

Also available in: Unified diff