Changeset 6135

Timestamp:

02/03/12 17:20:55 (4 months ago)

Author:

mtld

Message:

use target theme list for runtime includes too

Location:

trunk/pustefix-core/src/main/java/de/schlund/pfixxml

Files:

• IncludeDocumentExtension.java (modified) (6 diffs)
• targets/Themes.java (modified) (2 diffs)
• util/Xslt.java (modified) (2 diffs)
• util/XsltContext.java (modified) (2 diffs)
• util/xsltimpl/XsltContextSaxon1.java (modified) (2 diffs)
• util/xsltimpl/XsltContextSaxon2.java (modified) (2 diffs)

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/IncludeDocumentExtension.java

@@ -28 +28 @@
 
 import javax.xml.transform.TransformerException;
+import javax.xml.transform.URIResolver;
 
 import org.apache.log4j.Logger;
@@ -40 +41 @@
 import de.schlund.pfixxml.resources.ResourceProviderRegistry;
 import de.schlund.pfixxml.resources.ResourceUtil;
+import de.schlund.pfixxml.targets.Target;
 import de.schlund.pfixxml.targets.TargetGenerator;
 import de.schlund.pfixxml.targets.VirtualTarget;
@@ -46 +48 @@
 import de.schlund.pfixxml.util.XPath;
 import de.schlund.pfixxml.util.Xml;
+import de.schlund.pfixxml.util.Xslt.ResourceResolver;
 import de.schlund.pfixxml.util.XsltContext;
 
@@ -139 +142 @@
 
             String[] themes = targetgen.getGlobalThemes().getThemesArr();
-            if (!targetkey.equals(NOTARGET)) {
+            if(targetkey.equals(NOTARGET)) {
+                Target parentTarget = getParentTarget(context);
+                if(parentTarget != null && parentTarget.getThemes() != null && !parentTarget.getThemes().isEmpty()) {
+                    themes = parentTarget.getThemes().getThemesArr();
+                }
+            } else {
                 themes = target.getThemes().getThemesArr();
             }
@@ -356 +364 @@
 
             String[] themes = targetgen.getGlobalThemes().getThemesArr();
-            if (!targetkey.equals(NOTARGET)) {
+            if(targetkey.equals(NOTARGET)) {
+                Target parentTarget = getParentTarget(context);
+                if(parentTarget != null && parentTarget.getThemes() != null && !parentTarget.getThemes().isEmpty()) {
+                    themes = parentTarget.getThemes().getThemesArr();
+                }
+            } else {
                 themes = target.getThemes().getThemesArr();
             }
@@ -450 +463 @@
         return "";
     }
+    
+    private static Target getParentTarget(XsltContext context) {
+        URIResolver resolver = context.getURIResolver();
+        if(resolver != null && resolver instanceof ResourceResolver) {
+            ResourceResolver resResolver = (ResourceResolver)resolver;
+            return resResolver.getParentTarget();
+        }
+        return null;
+    }
 
     public static boolean isIncludeDocument(XsltContext context) {

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/targets/Themes.java

@@ -33 +33 @@
  */
 public class Themes {
+    
     ArrayList<String> themes;
     String id;
@@ -82 +83 @@
         return (String[]) themes.toArray(new String[]{});
     }
+    
+    public boolean isEmpty() {
+        return themes.isEmpty();
+    }
 
     @Override

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/util/Xslt.java

@@ -252 +252 @@
     
     
-    static class ResourceResolver implements URIResolver {
+    public static class ResourceResolver implements URIResolver {
         
         private TargetImpl parent;
@@ -264 +264 @@
         }
 
+        public Target getParentTarget() {
+            return parent;
+        }
+        
         /**
          * Resolve file url relative to root. Before searching the file system, check

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/util/XsltContext.java

@@ -19 +19 @@
 package de.schlund.pfixxml.util;
 
+import javax.xml.transform.URIResolver;
+
 /**
  * @author mleidig@schlund.de
@@ -27 +29 @@
     public String getDocumentElementName();
     public XsltVersion getXsltVersion();
-    
+    public URIResolver getURIResolver();
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/util/xsltimpl/XsltContextSaxon1.java

@@ -18 +18 @@
 
 package de.schlund.pfixxml.util.xsltimpl;
+
+import javax.xml.transform.URIResolver;
 
 import org.w3c.dom.Document;
@@ -52 +54 @@
     }
     
+    public URIResolver getURIResolver() {
+        return context.getController().getURIResolver();
+    }
+        
 }

trunk/pustefix-core/src/main/java/de/schlund/pfixxml/util/xsltimpl/XsltContextSaxon2.java

@@ -18 +18 @@
 
 package de.schlund.pfixxml.util.xsltimpl;
+
+import javax.xml.transform.URIResolver;
 
 import net.sf.saxon.expr.XPathContext;
@@ -49 +51 @@
     }
     
+    public URIResolver getURIResolver() {
+        return context.getController().getURIResolver();
+    }
+    
 }