From 1e125b4ae9c417435f44de3c705215ec1ab1201a Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 2 Jun 2010 07:47:03 +0000 Subject: [PATCH] #5114 correction: prefix map keys for uniqueness svn changeset:13486/svn branch:6.4 --- .../gwt/widgetsetutils/ClassPathExplorer.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java index 681ebe60bf..aa65d80d96 100644 --- a/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java +++ b/src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java @@ -135,7 +135,8 @@ public class ClassPathExplorer { // remove the extension String classname = files[i].substring(0, files[i].length() - 8); - String packageName = locationString; + String packageName = locationString + .substring(locationString.lastIndexOf("/") + 1); classname = packageName + "." + classname; if (!widgetsets.containsKey(classname)) { String packagePath = packageName.replaceAll("\\.", "/"); @@ -312,7 +313,9 @@ public class ClassPathExplorer { // add the present directory if (!dirs[i].isHidden() && !dirs[i].getPath().contains(File.separator + ".")) { - locations.put(name + dirs[i].getName(), new URL("file://" + String key = dirs[i].getCanonicalPath() + "/" + name + + dirs[i].getName(); + locations.put(key, new URL("file://" + dirs[i].getCanonicalPath())); } } catch (Exception ioe) { @@ -340,7 +343,7 @@ public class ClassPathExplorer { } private final static void searchForPaintables(URL location, - String packageName, + String locationString, Collection> paintables) { // Get a File object for the package @@ -355,6 +358,8 @@ public class ClassPathExplorer { // remove the .class extension String classname = files[i].substring(0, files[i].length() - 6); + String packageName = locationString + .substring(locationString.lastIndexOf("/") + 1); classname = packageName + "." + classname; tryToAdd(classname, paintables); } -- 2.39.5