commit a7a0f560a28d694aecc790f9c96923d9a93f5f69
author Thomas Vachuska <tom@onlab.us> Tue Apr 14 23:27:44 2015 -0700
committer Thomas Vachuska <tom@onlab.us> Thu Apr 16 14:04:35 2015 -0700
tree 42feb5d5bba7de4f42d38976cf8598094586352d
parent fcbde8919da62dae90fd941e18436868041df460

Converting builtin applications to be delivered in a self-contained manner via OAR files.

Change-Id: I5b7c6939aacc263248868fac2e0f69124c5f3609

cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java

diff --git a/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java b/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
index 1479b9d..1746169 100644
--- a/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
+++ b/cli/src/main/java/org/onosproject/cli/app/ApplicationNameCompleter.java
@@ -15,7 +15,6 @@
  */
 package org.onosproject.cli.app;
 
-import com.google.common.collect.Sets;
 import org.apache.karaf.shell.console.completer.ArgumentCompleter;
 import org.apache.karaf.shell.console.completer.StringsCompleter;
 import org.onosproject.app.ApplicationService;
@@ -23,11 +22,8 @@
 import org.onosproject.cli.AbstractCompleter;
 import org.onosproject.core.Application;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 import java.util.SortedSet;
 
 import static org.onosproject.app.ApplicationState.ACTIVE;
@@ -48,13 +44,14 @@
         String cmd = list.getArguments()[1];
 
         // Grab apps already on the command (to prevent tab-completed duplicates)
-        final Set previousApps;
-        if (list.getArguments().length > 2) {
-            previousApps = Sets.newHashSet(
-                    Arrays.copyOfRange(list.getArguments(), 2, list.getArguments().length));
-        } else {
-            previousApps = Collections.emptySet();
-        }
+        // FIXME: This does not work.
+//        final Set previousApps;
+//        if (list.getArguments().length > 2) {
+//            previousApps = Sets.newHashSet(
+//                    Arrays.copyOfRange(list.getArguments(), 2, list.getArguments().length));
+//        } else {
+//            previousApps = Collections.emptySet();
+//        }
 
         // Fetch our service and feed it's offerings to the string completer
         ApplicationService service = get(ApplicationService.class);
@@ -63,9 +60,9 @@
         while (it.hasNext()) {
             Application app = it.next();
             ApplicationState state = service.getState(app.id());
-            if (previousApps.contains(app.id().name())) {
-                continue;
-            }
+//            if (previousApps.contains(app.id().name())) {
+//                continue;
+//            }
             if (cmd.equals("uninstall") ||
                     (cmd.equals("activate") && state == INSTALLED) ||
                     (cmd.equals("deactivate") && state == ACTIVE)) {