Mercurial > dive4elements > river
changeset 7381:b7e82468299a
(issue1474) Fix deepCopy signatures and actually copy the facet index now
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 18 Oct 2013 15:44:01 +0200 |
| parents | d8d0caaf60a2 |
| children | 420eb5a5fde4 |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQMeasurementFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierFacet.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOverviewFacet.java |
| diffstat | 4 files changed, 20 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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; }
--- 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; }
--- 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;