Revision 46907 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
DefaultFeatureQuery.java | ||
---|---|---|
56 | 56 |
import org.slf4j.Logger; |
57 | 57 |
import org.slf4j.LoggerFactory; |
58 | 58 |
import org.gvsig.fmap.dal.feature.FeatureExtraColumns; |
59 |
import org.gvsig.tools.packageutils.Version; |
|
60 |
import org.gvsig.tools.packageutils.impl.DefaultVersion; |
|
59 | 61 |
|
60 | 62 |
/** |
61 | 63 |
* Defines the properties of a collection of Features, as a result of a query |
... | ... | |
92 | 94 |
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFeatureQuery.class); |
93 | 95 |
|
94 | 96 |
public static final String SCALE_PARAM_NAME = "Scale"; |
97 |
|
|
98 |
private static final Version VERSION_2_6_0 = ToolsLocator.getPackageManager().createVersion("2.6.0"); |
|
95 | 99 |
|
96 | 100 |
private Map<String,Object> queryParameters = new HashMap(); |
97 | 101 |
|
... | ... | |
597 | 601 |
@Override |
598 | 602 |
public void saveToState(PersistentState state) throws PersistenceException { |
599 | 603 |
// FIXME: falta por terminar de implementar |
604 |
state.set("version", VERSION_2_6_0); |
|
600 | 605 |
state.set("queryParameters", this.queryParameters); |
601 | 606 |
state.set("featureTypeId", this.featureTypeId); |
602 | 607 |
state.set("attributeNames", this.attributeNames); |
... | ... | |
643 | 648 |
@Override |
644 | 649 |
public void loadFromState(PersistentState state) throws PersistenceException { |
645 | 650 |
// FIXME: falta por terminar de implementar |
651 |
Version version = (Version) state.get("version"); |
|
646 | 652 |
this.queryParameters = (Map) state.get("queryParameters"); |
647 | 653 |
this.featureTypeId = state.getString("featureTypeId"); |
648 | 654 |
this.attributeNames = state.getList("attributeNames"); |
... | ... | |
682 | 688 |
} |
683 | 689 |
} |
684 | 690 |
this.limit = state.getLong("limit"); |
691 |
if(version == null || version.compareTo(VERSION_2_6_0)<0){ |
|
692 |
if(this.limit == 0) { |
|
693 |
this.clearLimit(); |
|
694 |
} |
|
695 |
} |
|
685 | 696 |
this.pageSize = state.getLong("pageSize"); |
686 | 697 |
this.useSubquery = state.getBoolean("useSubquery",true); |
687 | 698 |
this.storeName = state.getString("storeName"); |
... | ... | |
718 | 729 |
null, |
719 | 730 |
null); |
720 | 731 |
|
732 |
|
|
733 |
definition.addDynFieldObject("version") |
|
734 |
.setClassOfValue(DefaultVersion.class) |
|
735 |
.setMandatory(false); |
|
736 |
|
|
721 | 737 |
definition.addDynFieldMap("queryParameters") |
722 | 738 |
.setClassOfItems(Object.class) |
723 | 739 |
.setMandatory(true); |
Also available in: Unified diff