From ed01a2624994446d2399b8b65ce28b0137184f9e Mon Sep 17 00:00:00 2001 From: Rodrigo Rato Date: Thu, 7 Dec 2017 18:25:28 +0000 Subject: [PATCH] Final text fixes --- client/runclient.sh | 2 +- .../java/a16/yarfs/client/presentation/CommitCommand.java | 2 +- .../java/a16/yarfs/client/presentation/RefreshCommand.java | 4 ++-- client/src/main/java/a16/yarfs/client/presentation/Shell.java | 4 ++-- .../java/a16/yarfs/client/presentation/Unsharecommand.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/client/runclient.sh b/client/runclient.sh index 89cf855..de0e512 100755 --- a/client/runclient.sh +++ b/client/runclient.sh @@ -5,4 +5,4 @@ mvn compile package mvn install:install-file -Dfile=target/ca-1.0-SNAPSHOT.jar -DgroupId=a16 -DartifactId=ca -Dversion=1.0-SNAPSHOT -Dpackaging=jar -DlocalRepositoryPath=../client/my-repo popd mvn dependency:purge-local-repository -mvn -U compile exec:java -Dexec.args="https://server.yarfs:31000 --ca-addr=ca.yarfs" +mvn -U compile exec:java -Dexec.args="https://server.yarfs:31001 --ca-addr=ca.yarfs" diff --git a/client/src/main/java/a16/yarfs/client/presentation/CommitCommand.java b/client/src/main/java/a16/yarfs/client/presentation/CommitCommand.java index f200768..216174f 100644 --- a/client/src/main/java/a16/yarfs/client/presentation/CommitCommand.java +++ b/client/src/main/java/a16/yarfs/client/presentation/CommitCommand.java @@ -23,7 +23,7 @@ */ public class CommitCommand extends Command{ public CommitCommand(Shell sh, String name) { - super(sh, name, "Commit a change of existing file."); + super(sh, name, "commit a change of an existing file."); } @Override diff --git a/client/src/main/java/a16/yarfs/client/presentation/RefreshCommand.java b/client/src/main/java/a16/yarfs/client/presentation/RefreshCommand.java index 7224e60..e8f28d1 100644 --- a/client/src/main/java/a16/yarfs/client/presentation/RefreshCommand.java +++ b/client/src/main/java/a16/yarfs/client/presentation/RefreshCommand.java @@ -12,7 +12,7 @@ public class RefreshCommand extends Command{ public RefreshCommand(Shell sh, String name) { - super(sh, name, "Unable to refresh metadata from server."); + super(sh, name, "refreshes metadata from server."); } @Override @@ -29,7 +29,7 @@ void execute(String[] args) { service.execute(); List newFiles = service.getNewFiles(); if( newFiles.size() == 0 ){ - shell.println("No new files. All up to date!"); + shell.println("No new files. "); }else{ shell.println("New files were found."); for(String filename : newFiles){ diff --git a/client/src/main/java/a16/yarfs/client/presentation/Shell.java b/client/src/main/java/a16/yarfs/client/presentation/Shell.java index 13eba14..51eeb63 100644 --- a/client/src/main/java/a16/yarfs/client/presentation/Shell.java +++ b/client/src/main/java/a16/yarfs/client/presentation/Shell.java @@ -83,7 +83,7 @@ void execute(String[] args) { Collections.sort(availableCmds); for(String cmdName : availableCmds) { Command c = getShell().getCommand(cmdName); - println(" " + whatIs(c)); + println("\t" + whatIs(c)); } } else { String cmdName = args[0]; @@ -106,7 +106,7 @@ public String getUsage() { } protected String whatIs(Command cmd) { - return cmd.getName() + "\t\t" + cmd.getHelp(); + return cmd.getName() + "\t\t\t" + cmd.getHelp(); } public void println(String s) { diff --git a/client/src/main/java/a16/yarfs/client/presentation/Unsharecommand.java b/client/src/main/java/a16/yarfs/client/presentation/Unsharecommand.java index 263be1e..ce57822 100644 --- a/client/src/main/java/a16/yarfs/client/presentation/Unsharecommand.java +++ b/client/src/main/java/a16/yarfs/client/presentation/Unsharecommand.java @@ -22,7 +22,7 @@ public class Unsharecommand extends Command{ public Unsharecommand(Shell sh, String name) { - super(sh, name, "Unshare a file with a user."); + super(sh, name, "unshare a file with a user."); } @Override