Refactored

Crypto/src/Main/ROT13.java

@@ -1,15 +1,18 @@
-
 import java.util.Arrays;
 import java.util.List;
 
-import static java.lang.Character.isLowerCase;
-import static java.lang.Character.isUpperCase;
-import static java.lang.Character.toLowerCase;
-
 public class ROT13  {
     private int rotate;
     private int encryptShift = 26;
+    private boolean encrypt;
+
+    public boolean isEncrypt() {
+        return encrypt;
+    }
 
+    public void setEncrypt(boolean encrypt) {
+        this.encrypt = encrypt;
+    }
 
     ROT13(Character cs, Character cf) {
         rotate = (int)(cs) - (int)(cf);
@@ -26,54 +29,46 @@ public class ROT13  {
         return encrypt(text);
     }
 
-
-    public String crypt(String text, int shift, int rotate, boolean encrypt) throws UnsupportedOperationException {
+    public String crypt(String text, int rotate) throws UnsupportedOperationException {
         List<String> textList = Arrays.asList(text.split(" "));
         StringBuilder builder = new StringBuilder();
 
         for (String s: textList) {
             char[] charArr = s.toCharArray();
             for (char c: charArr) {
-                if (encrypt)
-                    builder.append(shiftCharEncrypt(c, shift, rotate));
-                else {
-                    builder.append(shiftCharDecrypt(c, shift, rotate));
-                }
+                String strToAppend = isEncrypt() ? shiftCharEncrypt(c, rotate) : shiftCharDecrypt(c, rotate);
+                builder.append(strToAppend);
             }
             builder.append(" ");
         }
-
         return builder.toString().trim();
     }
 
     public String encrypt(String text) {
-        return crypt(text, encryptShift, getRotate(), true);
+        setEncrypt(true);
+        return crypt(text, getRotate());
     }
 
     public String decrypt(String text) {
-
-        return crypt(text, encryptShift * -1, getRotate() * -1, false);
+        setEncrypt(false);
+        return crypt(text, getRotate() * -1);
     }
 
-    public String shiftCharEncrypt(char c, int shift, int rotate){
+    public String shiftCharEncrypt(char c, int rotate){
         if (c > 64){
-            if ( (c > 96 && (c+ rotate) > 96) || (c <= 96 && (c+ rotate) > 64))
-                return  ( Character.toString( (char)(c+ rotate) ) );
-            else {
-                return  ( Character.toString( (char)(c+ rotate +shift) ) );
-            }
+            return  ( (c > 96 && (c + rotate) > 96) || (c <= 96 && (c + rotate) > 64) ) ?
+                    ( Character.toString( (char)(c + rotate) ) ) :
+                    ( Character.toString( (char)(c + rotate + encryptShift) ) );
         } else {
             return Character.toString(c);
         }
     }
 
-    public String shiftCharDecrypt(char c, int shift, int rotate){
+    public String shiftCharDecrypt(char c, int rotate){
         if (c > 64){
-            if ( (c + rotate > 122) || (c <= 90  && c + rotate > 90 ) ) // ( (c < 123 && (c+ rotate) < 123) || (c <= 123 && (c+ rotate) > 64))
-                return  ( Character.toString( (char)(c+ rotate +shift) ) );
-            else {
-                return  ( Character.toString( (char)(c+ rotate) ) );
-            }
+            return  ( (c + rotate > 122) || (c <= 90  && c + rotate > 90 ) ) ?
+                    ( Character.toString( (char)(c + rotate + encryptShift * -1) ) ) :
+                    ( Character.toString( (char)(c + rotate) ) );
         } else {
             return Character.toString(c);
         }
@@ -94,22 +89,7 @@ public class ROT13  {
             returnChar[j] = (char)( (int)(charArr[i]));
             j++;
         }
-
         return String.copyValueOf(returnChar);
     }
 
 }
-//    public String encrypt(String word) {
-//        char[] charArr = word.toCharArray();
-//        for(int i = 0; i < charArr.length; i++)
-//        {
-//            int tempInt = ((int)charArr[i]) + 3;
-//            if(tempInt > 122)
-//            {
-//                tempInt -= 26;
-//            }
-//            charArr[i] = (char)tempInt;
-//        }
-//        String returnStr = new String(charArr);
-//        return returnStr;
-//    }

Crypto/src/Main/ROT13A.java

@@ -1,110 +0,0 @@
-
-import java.util.Arrays;
-import java.util.List;
-
-import static java.lang.Character.isLowerCase;
-import static java.lang.Character.isUpperCase;
-import static java.lang.Character.toLowerCase;
-
-public class ROT13A  {
-    private int rotate;
-    private int encryptShift = 26;
-
-
-    ROT13A(Character cs, Character cf) {
-        rotate = (int)(cs) - (int)(cf);
-    }
-
-    ROT13A() {
-    }
-
-    public int getRotate() {
-        return rotate;
-    }
-
-    public String crypt(String text, int shift, int rotate, boolean encrypt) throws UnsupportedOperationException {
-        List<String> textList = Arrays.asList(text.split(" "));
-        StringBuilder builder = new StringBuilder();
-
-        for (String s: textList) {
-            char[] charArr = s.toCharArray();
-            for (char c: charArr) {
-                if (encrypt)
-                    builder.append(shiftCharEncrypt(c, shift, rotate));
-                else {
-                    builder.append(shiftCharDecrypt(c, shift, rotate));
-                }
-            }
-            builder.append(" ");
-        }
-
-        return builder.toString().trim();
-    }
-
-    public String encrypt(String text) {
-        return crypt(text, encryptShift, getRotate(), true);
-    }
-
-    public String decrypt(String text) {
-
-        return crypt(text, encryptShift * -1, getRotate() * -1, false);
-    }
-
-    public String shiftCharEncrypt(char c, int shift, int rotate){
-        if (c > 64){
-            if ( (c > 96 && (c+ rotate) > 96) || (c <= 96 && (c+ rotate) > 64))
-                return  ( Character.toString( (char)(c+ rotate) ) );
-            else {
-                return  ( Character.toString( (char)(c+ rotate +shift) ) );
-            }
-        } else {
-            return Character.toString(c);
-        }
-    }
-
-    public String shiftCharDecrypt(char c, int shift, int rotate){
-        if (c > 64){
-            if ( (c + rotate > 122) || (c <= 90  && c + rotate > 90 ) ) // ( (c < 123 && (c+ rotate) < 123) || (c <= 123 && (c+ rotate) > 64))
-                return  ( Character.toString( (char)(c+ rotate +shift) ) );
-            else {
-                return  ( Character.toString( (char)(c+ rotate) ) );
-            }
-        } else {
-            return Character.toString(c);
-        }
-    }
-
-    public static String rotate(String s, Character c) {
-        int staticRotateBy = (int)(c) - (int)(s.charAt(0));
-        char[] charArr = s.toCharArray();
-        char[] returnChar = new char[charArr.length];
-
-        int j = 0;
-        for (int i = staticRotateBy; i < returnChar.length; i++) {
-            returnChar[j] = (char)( (int)(charArr[i]));
-            j++;
-        }
-
-        for (int i = 0; i < staticRotateBy; i++) {
-            returnChar[j] = (char)( (int)(charArr[i]));
-            j++;
-        }
-
-        return String.copyValueOf(returnChar);
-    }
-
-}
-//    public String encrypt(String word) {
-//        char[] charArr = word.toCharArray();
-//        for(int i = 0; i < charArr.length; i++)
-//        {
-//            int tempInt = ((int)charArr[i]) + 3;
-//            if(tempInt > 122)
-//            {
-//                tempInt -= 26;
-//            }
-//            charArr[i] = (char)tempInt;
-//        }
-//        String returnStr = new String(charArr);
-//        return returnStr;
-//    }