diff gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java @ 1008:1b42a86184f6

Removed the changes of rev1206 and 1214. gnv/trunk@1222 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Fri, 25 Jun 2010 08:11:39 +0000
parents b1eea43ba133
children 28a0628b11b0
line wrap: on
line diff
--- a/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java	Tue Jun 15 08:10:44 2010 +0000
+++ b/gnv/src/main/java/de/intevation/gnv/action/DescribeUIAction.java	Fri Jun 25 08:11:39 2010 +0000
@@ -25,8 +25,6 @@
 import de.intevation.gnv.util.XMLUtils;
 import de.intevation.gnv.util.XSLTransformer;
 
-import org.apache.log4j.Logger;
-
 /**
  * This controller is called to fetch the current artifact description using the
  * describe operation. The describe document is used to feed an XSL transformer
@@ -38,9 +36,6 @@
  */
 public class DescribeUIAction extends ArtifactDatabaseActionBase {
 
-    private static Logger log = Logger
-            .getLogger(DescribeUIAction.class);
-
     public static final String XPATH_DYNAMIC_UI = "art:dynamic";
     public static final String XPATH_STATIC_UI  = "art:static";
 
@@ -63,11 +58,6 @@
         super();
     }
 
-    public static String getInputException(HttpServletRequest request) {
-        Object msg = request.getAttribute(CommunicationKeys.REQUEST_EXCEPTION_INPUT_ID);
-        return msg != null ? msg.toString() : "";
-    }
-
 
     @Override
     public ActionForward execute(
@@ -114,10 +104,8 @@
             if (currentUI != null) {
                 ResourceBundle res = ResourceBundle.getBundle(
                     "applicationMessages", locale);
-                String editText = res.getString(
+                String editText           = res.getString(
                     "gnviewer.history.back.button");
-                String submitButton = res.getString(
-                    "gnviewer.select.button.src");
                 String exampleLinestring = res.getString(
                     "gnviewer.example.linestring");
                 String examplePolygon = res.getString(
@@ -125,37 +113,12 @@
 
                 XSLTransformer transformer = new XSLTransformer();
 
-                String nextUrl = response.encodeURL(
-                    mapping.findForward("next").getPath());
-
                 String url = response.encodeURL(
                     mapping.findForward("back").getPath());
-
-
-                transformer.addParameter(
-                    "uuid",
-                    sm.getCurrentArtifact().getDescription());
-
-                transformer.addParameter(
-                    "exception",
-                    getInputException(request));
-
-
-                Object ft = request.getAttribute("furthertargets");
-
-                transformer.addParameter("further",
-                    ft == null || (ft instanceof Boolean && ((Boolean)ft).booleanValue())
-                    ? "true"
-                    : "false");
-
-                transformer.addParameter("next-url", nextUrl);
                 transformer.addParameter("back-url", url);
                 transformer.addParameter("edit", editText);
                 transformer.addParameter("example-polygon", examplePolygon);
                 transformer.addParameter(
-                    "gnviewer-select-button-src",
-                    submitButton);
-                transformer.addParameter(
                     "example-linestring",
                     exampleLinestring);
 
@@ -172,9 +135,10 @@
                 );
 
                 String ui = transformer.transform(
-                    dynamicNode.getParentNode(),
+                    dynamicNode,
                     "UTF-8",
-                    request.getRealPath(XSL_SHEET_DYNAMIC));
+                    request.getRealPath(XSL_SHEET_DYNAMIC
+                ));
 
                 if (ui != null && ui.length() > 1)
                     request.setAttribute("ui", ui);

http://dive4elements.wald.intevation.org