From 42020a16ed55b344919e312afa77712644672014 Mon Sep 17 00:00:00 2001
From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:06:48 -0400
Subject: [PATCH 1/2] the struggle

---
 src/.idea/.gitignore                                   |  3 +++
 src/.idea/misc.xml                                     |  6 ++++++
 src/.idea/modules.xml                                  | 10 ++++++++++
 src/.idea/vcs.xml                                      |  6 ++++++
 .../scientificcalculator/CalculatorDisplay.java        | 10 ++++++++++
 .../scientificcalculator/CalculatorEngine.java         |  4 ++++
 6 files changed, 39 insertions(+)
 create mode 100644 src/.idea/.gitignore
 create mode 100644 src/.idea/misc.xml
 create mode 100644 src/.idea/modules.xml
 create mode 100644 src/.idea/vcs.xml

diff --git a/src/.idea/.gitignore b/src/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/src/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/src/.idea/misc.xml b/src/.idea/misc.xml
new file mode 100644
index 0000000..8ed5f34
--- /dev/null
+++ b/src/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/modules.xml b/src/.idea/modules.xml
new file mode 100644
index 0000000..31eaf94
--- /dev/null
+++ b/src/.idea/modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/main/main.iml" filepath="$PROJECT_DIR$/main/main.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/src.iml" filepath="$PROJECT_DIR$/.idea/src.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test/test.iml" filepath="$PROJECT_DIR$/test/test.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/.idea/vcs.xml b/src/.idea/vcs.xml
new file mode 100644
index 0000000..6c0b863
--- /dev/null
+++ b/src/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
index d24bf2c..dcc7d90 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
@@ -1,4 +1,14 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class CalculatorDisplay {
+
+    public void currentEngineReturn(){
+
+        switch ( new CalculatorEngine()){
+
+
+    }
+
+
+
 }
diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java
index b695cc4..3971d5c 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorEngine.java
@@ -1,8 +1,10 @@
 package com.zipcodewilmington.scientificcalculator;
 
 public class CalculatorEngine {
+
     private static int result;
 
+
     public static int sum(int firstNum, int secondNum) {
         result = firstNum + secondNum;
         return result;
@@ -14,4 +16,6 @@ public int subtract(int firstNum, int secondNum) {
     }
 
 
+
+
 }

From 013a00d3b318aefa7f881a0d3026925a58478aa8 Mon Sep 17 00:00:00 2001
From: Bobbi-Z <85585077+Bobbi-Z@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:15:39 -0400
Subject: [PATCH 2/2] the struggle is real

---
 .../scientificcalculator/CalculatorDisplay.java               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
index dcc7d90..d4b2fb5 100644
--- a/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
+++ b/src/main/java/com/zipcodewilmington/scientificcalculator/CalculatorDisplay.java
@@ -2,9 +2,9 @@
 
 public class CalculatorDisplay {
 
-    public void currentEngineReturn(){
 
-        switch ( new CalculatorEngine()){
+
+
 
 
     }