/ - Diff - Application: gvSIG desktop - gvSIG

     import java.util.ArrayList;
     import java.util.HashSet;
     import java.util.List;
     import java.util.Objects;
     import java.util.Set;
     import org.apache.commons.lang3.StringUtils;
     import org.gvsig.expressionevaluator.Code;
     import org.gvsig.expressionevaluator.Code.Callable;
     import org.gvsig.expressionevaluator.SymbolTable;
     import org.gvsig.expressionevaluator.Expression;
     import org.gvsig.expressionevaluator.ExpressionBuilder;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
     import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
     import org.gvsig.expressionevaluator.Function;
-...
+        {
         private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFeatureExpressionEvaluator.class);
     	private String storeName;
         private static class DescriptionAdapter implements Description {
-...
+        }
         public DefaultFeatureExpressionEvaluator(String source) {
     		this(null, source);
+    	}
         public DefaultFeatureExpressionEvaluator(String storeName, String source) {
             this();
             ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
             this.expression = manager.createExpression();
             this.expression.setPhrase(source);
     		this.storeName = storeName;
+        }
         public DefaultFeatureExpressionEvaluator(Expression expression) {
     		this(null, expression);
+        }
         public DefaultFeatureExpressionEvaluator(String storeName, Expression expression) {
             this();
             this.expression = expression;
+        }
     		this.storeName = storeName;
+    	}
         @Override
         public String getName() {
-...
                 this.expression.getCode().accept((Object code) -> {
                   if (code instanceof Code.Identifier) {
                     Code.Identifier identifier = (Code.Identifier) code;
                     names.add(identifier.name());
+                  }
     				if(!StringUtils.equalsIgnoreCase(storeName, identifier.name())) {
     					names.add(identifier.name());
+    				}
                   } else if (code instanceof Code.Callable) {
     				  Callable callable = (Callable) code;
     				  if (callable.name().equals(ExpressionBuilder.FUNCTION_GETATTR)) {
     					  Code p0 = callable.parameters().get(0);
     					  if (!(p0 instanceof Code.Identifier)) {
     						  return;
+    					  }
     					  if (!StringUtils.equalsIgnoreCase(storeName, ((Code.Identifier) p0).name())) {
     						  return;
+    					  }
     					  Code p1 = callable.parameters().get(1);
     					  if (!(p1 instanceof Code.Constant)) {
     						  return;
+    					  }
     					  String s = Objects.toString(((Code.Constant)p1).value(), null);
     					  if (s != null) {
     						  names.add(s);
+    					  }
+    				  }
+    			  }
                 });
                 EvaluatorFieldsInfo info = new EvaluatorFieldsInfo();
                 for (String name : names) {

         @Override
         public FeatureQuery createFeatureQuery() {
             return new DefaultFeatureQuery();
             return new DefaultFeatureQuery(this.getName());
+        }
         @Override

trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/feature/impl/DefaultFeatureQuery.java
115	115	private FeatureExtraColumns extraColumn = new DefaultFeatureExtraColumns();
116	116
117	117	private MutableSymbolTable symbolTable;
	118	private String storeName;
118	119
119	120	/**
120	121	* Creates a FeatureQuery which will load all available Features of a type.
121	122	*
122	123	*/
123	124	public DefaultFeatureQuery() {
124		super();
	125	super();
	126	}
	127
	128	public DefaultFeatureQuery(String storeName) {
	129	this();
	130	this.storeName = storeName;
	131
125	132	}
126	133
127	134	/**
...	...
377	384	this.clearFilter();
378	385	return;
379	386	}
380		Evaluator x = new DefaultFeatureExpressionEvaluator(filter);
	387	Evaluator x = new DefaultFeatureExpressionEvaluator(storeName, filter);
381	388	this.setFilter(x);
382	389	}
383	390
...	...
606	613	state.set("groupByColumns", this.groupByColumns);
607	614	state.set("aggregateFunctions", this.aggregateFunctions);
608	615	state.set("extraColumn", this.extraColumn);
	616	state.set("storeName", this.storeName);
609	617
610	618
611	619	}
...	...
654	662	}
655	663	this.limit = state.getLong("limit");
656	664	this.pageSize = state.getLong("pageSize");
	665	this.storeName = state.getString("storeName");
657	666
658	667
659	668	this.order = (FeatureQueryOrder) state.get("order");
...	...
720	729	definition.addDynFieldObject("extraColumn")
721	730	.setClassOfValue(DefaultFeatureExtraColumns.class);
722	731
	732	definition.addDynFieldString("storeName").setMandatory(false);
723	733
724	734	}
725	735
...	...
890	900	LOGGER.debug("Can't clone symbol table",ex);
891	901	}
892	902	}
	903	this.storeName = other.storeName;
893	904	}
894	905
895	906	@Override

Application: gvSIG desktop

Revision 46078