# HG changeset patch # User Andre Heinecke # Date 1382027876 -7200 # Node ID aff189df381b15399295da36ef3f6cb1e0f007ad # Parent ad2fdc34910a4150c736076509f6234a6c821df2 (issue1474) Fix copying of SQ* Facets The main thing causing confusion was that the fractionIdx was not copied. But the other DataFacet specific parts were also lost. diff -r ad2fdc34910a -r aff189df381b 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 Thu Oct 17 17:47:58 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQCurveFacet.java Thu Oct 17 18:37:56 2013 +0200 @@ -106,6 +106,10 @@ public SQCurveFacet deepCopy() { SQCurveFacet copy = new SQCurveFacet(); copy.set(this); + copy.type = type; + copy.hash = hash; + copy.stateId = stateId; + copy.fractionIdx = fractionIdx; return copy; } diff -r ad2fdc34910a -r aff189df381b artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierCurveFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierCurveFacet.java Thu Oct 17 17:47:58 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierCurveFacet.java Thu Oct 17 18:37:56 2013 +0200 @@ -104,6 +104,11 @@ public Facet deepCopy() { SQOutlierCurveFacet copy = new SQOutlierCurveFacet(); copy.set(this); + copy.type = type; + copy.hash = hash; + copy.stateId = stateId; + copy.fractionIdx = fractionIdx; + return copy; } } diff -r ad2fdc34910a -r aff189df381b artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierMeasurementFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierMeasurementFacet.java Thu Oct 17 17:47:58 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOutlierMeasurementFacet.java Thu Oct 17 18:37:56 2013 +0200 @@ -75,6 +75,11 @@ public Facet deepCopy() { SQOutlierMeasurementFacet copy = new SQOutlierMeasurementFacet(); copy.set(this); + copy.type = type; + copy.hash = hash; + copy.stateId = stateId; + copy.fractionIdx = fractionIdx; + return copy; } } diff -r ad2fdc34910a -r aff189df381b 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 Thu Oct 17 17:47:58 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/SQOverviewFacet.java Thu Oct 17 18:37:56 2013 +0200 @@ -62,6 +62,10 @@ public SQOverviewFacet deepCopy() { SQOverviewFacet copy = new SQOverviewFacet(); copy.set(this); + copy.type = type; + copy.hash = hash; + copy.stateId = stateId; + copy.fractionIdx = fractionIdx; return copy; }