/ - Diff - Application: gvSIG desktop - gvSIG

     			this.pk[i] = state.get("pk.item" + i);
+    		}
+    	}
     	public boolean equals(Object obj) {
     		if (!(obj instanceof DefaultFeatureReference)) {
     			return false;
+    		}
     		DefaultFeatureReference other = (DefaultFeatureReference) obj;
     		FeatureStore otherStore = (FeatureStore) other.storeRef.get();
     		FeatureStore myrStore = (FeatureStore) this.storeRef.get();
     		if (otherStore == null || myrStore == null) {
     			return false;
+    		}
     		if (!myrStore.equals(otherStore)) {
     			return false;
+    		}
     		if (this.oid != null) {
     			return this.oid.equals(other.oid);
+    		}
     		for (int i = 0; i < this.pk.length; i++) {
     			if (!this.pk[i].equals(other.pk[i])) {
     				return false;
+    			}
+    		}
     		return true;
+    	}
     	public int hashCode() {
     		if (this.oid != null) {
     			return this.oid.hashCode();
     		} else {
     			StringBuffer buff = new StringBuffer();
     			for (int i = 0; i < this.pk.length; i++) {
     				buff.append(this.pk[i].hashCode());
     				buff.append("$");
+    			}
     			return buff.toString().hashCode();
+    		}
+    	}
+    }

branches/v2_0_0_prep/libraries/libFMap_dal/src/org/gvsig/fmap/dal/feature/impl/DefaultFeature.java
50	50
51	51	public void setData(FeatureData data) {
52	52	this.data = data;
	53	this.reference = null;
53	54	}
54	55
55	56	public FeatureData getData() {

     		this.hasEvaluators = other.hasEvaluators;
     		this.rules = (DefaultFeatureRules) other.rules.getCopy();
     		this.defaultGeometryAttributeIndex = other.defaultGeometryAttributeIndex;
     		this.hasOID = other.hasOID;
     		this.id = other.id; // XXX ???? copiar o no esto????
+    	}
     	public String getId() {

Application: gvSIG desktop