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

Calculations.java

@@ -2,6 +2,7 @@ import java.util.ArrayList;
 
 public class Calculations
 {
+    public static Console console = new Console();
     public static ArrayList<String> library = new ArrayList<String>();
     
     public Calculations(){
@@ -25,10 +26,12 @@ public class Calculations
         
     }
 
-    public static String getCommand(String userInput)
+    public static void getCommand(String userInput)
     {
         boolean foundCommand = false;
         String command = "";
+        String result = "";
+        
         String[] inputArr = userInput.split(" ");
         for(int i = 0; i < library.size(); i ++)
         {
@@ -44,40 +47,110 @@ public class Calculations
         switch(command)
         {
             case "multiply":
-                Multiply(userInput);
+                result = Multiply(userInput);
             break;
             
             case "divide":
-                Divide(userInput);
+                result = Divide(userInput);
             break;
             
             case "add":
-                Add(userInput);
+                result = Add(userInput);
             break;
             
             case "subtract":
-                Subtract(userInput);
+                result = Subtract(userInput);
             break;
             
             case "invertS":
-                InvertSign(userInput);
+                result = InvertSign(userInput);
             break;
             
             case "invertN":
-                InvertNumber(userInput);
+                result = InvertNumber(userInput);
             break;   
             
             case "clear":
                 Clear();
             break;
         }
-        
+        System.out.println(result);
+        //return result;
+    }
+    
+    public static String Multiply(String userInput)
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
+        return null;
+    }
+
+    public static String Divide(String userInput)
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
+        return null;
+    } 
+
+        public static String Add(String userInput)
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
         return null;
     }
     
+    public static String Subtract(String userInput)
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
+        return null;
+    }
+ 
     public static String InvertSign(String userInput)
     {
-        
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
+        return null;
+    }  
+    
+    public static String InvertNumber(String userInput)
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
+        return null;
+    } 
+
+    public static void Clear()
+    {
+        //take in a string
+        //take the numbers out of the string
+        //convert them to doubles
+        //perform the operation
+        //convert to string
+        //return string
     }
-   
 }

MainApplication.java

@@ -1,10 +1,12 @@
- 
+import java.util.Scanner;
 
-/**
- * Created by leon on 2/9/18.
- */
 public class MainApplication {
+    boolean on = false;
+    Calculations calculator = new Calculations();
+    Console console = calculator.console;
+    
     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");
@@ -14,4 +16,18 @@ public class MainApplication {
         //Console.println("The user input %s as a integer", i);
         //Console.println("The user input %s as a d", d);
     }
+    
+    public void Run(){
+        Scanner scanner = new Scanner(System.in);       
+        while(this.on == true)
+        {
+            String userInput = scanner.nextLine();
+            calculator.getCommand(userInput); 
+        }
+    }
+    
+    public void Power(){
+        this.on = !this.on;
+        this.Run();
+    }
 }

package.bluej

@@ -1,5 +1,6 @@
 #BlueJ package file
 <<<<<<< HEAD
+<<<<<<< HEAD
 editor.fx.0.height=709
 editor.fx.0.width=800
 editor.fx.0.x=480
@@ -21,6 +22,12 @@ editor.fx.0.height=0
 editor.fx.0.width=0
 editor.fx.0.x=0
 editor.fx.0.y=0
+=======
+editor.fx.0.height=717
+editor.fx.0.width=800
+editor.fx.0.x=240
+editor.fx.0.y=23
+>>>>>>> eac4369901be64afb2073e5d3077b9a43303c3c0
 objectbench.height=200
 objectbench.width=595
 package.divider.horizontal=0.6