/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 35328

      */
     package org.gvsig.fmap.dal.feature.impl;
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.Iterator;
     import java.util.List;
     import java.util.Map;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
-...
         private String featureTypeId = null;
         private String[] attributeNames;
         private List attributeNames = new ArrayList();
         private Evaluator filter;
-...
          */
         public DefaultFeatureQuery(String[] attributeNames) {
             super();
             this.attributeNames = attributeNames;
             setAttributeNames(attributeNames);
+        }
         /**
-...
          */
         public DefaultFeatureQuery(String[] attributeNames, Evaluator filter) {
             super();
             this.attributeNames = attributeNames;
             setAttributeNames(attributeNames);
             this.filter = filter;
+        }
-...
          */
         public DefaultFeatureQuery(String[] attributeNames, Evaluator filter,
             double scale) {
             this.attributeNames = attributeNames;
             setAttributeNames(attributeNames);
             this.filter = filter;
             this.setScale(scale);
+        }
-...
                 attrs[i] = attr.getName();
                 i++;
+            }
             this.attributeNames = attrs;
             setAttributeNames(attrs);
+        }
         public String[] getAttributeNames() {
             return attributeNames;
             return (String[])attributeNames.toArray(new String[attributeNames.size()]);
+        }
         public void setAttributeNames(String[] attributeNames) {
             this.attributeNames = attributeNames;
             this.attributeNames.clear();
             for (int i=0 ; i<attributeNames.length ; i++){
                 this.attributeNames.add(attributeNames[i]);
+            }
+        }
         public void addAttributeName(String attributeName){
             //If the attribute exists finish the method
             for (int i=0 ; i<attributeNames.size() ; i++){
                 if (attributeNames.get(i).equals(attributeName)){
                     return;
+                }
+            }
             this.attributeNames.add(attributeName);
+        }
         public Evaluator getFilter() {
             return filter;
-...
         public void setFilter(Evaluator filter) {
             this.filter = filter;
             addFilterAttributes(filter);
             isAddFilter = false;
+        }
         public void addFilter(Evaluator targetFilter) {
         public void addFilter(Evaluator evaluator) {
             if (isAddFilter){
                 if (this.filter == null){
                     this.filter = targetFilter;
                     this.filter = evaluator;
                 }else{
                     if (targetFilter != null){
                     if (evaluator != null){
                         if (this.filter instanceof AndEvaluator){
                             ((AndEvaluator)this.filter).addEvaluator(targetFilter);
                             ((AndEvaluator)this.filter).addEvaluator(evaluator);
                         }else{
                             this.filter = new AndEvaluator(this.filter);
                             ((AndEvaluator)this.filter).addEvaluator(targetFilter);
                             ((AndEvaluator)this.filter).addEvaluator(evaluator);
+                        }
+                    }
+                }
             }else{
                 this.filter = targetFilter;
                 this.filter = evaluator;
+            }
             addFilterAttributes(evaluator);
             isAddFilter = true;
+        }
         private void addFilterAttributes(Evaluator evaluator){
             if (evaluator != null){
                 String[] fieldNames = evaluator.getFieldsInfo().getFieldNames();
                 for (int i=0 ; i<fieldNames.length ; i++){
                     addAttributeName(fieldNames[i]);
+                }
+            }
+        }
         public FeatureQueryOrder getOrder() {
             return order;
-...
             // Clone attribute names array
             if (attributeNames != null) {
                 clone.attributeNames = new String[attributeNames.length];
                 System.arraycopy(attributeNames, 0, clone.attributeNames, 0,
                     attributeNames.length);
                 clone.attributeNames = new ArrayList();
                 for (int i=0 ; i<attributeNames.size() ; i++){
                     clone.attributeNames.add(attributeNames.get(i));
+                }
+            }
             // Clone order
-...
             // FIXME: falta por terminar de implementar
             this.queryParameters = (Map) state.get("queryParameters");
             this.featureTypeId = state.getString("featureTypeId");
             this.attributeNames = (String[]) state.getArray("attributeNames", String.class);
             this.attributeNames = state.getList("attributeNames");
             this.filter = (Evaluator) state.get("filter");
             this.limit = state.getLong("limit");
             this.pageSize = state.getLong("pageSize");

     	 *            the attribute names to load
     	 */
     	void setAttributeNames(String[] attributeNames);
     	/**
     	 * Adds the name of an attribute that has to be used to load each
     	 * {@link Feature}.
+    	 *
     	 * @param attributeName
     	 *             the attribute name to load
     	 */
     	void addAttributeName(String attributeName);
     	/**
     	 * Sets the {@link FeatureType} of the {@link Feature}s to load. It may be

Also available in: Unified diff