fixed some import statements

Author: parmism

src/main/java/entities/user_entities/User.java

@@ -47,6 +47,10 @@ public void changeFeature(String feature, String newFeature){
         }
     }
 
+    public Boolean PasswordMatch(String attempt){
+        return (this.getPassword().equals(attempt));
+    }
+
     public void login(){
         UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
     }

src/main/java/interface_adapters/User/UserModificationGateway.java

@@ -1,6 +1,6 @@
 package interface_adapters.User;
 
-import entities.userEntities.User;
+import entities.user_entities.User;
 
 // allows for the serialized data_access.UserDatabase to update when changes occur to user attributes.
 public interface UserModificationGateway {

src/main/java/interface_adapters/User_search_IA/IRetrieveList.java

@@ -1,12 +1,8 @@
-<<<<<<<< HEAD:src/main/java/interface_adapters/User_search_IA/IRetrieveList.java
 package interface_adapters.User_search_IA;
 
 import entities.user_entities.User;
 
-========
-package interface_adapters;
 import entities.user_entities.User;
->>>>>>>> main:src/main/java/interface_adapters/IRetrieveList.java
 import java.util.List;
 
 public interface IRetrieveList {

src/main/java/interface_adapters/app_screen_interface_adapters/UserAppScreenGateway.java

@@ -1,9 +1,13 @@
 package interface_adapters.app_screen_interface_adapters;
 
 import java.util.ArrayList;
+
+import entities.chat.Chat;
 import interface_adapters.*;
 import entities.*;
 import data_access.UserDatabase;
+import interface_adapters.login_interface_adapters.Login;
+
 import java.util.ArrayList;
 
 public class UserAppScreenGateway implements Login {

src/main/java/interface_adapters/user_registration_interface_adapters/UserExists.java

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:src/main/java/interface_adapters/user_registration_interface_adapters/UserExists.java
 package interface_adapters.user_registration_interface_adapters;
-========
-package interface_adapters.User;
->>>>>>>> main:src/main/java/interface_adapters/User/UserExists.java
 
 public interface UserExists {
     boolean UserExists(String username, String email);

src/main/java/screens/Profile_screen/UserSearchUI.java

@@ -2,7 +2,7 @@
  * Provides the UI elements
  */
 import data_access.UserDatabase;
-import entities.userEntities.User;
+import entities.user_entities.User;
 import interface_adapters.User_search_IA.UserPresenter;
 import use_cases.user_profile_display_use_case.UserReader;
 

src/main/java/screens/profile_update_screen/UserModificationUI.java

@@ -2,7 +2,7 @@
  * Provides the UI elements
  */
 import data_access.UserDatabase;
-import entities.userEntities.User;
+import entities.user_entities.User;
 import interface_adapters.profile_modification_IA.ChangeController;
 
 import javax.swing.*;

src/main/java/use_cases/user_profile_display_use_case/UserReader.java

@@ -1,6 +1,7 @@
 package use_cases.user_profile_display_use_case;
 
-import entities.userEntities.User;
+
+import entities.user_entities.User;
 
 import java.io.File;
 

src/main/java/use_cases/user_registration_use_cases/UserCreator.java

@@ -1,9 +1,3 @@
-<<<<<<<< HEAD:src/main/java/use_cases/user_registration_use_cases/UserCreator.java
-package use_cases.user_registration_use_cases;
-========
-package interface_adapters.User;
->>>>>>>> main:src/main/java/interface_adapters/User/UserCreator.java
-
 public interface UserCreator {
     void createUser(String username, String password, String email, String type);
 }