[PATCH] (issue1474) Fix deepCopy signatures and actually copy the facet index now
Wald Commits
scm-commit at wald.intevation.org
Fri Oct 18 15:44:05 CEST 2013
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1382103841 -7200
# Node ID b7e82468299a2a5fdba001dbcf8bec7122eec566
# Parent d8d0caaf60a2a5b5d1755754176cafc77c9c079d
(issue1474) Fix deepCopy signatures and actually copy the facet index now
diff -r d8d0caaf60a2 -r b7e82468299a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java Fri Oct 18 15:30:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java Fri Oct 18 15:44:01 2013 +0200
@@ -12,6 +12,8 @@
import java.util.List;
+import org.dive4elements.artifactdatabase.state.Facet;
+
import org.dive4elements.artifacts.Artifact;
import org.dive4elements.artifacts.CallContext;
@@ -103,7 +105,7 @@
@Override
- public SQCurveFacet deepCopy() {
+ public Facet deepCopy() {
SQCurveFacet copy = new SQCurveFacet();
copy.set(this);
copy.type = type;
diff -r d8d0caaf60a2 -r b7e82468299a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java Fri Oct 18 15:30:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java Fri Oct 18 15:44:01 2013 +0200
@@ -10,6 +10,8 @@
import org.apache.log4j.Logger;
+import org.dive4elements.artifactdatabase.state.Facet;
+
import org.dive4elements.artifacts.Artifact;
import org.dive4elements.artifacts.CallContext;
@@ -71,9 +73,13 @@
@Override
- public SQMeasurementFacet deepCopy() {
+ public Facet deepCopy() {
SQMeasurementFacet copy = new SQMeasurementFacet();
copy.set(this);
+ copy.type = type;
+ copy.hash = hash;
+ copy.stateId = stateId;
+ copy.fractionIdx = fractionIdx;
return copy;
}
diff -r d8d0caaf60a2 -r b7e82468299a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java Fri Oct 18 15:30:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java Fri Oct 18 15:44:01 2013 +0200
@@ -8,6 +8,8 @@
package org.dive4elements.river.artifacts.model.sq;
+import org.dive4elements.artifactdatabase.state.Facet;
+
import org.dive4elements.artifacts.Artifact;
import org.dive4elements.artifacts.CallContext;
@@ -95,9 +97,13 @@
@Override
- public SQOutlierFacet deepCopy() {
+ public Facet deepCopy() {
SQOutlierFacet copy = new SQOutlierFacet();
copy.set(this);
+ copy.type = type;
+ copy.hash = hash;
+ copy.stateId = stateId;
+ copy.fractionIdx = fractionIdx;
return copy;
}
diff -r d8d0caaf60a2 -r b7e82468299a artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOverviewFacet.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOverviewFacet.java Fri Oct 18 15:30:44 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOverviewFacet.java Fri Oct 18 15:44:01 2013 +0200
@@ -13,6 +13,8 @@
import org.dive4elements.artifacts.Artifact;
import org.dive4elements.artifacts.CallContext;
+import org.dive4elements.artifactdatabase.state.Facet;
+
import org.dive4elements.river.artifacts.model.DataFacet;
import org.dive4elements.river.artifacts.model.FacetTypes;
@@ -59,7 +61,7 @@
@Override
- public SQOverviewFacet deepCopy() {
+ public Facet deepCopy() {
SQOverviewFacet copy = new SQOverviewFacet();
copy.set(this);
copy.type = type;
More information about the Dive4elements-commits
mailing list