Mercurial > dive4elements > gnv-client
changeset 208:a33d59f5791a
Use super.identifier as uuid. issue3
gnv-artifacts/trunk@264 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Tim Englich <tim.englich@intevation.de> |
|---|---|
| date | Fri, 23 Oct 2009 14:26:45 +0000 |
| parents | d87347142702 |
| children | d5cef9f17525 |
| files | gnv-artifacts/ChangeLog gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java |
| diffstat | 6 files changed, 17 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/gnv-artifacts/ChangeLog Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/ChangeLog Fri Oct 23 14:26:45 2009 +0000 @@ -1,5 +1,13 @@ 2009-10-23 Tim Englich <tim.englich@intevation.de> + * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java, + src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java (describe), + src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java (describe), + src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java (describe), + src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java (describe): + Use super.identifier as uuid. issue3 + +2009-10-23 Tim Englich <tim.englich@intevation.de> * src/test/ressources/verticalprofile/verticalprofile_step_04_feed.xml, src/test/ressources/verticalprofile/verticalprofile_step_03_advance.xml, src/test/ressources/verticalprofile/verticalprofile_step_04_out_*.xml,
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Fri Oct 23 14:26:45 2009 +0000 @@ -65,8 +65,6 @@ + XPATH_IDENTIFIER_REPLACE + "']"; - - protected String uuid = null; /** * The current Transition */ @@ -98,7 +96,6 @@ @Override public Document advance(Document target, CallContext context) { log.debug("GNVArtifactBase.advance"); - this.uuid = Config.getStringXPath(target, "action/uuid/@value"); Document result = XMLUtils.newDocument(); try { if (this.current != null) { @@ -112,10 +109,10 @@ Transition nextStep = this.transitions .get(transitionName); // 2.Ergebnisse Berechnen - this.current.advance(uuid, context.getMeta()); + this.current.advance(super.identifier, context.getMeta()); // 3. Ergebnisse Übergeben - nextStep.putInputData(this.current.getInputData(), - uuid); + nextStep.putInputData(this.current.getInputData(), + super.identifier); // 4. Umschalten auf neue Transistion this.current = nextStep; result = new ArtifactXMLUtilities() @@ -209,11 +206,10 @@ Document result = XMLUtils.newDocument(); try { if (this.current != null) { - this.uuid = Config.getStringXPath(target,"action/uuid/@value"); Collection<InputData> inputData = this.parseInputData(target, "/action/data/input"); if (!inputData.isEmpty()){ - this.current.putInputData(inputData, uuid); + this.current.putInputData(inputData, super.identifier); result = new ArtifactXMLUtilities().createSuccessReport( "Feed success", XMLUtils.newDocument()); }else{ @@ -463,11 +459,10 @@ try { if (current != null && current instanceof OutputTransition) { - this.uuid = Config.getStringXPath(format,"action/uuid/@value"); ((OutputTransition) current) .out(this.readOutputType(format), this.parseInputData( format, "/action/out/params/input"), - outputStream, uuid, context.getMeta()); + outputStream, super.identifier, context.getMeta()); } } catch (TransitionException e) { log.error(e, e);
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/horizontal/HorizontalProfileArtifact.java Fri Oct 23 14:26:45 2009 +0000 @@ -41,7 +41,7 @@ @Override public Document describe(CallContext context) { log.debug("HorizontalProfileArtifact.describe"); - return super.createDescibeOutput(context.getMeta(), super.uuid); + return super.createDescibeOutput(context.getMeta(), super.identifier); } /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/vertical/VerticalProfileArtifact.java Fri Oct 23 14:26:45 2009 +0000 @@ -40,7 +40,7 @@ @Override public Document describe(CallContext context) { log.debug("VerticalProfileArtifact.describe"); - return super.createDescibeOutput(context.getMeta(),super.uuid); + return super.createDescibeOutput(context.getMeta(),super.identifier); } /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/profile/verticalcrosssection/VerticalCrossSectionMeshArtifact.java Fri Oct 23 14:26:45 2009 +0000 @@ -41,7 +41,7 @@ @Override public Document describe(CallContext context) { log.debug("VerticalCrossSectionMeshArtifact.describe"); - return super.createDescibeOutput(context.getMeta(),super.uuid); + return super.createDescibeOutput(context.getMeta(),super.identifier); } /**
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Fri Oct 23 08:50:50 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/timeseries/TimeSeriesArtifact.java Fri Oct 23 14:26:45 2009 +0000 @@ -40,7 +40,7 @@ @Override public Document describe(CallContext context) { log.debug("TimeSeriesArtifact.describe"); - return super.createDescibeOutput(context.getMeta(), super.uuid); + return super.createDescibeOutput(context.getMeta(), super.identifier); } /**