Revision 46078 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

View differences:

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

Also available in: Unified diff