Changeset 5310 for trunk/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java

Timestamp:

08/13/10 14:03:21 (22 months ago)

Author:

mtld

Message:

fixed IWrapper warning check for variants

Files:

• trunk/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java (modified) (4 diffs, 1 prop)

trunk/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java

@@ -172 +172 @@
         }
     }
-
+    
     public static Node getIWrapperInfo(RequestContextImpl requestContext, Node docNode, String pageName, String prefix) {
         try {
+            PageRequest pageRequest;
             ContextImpl context = requestContext.getParentContext();
             XsltVersion xsltVersion = Xml.getXsltVersion(docNode);
             if (pageName == null || pageName.equals("")) {
-                PageRequest pg = requestContext.getCurrentPageRequest();
-                if (pg != null)
-                    pageName = pg.getName();
-                else
-                    throw new IllegalArgumentException("Missing page name");
-            }
-            State state;
-            if (pageName != null) {
-                state = getState(context, pageName);
+                pageRequest = requestContext.getCurrentPageRequest();
             } else {
-                state = getState(context, context.getCurrentPageRequest().getName());
-            }
-            if (state == null) {
-                return null;
-            }
-            if (state instanceof IWrapperState) {
+                pageRequest = context.createPageRequest(pageName);
+            }
+            PageRequestConfig pageConfig = context.getContextConfig().getPageRequestConfig(pageRequest.getName());
+            State state = pageConfig.getState();
+            if (state != null && state instanceof IWrapperState) {
                 IWrapperState iwState = (IWrapperState) state;
                 Map<String, ? extends IWrapperConfig> iwrappers = iwState.getIWrapperConfigMap();
@@ -210 +202 @@
         }
     }
-
+    
     public static Node getIWrappers(RequestContextImpl requestContext, Node docNode, String pageName) throws Exception {
         try {
@@ -219 +211 @@
             Element root = doc.createElement("iwrappers");
             doc.appendChild(root);
+            PageRequest pageRequest;
             if (pageName == null || pageName.equals("")) {
-                PageRequest pg = requestContext.getCurrentPageRequest();
-                if (pg != null)
-                    pageName = pg.getName();
-                else
-                    throw new IllegalArgumentException("Missing page name");
-            }
-            State state = getState(context, pageName);
-            if (state instanceof IWrapperState) {
+                pageRequest = requestContext.getCurrentPageRequest();
+            } else {
+                pageRequest = context.createPageRequest(pageName);
+            }
+            PageRequestConfig pageConfig = context.getContextConfig().getPageRequestConfig(pageRequest.getName());
+            State state = pageConfig.getState();
+            if (state != null && state instanceof IWrapperState) {
                 IWrapperState iwState = (IWrapperState) state;
                 Map<String, ? extends IWrapperConfig> iwrappers = iwState.getIWrapperConfigMap();
@@ -238 +230 @@
                 }
             }
-            PageRequestConfig pageConfig = context.getContextConfig().getPageRequestConfig(pageName);
             if(pageConfig != null) {
                 Map<String, ? extends ProcessActionPageRequestConfig> actions = pageConfig.getProcessActions();