FORGE-763: ShellImpl "noInitMode" concept mismanages completers

forge · Jan 23, 2013 · ddaaea2 · ddaaea2
1 parent 21f2b78
commit ddaaea2
Showing 1 changed file with 4 additions and 38 deletions.
diff --git a/shell/src/main/java/org/jboss/forge/shell/ShellImpl.java b/shell/src/main/java/org/jboss/forge/shell/ShellImpl.java
@@ -156,7 +156,6 @@ public class ShellImpl extends AbstractShellPrompt implements Shell
    // overrides
    private InputStream _redirectedStream;
    private List<String> _historyOverride;
-   private List<Completer> _deferredCompleters;
 
    private enum BufferingMode
    {
@@ -322,6 +321,8 @@ public boolean canConvertFrom(final Class aClass)
       });
 
       configureOSTerminal();
+
+      this.completer = new AggregateCompleter(pluginCompleter);
       initReaderAndStreams();
       initParameters();
 
@@ -349,8 +350,6 @@ public boolean canConvertFrom(final Class aClass)
          environment.setProperty(OFFLINE_FLAG, false);
       }
 
-      initCompleters(pluginCompleter);
-
       shellConfig.loadHistory(this);
       shellConfig.loadConfig(this);
 
@@ -473,32 +472,6 @@ private void _setHistory(final List<String> lines)
       reader.setHistory(history);
    }
 
-   private void initCompleters(final PluginCommandCompleter pluginCompleter)
-   {
-      List<Completer> completers = new ArrayList<Completer>();
-      completers.add(pluginCompleter);
-      completer = new AggregateCompleter(completers);
-
-      if (isNoInitMode())
-      {
-         if (_deferredCompleters == null)
-         {
-            _deferredCompleters = new ArrayList<Completer>();
-         }
-         _deferredCompleters.add(pluginCompleter);
-      }
-      else
-      {
-         _initCompleters(pluginCompleter);
-      }
-   }
-
-   private void _initCompleters(final Completer completer)
-   {
-      this.reader.addCompleter(this.completer);
-      this.reader.setCompletionHandler(new OptionAwareCompletionHandler(commandHolder, this));
-   }
-
    boolean isNoInitMode()
    {
       return Boolean.getBoolean(NO_INIT_SYSTEM_PROPERTY);
@@ -566,19 +539,12 @@ public void write(final int b) throws IOException
       {
          if (_historyOverride != null)
          {
-
             _setHistory(_historyOverride);
          }
-
-         if (_deferredCompleters != null)
-         {
-            for (Completer completer : _deferredCompleters)
-            {
-               _initCompleters(completer);
-            }
-         }
       }
 
+      this.reader.addCompleter(completer);
+      this.reader.setCompletionHandler(new OptionAwareCompletionHandler(commandHolder, this));
    }
 
    private void initParameters()