# HG changeset patch # User Ingo Weinzierl # Date 1267452933 0 # Node ID 22cc12b1622cb24e5b5d5e5b91c64a3282ece05b # Parent 87f05cec16322d40cd836dfad3c64210fc64ec51 Take parent states only to describe static user interface part - not the current state itself. gnv-artifacts/trunk@718 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 87f05cec1632 -r 22cc12b1622c gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Mon Mar 01 13:39:00 2010 +0000 +++ b/gnv-artifacts/ChangeLog Mon Mar 01 14:15:33 2010 +0000 @@ -1,3 +1,14 @@ +2010-03-01 Ingo Weinzierl + + Issue179 + + * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java: Removed + code former used to append product select box. + + * src/main/java/de/intevation/gnv/state/StateBase.java: Just use all parent + states to render the static part of the user interfact - not the current + state itself! + 2010-03-01 Ingo Weinzierl * src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java: Removed diff -r 87f05cec1632 -r 22cc12b1622c gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Mon Mar 01 13:39:00 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/artifacts/GNVArtifactBase.java Mon Mar 01 14:15:33 2010 +0000 @@ -383,26 +383,6 @@ getIncludeUIFromDocument(data) ); - // insert node for rendering product field - Element staticNode = (Element) XMLUtils.xpath( - document, - XPATH_STATIC_NODE, - XPathConstants.NODE, - ArtifactNamespaceContext.INSTANCE - ); - - XMLUtils.ElementCreator creator = new XMLUtils.ElementCreator( - document, - XMLUtils.XFORM_URL, - XMLUtils.XFORM_PREFIX - ); - - XMLUtils.ElementCreator artCreator = new XMLUtils.ElementCreator( - document, - ArtifactNamespaceContext.NAMESPACE_URI, - ArtifactNamespaceContext.NAMESPACE_PREFIX - ); - return document; } diff -r 87f05cec1632 -r 22cc12b1622c gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Mon Mar 01 13:39:00 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/state/StateBase.java Mon Mar 01 14:15:33 2010 +0000 @@ -629,8 +629,11 @@ ArtifactNamespaceContext.INSTANCE ); - describeStatic( - creator,xCreator, document, staticNode, context,uuid); + State parent = getParent(); + if (parent != null && parent instanceof StateBase) { + ((StateBase) parent).describeStatic( + creator,xCreator, document, staticNode, context,uuid); + } }