/ - Diff - Application: gvSIG desktop - gvSIG

     import org.gvsig.fmap.dal.feature.FeatureSelection;
     import org.gvsig.fmap.dal.feature.FeatureStore;
     import org.gvsig.fmap.dal.feature.FeatureType;
     import org.gvsig.tools.script.Script;
     import org.gvsig.tools.util.UnmodifiableBasicList;
     /**
+     *
-...
             this.addFunction(new IsSelectedFunction());
+        }
         @SuppressWarnings("OverridableMethodCallInConstructor")
         public DefaultFeatureSymbolTable(Script userScript, UnmodifiableBasicList<Script> scripts) {
             this();
             if (userScript != null) {
                 this.getScripts().add(userScript);
+            }
             if (scripts != null && !scripts.isEmpty()) {
                 for (Script script : scripts) {
                     this.getScripts().add(script);
+                }
+            }
+        }
         public final void addFunction(Function function) {
             if (function == null) {
                 throw new IllegalArgumentException("function can't be null");

     import org.gvsig.expressionevaluator.Interpreter;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.expressionevaluator.Compiler;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.Function;
-...
         private Compiler compiler;
         private Interpreter interpreter;
         private Code code;
         private String source;
         private Expression expression;
         private Description[] availableOperators;
         private Description[] availableFunctions;
         public DefaultExpressionEvaluator(String source) {
             this.featureSymbolTable = new DefaultFeatureSymbolTable();
             this.source = source;
             this.expression = ExpressionEvaluatorLocator.getManager().createExpression();
             this.expression.setPhrase(source);
+        }
         public DefaultExpressionEvaluator(Expression expression) {
             this.expression = expression;
             this.featureSymbolTable = new DefaultFeatureSymbolTable(
                     expression.getUserScript(),
                     expression.getScripts()
             );
+        }
         private void compile() {
             this.code = this.compiler.compileExpression(source);
             this.code = this.compiler.compileExpression(expression.getPhrase());
+        }
         @Override
-...
         public Evaluator clone() throws CloneNotSupportedException {
             DefaultExpressionEvaluator other = (DefaultExpressionEvaluator) super.clone();
             other.code = this.code;
             other.source = this.source;
             other.expression = this.expression.clone();
             other.availableFunctions = null;
             other.availableOperators = null;
             if (this.featureSymbolTable != null) {
                 // evaluatorData don't support clone.
                 other.featureSymbolTable = this.featureSymbolTable.clone();
+            }
             if (this.compiler != null) {

     import java.util.List;
     import java.util.Map;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.fmap.dal.DataFactory;
     import org.gvsig.fmap.dal.DataManager;
-...
     import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProvider;
     import org.gvsig.fmap.dal.feature.spi.index.FeatureIndexProviderServices;
     import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultEvaluatorFactory;
     import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultExpressionEvaluator;
     import org.gvsig.fmap.dal.impl.expressionevaluator.DefaultFeatureSymbolTable;
     import org.gvsig.fmap.dal.raster.impl.RasterStoreFactory;
     import org.gvsig.fmap.dal.raster.impl.RasterStoreOldFactory;
-...
+        }
         @Override
         public Evaluator createExpresion(Expression expression) throws InitializeException {
             DefaultExpressionEvaluator exp = new DefaultExpressionEvaluator(expression);
             return exp;
+        }
         @Override
         public FeaturePagingHelper createFeaturePagingHelper(
                 FeatureStore featureStore, int pageSize) throws BaseException {
             return new FeaturePagingHelperImpl(featureStore, pageSize);

     import java.io.File;
     import java.util.List;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
-...
         public Evaluator createExpresion(String expression)
                 throws InitializeException;
         public Evaluator createExpresion(Expression expression)
                 throws InitializeException;
         public EvaluatorFactory createEvaluatorFactory();
         /*

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/pom.xml
11	11	<modules>
12	12	<module>org.gvsig.expressionevaluator.lib</module>
13	13	<module>org.gvsig.expressionevaluator.swing</module>
	14	<module>org.gvsig.expressionevaluator.main</module>
14	15	</modules>
15	16	</project>

                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-math</artifactId>
                 <groupId>org.json</groupId>
                 <artifactId>json</artifactId>
                 <scope>compile</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
                 <version>4.5.2</version>
                 <type>jar</type>
             </dependency>
         </dependencies>
     </project>

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestExpressionToString.java
34	34	expression.setPhrase(source);
35	35
36	36	assertEquals(
37		"expression:?phrase=precio+%2B+10&userScriptCode&userScriptLanguage&scriptsCount=0&scripts",
38		expression.toURI().toString()
	37	"{\"phrase\":\"precio + 10\"}",
	38	expression.toJSON()
39	39	);
40	40	}
41	41	}

     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.Function;
     import org.gvsig.expressionevaluator.MutableSymbolTable;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.tools.script.Script;
     /**
-...
         protected final void init() {
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             this.addSymbolTable(manager.getSymbolTable("SQL"));
             this.addSymbolTable(manager.getSymbolTable("OGC"));
             for (SymbolTable symbolTable : manager.getSymbolTables()) {
                 this.addSymbolTable(symbolTable);
+            }
+        }
         @Override

     package org.gvsig.expressionevaluator.impl;
     import java.net.URI;
     import java.net.URISyntaxException;
     import java.util.ArrayList;
     import java.util.Iterator;
     import java.util.List;
     import java.util.logging.Level;
     import java.util.logging.Logger;
     import org.apache.commons.lang3.StringUtils;
     import org.apache.http.client.utils.URIBuilder;
     import org.gvsig.expressionevaluator.Code;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
-...
     import org.gvsig.tools.script.ScriptManager;
     import org.gvsig.tools.util.UnmodifiableBasicList;
     import org.gvsig.tools.util.UnmodifiableBasicListAdapter;
     import org.json.JSONArray;
     import org.json.JSONObject;
     /**
+     *
-...
+        }
         @Override
         public void clear() {
             this.phrase = null;
             this.userScript = null;
             this.unmodifiableScripts = null;
             this.scripts = null;
             this.code = null;
             this.interpreter = null;
+        }
         @Override
         public Object execute(SymbolTable symbolTable) {
             if (this.code == null) {
                 ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
-...
+        }
         @Override
         public URI toURI() {
             URIBuilder builder = new URIBuilder();
         public String toJSON() {
             JSONObject expressionJson = new JSONObject();
             expressionJson.put("phrase", this.phrase);
             builder.setScheme("expression");
             builder.addParameter("phrase", this.phrase);
             if( this.userScript==null ) {
                 builder.addParameter("userScriptCode", null);
                 builder.addParameter("userScriptLanguage", null);
             } else {
                 builder.addParameter("userScriptCode", this.userScript.getCode());
                 builder.addParameter("userScriptLanguage", this.userScript.getTypeName());
             if( this.userScript!=null ) {
                 JSONObject userScriptJson = new JSONObject();
                 userScriptJson.put("code", this.userScript.getCode());
                 userScriptJson.put("language", this.userScript.getTypeName());
                 expressionJson.put("userScript", userScriptJson);
+            }
             if (this.scripts != null && !this.scripts.isEmpty()) {
                 List<URI> l = new ArrayList<>();
             if( this.scripts!=null && !this.scripts.isEmpty() ) {
                 JSONArray scriptsJson = new JSONArray();
                 for (Script script : this.scripts) {
                     URI location = script.getURI();
                     if (location != null) {
                         l.add(location);
+                    }
                     scriptsJson.put(script.getURI());
+                }
                 if (l.isEmpty()) {
                     builder.addParameter("scriptsCount", "0");
                     builder.addParameter("scripts", null);
                 } else {
                     builder.addParameter("scriptsCount", String.valueOf(l.size()));
                     int n = 1;
                     for (URI uri : l) {
                         builder.addParameter("scripts"+n, uri.toString());
+                    }
                 expressionJson.put("scripts", scriptsJson);
+            }
             return expressionJson.toString();
+        }
         @Override
         public void fromJSON(String json) {
             this.clear();
             ScriptManager scriptMananger = ToolsLocator.getScriptManager();
             JSONObject expressionJson = new JSONObject(json);
             if( expressionJson.has("phrase") ) {
                 this.phrase = expressionJson.getString("phrase");
+            }
             if( expressionJson.has("userScript") ) {
                 String theCode = "";
                 String theLanguage = "python";
                 JSONObject userScriptJson = expressionJson.getJSONObject("userScript");
                 if( userScriptJson.has("code") ) {
                     theCode = userScriptJson.getString("code");
+                }
             } else {
                 builder.addParameter("scriptsCount", "0");
                 builder.addParameter("scripts", null);
                 if( userScriptJson.has("language") ) {
                     theCode = userScriptJson.getString("language");
+                }
                 this.userScript = scriptMananger.createScript("user", theCode, theLanguage);
+            }
             try {
                 return builder.build();
             } catch (URISyntaxException ex) {
                 throw new RuntimeException("Can't serialize expression", ex);
             if( expressionJson.has("scripts") ) {
                 this.scripts = new ArrayList<>();
                 JSONArray scriptsJson = expressionJson.getJSONArray("scripts");
                 for (Object object : scriptsJson) {
                     URI location = (URI) object;
                     Script script = scriptMananger.loadScript(location);
                     this.scripts.add(script);
+                }
+            }
+        }
         @Override
         public String toString() {
             return this.toJSON();
+        }
         @Override
         public Expression clone() throws CloneNotSupportedException {
             Expression other = (Expression) super.clone();
             other.fromJSON(this.toJSON());
             return other;
+        }
+    }

      */
     package org.gvsig.expressionevaluator;
     import java.net.URI;
     import org.gvsig.tools.persistence.Persistent;
     import org.gvsig.tools.script.Script;
     import org.gvsig.tools.util.UnmodifiableBasicList;
