Changeset 492

Timestamp:

10/23/13 16:07:59 (11 years ago)

Author:

davidb

Message:

Replaced getClasses() with getClassesNew(), an alternative that is compatible with use in an Applet. After a bit more testing, this should be renamed and become the main one used in Expeditee

File:

• trunk/src/org/expeditee/actions/Actions.java (modified) (12 diffs)

trunk/src/org/expeditee/actions/Actions.java

@@ -8 +8 @@
 import java.lang.reflect.Modifier;
 import java.net.URL;
+import java.net.URI;
+import java.net.URLDecoder;
+import java.net.JarURLConnection;
 import java.rmi.UnexpectedException;
 import java.util.ArrayList;
@@ -16 +19 @@
 import java.util.List;
 import java.util.Set;
+import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.zip.ZipEntry;
+
 
 import org.expeditee.agents.Agent;
@@ -28 +33 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.UserSettings;
 import org.expeditee.io.Conversion;
 import org.expeditee.items.Item;
@@ -87 +93 @@
             + "actions.NavigationActions";
 
+
+
+    // The following is adapted from:
+    //    http://stackoverflow.com/questions/1456930/how-do-i-read-all-classes-from-a-java-package-in-the-classpath
+
+    public static Class<?>[] getClassesNew(String packageName)
+        throws ClassNotFoundException {
+
+        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+
+        ArrayList<String> names = new ArrayList<String>();;
+        final ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
+
+        packageName = packageName.replace(".", "/");
+        URL packageURL = classLoader.getResource(packageName);
+
+        if(packageURL.getProtocol().equals("jar")) {
+
+            // build jar file name, then loop through zipped entries
+
+            String jarFileNameUndecoded = packageURL.getFile();
+
+            try {
+                String jarFileName = URLDecoder.decode(jarFileNameUndecoded, "UTF-8");
+
+
+                JarURLConnection ju_connection=(JarURLConnection)packageURL.openConnection();
+                JarFile jf =ju_connection.getJarFile();
+
+                Enumeration<JarEntry> jarEntries = jf.entries();
+                while(jarEntries.hasMoreElements()) {
+                    String entryName = jarEntries.nextElement().getName();
+                    
+                    if (entryName.startsWith(packageName)) {
+
+                        if (entryName.endsWith(".class") && !entryName.contains("$")) {
+
+                            // Deal with situation where the class found might be a further sub-package
+                            // e.g. for "org.expeditee.action"
+                            // there is: org/expeditee/action/widgets/Chart.class
+                            // which would produce a value of 'entryName' as widgets/Chart.class
+
+                            entryName = entryName.substring(0,entryName.length() - 6); // 6 = '.class'
+                            entryName = entryName.replace('/', '.');
+
+                            names.add(entryName);
+                            classes.add(Class.forName(entryName));
+                        }
+                    }
+                }
+            }
+            catch (Exception e) {
+                System.err.println("Failed to decode jar file: " + jarFileNameUndecoded);
+                e.printStackTrace();
+            }
+        }
+        else {
+            // loop through files in classpath
+
+            String packageURLString = packageURL.toString();
+            try {
+                URI uri = new URI(packageURLString);
+                File folder = new File(uri.getPath());
+                
+                // won't work with path which contains blank (%20)
+                // File folder = new File(packageURL.getFile()); 
+                File[] contenuti = folder.listFiles();
+                
+                for (File actual: contenuti) {
+                    String entryName = actual.getName();
+
+                    if (entryName.endsWith(".class") && !entryName.contains("$")) {
+                        entryName = entryName.substring(0, entryName.lastIndexOf('.'));
+                    
+                        names.add(entryName);
+                        classes.add(Class.forName(entryName));
+                    }
+                }
+            }
+            catch (Exception e) {
+                System.err.println("Failed to process file: " + packageURLString);
+                e.printStackTrace();
+            }
+        }
+
+        Class<?>[] classesA = new Class<?>[classes.size()];
+        classes.toArray(classesA);
+        return classesA;
+    }
+
     public static Class<?>[] getClasses(final String pckgname)
             throws ClassNotFoundException {
+
         final ArrayList<Class<?>> classes = new ArrayList<Class<?>>();
+
         // Must be a forward slash for loading resources
         final String packagePath = pckgname.replace('.', '/');
-        if(System.getProperty("expeditee.home") == null) {
+
+        if (System.getProperty("eclipse.expeditee.home") == null) {
             final ClassLoader cld = Thread.currentThread().getContextClassLoader();
             if (cld == null) {
@@ -108 +207 @@
                         + System.getProperty("line.separator")
                         + "Are you running from within Eclipse? (or just not with Jar)  Then make sure your"
-                        + " 'expeditee.home' property is set correctly.  It is currently: '" 
-                        + System.getProperty("expeditee.home") + "'" + System.getProperty("line.separator")
+                        + " 'eclipse.expeditee.home' property is set correctly.  It is currently: '" 
+                        + System.getProperty("eclipse.expeditee.home") + "'" + System.getProperty("line.separator")
                         + "You can set it by adding a VM argument.  " 
-                        + "Example: -Dexpeditee.home=D:\\Desktop\\Research\\expeditee-svn");
+                        + "Example: -Declipse.expeditee.home=D:\\Desktop\\Research\\expeditee-svn");
                 e.printStackTrace();
             }
@@ -118 +217 @@
             }
             final File directory = new File(resource.getFile());
