You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/10/04 12:17:58 UTC
svn commit: r1004186 - in
/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline:
InstallCompletor.java TShellCompletor.java
Author: antelder
Date: Mon Oct 4 10:17:58 2010
New Revision: 1004186
URL: http://svn.apache.org/viewvc?rev=1004186&view=rev
Log:
Start of the comand compeltor for teh install command
Added:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java (with props)
Modified:
tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/TShellCompletor.java
Added: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java?rev=1004186&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java (added)
+++ tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java Mon Oct 4 10:17:58 2010
@@ -0,0 +1,123 @@
+/*
+ * 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.io.File;
+import java.util.List;
+
+import jline.FileNameCompletor;
+
+import org.apache.tuscany.sca.shell.Shell;
+
+/**
+ * A Completor for the install command.
+ * The command format is: install [<uri>] <contributionURL> [-start] [-metadata <url>] [-duris <uri,uri,...>]
+ *
+ * TODO: doesn't seem to complete the -xxx parameters properly yet
+ *
+ */
+public class InstallCompletor extends FileNameCompletor {
+
+ ICURICompletor icuriCompletor;
+
+ public InstallCompletor(Shell shell) {
+ icuriCompletor = new ICURICompletor(shell);
+ }
+
+ public int complete(final String buf, final int cursor,
+ final List candidates) {
+
+// System.err.println("buf:" + buf);
+// System.err.println("candidates:" + candidates);
+
+ if ("-duris".equals(TShellCompletor.lastArg)) {
+ return icuriCompletor.complete(buf, cursor, candidates);
+ }
+ if ("-metadata".equals(TShellCompletor.lastArg)) {
+ return super.complete(buf, cursor, candidates);
+ }
+
+ return super.complete(buf, cursor, candidates);
+ }
+
+ @Override
+ public int matchFiles(String buffer, String translated, File[] entries,
+ List candidates) {
+ if (entries == null) {
+ return -1;
+ }
+
+ int matches = 0;
+
+ // first pass: just count the matches
+ for (int i = 0; i < entries.length; i++) {
+ if (entries[i].getAbsolutePath().startsWith(translated)) {
+ matches++;
+ }
+ }
+ if ("-metadata".startsWith(buffer)) {
+ matches++;
+ }
+ if ("-duris".startsWith(buffer)) {
+ matches++;
+ }
+ if ("-start".startsWith(buffer)) {
+ matches++;
+ }
+
+ // green - executable
+ // blue - directory
+ // red - compressed
+ // cyan - symlink
+ for (int i = 0; i < entries.length; i++) {
+ if (entries[i].getAbsolutePath().startsWith(translated)) {
+ String name =
+ entries[i].getName()
+ + (((matches == 1) && entries[i].isDirectory())
+ ? File.separator : " ");
+
+ /*
+ if (entries [i].isDirectory ())
+ {
+ name = new ANSIBuffer ().blue (name).toString ();
+ }
+ */
+ candidates.add(name);
+ }
+ }
+
+ if ("-metadata".startsWith(buffer) && !TShellCompletor.allArgs.contains("-metadata")) {
+ candidates.add("-metadata" + (matches == 1 ? " " : ""));
+ }
+ if ("-duris".startsWith(buffer) && !TShellCompletor.allArgs.contains("-duris")) {
+ candidates.add("-duris" + (matches == 1 ? " " : ""));
+ }
+ if ("-start".startsWith(buffer) && !TShellCompletor.allArgs.contains("-start")) {
+ candidates.add("-start" + (matches == 1 ? " " : ""));
+ }
+
+ final int index = buffer.lastIndexOf(File.separator);
+
+ int x= index + File.separator.length();
+// System.out.println("x="+x);
+ return x;
+// return index + File.separator.length();
+ }
+}
Propchange: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tuscany/sca-java-2.x/trunk/modules/shell/src/main/java/org/apache/tuscany/sca/shell/jline/InstallCompletor.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=1004186&r1=1004185&r2=1004186&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 Mon Oct 4 10:17:58 2010
@@ -19,6 +19,7 @@
package org.apache.tuscany.sca.shell.jline;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -45,14 +46,14 @@ public class TShellCompletor extends Arg
final Shell shell;
static String lastArg;
+ static List<String> allArgs;
public TShellCompletor(Shell shell) {
super((Completor)null);
this.shell = shell;
completors = new HashMap<String, Completor[]>();
completors.put("help", new Completor[]{commandCompletor, commandCompletor, new NullCompletor()});
-// completors.put("install", new Completor[]{commandCompletor, new InstallCompletor(), new NullCompletor()});
- completors.put("install", new Completor[]{commandCompletor, new FileNameCompletor(), new FileNameCompletor(), new NullCompletor()});
+ completors.put("install", new Completor[]{commandCompletor, new InstallCompletor(shell)});
completors.put("installed", new Completor[]{commandCompletor, new ICURICompletor(shell), new NullCompletor()});
completors.put("load", new Completor[]{commandCompletor, new FileNameCompletor(), new NullCompletor()});
completors.put("remove", new Completor[]{commandCompletor, new ICURICompletor(shell), new NullCompletor()});
@@ -70,6 +71,7 @@ public class TShellCompletor extends Arg
*/
public int complete(final String buffer, final int cursor,
final List candidates) {
+
ArgumentList list = delim.delimit(buffer, cursor);
int argpos = list.getArgumentPosition();
int argIndex = list.getCursorArgumentIndex();
@@ -83,6 +85,7 @@ public class TShellCompletor extends Arg
lastArg = list.getArguments()[argIndex-1];
if (lastArg != null) lastArg = lastArg.trim();
}
+ allArgs = Arrays.asList(list.getArguments());
final Completor comp;