You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/12/18 13:22:45 UTC
[10/50] [abbrv] git commit: Code cleanup.
Code cleanup.
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/trunk@1471404 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/3b641e4c
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/3b641e4c
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/3b641e4c
Branch: refs/heads/master
Commit: 3b641e4c9e740efa318817c3d14b132a624aa8f5
Parents: cbc5c6e
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Wed Apr 24 13:30:23 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Wed Apr 24 13:30:23 2013 +0000
----------------------------------------------------------------------
.../cellar/core/completer/AllNodeCompleter.java | 34 ------------
.../core/completer/NodeCompleterSupport.java | 58 --------------------
.../core/shell/completer/AllNodeCompleter.java | 34 ++++++++++++
.../shell/completer/NodeCompleterSupport.java | 58 ++++++++++++++++++++
.../OSGI-INF/blueprint/shell-cluster.xml | 2 +-
5 files changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3b641e4c/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java b/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
deleted file mode 100644
index 5bfbb3e..0000000
--- a/core/src/main/java/org/apache/karaf/cellar/core/completer/AllNodeCompleter.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.apache.karaf.cellar.core.completer;
-
-import org.apache.karaf.cellar.core.Node;
-
-/**
- * A completer which includes all nodes.
- */
-public class AllNodeCompleter extends NodeCompleterSupport {
-
- /**
- * Always returns true.
- *
- * @param node the node.
- * @return return true.
- */
- @Override
- protected boolean acceptsNode(Node node) {
- return true;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3b641e4c/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java b/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
deleted file mode 100644
index 6d4c33d..0000000
--- a/core/src/main/java/org/apache/karaf/cellar/core/completer/NodeCompleterSupport.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.apache.karaf.cellar.core.completer;
-
-import org.apache.karaf.cellar.core.ClusterManager;
-import org.apache.karaf.cellar.core.Node;
-import org.apache.karaf.shell.console.Completer;
-import org.apache.karaf.shell.console.completer.StringsCompleter;
-
-import java.util.List;
-
-/**
- * Completer on the node.
- */
-public abstract class NodeCompleterSupport implements Completer {
-
- private ClusterManager clusterManager;
-
- @Override
- public int complete(String buffer, int cursor, List<String> candidates) {
- StringsCompleter delegate = new StringsCompleter();
- try {
- for (Node node : clusterManager.listNodes()) {
- if (acceptsNode(node)) {
- String id = node.getId();
- if (delegate.getStrings() != null && !delegate.getStrings().contains(id)) {
- delegate.getStrings().add(id);
- }
- }
- }
- } catch (Exception e) {
- // Ignore
- }
- return delegate.complete(buffer, cursor, candidates);
- }
-
- protected abstract boolean acceptsNode(Node node);
-
- public ClusterManager getClusterManager() {
- return clusterManager;
- }
-
- public void setClusterManager(ClusterManager clusterManager) {
- this.clusterManager = clusterManager;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3b641e4c/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllNodeCompleter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllNodeCompleter.java b/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllNodeCompleter.java
new file mode 100644
index 0000000..be7f26f
--- /dev/null
+++ b/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/AllNodeCompleter.java
@@ -0,0 +1,34 @@
+/*
+ * 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.apache.karaf.cellar.core.shell.completer;
+
+import org.apache.karaf.cellar.core.Node;
+
+/**
+ * A completer which includes all nodes.
+ */
+public class AllNodeCompleter extends NodeCompleterSupport {
+
+ /**
+ * Always returns true.
+ *
+ * @param node the node.
+ * @return return true.
+ */
+ @Override
+ protected boolean acceptsNode(Node node) {
+ return true;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3b641e4c/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/NodeCompleterSupport.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/NodeCompleterSupport.java b/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/NodeCompleterSupport.java
new file mode 100644
index 0000000..815a658
--- /dev/null
+++ b/core/src/main/java/org/apache/karaf/cellar/core/shell/completer/NodeCompleterSupport.java
@@ -0,0 +1,58 @@
+/*
+ * 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.apache.karaf.cellar.core.shell.completer;
+
+import org.apache.karaf.cellar.core.ClusterManager;
+import org.apache.karaf.cellar.core.Node;
+import org.apache.karaf.shell.console.Completer;
+import org.apache.karaf.shell.console.completer.StringsCompleter;
+
+import java.util.List;
+
+/**
+ * Completer on the node.
+ */
+public abstract class NodeCompleterSupport implements Completer {
+
+ private ClusterManager clusterManager;
+
+ @Override
+ public int complete(String buffer, int cursor, List<String> candidates) {
+ StringsCompleter delegate = new StringsCompleter();
+ try {
+ for (Node node : clusterManager.listNodes()) {
+ if (acceptsNode(node)) {
+ String id = node.getId();
+ if (delegate.getStrings() != null && !delegate.getStrings().contains(id)) {
+ delegate.getStrings().add(id);
+ }
+ }
+ }
+ } catch (Exception e) {
+ // Ignore
+ }
+ return delegate.complete(buffer, cursor, candidates);
+ }
+
+ protected abstract boolean acceptsNode(Node node);
+
+ public ClusterManager getClusterManager() {
+ return clusterManager;
+ }
+
+ public void setClusterManager(ClusterManager clusterManager) {
+ this.clusterManager = clusterManager;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/3b641e4c/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
----------------------------------------------------------------------
diff --git a/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml b/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
index f25974b..dd4fa8e 100644
--- a/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
+++ b/shell/src/main/resources/OSGI-INF/blueprint/shell-cluster.xml
@@ -209,7 +209,7 @@
<reference id="executionContext" interface="org.apache.karaf.cellar.core.command.ExecutionContext" availability="optional"/>
<!-- Completers -->
- <bean id="allNodesCompleter" class="org.apache.karaf.cellar.core.completer.AllNodeCompleter">
+ <bean id="allNodesCompleter" class="org.apache.karaf.cellar.core.shell.completer.AllNodeCompleter">
<property name="clusterManager" ref="clusterManager"/>
</bean>