Enhanced application name completer to consider the command context.

Change-Id: Ib77a53830d4b6d14ef99115309ea25707a8281b4

@@ -15,31 +15,46 @@
  */
  */
 package org.onosproject.cli.app;
 package org.onosproject.cli.app;
 
 
-import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.ArgumentCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.onosproject.app.ApplicationService;
 import org.onosproject.app.ApplicationService;
-import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.app.ApplicationState;
+import org.onosproject.cli.net.AbstractCompleter;
 import org.onosproject.core.Application;
 import org.onosproject.core.Application;
 
 
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.SortedSet;
 
 
+import static org.onosproject.app.ApplicationState.ACTIVE;
+import static org.onosproject.app.ApplicationState.INSTALLED;
+import static org.onosproject.cli.AbstractShellCommand.get;
+
 /**
 /**
  * Application name completer.
  * Application name completer.
  */
  */
-public class ApplicationNameCompleter implements Completer {
+public class ApplicationNameCompleter extends AbstractCompleter {
     @Override
     @Override
     public int complete(String buffer, int cursor, List<String> candidates) {
     public int complete(String buffer, int cursor, List<String> candidates) {
         // Delegate string completer
         // Delegate string completer
         StringsCompleter delegate = new StringsCompleter();
         StringsCompleter delegate = new StringsCompleter();
 
 
+        // Command name is the second argument.
+        ArgumentCompleter.ArgumentList list = getArgumentList();
+        String cmd = list.getArguments()[1];
+
         // Fetch our service and feed it's offerings to the string completer
         // Fetch our service and feed it's offerings to the string completer
-        ApplicationService service = AbstractShellCommand.get(ApplicationService.class);
+        ApplicationService service = get(ApplicationService.class);
         Iterator<Application> it = service.getApplications().iterator();
         Iterator<Application> it = service.getApplications().iterator();
         SortedSet<String> strings = delegate.getStrings();
         SortedSet<String> strings = delegate.getStrings();
         while (it.hasNext()) {
         while (it.hasNext()) {
-            strings.add(it.next().id().name());
+            Application app = it.next();
+            ApplicationState state = service.getState(app.id());
+            if (cmd.equals("uninstall") ||
+                    (cmd.equals("activate") && state == INSTALLED) ||
+                    (cmd.equals("deactivate") && state == ACTIVE)) {
+                strings.add(app.id().name());
+            }
         }
         }
 
 
         // Now let the completer do the work for figuring out what to offer.
         // Now let the completer do the work for figuring out what to offer.

@@ -15,41 +15,35 @@
  */
  */
 package org.onosproject.cli.cfg;
 package org.onosproject.cli.cfg;
 
 
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.apache.felix.service.command.CommandSession;
-import org.apache.karaf.shell.console.CommandSessionHolder;
-import org.apache.karaf.shell.console.Completer;
 import org.apache.karaf.shell.console.completer.ArgumentCompleter;
 import org.apache.karaf.shell.console.completer.ArgumentCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.cfg.ConfigProperty;
 import org.onosproject.cfg.ConfigProperty;
-import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.cli.net.AbstractCompleter;
+
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+
+import static org.onosproject.cli.AbstractShellCommand.get;
 
 
 /**
 /**
  * Component property name completer.
  * Component property name completer.
  */
  */
-public class ComponentPropertyNameCompleter implements Completer {
+public class ComponentPropertyNameCompleter extends AbstractCompleter {
     @Override
     @Override
     public int complete(String buffer, int cursor, List<String> candidates) {
     public int complete(String buffer, int cursor, List<String> candidates) {
         // Delegate string completer
         // Delegate string completer
         StringsCompleter delegate = new StringsCompleter();
         StringsCompleter delegate = new StringsCompleter();
 
 
-        CommandSession session = CommandSessionHolder.getSession();
-        ArgumentCompleter.ArgumentList list =
-                (ArgumentCompleter.ArgumentList) session.get(
-                        ArgumentCompleter.ARGUMENTS_LIST);
-
         // Component name is the previous argument.
         // Component name is the previous argument.
+        ArgumentCompleter.ArgumentList list = getArgumentList();
         String componentName = list.getArguments()[list.getCursorArgumentIndex() - 1];
         String componentName = list.getArguments()[list.getCursorArgumentIndex() - 1];
-        ComponentConfigService service =
-                AbstractShellCommand.get(ComponentConfigService.class);
+        ComponentConfigService service = get(ComponentConfigService.class);
 
 
         SortedSet<String> strings = delegate.getStrings();
         SortedSet<String> strings = delegate.getStrings();
         Set<ConfigProperty> properties =
         Set<ConfigProperty> properties =
-            service.getProperties(componentName);
+                service.getProperties(componentName);
         if (properties != null) {
         if (properties != null) {
             properties.forEach(property -> strings.add(property.name()));
             properties.forEach(property -> strings.add(property.name()));
         }
         }

+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.cli.net;
+
+import org.apache.felix.service.command.CommandSession;
+import org.apache.karaf.shell.console.CommandSessionHolder;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.ArgumentCompleter;
+
+/**
+ * Abstract argument completer.
+ */
+public abstract class AbstractCompleter implements Completer {
+
+    /**
+     * Returns the argument list.
+     *
+     * @return argument list
+     */
+    protected ArgumentCompleter.ArgumentList getArgumentList() {
+        CommandSession session = CommandSessionHolder.getSession();
+        return (ArgumentCompleter.ArgumentList)
+                session.get(ArgumentCompleter.ARGUMENTS_LIST);
+    }
+
+}