-...
      * @author jjdelcerro
      */
     public interface Expression extends Persistent {
         public void clear();
         public String getPhrase();
-...
         public Object execute(SymbolTable symbolTable);
         public URI toURI();
         public String toJSON();
         public void fromJSON(String json);
         public Expression clone() throws CloneNotSupportedException;
+    }

         public void addSymbolTable(SymbolTable symbolTable);
         public void removeSymbolTable(String name);
         public void removeAllSymbolTables();
         public void setScriptsEnabled(boolean enabled);
         public boolean getScriptsEnabled();
+    }

         public void removeAllSymbolTables() {
             this.controller.removeAllSymbolTables();
+        }
         @Override
         public void removeSymbolTable(String name) {
             this.controller.removeSymbolTable(name);
+        }
         @Override
         public void setScriptsEnabled(boolean enabled) {
             this.controller.setScriptsEnabled(enabled);
+        }
         @Override
         public boolean getScriptsEnabled() {
             return this.controller.getScriptsEnabled();
+        }
+    }

         private int limit;
         private HashMap<String, SymbolTable> symbolTables;
         private final ExpressionEvaluatorSwingManager manager;
         private boolean scriptsEnabled = true;
         public DefaultExpressionBuilderConfig(ExpressionEvaluatorSwingManager manager) {
             this.manager = manager;
-...
         public void setSimpleElementsLimit(int limit) {
             this.limit = limit;
+        }
         @Override
         public void removeSymbolTable(String name) {
             this.symbolTables.remove(name);
+        }
         @Override
         public void setScriptsEnabled(boolean enabled) {
             this.scriptsEnabled = enabled;
+        }
         @Override
         public boolean getScriptsEnabled() {
             return this.scriptsEnabled;
+        }
+    }

     import java.net.URL;
     import java.util.ArrayList;
     import java.util.Collection;
     import java.util.Collections;
     import java.util.Date;
     import java.util.HashMap;
     import java.util.List;
     import java.util.Objects;
     import javax.swing.DefaultListCellRenderer;
