Extremely Stable Version of Shell

dennysem · Sep 30, 2014 · d4eb276 · d4eb276
1 parent 960d913
commit d4eb276
Show file tree

Hide file tree

Showing 15 changed files with 2,090 additions and 2,088 deletions.
diff --git a/src/ru/fizteh/fivt/students/mrshoco/shell/bin/workbench.xmi b/src/ru/fizteh/fivt/students/mrshoco/shell/bin/workbench.xmi
diff --git a/src/ru/fizteh/fivt/students/mrshoco/shell/util/.ExitCommand.java.swp b/src/ru/fizteh/fivt/students/mrshoco/shell/util/.ExitCommand.java.swp
diff --git a/.../mrshoco/shell/shell_util/CatCommand.java → ...udents/mrshoco/shell/util/CatCommand.java b/.../mrshoco/shell/shell_util/CatCommand.java → ...udents/mrshoco/shell/util/CatCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 import java.util.Scanner;

diff --git a/...s/mrshoco/shell/shell_util/CdCommand.java → ...tudents/mrshoco/shell/util/CdCommand.java b/...s/mrshoco/shell/shell_util/CdCommand.java → ...tudents/mrshoco/shell/util/CdCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 

diff --git a/...nts/mrshoco/shell/shell_util/Command.java → .../students/mrshoco/shell/util/Command.java b/...nts/mrshoco/shell/shell_util/Command.java → .../students/mrshoco/shell/util/Command.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 /**
  * class Command.

diff --git a/...s/mrshoco/shell/shell_util/CpCommand.java → ...tudents/mrshoco/shell/util/CpCommand.java b/...s/mrshoco/shell/shell_util/CpCommand.java → ...tudents/mrshoco/shell/util/CpCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 import java.io.InputStream;
@@ -9,21 +9,22 @@
 public class CpCommand extends Command {
     /**
      * {@inheritDoc}
+     *
      * @see Command#CpCommand(String[])
      */
     CpCommand(final String[] cmd) {
         super(cmd);
     }
 
     /**
-     * {@inheritDoc}
      * @see Command#run()
      */
     public final void run() throws Exception {
-        if (args.length < 3 || (args[1] == "-r" && args.length < 4)) {
+        if (args.length < 3 || (args[1].equals("-r") && args.length < 4)) {
             throw new Exception("cp: missing file operand");
         }
-        File src, dest;
+        File src;
+        File dest;
 
         if (args[1].equals("-r")) {
             src = new File(System.getProperty("user.dir"), args[2]);

diff --git a/...mrshoco/shell/shell_util/ExitCommand.java → ...dents/mrshoco/shell/util/ExitCommand.java b/...mrshoco/shell/shell_util/ExitCommand.java → ...dents/mrshoco/shell/util/ExitCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.IOException;
 

diff --git a/...s/mrshoco/shell/shell_util/LsCommand.java → ...tudents/mrshoco/shell/util/LsCommand.java b/...s/mrshoco/shell/shell_util/LsCommand.java → ...tudents/mrshoco/shell/util/LsCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 

diff --git a/...rshoco/shell/shell_util/MkdirCommand.java → ...ents/mrshoco/shell/util/MkdirCommand.java b/...rshoco/shell/shell_util/MkdirCommand.java → ...ents/mrshoco/shell/util/MkdirCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 

diff --git a/...s/mrshoco/shell/shell_util/MvCommand.java → ...tudents/mrshoco/shell/util/MvCommand.java b/...s/mrshoco/shell/shell_util/MvCommand.java → ...tudents/mrshoco/shell/util/MvCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 /**
  * .
@@ -22,8 +22,8 @@ public final void run() throws Exception {
         }
 
         try {
-            new CpCommand(new String[] { "cp", "-r", args[1], args[2] }).run();
-            new RmCommand(new String[] { "rm", "-r", args[1] }).run();
+            new CpCommand(new String[] {"cp", "-r", args[1], args[2]}).run();
+            new RmCommand(new String[] {"rm", "-r", args[1]}).run();
         } catch (Exception e) {
             throw e;
         }

diff --git a/.../mrshoco/shell/shell_util/PwdCommand.java → ...udents/mrshoco/shell/util/PwdCommand.java b/.../mrshoco/shell/shell_util/PwdCommand.java → ...udents/mrshoco/shell/util/PwdCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 /**
  * .

diff --git a/...s/mrshoco/shell/shell_util/RmCommand.java → ...tudents/mrshoco/shell/util/RmCommand.java b/...s/mrshoco/shell/shell_util/RmCommand.java → ...tudents/mrshoco/shell/util/RmCommand.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.io.File;
 
@@ -18,7 +18,7 @@ public class RmCommand extends Command {
      * .
      */
     public final void run() throws Exception {
-        if (args.length < 2 || (args[1] == "-r" && args.length < 3)) {
+        if (args.length < 2 || (args[1].equals("-r") && args.length < 3)) {
             throw new Exception("rm: missing operand");
         }
         File file;

diff --git a/...s/mrshoco/shell/shell_util/ShellMain.java → ...tudents/mrshoco/shell/util/ShellMain.java b/...s/mrshoco/shell/shell_util/ShellMain.java → ...tudents/mrshoco/shell/util/ShellMain.java
@@ -1,4 +1,4 @@
-package shell_util;
+package util;
 
 import java.util.Arrays;
 import java.util.Scanner;
@@ -26,7 +26,8 @@ private ShellMain() {
      */
     public static void main(final String[] args) {
         if (args.length != 0) {
-            int i = 0, j = 0;
+            int i = 0;
+            int j = 0;
             for (i = 0; i <= args.length; i++) {
                 if (i == args.length || args[i].equals(";")) {
                     try {

diff --git a/...rshoco/shell/shell_util/package-info.java → ...ents/mrshoco/shell/util/package-info.java b/...rshoco/shell/shell_util/package-info.java → ...ents/mrshoco/shell/util/package-info.java
diff --git a/src/ru/fizteh/fivt/students/mrshoco/shell/workbench.xmi b/src/ru/fizteh/fivt/students/mrshoco/shell/workbench.xmi