almost finished

Crypto/src/main/java/ROT13.java

@@ -11,14 +11,21 @@ public class ROT13  {
     int rotateBy = 13;
 
     private char[] rotatedAlphbet;
-    private char[] alphChars = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+
+    private String alphbet = "abcdefghijklmnopqrstuvwxyz";
+    private char[] alphChars = alphbet.toCharArray();
+
+
 
     ROT13(Character cs, Character cf) {
         rotateBy = numbersByCount(cs, cf);
         rotatedAlphbet = rotate("abcdefghijklmnopqrstuvwxyz").toCharArray();
     }
 
-    ROT13() {}
+    ROT13() {
+        rotateBy = 13;
+        rotatedAlphbet = rotate("abcdefghijklmnopqrstuvwxyz").toCharArray();
+    }
 
     public static int numbersByCount(Character cs, Character cf){
         String alphabet = "abcdefghijklmnopqrstuvwxyz";
@@ -41,40 +48,26 @@ public class ROT13  {
     }
 
     public static void main(String[] args){
-        ROT13 rot13 = new ROT13('a','n');
+        ROT13 rot13 = new ROT13('a', 'm');
+        System.out.println(rot13.rotateBy);
         rot13.encryptFile("sonnet18.txt");
         rot13.decryptFile("sonnet18.enc");
-        //System.out.println(new ROT13().crypt("Gb trg gb gur bgure fvqr!"));
     }
 
     public String crypt(String text) throws UnsupportedOperationException {
-        StringBuilder sb = new StringBuilder();
         char[] cars = text.toCharArray();
+        StringBuilder sb =  new StringBuilder();
 
         for(char car: cars){
             if(Character.isLetter(car)){
-                if(Character.isUpperCase(car)){
-                    sb.append(Character.toUpperCase(charShift(car)));
-                }else {
-                    sb.append(charShift(car));
-                }
+                sb.append(this.rotate(this.alphbet, car).toCharArray()[rotateBy]);
             } else{
                 sb.append(car);
             }
         }
-        return sb.toString();
 
-    }
+        return sb.toString();
 
-    private Character charShift(char c){
-        Character car = null;
-        for(int i = 0; i < this.alphChars.length; i++) {
-            if(this.alphChars[i] == Character.toLowerCase(c)){
-                car = this.rotatedAlphbet[i];
-                break;
-            }
-        }
-        return car;
     }
 
     public String encrypt(String text) {
@@ -82,25 +75,19 @@ public class ROT13  {
     }
 
     public String decrypt(String text) {
-
         char[] cars = text.toCharArray();
-
         StringBuilder sb =  new StringBuilder();
 
-        for(int i = 0; i < cars.length; i++){
-            if(Character.isLetter(cars[i])){
-                sb.append(cars[i]);
-                if(rotateBy - i < 0){
-                    System.out.println(rotateBy -1);
-                    sb.append(rotatedAlphbet[(rotateBy - i) + (rotatedAlphbet.length -1)]);
-                } else {
-                    sb.append(rotatedAlphbet[rotateBy - i]);
-                }
-            } else {
-                sb.append(cars[i]);
+        for(char car: cars){
+            if(Character.isLetter(car)){
+                sb.append(this.rotate(this.alphbet, car).toCharArray()[this.alphChars.length - rotateBy]);
+            } else{
+                sb.append(car);
             }
         }
+
         return sb.toString();
+
     }
 
     public String rotate(String s) {
@@ -119,11 +106,14 @@ public class ROT13  {
         return new String(cars);
     }
 
-    public static String rotate(String s, Character c) {
+    public String rotate(String s, Character c) {
+        char temp;
+        boolean isUpper = false;
         char[] cars = s.toCharArray();
+        isUpper = Character.isUpperCase(c) ? true : false;
+        char car = Character.toLowerCase(c);
 
-        char temp;
-        while(cars[0] != c){
+        while(cars[0] != car){
             temp = cars[0];
             for(int i = 0; i < cars.length -1; i++){
                 cars[i] = cars[i +1];
@@ -131,7 +121,7 @@ public class ROT13  {
             cars[cars.length -1] = temp;
         }
 
-        return new String(cars);
+        return isUpper == true ? new String(cars).toUpperCase() : new String(cars);
     }
 
     public void encryptFile(String fileName){
@@ -180,7 +170,7 @@ public class ROT13  {
             String decryptFile = this.decrypt(sb.toString());
 
             try {
-                File file = new File("sonnet18dec.txt");
+                File file = new File("sonnet18.dec");
                 FileWriter fileWriter = new FileWriter(file);
                 fileWriter.write(decryptFile);
                 fileWriter.flush();

sonnet18.dec

@@ -0,0 +1,14 @@
+Shall I compare thee to a summer’s day?
+Thou art more lovely and more temperate:
+Rough winds do shake the darling buds of May,
+And summer’s lease hath all too short a date;
+Sometime too hot the eye of heaven shines,
+And often is his gold complexion dimm'd;
+And every fair from fair sometime declines,
+By chance or nature’s changing course untrimm'd;
+But thy eternal summer shall not fade,
+Nor lose possession of that fair thou ow’st;
+Nor shall death brag thou wander’st in his shade,
+When in eternal lines to time thou grow’st:
+   So long as men can breathe or eyes can see,
+   So long lives this, and this gives life to thee.

sonnet18.enc

@@ -1,14 +1,14 @@
-Funyy V pbzcner gurr gb n fhzzre’f qnl?
-Gubh neg zber ybiryl naq zber grzcrengr:
-Ebhtu jvaqf qb funxr gur qneyvat ohqf bs Znl,
-Naq fhzzre’f yrnfr ungu nyy gbb fubeg n qngr;
-Fbzrgvzr gbb ubg gur rlr bs urnira fuvarf,
-Naq bsgra vf uvf tbyq pbzcyrkvba qvzz'q;
-Naq rirel snve sebz snve fbzrgvzr qrpyvarf,
-Ol punapr be angher’f punatvat pbhefr hagevzz'q;
-Ohg gul rgreany fhzzre funyy abg snqr,
-Abe ybfr cbffrffvba bs gung snve gubh bj’fg;
-Abe funyy qrngu oent gubh jnaqre’fg va uvf funqr,
-Jura va rgreany yvarf gb gvzr gubh tebj’fg:
-   Fb ybat nf zra pna oerngur be rlrf pna frr,
-   Fb ybat yvirf guvf, naq guvf tvirf yvsr gb gurr.
+Etmxx U oaybmdq ftqq fa m egyyqd’e pmk?
+Ftag mdf yadq xahqxk mzp yadq fqybqdmfq:
+Dagst iuzpe pa etmwq ftq pmdxuzs ngpe ar Ymk,
+Mzp egyyqd’e xqmeq tmft mxx faa etadf m pmfq;
+Eayqfuyq faa taf ftq qkq ar tqmhqz etuzqe,
+Mzp arfqz ue tue saxp oaybxqjuaz puyy'p;
+Mzp qhqdk rmud rday rmud eayqfuyq pqoxuzqe,
+Nk otmzoq ad zmfgdq’e otmzsuzs oagdeq gzfduyy'p;
+Ngf ftk qfqdzmx egyyqd etmxx zaf rmpq,
+Zad xaeq baeeqeeuaz ar ftmf rmud ftag ai’ef;
+Zad etmxx pqmft ndms ftag imzpqd’ef uz tue etmpq,
+Itqz uz qfqdzmx xuzqe fa fuyq ftag sdai’ef:
+   Ea xazs me yqz omz ndqmftq ad qkqe omz eqq,
+   Ea xazs xuhqe ftue, mzp ftue suhqe xurq fa ftqq.

sonnet18dec.txt

@@ -1 +0,0 @@
-enczb  yynuF