You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2011/03/11 12:07:29 UTC
svn commit: r1080524 -
/karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java
Author: gnodet
Date: Fri Mar 11 11:07:29 2011
New Revision: 1080524
URL: http://svn.apache.org/viewvc?rev=1080524&view=rev
Log:
[KARAF-507] The config shell completer does not allow completion of factory based pids
Modified:
karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java
Modified: karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java?rev=1080524&r1=1080523&r2=1080524&view=diff
==============================================================================
--- karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java (original)
+++ karaf/branches/karaf-2.1.x/shell/config/src/main/java/org/apache/karaf/shell/config/completers/ConfigurationCompleter.java Fri Mar 11 11:07:29 2011
@@ -58,17 +58,11 @@ public class ConfigurationCompleter impl
}
Collection<String> pids = new ArrayList<String>();
-
for (Configuration config : configs) {
- if (config.getFactoryPid() != null) {
- pids.add(config.getFactoryPid());
- } else {
- pids.add(config.getPid());
- }
+ pids.add(config.getPid());
}
delegate.getStrings().addAll(pids);
-
}
public int complete(final String buffer, final int cursor, final List candidates) {
@@ -76,7 +70,7 @@ public class ConfigurationCompleter impl
}
public void configurationEvent(ConfigurationEvent configurationEvent) {
- String pid = configurationEvent.getFactoryPid()!=null ? configurationEvent.getFactoryPid() : configurationEvent.getPid();
+ String pid = configurationEvent.getPid();
if (configurationEvent.getType() == ConfigurationEvent.CM_DELETED) {
delegate.getStrings().remove(pid);
} else if (configurationEvent.getType() == ConfigurationEvent.CM_UPDATED) {