Packaged all the files

Author: Madhavan7

.gitignore

@@ -1,14 +1,14 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-# User-specific stuff
+# Entities.User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
 
-# AWS User-specific
+# AWS Entities.User-specific
 .idea/**/aws.xml
 
 # Generated files

src/main/java/IRetrieveList.java renamed to src/main/java/Controllers/IRetrieveList.java

@@ -1,3 +1,5 @@
+package Controllers;
+import Entities.User;
 import java.util.List;
 
 public interface IRetrieveList {

src/main/java/UserExists.java renamed to src/main/java/Controllers/UserExists.java

@@ -1,3 +1,5 @@
+package Controllers;
+
 public interface UserExists {
     boolean UserExists(String username, String password);
 }

src/main/java/UserRegistrationUseCase.java renamed to src/main/java/Controllers/UserRegistrationUseCase.java

@@ -1,3 +1,5 @@
+package Controllers;
+
 public interface UserRegistrationUseCase {
     void registerUser(String username, String password, String email);
 }

src/main/java/BasicUser.java renamed to src/main/java/Entities/BasicUser.java

@@ -1,4 +1,8 @@
-public class BasicUser extends User{
+package Entities;
+
+import Entities.User;
+
+public class BasicUser extends User {
     public BasicUser(String Username, String Password, String Email){
         super(Username, Password, Email);
     }

src/main/java/User.java renamed to src/main/java/Entities/User.java

@@ -1,5 +1,7 @@
+package Entities;
+import UseCase.Changeable;
 import java.io.Serializable;
-public abstract class User implements Serializable, Changeable{
+public abstract class User implements Serializable, Changeable {
     protected String username;
     protected String password;
     protected String email;
@@ -21,7 +23,7 @@ private String getPassword(){
     }
 
     @Override
-//    from Changeable
+//    from UseCase.Changeable
     public void changeFeature(String feature, String newFeature){
         if (feature == "Username"){
             this.username = newFeature;

src/main/java/UserFactory.java renamed to src/main/java/Entities/UserFactory.java

@@ -1,3 +1,8 @@
+package Entities;
+
+import Entities.BasicUser;
+import Entities.User;
+
 public class UserFactory {
     //Following the factory design pattern, just in case in the future we decide to add various different types of Users
     public static User BirthUser(String Username, String Password, String Email, String type){

src/main/java/UserDatabase.java renamed to src/main/java/UI/UserDatabase.java

@@ -1,7 +1,16 @@
+package UI;
+
+import Controllers.IRetrieveList;
+import Controllers.UserExists;
+import Entities.User;
+import Entities.UserFactory;
+import UseCase.UserCreator;
+import UseCase.UserRetriever;
+
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
-public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList{
+public class UserDatabase implements UserExists, UserRetriever, UserCreator, IRetrieveList {
     File accounts;
     List<User> accountList;
     public UserDatabase(){
@@ -72,7 +81,7 @@ public List<User> getList() {
             /*
             while(true){
                 try{
-                    User user = (User) in.readObject();
+                    Entities.User user = (Entities.User) in.readObject();
                     users.add(user);}
                 catch(EOFException e){
                     break;

src/main/java/UserRegistrationUI.java renamed to src/main/java/UI/UserRegistrationUI.java

@@ -1,9 +1,9 @@
-import junit.framework.JUnit4TestAdapter;
+package UI;
 
+import Controllers.UserRegistrationUseCase;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Random;
 import java.io.File;
 
 public class UserRegistrationUI implements UserRegistrationUseCase, ActionListener {
@@ -18,7 +18,7 @@ public class UserRegistrationUI implements UserRegistrationUseCase, ActionListen
 
     public UserRegistrationUI(UserDatabase database) {
         this.database = database;
-        /*TODO: For now the code is 389 for testing purposes, but once UserVerificationUI.sendVerificationCode() is
+        /*TODO: For now the code is 389 for testing purposes, but once UI.UserVerificationUI.sendVerificationCode() is
             implemented this will be a random integer.
         */
         /*code = new Random().nextInt(1244254);*/
@@ -86,7 +86,7 @@ public void registerUser(String username, String password, String email) {
     }
     //For Testing purposes
     public static void main(String[] args){
-        UserDatabase testDB = new UserDatabase(new File("Test4"));
+        UserDatabase testDB = new UserDatabase(new File("Test5"));
         System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
         System.out.println(testDB.getList().size());
         UserRegistrationUI testUI = new UserRegistrationUI(testDB);

src/main/java/UserVerificationUI.java renamed to src/main/java/UI/UserVerificationUI.java

@@ -1,3 +1,8 @@
+package UI;
+
+import UseCase.UserVerifier;
+import UseCase.verificationMethodFactory;
+
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -47,7 +52,7 @@ public void verify(String email){
 
     //For testing purposes
     /*public static void main(String[] args){
-        UserVerificationUI ver = new UserVerificationUI(389);
+        UI.UserVerificationUI ver = new UI.UserVerificationUI(389);
         ver.verify("abc");
     }*/