From 0dd508f7294b959460a7dddb429aeddd3ee90004 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Tue, 12 Mar 2013 17:02:39 +0800
Subject: [PATCH] IDEMPIERE-724 Zk: Make iDempiere theme more easily
 customizable.

---
 .../webui/util/WebUIResourceFinder.java       | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
index 5650a6661d..857063a39d 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/WebUIResourceFinder.java
@@ -14,6 +14,7 @@
 package org.adempiere.webui.util;
 
 import java.net.URL;
+import java.util.Enumeration;
 
 import org.adempiere.base.IResourceFinder;
 import org.adempiere.webui.WebUIActivator;
@@ -26,24 +27,42 @@ import org.adempiere.webui.theme.ThemeManager;
  */
 public class WebUIResourceFinder implements IResourceFinder {
 
+	private Enumeration<URL> find(String name) {
+		int pathIndex = name.lastIndexOf("/");
+		String path = "/";
+		String pattern = null;
+		if (pathIndex > 0) {
+			path = name.substring(0, pathIndex);
+			pattern = name.substring(pathIndex+1);
+		} else {
+			pattern = name;
+		}
+		return WebUIActivator.getBundleContext().getBundle().findEntries(path, pattern, false);
+	}
+	
 	@Override
 	public URL getResource(String name) {
-		URL url = WebUIActivator.getBundleContext().getBundle().getEntry(name);
+		Enumeration<URL> e = find(name);
+		URL url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 		if (url == null && name.startsWith("org/compiere/images")) {
 			String t = name.substring("org/compiere/".length());
 			t = ThemeManager.getThemeResource(t);
-			url = WebUIActivator.getBundleContext().getBundle().getEntry(t);
+			e = find(t);
+			url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 			if (url == null && t.endsWith(".gif")) {
 				t = t.replace(".gif", ".png");
-				url = WebUIActivator.getBundleContext().getBundle().getEntry(t);
+				e = find(t);
+				url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 			}
 		} else if (url == null && name.startsWith("/org/compiere/images")) {
 			String t = name.substring("/org/compiere/".length());
 			t = ThemeManager.getThemeResource(t);
-			url = WebUIActivator.getBundleContext().getBundle().getEntry(t);
+			e = find(t);
+			url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 			if (url == null && t.endsWith(".gif")) {
 				t = t.replace(".gif", ".png");
-				url = WebUIActivator.getBundleContext().getBundle().getEntry(t);
+				e = find(t);
+				url = e != null && e.hasMoreElements() ? e.nextElement() : null;
 			}
 		}
 		return url;