Browse Source

Fix the test chooser to not instantiate the class if it's just
going to call it's static main method anyway. Also, call the static
main method on the class instead of an instantiated object.

Paul Speed 9 years ago
parent
commit
57bcb3967f
1 changed files with 3 additions and 3 deletions
  1. 3 3
      jme3-examples/src/main/java/jme3test/TestChooser.java

+ 3 - 3
jme3-examples/src/main/java/jme3test/TestChooser.java

@@ -260,8 +260,8 @@ public class TestChooser extends JDialog {
                     for (int i = 0; i < appClass.length; i++) {
                     for (int i = 0; i < appClass.length; i++) {
                 	    Class<?> clazz = (Class)appClass[i];
                 	    Class<?> clazz = (Class)appClass[i];
                 		try {
                 		try {
-                			Object app = clazz.newInstance();
-                			if (app instanceof Application) {
+                			if (Application.class.isAssignableFrom(clazz)) {
+                    			Object app = clazz.newInstance();
                 			    if (app instanceof SimpleApplication) {
                 			    if (app instanceof SimpleApplication) {
                 			        final Method settingMethod = clazz.getMethod("setShowSettings", boolean.class);
                 			        final Method settingMethod = clazz.getMethod("setShowSettings", boolean.class);
                 			        settingMethod.invoke(app, showSetting);
                 			        settingMethod.invoke(app, showSetting);
@@ -283,7 +283,7 @@ public class TestChooser extends JDialog {
                 			    }
                 			    }
                 			} else {
                 			} else {
                                 final Method mainMethod = clazz.getMethod("main", (new String[0]).getClass());
                                 final Method mainMethod = clazz.getMethod("main", (new String[0]).getClass());
-                                mainMethod.invoke(app, new Object[]{new String[0]});
+                                mainMethod.invoke(clazz, new Object[]{new String[0]});
                 			}
                 			}
                 			// wait for destroy
                 			// wait for destroy
                 			System.gc();
                 			System.gc();