-...
     import org.apache.commons.lang.StringEscapeUtils;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.Function;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.expressionevaluator.swing.Element;
-...
         private PickerController<List<Script>> scriptPicker;
         private ScriptSwingManager.ScriptEditor scriptEditor;
         private ExpressionBuilderConfig config;
         private final ExpressionBuilderConfig config;
         private class ElementsTreeModel implements TreeModel {
-...
             this.pnlScriptEditorContainer.setLayout(new BorderLayout());
             this.pnlScriptEditorContainer.add(this.scriptEditor.asJComponent(), BorderLayout.CENTER);
             this.tabExpressionBuilder.setEnabledAt(0, this.config.getScriptsEnabled());
             this.setPreferredSize(new Dimension(750, 500));
+        }
-...
             this.config.removeAllSymbolTables();
+        }
         @Override
         public void removeSymbolTable(String name) {
             this.config.removeSymbolTable(name);
+        }
         @Override
         public void setScriptsEnabled(boolean enabled) {
             this.config.setScriptsEnabled(enabled);
             this.tabExpressionBuilder.setEnabledAt(0, this.config.getScriptsEnabled());
+        }
         @Override
         public boolean getScriptsEnabled() {
             return this.config.getScriptsEnabled();
+        }
         @Override
         public JComponent asJComponent() {

             this.config.removeAllSymbolTables();
+        }
         @Override
         public void removeSymbolTable(String name) {
             this.config.removeSymbolTable(name);
+        }
         @Override
         public void setScriptsEnabled(boolean enabled) {
             this.config.setScriptsEnabled(enabled);
+        }
         @Override
         public boolean getScriptsEnabled() {
             return this.config.getScriptsEnabled();
+        }
+    }

Application: gvSIG desktop

Revision 43984