Changeset 1243 for trunk/java-utils/src/main/java/de/ugoe/cs/util/console

Timestamp:

06/28/13 14:38:46 (12 years ago)

Author:

pharms

Message:

• improved autocompletion of console to also autocomplete to paths and objects in the global data container

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

@@ -30 +30 @@
 import java.util.jar.JarInputStream;
 import java.util.logging.Level;
+
+import de.ugoe.cs.util.StringTools;
 
 /**
@@ -356 +358 @@
         Command[] commands = getAvailableCommands();
         
-        List<Command> matchingCommands = new ArrayList<Command>();
-        for (Command command : commands) {
-            String commandName = command.getClass().getSimpleName().substring(3);
-            if (commandName.startsWith(commandPrefix)) {
-                matchingCommands.add(command);
-            }
-        }
+        String[] completions = new String[commands.length];
         
-        StringBuffer completedPrefix = new StringBuffer(commandPrefix);
+        for (int i = 0; i < commands.length; i++) {
+            completions[i] = commands[i].getClass().getSimpleName().substring(3);
+        }
         
-        boolean foundCompletion = false;
-        
-        while (!foundCompletion) {
-            char nextCompletionChar = 0;
-            for (Command command : matchingCommands) {
-                String commandName = command.getClass().getSimpleName().substring(3);
-                if (commandName.length() > completedPrefix.length()) {
-                    if (nextCompletionChar == 0) {
-                        nextCompletionChar = commandName.charAt(completedPrefix.length());
-                    }
-                    else if (nextCompletionChar != commandName.charAt(completedPrefix.length())) {
-                        foundCompletion = true;
-                    }
-                }
-                else {
-                    foundCompletion = true;
-                }
-            }
-            
-            if (!foundCompletion && (nextCompletionChar != 0)) {
-                completedPrefix.append(nextCompletionChar);
-            }
-            else {
-                foundCompletion = true;
-            }
-        }
-        
-        return completedPrefix.toString();
+        return StringTools.autocomplete(commandPrefix, completions);
     }
 }