Changeset 5307

Timestamp:

08/13/10 12:55:15 (18 months ago)

Author:

mtld

Message:

fixed IWrapper warning check for variants

Files:

• branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java (modified) (5 diffs)

branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixcore/util/TransformerCallback.java

@@ -58 +58 @@
 import de.schlund.pfixxml.resources.FileResource;
 import de.schlund.pfixxml.resources.ResourceUtil;
-import de.schlund.pfixxml.targets.PageTargetTree;
 import de.schlund.pfixxml.targets.TargetGenerator;
 import de.schlund.pfixxml.targets.TargetGeneratorFactory;
@@ -180 +179 @@
         }
     }
-
+    
     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 = context.getPageMap().getState(pageName);
+                pageRequest = requestContext.getCurrentPageRequest();
             } else {
-                state = context.getPageMap().getState(context.getCurrentPageRequest());
-            }
-            if (state == null) {
-                return null;
-            }
-            if (state instanceof IWrapperState) {
+                pageRequest = context.createPageRequest(pageName);
+            }
+            State state = context.getPageMap().getState(pageRequest);
+            if (state != null && state instanceof IWrapperState) {
                 IWrapperState iwState = (IWrapperState) state;
                 Map<String, ? extends IWrapperConfig> iwrappers = iwState.getIWrapperConfigMap();
@@ -218 +208 @@
         }
     }
-
+    
     public static Node getIWrappers(RequestContextImpl requestContext, Node docNode, String pageName) throws Exception {
         try {
@@ -227 +217 @@
             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 = context.getPageMap().getState(pageName);
-            if (state instanceof IWrapperState) {
+                pageRequest = requestContext.getCurrentPageRequest();
+            } else {
+                pageRequest = context.createPageRequest(pageName);
+            }
+            PageRequestConfig pageConfig = context.getContextConfig().getPageRequestConfig(pageRequest.getName());
+            State state = context.getPageMap().getState(pageRequest);
+            if (state != null && state instanceof IWrapperState) {
                 IWrapperState iwState = (IWrapperState) state;
                 Map<String, ? extends IWrapperConfig> iwrappers = iwState.getIWrapperConfigMap();
@@ -246 +236 @@
                 }
             }
-            PageRequestConfig pageConfig = context.getContextConfig().getPageRequestConfig(pageName);
             if(pageConfig != null) {
                 Map<String, ? extends ProcessActionPageRequestConfig> actions = pageConfig.getProcessActions();