Mercurial > dive4elements > gnv-client
diff gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java @ 408:b5733f9f386b
Design improvements: Moved chart option panel and export actions beneath the parameterization panel on the left side. Do not render a useless 'draw' button after reaching the final state.
gnv/trunk@594 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 22 Jan 2010 09:49:34 +0000 |
| parents | 002a4d38c16d |
| children | df78178e1180 |
line wrap: on
line diff
--- a/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Wed Jan 20 14:44:39 2010 +0000 +++ b/gnv/src/main/java/de/intevation/gnv/action/NextArtifactStepAction.java Fri Jan 22 09:49:34 2010 +0000 @@ -33,6 +33,7 @@ * */ public class NextArtifactStepAction extends ArtifactDatabaseActionBase { + /** * the logger, used to log exceptions and additonaly information */ @@ -117,24 +118,21 @@ Node dynamicUINode = new XMLUtils().getNodeXPath(currentUI,"art:dynamic"); if (dynamicUINode != null){ - String ui = transformer - .transform( - dynamicUINode, - "UTF-8", - request - .getRealPath("WEB-INF/config/templates/describe-ui.xsl")); + String ui = transformer.transform( + dynamicUINode, + "UTF-8", + request.getRealPath(XSL_SHEET_DYNAMIC)); - request.setAttribute("ui", ui); + if (ui != null && ui.length() > 1) + request.setAttribute("ui", ui); } Node staticUINode = new XMLUtils().getNodeXPath(currentUI, "art:static"); if (staticUINode != null){ - String staticUI = transformer - .transform( - staticUINode, - "UTF-8", - request - .getRealPath("WEB-INF/config/templates/describe-ui-static.xsl")); + String staticUI = transformer.transform( + staticUINode, + "UTF-8", + request.getRealPath(XSL_SHEET_STATIC)); request.setAttribute("staticui", staticUI); } } @@ -147,16 +145,11 @@ // statistic abholen und in das sessionmodell schreiben. ArtifactDescription artifactDescription; try{ - - Collection<ArtifactStatisticsSet> statistics = adc - .calculateStatistics(sm.getSelectedArtifactFactory(), - sm.getCurrentArtifact()); - sm.setStatistics(statistics); - artifactDescription = adc - .getCurrentStepDescription(sm - .getSelectedArtifactFactory(), sm - .getCurrentArtifact(), - true); + artifactDescription = adc.getCurrentStepDescription( + sm.getSelectedArtifactFactory(), + sm.getCurrentArtifact(), + true + ); request.setAttribute("diagramm", true); @@ -181,24 +174,22 @@ Node dynamicUINode = new XMLUtils().getNodeXPath(currentUI,"art:dynamic"); if (dynamicUINode != null){ - String ui = transformer - .transform( - dynamicUINode, - "UTF-8", - request - .getRealPath("WEB-INF/config/templates/describe-ui.xsl")); + String ui = transformer.transform( + dynamicUINode, + "UTF-8", + request.getRealPath(XSL_SHEET_DYNAMIC)); - request.setAttribute("ui", ui); + if (ui != null && ui.length() > 1) + request.setAttribute("ui", ui); } Node staticUINode = new XMLUtils().getNodeXPath(currentUI, "art:static"); if (staticUINode != null){ - String staticUI = transformer - .transform( - staticUINode, - "UTF-8", - request - .getRealPath("WEB-INF/config/templates/describe-ui-static.xsl")); + String staticUI = transformer.transform( + staticUINode, + "UTF-8", + request.getRealPath(XSL_SHEET_STATIC)); + request.setAttribute("staticui", staticUI); } }