Changeset 725

Timestamp:

01/21/14 10:10:57 (10 years ago)

Author:

jts21

Message:

Auto-correct widget names with invalid capitalisation and/or missing widget package prefix

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (1 diff)
• items/widgets/InteractiveWidget.java (modified) (2 diffs)

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

@@ -75 +75 @@
 
         // Package and class file locations
-        private static final String ACTIONS_PACKAGE = ROOT_PACKAGE + "actions.";
-
-        private static final String AGENTS_PACKAGE = ROOT_PACKAGE + "agents.";
-
-        private static final String WIDGET_PACKAGE = ROOT_PACKAGE + "items.widgets.";
-
-        private static final String CHARTS_PACKAGE = ROOT_PACKAGE + "items.widgets.charts.";
-
-        private static final String NAVIGATIONS_CLASS = ROOT_PACKAGE + "actions.NavigationActions";
+        public static final String ACTIONS_PACKAGE = ROOT_PACKAGE + "actions.";
+
+        public static final String AGENTS_PACKAGE = ROOT_PACKAGE + "agents.";
+
+        public static final String WIDGET_PACKAGE = ROOT_PACKAGE + "items.widgets.";
+
+        public static final String CHARTS_PACKAGE = ROOT_PACKAGE + "items.widgets.charts.";
+
+        public static final String NAVIGATIONS_CLASS = ROOT_PACKAGE + "actions.NavigationActions";
 
         // public static Class[] getClasses(String pckgname)

trunk/src/org/expeditee/items/widgets/InteractiveWidget.java

@@ -190 +190 @@
                 String classname = tokens[0];
                 if (classname.charAt(0) == '$'){
-                        String shortClassname = classname.substring(1);
-                        classname = Actions.getClassName(shortClassname);
-                        
-                        if (classname == null) // ensure it exists
-                                throw new InteractiveWidgetNotAvailableException(shortClassname
-                                                + " does not exist or is not an InteractiveWidget");
-                }
+                        classname = classname.substring(1);
+                }
+                
                 // Attempt to locate the class using reflection
                 Class<?> iwclass = findIWidgetClass(classname);
@@ -248 +244 @@
                 if(classname == null)
                         return null;
-                
+                // try just the classname
                 try {
                         Class c = Class.forName(classname); // attempt to find the class
+
+                        // If one is found, ensure that it is a descendant of an
+                        // InteractiveWidget
+                        for (Class superclass = c.getSuperclass(); superclass != null
+                                        && superclass != Item.class; superclass = superclass
+                                        .getSuperclass()) {
+                                if (superclass == InteractiveWidget.class)
+                                        return c;
+                        }
+
+                } catch (ClassNotFoundException e) {
+                }
+                // see if the class is a widget with invalid capitalisation, or missing the widget package prefix
+                if(classname.startsWith(Actions.WIDGET_PACKAGE)) {
+                        classname = classname.substring(Actions.WIDGET_PACKAGE.length());
+                }
+                try {
+                        Class c = Class.forName(Actions.getClassName(classname)); // attempt to find the class
 
                         // If one is found, ensure that it is a descendant of an