Merge branch 'master' of https://git.zipcode.rocks/jonathan-hinds/ZCW-MacroLabs-OOP-ScientificCalculator

Calculations.java

@@ -0,0 +1,83 @@
+import java.util.ArrayList;
+
+public class Calculations
+{
+    public static ArrayList<String> library = new ArrayList<String>();
+    
+    public Calculations(){
+   
+    library.add("multiply");
+    library.add("divide");
+    library.add("subtract");
+    library.add("add");
+    library.add("COS");
+    library.add("SIN");
+    library.add("TAN");
+    library.add("invertS");
+    library.add("invertN");
+    library.add("factorial");
+    library.add("switchunit");
+    library.add("clear");
+    library.add("storeM");
+    library.add("resetM");
+    library.add("recallM");
+    library.add("displayM");
+        
+    }
+
+    public static String getCommand(String userInput)
+    {
+        boolean foundCommand = false;
+        String command = "";
+        String[] inputArr = userInput.split(" ");
+        for(int i = 0; i < library.size(); i ++)
+        {
+            String currCommand = library.get(i);
+            if(currCommand.equalsIgnoreCase(inputArr[0]))
+            {
+                command = currCommand;
+                foundCommand = true;
+                break;
+            }
+        }
+        
+        switch(command)
+        {
+            case "multiply":
+                Multiply(userInput);
+            break;
+            
+            case "divide":
+                Divide(userInput);
+            break;
+            
+            case "add":
+                Add(userInput);
+            break;
+            
+            case "subtract":
+                Subtract(userInput);
+            break;
+            
+            case "invertS":
+                InvertSign(userInput);
+            break;
+            
+            case "invertN":
+                InvertNumber(userInput);
+            break;   
+            
+            case "clear":
+                Clear();
+            break;
+        }
+        
+        return null;
+    }
+    
+    public static String InvertSign(String userInput)
+    {
+        
+    }
+   
+}

Console.java

@@ -7,26 +7,27 @@ import java.util.Scanner;
  */
 public class Console {
 
-    public static void print(String output, Object... args) {
-        System.out.printf(output, args);
-    }
+    
+    //public static void print(String output, Object... args) {
+    //    System.out.printf(output, args);
+    //}
 
-    public static void println(String output, Object... args) {
-        print(output + "\n", args);
-    }
+    //public static void println(String output, Object... args) {
+    //    print(output + "\n", args);
+    //}
 
-    public static String getStringInput(String prompt) {
-        Scanner scanner = new Scanner(System.in);
-        println(prompt);
-        String userInput = scanner.nextLine();
-        return userInput;
-    }
+    //public static String getStringInput(String prompt) {
+    //    Scanner scanner = new Scanner(System.in);
+    //    println(prompt);
+    //    String userInput = scanner.nextLine();
+    //    return userInput;
+    //}
 
-    public static Integer getIntegerInput(String prompt) {
-        return null;
-    }
+    //public static Integer getIntegerInput(String prompt) {
+    //    return null;
+    //}
 
-    public static Double getDoubleInput(String prompt) {
-        return null;
-    }
+    //public static Double getDoubleInput(String prompt) {
+    //    return null;
+    //}
 }

MainApplication.java

@@ -0,0 +1,17 @@
+ 
+
+/**
+ * Created by leon on 2/9/18.
+ */
+public class MainApplication {
+    public static void main(String[] args) {
+        //Console.println("Welcome to my calculator!");
+        //String s = Console.getStringInput("Enter a string");
+        //Integer i = Console.getIntegerInput("Enter an integer");
+        //Double d = Console.getDoubleInput("Enter a double.");
+
+        //Console.println("The user input %s as a string", s);
+        //Console.println("The user input %s as a integer", i);
+        //Console.println("The user input %s as a d", d);
+    }
+}

package.bluej

@@ -1,4 +1,5 @@
 #BlueJ package file
+<<<<<<< HEAD
 editor.fx.0.height=709
 editor.fx.0.width=800
 editor.fx.0.x=480
@@ -15,6 +16,24 @@ package.frame.height=709
 package.frame.width=619
 package.numDependencies=0
 package.numTargets=2
+=======
+editor.fx.0.height=0
+editor.fx.0.width=0
+editor.fx.0.x=0
+editor.fx.0.y=0
+objectbench.height=200
+objectbench.width=595
+package.divider.horizontal=0.6
+package.divider.vertical=0.6854103343465046
+package.editor.height=444
+package.editor.width=493
+package.editor.x=35
+package.editor.y=23
+package.frame.height=716
+package.frame.width=619
+package.numDependencies=0
+package.numTargets=3
+>>>>>>> 5c782a9d95f3f9208ab5ec62241ab490d899062b
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -24,16 +43,37 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
+<<<<<<< HEAD
 target1.name=OrderOfOperations
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=140
 target1.x=70
 target1.y=70
+=======
+target1.name=Calculations
+target1.showInterface=false
+target1.type=ClassTarget
+target1.width=100
+target1.x=120
+target1.y=150
+>>>>>>> 5c782a9d95f3f9208ab5ec62241ab490d899062b
 target2.height=50
 target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
+<<<<<<< HEAD
 target2.x=80
 target2.y=200
+=======
+target2.x=20
+target2.y=150
+target3.height=50
+target3.name=MainApplication
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=120
+target3.x=70
+target3.y=70
+>>>>>>> 5c782a9d95f3f9208ab5ec62241ab490d899062b