Changeset 2283 for trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java

Timestamp:

08/02/19 14:47:33 (5 years ago)

Author:

pharms

Message:

 

File:

• trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java (modified) (2 diffs)

trunk/java-utils/src/main/java/de/ugoe/cs/util/console/CommandExecuter.java

@@ -246 +246 @@
                                     String className = classFile.getName()
                                         .substring(0, classFile.getName().lastIndexOf('.'));
+                                    
                                     Class<?> clazz =
                                         loader.loadClass(commandPackage.getPackageName() + "." +
                                             className);
-                                    if (Command.class.isAssignableFrom(clazz)) {
+                                    
+                                    if (Command.class.isAssignableFrom(clazz) &&
+                                        clazz.getSimpleName().startsWith(cmdPrefix))
+                                    {
                                         commands.add((Command) clazz.getConstructor().newInstance());
                                     }
@@ -277 +281 @@
                                                 .substring(path.length() + 1,
                                                            entry.getName().lastIndexOf('.'));
+                                            
                                             Class<?> clazz =
                                                 loader.loadClass(commandPackage.getPackageName() +
                                                     "." + className);
                                             
-                                            Console.traceln(Level.WARNING, clazz.getName());
-                                            if (Command.class.isAssignableFrom(clazz)) {
+                                            if (Command.class.isAssignableFrom(clazz) &&
+                                                clazz.getSimpleName().startsWith(cmdPrefix))
+                                            {
                                                 commands.add((Command) clazz.getConstructor().newInstance());
                                             }