tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r1133278 - in /tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline: CompositeURICompletor.java RemoteNodeCompletor.java TShellCompletor.java
Date Wed, 08 Jun 2011 08:10:46 GMT
Author: antelder
Date: Wed Jun  8 08:10:45 2011
New Revision: 1133278

URL: http://svn.apache.org/viewvc?rev=1133278&view=rev
Log:
Add a completor for the names of remote nodes and use that with the start command

Added:
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/RemoteNodeCompletor.java
Modified:
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
    tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java

Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java?rev=1133278&r1=1133277&r2=1133278&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/CompositeURICompletor.java
Wed Jun  8 08:10:45 2011
@@ -53,7 +53,7 @@ public class CompositeURICompletor exten
        try {
            c = shell.getNode().getContribution(getContributionURI());
        } catch (Exception e) {
-           c = null;
+           return super.complete(buffer, cursor, clist);   
        }
        if (c == null) {
            return -1;

Added: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/RemoteNodeCompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/RemoteNodeCompletor.java?rev=1133278&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/RemoteNodeCompletor.java
(added)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/RemoteNodeCompletor.java
Wed Jun  8 08:10:45 2011
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.tuscany.sca.shell.jline;
+
+import java.util.List;
+
+import jline.SimpleCompletor;
+
+import org.apache.tuscany.sca.shell.Shell;
+
+/**
+ * A Completor for the names of the remote nodes in the domain
+ */
+public class RemoteNodeCompletor extends SimpleCompletor {
+
+    private Shell shell;
+
+    public RemoteNodeCompletor(Shell shell) {
+        super("");
+        this.shell = shell;
+    }
+    
+    @Override
+    public int complete(final String buffer, final int cursor, final List clist) {
+        if (shell.getNode() == null) {
+            return -1;
+        }
+
+        List<String> nodes = shell.getNode().getNodeNames();
+        nodes.remove(shell.getNode().getLocalNodeName());
+        setCandidateStrings(nodes.toArray(new String[nodes.size()]));
+        return super.complete(buffer, cursor, clist);   
+    }
+}

Modified: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java?rev=1133278&r1=1133277&r2=1133278&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
(original)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
Wed Jun  8 08:10:45 2011
@@ -60,7 +60,7 @@ public class TShellCompletor extends Arg
         completors.put("remove", new Completor[]{commandCompletor, new ICURICompletor(shell),
new NullCompletor()});    
         completors.put("run", new Completor[]{commandCompletor, new FileNameCompletor(),
new NullCompletor()});    
         completors.put("save", new Completor[]{commandCompletor, new FileNameCompletor(),
new NullCompletor()});    
-        completors.put("start", new Completor[]{commandCompletor, new ICURICompletor(shell),
new CompositeURICompletor(shell), new NullCompletor()});    
+        completors.put("start", new Completor[]{commandCompletor, new ICURICompletor(shell),
new CompositeURICompletor(shell), new RemoteNodeCompletor(shell), new NullCompletor()}); 
  
         completors.put("started", new Completor[]{commandCompletor, new ICURICompletor(shell),
new CompositeURICompletor(shell), new NullCompletor()});    
         completors.put("stop", new Completor[]{commandCompletor, new ICURICompletor(shell),
new CompositeURICompletor(shell), new NullCompletor()});    
     }



Mime
View raw message