Merge branch 'master' of WJB3003/ZCW-MacroLabs-OOP-ScientificCalculator into master

Console.java

@@ -1,7 +1,5 @@
- 
-
-import java.util.Scanner;
-
+import java.util.*;
+import java.lang.*;
 /**
  * Created by leon on 2/9/18.
  */
@@ -14,7 +12,7 @@ public class Console {
     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);
@@ -23,10 +21,80 @@ public class Console {
     }
 
     public static Integer getIntegerInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        int userInput = scanner.nextInt();
+        return userInput;
     }
 
     public static Double getDoubleInput(String prompt) {
-        return null;
+        Scanner scanner = new Scanner(System.in);
+        println(prompt);
+        double userInput = scanner.nextDouble();
+        return userInput;
+    }
+
+    public static String display(){
+        //ALWAYS DISPLAY WHATS IN YOUR CALCULATOR ( STRINGBUILDER )
+            return null;
+            //return display;
+    }
+    
+    public static void clear(){
+        //CLEARS SCREEN / SET TO ZERO ??
+    }
+    
+    public static int getInput(String numberString){
+        //GETS INPUT FROM PERSON ( X )
+            //String numberString = getStringInput("Please choose a number.");
+            quit(numberString);
+        try{
+            int number1 = Integer.parseInt(numberString);
+            System.out.println(number1);
+            return number1;
+        }catch(Exception e){
+            return getInput(numberString);
+        }
+    }
+    /*
+    public static int invert(int number){
+        //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
+        try{
+            int invertedNumber = -number;
+            System.out.println(invertedNumber);
+            return invertedNumber;
+        } catch(Exception e){
+            return getInput();
+        }
+    }
+    */
+    public static int getNumber(String numberString){
+        //GETS INPUT FROM PERSON ( Y )
+            //System.out.println(first + " " + op);
+            //String numberString = getStringInput("Please choose a number.");
+            quit(numberString);
+        try{
+            int number2 = Integer.parseInt(numberString);
+            System.out.println(number2);
+            return number2;
+        }catch(Exception e){
+            return getNumber(numberString);
+        }
+    }
+    
+    public static String getOp(){
+        //GET OPERATION FROM PERSON
+            String operation = getStringInput("Please choose your operation.");
+            quit(operation);
+            opSwitch.choose(operation);
+            //return opSwitch.choose(operation1);
+            return operation;
+    }
+    
+    public static void quit(String answer){
+        if(answer.equals("quit") || answer.equals("exit")){
+               System.exit(0);
+        }
     }
+   
 }

ConsoleTest.java

@@ -0,0 +1,52 @@
+
+
+import static org.junit.Assert.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * The test class ConsoleTest.
+ *
+ * @author  (your name)
+ * @version (a version number or a date)
+ */
+public class ConsoleTest
+{
+    /**
+     * Default constructor for test class ConsoleTest
+     */
+    public ConsoleTest()
+    {
+    }
+
+    /**
+     * Sets up the test fixture.
+     *
+     * Called before every test case method.
+     */
+    @Before
+    public void setUp()
+    {
+    }
+
+    /**
+     * Tears down the test fixture.
+     *
+     * Called after every test case method.
+     */
+    @After
+    public void tearDown()
+    {
+    }
+
+
+    @Test
+    public void getStringInputTest()
+    {
+        assertEquals("This is a string", Console.getStringInput("Please enter a string"));
+    }
+}
+
+
+

MainApplication.java

@@ -1,17 +1,11 @@
- 
 
 /**
  * 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);
+        while(true){
+            Console.getOp();
+        }
     }
-}
+}

opSwitch.java

@@ -0,0 +1,21 @@
+
+/**
+ * Write a description of class opSwitch here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class opSwitch
+{
+    public static void choose(String opInput){
+        //if/else state
+        if(opInput.equals("add") || opInput.equals("+")){
+            String addRequest1 = Console.getStringInput("Whats the first number you'll like to add?");
+            String addRequest2 = Console.getStringInput("Whats the second number you'll like to add?");
+            simpleOp.add(Console.getInput(addRequest1), Console.getNumber(addRequest2));
+        }else if(opInput.equals("invert")){
+            String invertRequest = Console.getStringInput("What number would you like to invert?");
+            simpleOp.invert(Console.getInput(invertRequest));
+        }
+    }
+}

package.bluej

@@ -1,23 +1,35 @@
 #BlueJ package file
-dependency1.from=MainApplication
+dependency1.from=ConsoleTest
 dependency1.to=Console
 dependency1.type=UsesDependency
-editor.fx.0.height=722
-editor.fx.0.width=800
-editor.fx.0.x=640
+dependency2.from=MainApplication
+dependency2.to=Console
+dependency2.type=UsesDependency
+dependency3.from=Console
+dependency3.to=opSwitch
+dependency3.type=UsesDependency
+dependency4.from=opSwitch
+dependency4.to=Console
+dependency4.type=UsesDependency
+dependency5.from=opSwitch
+dependency5.to=simpleOp
+dependency5.type=UsesDependency
+editor.fx.0.height=711
+editor.fx.0.width=811
+editor.fx.0.x=469
 editor.fx.0.y=23
-objectbench.height=214
-objectbench.width=595
+objectbench.height=199
+objectbench.width=444
 package.divider.horizontal=0.6
-package.divider.vertical=0.6847360912981455
-package.editor.height=473
-package.editor.width=493
-package.editor.x=35
-package.editor.y=60
-package.frame.height=759
-package.frame.width=619
-package.numDependencies=1
-package.numTargets=2
+package.divider.vertical=0.6845329249617151
+package.editor.height=440
+package.editor.width=342
+package.editor.x=0
+package.editor.y=23
+package.frame.height=711
+package.frame.width=468
+package.numDependencies=5
+package.numTargets=5
 package.showExtends=true
 package.showUses=true
 project.charset=UTF-8
@@ -27,16 +39,38 @@ readme.width=47
 readme.x=10
 readme.y=10
 target1.height=50
-target1.name=Console
+target1.name=simpleOp
 target1.showInterface=false
 target1.type=ClassTarget
 target1.width=80
-target1.x=80
-target1.y=200
+target1.x=130
+target1.y=220
+target2.association=ConsoleTest
 target2.height=50
-target2.name=MainApplication
+target2.name=Console
 target2.showInterface=false
 target2.type=ClassTarget
-target2.width=120
-target2.x=70
-target2.y=70
+target2.width=80
+target2.x=130
+target2.y=100
+target3.height=50
+target3.name=opSwitch
+target3.showInterface=false
+target3.type=ClassTarget
+target3.width=80
+target3.x=40
+target3.y=160
+target4.height=50
+target4.name=ConsoleTest
+target4.showInterface=false
+target4.type=UnitTestTargetJunit4
+target4.width=80
+target4.x=160
+target4.y=70
+target5.height=50
+target5.name=MainApplication
+target5.showInterface=false
+target5.type=ClassTarget
+target5.width=120
+target5.x=120
+target5.y=10

simpleOp.java

@@ -0,0 +1,23 @@
+
+/**
+ * Write a description of class simpleOp here.
+ *
+ * @author (your name)
+ * @version (a version number or a date)
+ */
+public class simpleOp
+{
+    public static int add(int num1, int num2){
+        //CALULATES THE SUM OF TWO NUMBERS
+        int num3 = num1 + num2;
+        System.out.println(num1 + " + " +num2 + " = " + num3);
+        return num3;
+    }
+    
+    public static int invert(int number){
+        //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
+            int invertedNumber = -number;
+            System.out.println(invertedNumber);
+            return invertedNumber;
+    }
+}