diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Exceptions/InvalidCharacterException.java b/src/main/java/com/mattrixwv/CipherStreamJava/Exceptions/InvalidCharacterException.java index 094b171..717f050 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Exceptions/InvalidCharacterException.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/Exceptions/InvalidCharacterException.java @@ -2,7 +2,7 @@ //Mattrixwv // Created: 01-04-22 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava.Exceptions; +package com.mattrixwv.CipherStreamJava.exceptions; public class InvalidCharacterException extends Exception{ diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Atbash.java b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Atbash.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/Atbash.java rename to src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Atbash.java index a999427..4433dfb 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Atbash.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Atbash.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; public class Atbash{ diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Autokey.java b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Autokey.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/Autokey.java rename to src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Autokey.java index ea64ae2..d0034ae 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Autokey.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Autokey.java @@ -2,8 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; - +package com.mattrixwv.CipherStreamJava.monoSubstitution; public class Autokey extends Vigenere{ //Special rules for setting the strings for encoding diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Caesar.java b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Caesar.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/Caesar.java rename to src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Caesar.java index 6e4b5cc..1a58362 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Caesar.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Caesar.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; public class Caesar{ diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Vigenere.java b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Vigenere.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/Vigenere.java rename to src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Vigenere.java index 50073b4..b34eb04 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Vigenere.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/monoSubstitution/Vigenere.java @@ -2,10 +2,12 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; + import java.util.ArrayList; + public class Vigenere{ protected String inputString; //This is the string that needs encoded/decoded protected String outputString; //This is the string that is output after encoding/decoding diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Morse.java b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Morse.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/Morse.java rename to src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Morse.java index c87a4ec..18facc6 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Morse.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Morse.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-28-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; public class Morse{ diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/Playfair.java b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Playfair.java similarity index 99% rename from src/main/java/com/mattrixwv/CipherStreamJava/Playfair.java rename to src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Playfair.java index f6fd8b2..42d2bee 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/Playfair.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/Playfair.java @@ -2,10 +2,10 @@ //Matthew Ellison // Created: 07-30-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; -import com.mattrixwv.CipherStreamJava.Exceptions.InvalidCharacterException; +import com.mattrixwv.CipherStreamJava.exceptions.InvalidCharacterException; public class Playfair{ diff --git a/src/main/java/com/mattrixwv/CipherStreamJava/PolybiusSquare.java b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/PolybiusSquare.java similarity index 98% rename from src/main/java/com/mattrixwv/CipherStreamJava/PolybiusSquare.java rename to src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/PolybiusSquare.java index ff61b9e..94ffee6 100644 --- a/src/main/java/com/mattrixwv/CipherStreamJava/PolybiusSquare.java +++ b/src/main/java/com/mattrixwv/CipherStreamJava/polySubstitution/PolybiusSquare.java @@ -2,12 +2,12 @@ //Mattrixwv // Created: 01-04-22 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; import java.util.StringJoiner; -import com.mattrixwv.CipherStreamJava.Exceptions.InvalidCharacterException; +import com.mattrixwv.CipherStreamJava.exceptions.InvalidCharacterException; public class PolybiusSquare{ diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestAtbash.java b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAtbash.java similarity index 99% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestAtbash.java rename to src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAtbash.java index b44cd90..28cdf18 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestAtbash.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAtbash.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestAutokey.java b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAutokey.java similarity index 99% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestAutokey.java rename to src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAutokey.java index 8549247..7174932 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestAutokey.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestAutokey.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-26-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestCaesar.java b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestCaesar.java similarity index 99% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestCaesar.java rename to src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestCaesar.java index 4a9353e..12c3b01 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestCaesar.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestCaesar.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestVigenere.java b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestVigenere.java similarity index 99% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestVigenere.java rename to src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestVigenere.java index b86b049..9d44ca4 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestVigenere.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/monoSubstitution/TestVigenere.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-25-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.monoSubstitution; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestMorse.java b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestMorse.java similarity index 96% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestMorse.java rename to src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestMorse.java index 852e66c..6e780c9 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestMorse.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestMorse.java @@ -2,7 +2,7 @@ //Matthew Ellison // Created: 07-28-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; import static org.junit.Assert.assertEquals; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestPlayfair.java b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPlayfair.java similarity index 99% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestPlayfair.java rename to src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPlayfair.java index b404cbe..65b42bf 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestPlayfair.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPlayfair.java @@ -2,12 +2,12 @@ //Matthew Ellison // Created: 07-30-21 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; import static org.junit.Assert.assertEquals; -import com.mattrixwv.CipherStreamJava.Exceptions.InvalidCharacterException; +import com.mattrixwv.CipherStreamJava.exceptions.InvalidCharacterException; import org.junit.Test; diff --git a/src/test/java/com/mattrixwv/CipherStreamJava/TestPolybiusSquare.java b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPolybiusSquare.java similarity index 98% rename from src/test/java/com/mattrixwv/CipherStreamJava/TestPolybiusSquare.java rename to src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPolybiusSquare.java index 556bda6..62576d5 100644 --- a/src/test/java/com/mattrixwv/CipherStreamJava/TestPolybiusSquare.java +++ b/src/test/java/com/mattrixwv/CipherStreamJava/polySubstitution/TestPolybiusSquare.java @@ -2,12 +2,12 @@ //Mattrixwv // Created: 01-04-22 //Modified: 01-04-22 -package com.mattrixwv.CipherStreamJava; +package com.mattrixwv.CipherStreamJava.polySubstitution; import static org.junit.Assert.assertEquals; -import com.mattrixwv.CipherStreamJava.Exceptions.InvalidCharacterException; +import com.mattrixwv.CipherStreamJava.exceptions.InvalidCharacterException; import org.junit.Test;