Changeset 6136

Timestamp:

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

Author:

mtld

Message:

use target theme list for runtime images too

Files:

• trunk/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java (modified) (3 diffs)

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

@@ -21 +21 @@
 import java.net.URLEncoder;
 
+import javax.xml.transform.URIResolver;
+
 import org.apache.log4j.Logger;
 
 import de.schlund.pfixxml.resources.Resource;
 import de.schlund.pfixxml.resources.ResourceUtil;
+import de.schlund.pfixxml.targets.Target;
 import de.schlund.pfixxml.targets.TargetGenerator;
 import de.schlund.pfixxml.targets.VirtualTarget;
 import de.schlund.pfixxml.util.XsltContext;
+import de.schlund.pfixxml.util.Xslt.ResourceResolver;
     
 /**
@@ -76 +80 @@
             target = (VirtualTarget) targetGen.getTarget(targetKey);
             themes               = target.getThemes().getThemesArr();
+        } else {
+            Target parentTarget = getParentTarget(context);
+            if(parentTarget != null && parentTarget.getThemes() != null && !parentTarget.getThemes().isEmpty()) {
+                themes = parentTarget.getThemes().getThemesArr();
+            }
         }
         if (themes == null) {
@@ -190 +199 @@
         return ((src == null || src.equals("")) && path != null && !path.equals("") && img != null && !img.equals(""));
     }
+    
+    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;
+    }
 
 }