+
             final int splitPoint = directory.getPath().indexOf('!');
             if(splitPoint > 0) {
@@ -141 +241 @@
                                     // The forward slash below is a forwards slash for
                                     // both windows and linux
-                                    classes.add(Class.forName(className.substring(0,
-                                            className.length() - 6).replace('/', '.')));
+
+                                    String class_forname = className.substring(0,className.length() - 6);
+                                    class_forname = class_forname.replace('/', '.');
+
+                                    classes.add(Class.forName(class_forname));
                                 }
                             }
@@ -157 +260 @@
                     }
             } else {
+
                 System.err.println( "A Error has occured when trying to use a Jar file to find actions or agents." 
                         + System.getProperty("line.separator")
                         + "Are you running from within Eclipse? (or just not with Jar)  Then make sure your"
-                        + " 'expeditee.home' property is set correctly.  It is currently: '" 
-                        + System.getProperty("expeditee.home") + "'" + System.getProperty("line.separator")
+                        + " 'eclipse.expeditee.home' property is set correctly.  It is currently: '" 
+                        + System.getProperty("eclipse.expeditee.home") + "'" + System.getProperty("line.separator")
                         + "You can set it by adding a VM argument.  " 
-                        + "Example: -Dexpeditee.home=D:\\Desktop\\Research\\expeditee-svn");
+                        + "Example: -Declipse.expeditee.home=D:\\Desktop\\Research\\expeditee-svn");
             }
         } else {
-            final File directory = new File(System.getProperty("expeditee.home", "") + "\\bin\\src\\" + packagePath);
+            String eclipse_expeditee_home = System.getProperty("eclipse.expeditee.home", "");
+            String full_package_path = eclipse_expeditee_home 
+                + File.separator + "bin" + File.separator + "src" + File.separator + packagePath;
+
+            final File directory = new File(full_package_path);
+
             if (directory.exists()) {
                 // Get the list of the files contained in the package
@@ -312 +421 @@
 
         try {
-            classes = getClasses(AGENTS_PACKAGE);
+            classes = getClassesNew(AGENTS_PACKAGE);
 
             for (int i = 0; i < classes.length; i++) {
@@ -320 +429 @@
             }
 
-            classes = getClasses(WIDGET_PACKAGE);
+            classes = getClassesNew(WIDGET_PACKAGE);
 
             for (int i = 0; i < classes.length; i++) {
@@ -328 +437 @@
             }
 
-            classes = getClasses(CHARTS_PACKAGE);
+            classes = getClassesNew(CHARTS_PACKAGE);
 
             for (int i = 0; i < classes.length; i++) {
@@ -345 +454 @@
 
         try {
-            classes = getClasses(ACTIONS_PACKAGE);
+            classes = getClassesNew(ACTIONS_PACKAGE);
 
             for (int i = 0; i < classes.length; i++) {