/ - Diff - Application: gvSIG desktop - gvSIG

     package org.gvsig.fmap.dal.swing;
     import java.util.function.Predicate;
     import javax.swing.ComboBoxModel;
     import javax.swing.JButton;
     import javax.swing.JComboBox;
     import javax.swing.JList;
     import javax.swing.JTextField;
     import org.cresques.cts.IProjection;
     import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
-...
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JComboBox combo);
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JList list);
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JComboBox combo, Predicate<FeatureAttributeDescriptor> filter);
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JList list, Predicate<FeatureAttributeDescriptor> filter);
         public FeatureTypePanel createFeatureTypePanel();
         public FeatureTypeAttributePanel createFeatureTypeAttributePanel();

     package org.gvsig.fmap.dal.swing.impl.featuretype;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import org.gvsig.fmap.dal.swing.featuretype.AttributeDescriptorPickerController;
     import java.awt.event.ItemEvent;
     import java.awt.event.ItemListener;
-...
     import java.util.List;
     import java.util.function.Predicate;
     import javax.swing.DefaultComboBoxModel;
     import javax.swing.DefaultListModel;
     import javax.swing.JComboBox;
     import javax.swing.JComponent;
     import javax.swing.JList;
     import javax.swing.event.ListSelectionEvent;
     import javax.swing.event.ListSelectionListener;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.tools.swing.api.Component;
     import org.gvsig.tools.swing.api.ListElement;
     import org.gvsig.tools.swing.api.pickercontroller.AbstractPickerController;
-...
             implements AttributeDescriptorPickerController
