From a12de5ca2e46c6e8fb07d66cd41205068364ca2a Mon Sep 17 00:00:00 2001
From: Rohan M <rohan0866@gmail.com>
Date: Thu, 2 Sep 2021 11:36:51 -0700
Subject: [PATCH 1/3] Uprooted buggy code

---
 src/ATM.java       | 20 ++++++++++++++++++++
 src/ATMTester.java | 17 +++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 src/ATMTester.java

diff --git a/src/ATM.java b/src/ATM.java
index 511df07..85dbc30 100644
--- a/src/ATM.java
+++ b/src/ATM.java
@@ -1,8 +1,12 @@
 import java.util.*;
 
 public class ATM {
+<<<<<<< Updated upstream
 	HashMap<String, Integer> map;
 	
+=======
+	HashMap<String, Double> map;
+>>>>>>> Stashed changes
 	public ATM() {
 		map = new HashMap<String, Integer>();
 	}
@@ -11,15 +15,31 @@ public void deposit(String id, int amt) {
 		map.put(id, amt);
 	}
 	
+<<<<<<< Updated upstream
+=======
+	public void withdraw(String id, Double amt) {
+		
+		Double balance = map.get(id);
+		if(balance - amt <0) {
+			System.out.println("You have an overwithdrawal of $" + (balance-amt));
+		}
+		else {
+			map.put(id, balance-amt);
+		}
+	}
+>>>>>>> Stashed changes
 	
 	@Override
 	public String toString() {
 		return "ATM [map=" + map + "]";
 	}
+<<<<<<< Updated upstream
 
 	public static void main (String [] args) {
 		ATM chase = new ATM();
 		chase.deposit("COLINYUAN01", 1000000);
 		System.out.println(chase.toString());
 	}
+=======
+>>>>>>> Stashed changes
 }
diff --git a/src/ATMTester.java b/src/ATMTester.java
new file mode 100644
index 0000000..c463f20
--- /dev/null
+++ b/src/ATMTester.java
@@ -0,0 +1,17 @@
+
+public class ATMTester {
+	public static void main (String[] args) {
+		ATM chase = new ATM();
+		chase.deposit("Winfrey", 10.0);
+		chase.deposit("Bezos", 5.0);
+		chase.deposit("Bezos", 2.0);
+		chase.deposit("MrTheiss",13.0);
+		chase.withdraw("Bezos", 2.0);
+		chase.withdraw("MrTheiss", 15.0);
+		System.out.println(chase.checkBalance("Bezos"));
+		System.out.println(chase.checkBalance("Winfrey"));
+		System.out.println(chase.checkBalance("YoMama"));
+		System.out.println(chase.checkBalance("MrTheiss"));
+	
+	}
+}

From cb74a889642557a70ecfaac7ab36d0837b814e25 Mon Sep 17 00:00:00 2001
From: Rohan M <rohan0866@gmail.com>
Date: Thu, 2 Sep 2021 11:42:08 -0700
Subject: [PATCH 2/3] Uprooted classpath

---
 .classpath | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index 9f9bbb5..b185c2e 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-16">
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="/Users/Rohan/Documents/GitHub/ATM-Project/src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

From b618f26ed61ac3627e4b602b348c72ffe36d1d42 Mon Sep 17 00:00:00 2001
From: Rohan M <rohan0866@gmail.com>
Date: Thu, 2 Sep 2021 11:43:43 -0700
Subject: [PATCH 3/3] Fixed merge conflict!

---
 src/ATM.java | 73 +++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 35 deletions(-)

diff --git a/src/ATM.java b/src/ATM.java
index 85dbc30..ff046a7 100644
--- a/src/ATM.java
+++ b/src/ATM.java
@@ -1,45 +1,48 @@
-import java.util.*;
+mport java.util.HashMap;
 
 public class ATM {
-<<<<<<< Updated upstream
-	HashMap<String, Integer> map;
-	
-=======
-	HashMap<String, Double> map;
->>>>>>> Stashed changes
-	public ATM() {
-		map = new HashMap<String, Integer>();
-	}
-	
-	public void deposit(String id, int amt) {
-		map.put(id, amt);
+	private HashMap <String, Double> database;
+
+	public  ATM()
+	{
+		database = new HashMap <String, Double> ();
 	}
-	
-<<<<<<< Updated upstream
-=======
-	public void withdraw(String id, Double amt) {
-		
-		Double balance = map.get(id);
-		if(balance - amt <0) {
-			System.out.println("You have an overwithdrawal of $" + (balance-amt));
+
+	public void deposit(String userID, double amount) throws Exception
+	{
+		if (database.containsKey (userID))
+		{
+			double currBalance= database.get(userID);
+			database.replace(userID, currBalance + amount);
 		}
-		else {
-			map.put(id, balance-amt);
+		else
+		{
+			database.put(userID,amount);
+
 		}
 	}
->>>>>>> Stashed changes
-	
-	@Override
-	public String toString() {
-		return "ATM [map=" + map + "]";
+
+	public void withdraw (String userID, double amount) throws Exception
+	{
+		double currBalance = database.get(userID);
+		if (amount> currBalance)
+		{
+			throw new Exception();
+		}
+		else
+		{
+			database.replace(userID, currBalance - amount);
+
+		}
 	}
-<<<<<<< Updated upstream
 
-	public static void main (String [] args) {
-		ATM chase = new ATM();
-		chase.deposit("COLINYUAN01", 1000000);
-		System.out.println(chase.toString());
+	public double checkBalance (String userID) throws Exception
+	{
+		if (!database.containsKey (userID))
+		{
+			throw new Exception();
+
+		}
+		return database.get(userID);
 	}
-=======
->>>>>>> Stashed changes
 }