Changeset 5332 for branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java

Timestamp:

09/01/10 15:58:37 (21 months ago)

Author:

mtld

Message:

module enhancements (Ticket #118 + #119)

Files:

• branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java (modified) (4 diffs)

branches/release-0.15.x/pustefix-core/src/main/java/de/schlund/pfixxml/ImageThemedSrc.java

@@ -78 +78 @@
             if(dynamic) {
                 String uri =  "dynamic:/"+src+"?project="+gen.getName();
-                if(module != null) uri += "&module="+module;
+                if(module != null && !module.equalsIgnoreCase("WEBAPP")) uri += "&module="+module;
                 Resource res = ResourceUtil.getResource(uri);
                 URI resUri = res.toURI();
@@ -90 +90 @@
                 return src;
             } else {
-                if(module!=null) src =  "modules/"+module+"/"+src;
+                if(module!=null && !module.equalsIgnoreCase("WEBAPP")) src =  "modules/"+module+"/"+src;
                 DependencyTracker.logImage(context, src, parent_part_in, parent_product_in, targetGen, targetKey, "image");
                 return src;
@@ -109 +109 @@
                 String uri =  "dynamic:/" + themed_path +"/THEME/" + themed_img +"?project="+gen.getName();
                 uri += themeParam;
-                if(module != null) uri += "&module="+module;
+                if(module != null && !module.equalsIgnoreCase("WEBAPP")) uri += "&module="+module;
                 Resource res = ResourceUtil.getResource(uri);
                 URI resUri = res.toURI();
@@ -128 +128 @@
                 testsrc = themed_path + "/" + currtheme + "/" + themed_img;
                 
-                if(module!=null) {
+                if(module!=null && !module.equalsIgnoreCase("WEBAPP")) {
                     testsrc =  "modules/"+module+"/"+testsrc;
                 }