+        {
         private final JComboBox combo;
         private static class ComboOrList<T> implements Component {
             private JComboBox combo;
             private JList list;
             public ComboOrList(JComboBox combo) {
                 this.combo = combo;
                 this.combo.setEditable(false);
+            }
             public ComboOrList(JList list) {
                 this.list = list;
+            }
             @Override
             public JComponent asJComponent() {
                 if( this.combo == null ) {
                     return this.list;
+                }
                 return this.combo;
+            }
             private void addSelectionListener(final ActionListener listener) {
                 if( this.combo == null ) {
                     this.list.addListSelectionListener(new ListSelectionListener() {
                         @Override
                         public void valueChanged(ListSelectionEvent e) {
                             if( e.getValueIsAdjusting() ) {
                                 return;
+                            }
                             listener.actionPerformed(new ActionEvent(list, 0, "selected"));
+                        }
                     });
                 } else {
                     this.combo.addItemListener(new ItemListener() {
                         @Override
                         public void itemStateChanged(ItemEvent e) {
                             if( e.getStateChange()==ItemEvent.SELECTED ) {
                                 listener.actionPerformed(new ActionEvent(combo, 0, "selected"));
+                            }
+                        }
                     });
+                }
+            }
             public void clear() {
                 if( this.combo == null ) {
                     DefaultListModel model = new DefaultListModel();
                     this.list.setModel(model);
                 } else {
                     DefaultComboBoxModel model = new DefaultComboBoxModel();
                     this.combo.setModel(model);
+                }
+            }
             public void add(String label, T value) {
                 ListElement<T> element = new ListElement<>(label,value);
                 if( this.combo == null ) {
                     DefaultListModel model = (DefaultListModel) this.list.getModel();
                     model.addElement(element);
                 } else {
                     DefaultComboBoxModel model = (DefaultComboBoxModel) this.combo.getModel();
                     model.addElement(element);
+                }
+            }
             public int getSize() {
                 if( this.combo == null ) {
                     return this.list.getModel().getSize();
                 } else {
                     return this.combo.getModel().getSize();
+                }
+            }
             public void setSelectedIndex(int i) {
                 if( this.combo == null ) {
                     this.list.setSelectedIndex(i);
                 } else {
                     this.combo.setSelectedIndex(i);
+                }
+            }
             public void setEnabled(boolean enabled) {
                 if( this.combo == null ) {
                     this.list.setEnabled(enabled);
                 } else {
                     this.combo.setEnabled(enabled);
+                }
+            }
             public boolean isEnabled() {
                 if( this.combo == null ) {
                     return this.list.isEnabled();
                 } else {
                     return this.combo.isEnabled();
+                }
+            }
             public void setSelectedValue(T value) {
                 if( this.combo == null ) {
                     ListElement.setSelected(this.list, value);
                 } else {
                     ListElement.setSelected(this.combo, value);
+                }
+            }
             public T getSelectedValue() {
                 T value;
                 if( this.combo == null ) {
                     value = (T) ListElement.getSelected(this.list);
                 } else {
                     value = (T) ListElement.getSelected(this.combo);
+                }
                 return value;
+            }
+        }
         private final ComboOrList<FeatureAttributeDescriptor> combo;
         private FeatureType featureType;
         private final Predicate<FeatureAttributeDescriptor> filter;
         public DefaultAttributeDescriptorPickerController(JComboBox combo, Predicate<FeatureAttributeDescriptor> filter) {
             this(new ComboOrList(combo), filter);
+        }
         public DefaultAttributeDescriptorPickerController(JList list, Predicate<FeatureAttributeDescriptor> filter) {
             this(new ComboOrList(list), filter);
+        }
         private DefaultAttributeDescriptorPickerController(ComboOrList combo, Predicate<FeatureAttributeDescriptor> filter) {
             this.combo = combo;
             this.combo.setEditable(false);
             this.combo.addItemListener(new ItemListener() {
             this.combo.addSelectionListener(new ActionListener() {
                 @Override
                 public void itemStateChanged(ItemEvent e) {
                 public void actionPerformed(ActionEvent e) {
                     fireChangeEvent();
+                }
             });
             this.filter = filter;
+        }
         @Override
         public void setFeatureType(FeatureType featureType) {
             this.featureType = featureType;
             this.combo.clear();
             if( this.featureType==null ) {
                 return;
+            }
             List<FeatureAttributeDescriptor> attributes = new ArrayList<>();
             for (FeatureAttributeDescriptor descriptor : featureType) {
                 if( filter==null || filter.test(descriptor) ) {
-...
                     return o1.getName().compareToIgnoreCase(o2.getName());
+                }
             });
             DefaultComboBoxModel model = new DefaultComboBoxModel();
             for (FeatureAttributeDescriptor descriptor : attributes) {
                 String nameDescription = descriptor.getName() + " [" + descriptor.getDataTypeName() + "]";
                 model.addElement(new ListElement<>(nameDescription, descriptor));
                 this.combo.add(nameDescription, descriptor);
+            }
             this.combo.setModel(model);
             if( this.combo.getModel().getSize()>0 ) {
             if( this.combo.getSize()>0 ) {
                 this.combo.setSelectedIndex(0);
             } else {
                 this.combo.setSelectedIndex(-1);
-...
         @Override
         public FeatureAttributeDescriptor get() {
             FeatureAttributeDescriptor descriptor = (FeatureAttributeDescriptor) ListElement.getSelected(this.combo);
             FeatureAttributeDescriptor descriptor = this.combo.getSelectedValue();
             return descriptor;
+        }
         @Override
         public void set(FeatureAttributeDescriptor descriptor) {
             ListElement.setSelected(this.combo, descriptor);
             this.combo.setSelectedValue(descriptor);
+        }
         @Override

     import java.util.function.Predicate;
     import javax.swing.JButton;
     import javax.swing.JComboBox;
     import javax.swing.JList;
     import javax.swing.JTextField;
     import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
     import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingLocator;
-...
+        }
         @Override
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JList list) {
             AttributeDescriptorPickerController controller = new DefaultAttributeDescriptorPickerController(list, null);
             return controller;
+        }
         @Override
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JComboBox combo, Predicate<FeatureAttributeDescriptor> filter) {
             AttributeDescriptorPickerController controller = new DefaultAttributeDescriptorPickerController(combo, filter);
             return controller;
+        }
         @Override
         public AttributeDescriptorPickerController createAttributeDescriptorPickerController(JList list, Predicate<FeatureAttributeDescriptor> filter) {
             AttributeDescriptorPickerController controller = new DefaultAttributeDescriptorPickerController(list, filter);
             return controller;
+        }
         @Override
         public FeatureTypePanel createFeatureTypePanel() {
             FeatureTypePanel panel = new DefaultFeatureTypePanel();
             return panel;

         @Override
         public List<Element> getElements() {
             if( this.elements == null ) {
                 return Collections.EMPTY_LIST;
+            }
             return Collections.unmodifiableList(this.elements);
+        }
-...
         @Override
         public void setFeatureStore(FeatureStore store) {
               if (store==null) {
                   this.elements = new ArrayList<>();
                   this.elements = Collections.EMPTY_LIST;
                   return;
+              }
               try {

     public interface Expression extends Persistent, Cloneable {
         public void clear();
         /**
          * This symbol table don't persist with the expression.
+         *
          * @return the symbol table of the expression
          */
         public SymbolTable getSymbolTable();
         public String getPhrase();
         public Script getUserScript();
-...
         public void setSQLCompatible(boolean sqlCompatible);
         public boolean isSQLCompatible();
         public void setUseBracketsForIdentifiers(boolean useBracketsForIdentifiers);
         public boolean getUseBracketsForIdentifiers();
+    }

+        }
         @Override
         public void addSymbolTable(SymbolTable symbolTable) {
         public boolean addSymbolTable(SymbolTable symbolTable) {
             if (this.symbolTables.contains(symbolTable)) {
                 return;
                 return false;
+            }
             this.symbolTables.add(symbolTable);
             return true;
+        }
         @Override
         public boolean containsSymbolTable(SymbolTable symbolTable) {
             return this.symbolTables.contains(symbolTable);
+        }
         @Override
         public boolean removeSymbolTable(SymbolTable symbolTable) {
             boolean n = this.symbolTables.remove(symbolTable);
             return n;
+        }
         protected Map<String, Object> getVars() {
             if (this.vars == null) {
                 this.vars = new HashMap<>();

         public String getName();
         public void addSymbolTable(SymbolTable symbolTable);
         public boolean addSymbolTable(SymbolTable symbolTable);
         public boolean removeSymbolTable(SymbolTable symbolTable);
         public boolean containsSymbolTable(SymbolTable symbolTable);
         public Function function(String name);
         public boolean exists(String name);

     package org.gvsig.expressionevaluator;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
     import org.gvsig.tools.script.Script;
-...
+        }
         public static Expression createExpression(String phrase) {
             if( StringUtils.isBlank(phrase) ) {
                 return null;
+            }
             Expression expression = ExpressionEvaluatorLocator.getManager().createExpression();
             expression.setPhrase(phrase);
             return expression;
-...
+        }
         public static Code compile(String expression) {
             if( StringUtils.isBlank(expression) ) {
                 return null;
+            }
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             Code code = manager.compile(expression);
             return code;
+        }
         public static Object evaluate(SymbolTable symbolTable, String expression) {
             if( StringUtils.isBlank(expression) ) {
                 return null;
+            }
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             Object x = manager.evaluate(symbolTable, expression);
             return x;
-...
             return code.toString(Code.EMPTY_FORMATTER);
+        }
         public static Expression createExpressionFromJSON(String json) {
             Expression expression = ExpressionUtils.createExpression();
             expression.fromJSON(json);
             return expression;
+        }
         public static MutableSymbolTable createSymbolTable() {
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             MutableSymbolTable symbolTable = manager.createSymbolTable();
             return symbolTable;
+        }
+    }

     import java.util.List;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.expressionevaluator.Code;
     import org.gvsig.expressionevaluator.Compiler;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.ExpressionUtils;
     import org.gvsig.expressionevaluator.Interpreter;
     import org.gvsig.expressionevaluator.Optimizer;
     import org.gvsig.expressionevaluator.SymbolTable;
-...
         private Code code = null;
         private Interpreter interpreter;
         private boolean hasNotBeenOptimized = true;
         private SymbolTable mySymbolTable = null;
         private boolean useBracketsForIdentifiers = false;
         public DefaultExpression() {
+        }
         @Override
         public SymbolTable getSymbolTable() {
             if( this.mySymbolTable==null ) {
                 this.mySymbolTable = ExpressionUtils.createSymbolTable();
+            }
             return this.mySymbolTable;
+        }
         @Override
         public String getPhrase() {
-...
         public Code getCode() {
             if (this.code == null) {
                 ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
                 this.code = manager.compile(this.phrase);
                 Compiler compiler = manager.createCompiler();
                 compiler.getLexicalAnalyzer().setUseBracketsForIdentifiers(
                         this.useBracketsForIdentifiers
                 );
                 this.code = compiler.compileExpression(this.phrase);
+            }
             return code;
+        }
-...
                 ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
                 this.interpreter = manager.createInterpreter();
+            }
             this.interpreter.setSymbolTable(symbolTable);
             if( this.hasNotBeenOptimized  ) {
                 Optimizer optimizer = new DefaultOptimizer(symbolTable);
                 this.code = optimizer.optimize(this.getCode());
                 this.hasNotBeenOptimized = false;
             boolean added = this.getSymbolTable().addSymbolTable(symbolTable);
             try {
                 this.interpreter.setSymbolTable(this.mySymbolTable);
                 if( this.hasNotBeenOptimized  ) {
                     Optimizer optimizer = new DefaultOptimizer(symbolTable);
                     this.code = optimizer.optimize(this.getCode());
                     this.hasNotBeenOptimized = false;
+                }
                 Object x = this.interpreter.run(this.getCode());
                 return x;
             } finally {
                 if( added ) {
                     this.getSymbolTable().removeSymbolTable(symbolTable);
+                }
+            }
             Object x = this.interpreter.run(this.getCode());
             return x;
+        }
         @Override
-...
             return other;
+        }
         @Override
         public void setUseBracketsForIdentifiers(boolean useBracketsForIdentifiers) {
             this.useBracketsForIdentifiers = useBracketsForIdentifiers;
+        }
         @Override
         public boolean getUseBracketsForIdentifiers() {
             return this.useBracketsForIdentifiers;
+        }
+    }

+            }
             @Override
             public void addSymbolTable(SymbolTable symbolTable) {
             public boolean addSymbolTable(SymbolTable symbolTable) {
                 throw new UnsupportedOperationException("Not supported yet.");
+            }
             @Override
             public boolean containsSymbolTable(SymbolTable symbolTable) {
                 throw new UnsupportedOperationException("Not supported yet.");
+            }
             @Override
             public boolean removeSymbolTable(SymbolTable symbolTable) {
                 throw new UnsupportedOperationException("Not supported yet.");
+            }
             @Override
             public Function function(String name) {
                 return this.symbolTable.function(name);
+            }

     import java.util.Collections;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Map;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.SymbolTable;
-...
     import org.gvsig.expressionevaluator.swing.ElementFactory;
     import org.gvsig.expressionevaluator.swing.ExpressionBuilderConfig;
     import org.gvsig.expressionevaluator.swing.ExpressionEvaluatorSwingManager;
     import org.gvsig.tools.util.PropertiesSupportHelper;
     /**
+     *
-...
         private boolean scriptsEnabled = true;
         private SymbolTable previewSymbolTable;
         private boolean SQLCompatible;
         private PropertiesSupportHelper propertiesSupportHelper;
         public DefaultExpressionBuilderConfig(ExpressionEvaluatorSwingManager manager) {
             this.manager = manager;
             this.limit = 6;
             this.SQLCompatible = false;
             this.propertiesSupportHelper = new PropertiesSupportHelper();
             initSymbolTables();
+        }
-...
         public boolean isSQLCompatible() {
             return SQLCompatible;
+        }
         @Override
         public Object getProperty(String string) {
             return this.propertiesSupportHelper.getProperty(string);
+        }
         @Override
         public void setProperty(String string, Object o) {
             this.propertiesSupportHelper.setProperty(string, o);
+        }
         @Override
         public Map<String, Object> getProperties() {
             return this.propertiesSupportHelper.getProperties();
+        }
+    }

     import java.util.HashSet;
     import java.util.List;
     import java.util.Locale;
     import java.util.Map;
     import java.util.Objects;
     import javax.swing.DefaultListCellRenderer;
     import javax.swing.ImageIcon;
-...
         public boolean isSQLCompatible() {
             return this.config.isSQLCompatible();
+        }
         @Override
         public Object getProperty(String string) {
             return this.config.getProperty(string);
+        }
         @Override
         public void setProperty(String string, Object o) {
             this.config.setProperty(string, o);
+        }
         @Override
         public Map<String, Object> getProperties() {
             return this.config.getProperties();
+        }
         @Override
         public JComponent asJComponent() {

     import java.net.URL;
     import java.util.Collection;
     import java.util.List;
     import java.util.Map;
     import javax.swing.ImageIcon;
     import javax.swing.JButton;
     import javax.swing.JMenuItem;
-...
             return this.config.isSQLCompatible();
+        }
         @Override
         public Object getProperty(String string) {
             return this.config.getProperty(string);
+        }
         @Override
         public void setProperty(String string, Object o) {
             this.config.setProperty(string, o);
+        }
         @Override
         public Map<String, Object> getProperties() {
             return this.config.getProperties();
+        }
+    }

     import java.awt.BorderLayout;
     import java.util.Collection;
     import java.util.List;
     import java.util.Map;
     import javax.swing.JButton;
     import javax.swing.JComponent;
     import javax.swing.JPanel;
-...
         public boolean isSQLCompatible() {
             return this.controller.isSQLCompatible();
+        }
         @Override
         public Object getProperty(String string) {
             return this.controller.getProperty(string);
+        }
         @Override
         public void setProperty(String string, Object o) {
             this.controller.setProperty(string, o);
+        }
         @Override
         public Map<String, Object> getProperties() {
             return this.controller.getProperties();
+        }
+    }

     import java.util.Collection;
     import java.util.List;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.tools.util.PropertiesSupport;
     /**
+     *
      * @author jjdelcerro
      */
     public interface ExpressionBuilderConfig {
     public interface ExpressionBuilderConfig extends PropertiesSupport {
         public List<Element> getElements();

Application: gvSIG desktop

Revision 44215