fixed how input works

Console.java

@@ -50,7 +50,7 @@ public class Console {
             quit(numberString);
         try{
             int number1 = Integer.parseInt(numberString);
-            System.out.println(number1);
+            //System.out.println(number1);
             return number1;
         }catch(Exception e){
             return getInput(numberString);
@@ -75,7 +75,7 @@ public class Console {
             quit(numberString);
         try{
             int number2 = Integer.parseInt(numberString);
-            System.out.println(number2);
+            //System.out.println(number2);
             return number2;
         }catch(Exception e){
             return getNumber(numberString);

opSwitch.java

@@ -8,6 +8,8 @@
 public class opSwitch
 {
     public static void choose(String opInput){
+        simpleOp op = new simpleOp();
+        
         String x;
         String y;
         // switchboard for operations
@@ -26,9 +28,9 @@ public class opSwitch
                 +"clear"+"\n");
                 break;
             case "+": 
-                x = Console.getStringInput("Please enter first number.");
-                y = Console.getStringInput("Please enter second number.");
-                simpleOp.add(Console.getNumber(x), Console.getNumber(y));
+                //x = Console.getStringInput("Please enter first number.");
+                y = Console.getStringInput("Please enter number.");
+                simpleOp.add(op.currentNumber, Console.getNumber(y));
                 break;
             case "-": 
                 x = Console.getStringInput("Please enter first number.");

package.bluej

@@ -16,16 +16,16 @@ 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
+editor.fx.0.x=585
+editor.fx.0.y=114
 objectbench.height=199
 objectbench.width=444
 package.divider.horizontal=0.6
 package.divider.vertical=0.6845329249617151
 package.editor.height=440
 package.editor.width=342
-package.editor.x=0
-package.editor.y=23
+package.editor.x=35
+package.editor.y=81
 package.frame.height=711
 package.frame.width=468
 package.numDependencies=5
@@ -45,21 +45,21 @@ target1.type=ClassTarget
 target1.width=80
 target1.x=130
 target1.y=220
-target2.association=ConsoleTest
 target2.height=50
-target2.name=Console
+target2.name=opSwitch
 target2.showInterface=false
 target2.type=ClassTarget
 target2.width=80
-target2.x=130
-target2.y=100
+target2.x=40
+target2.y=160
+target3.association=ConsoleTest
 target3.height=50
-target3.name=opSwitch
+target3.name=Console
 target3.showInterface=false
 target3.type=ClassTarget
 target3.width=80
-target3.x=40
-target3.y=160
+target3.x=130
+target3.y=100
 target4.height=50
 target4.name=ConsoleTest
 target4.showInterface=false
@@ -67,10 +67,10 @@ target4.type=UnitTestTargetJunit4
 target4.width=80
 target4.x=160
 target4.y=70
-target5.height=50
+target5.height=40
 target5.name=MainApplication
 target5.showInterface=false
 target5.type=ClassTarget
-target5.width=120
-target5.x=120
-target5.y=10
+target5.width=60
+target5.x=80
+target5.y=30

simpleOp.java

@@ -8,71 +8,73 @@
 import java.util.*;
 public class simpleOp
 {
+    public static int currentNumber = 0;
+    
     public static int add(int x, int y){
         //CALULATES THE SUM OF TWO NUMBERS
-        int z = x + y;
-        System.out.println(x + " + " + y + " = " + z);
-        return z;
+        currentNumber = x + y;
+        System.out.println(currentNumber);
+        return currentNumber;
     }
     
     public static int sub(int x, int y){
         //CALULATES THE DIFFERENCE OF TWO NUMBERS
-        int z = x - y;
-        System.out.println(x + " - " + y + " = " + z);
-        return z;
+        int currentNumber = x - y;
+        System.out.println(x + " - " + y + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static int mul(int x, int y){
         //CALULATES THE PRODUCT OF TWO NUMBERS
-        int z = x * y;
-        System.out.println(x + " * " + y + " = " + z);
-        return z;
+        int currentNumber = x * y;
+        System.out.println(x + " * " + y + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static int div(int x, int y){
         //CALULATES THE QUOTIENT OF TWO NUMBERS
-        int z = x / y;
-        System.out.println(x + " / " + y + " = " + z);
-        return z;
+        int currentNumber = x / y;
+        System.out.println(x + " / " + y + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static int squ(int x){
         //CALULATES THE SQUARE OF ONE NUMBER
         //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int z = (int) Math.pow(x,2);
-        System.out.println(x + "\u00B2 = " + z);
-        return z;
+        int currentNumber = (int) Math.pow(x,2);
+        System.out.println(x + "\u00B2 = " + currentNumber);
+        return currentNumber;
     }
     
     public static int sqrt(int x){
         //CALULATES THE SQUARE ROOT OF ONE NUMBER
         //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int z = (int) Math.sqrt(x);
-        System.out.println("√" + x + " = " + z);
-        return z;
+        int currentNumber = (int) Math.sqrt(x);
+        System.out.println("√" + x + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static int exp(int x, int y){
         //CALULATES EXPONENTIATION OF X TO POWER OF Y
         //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        int z = (int) Math.pow(x,y);
-        System.out.println(x + "^" + y + " = " + z);
-        return z;
+        int currentNumber = (int) Math.pow(x,y);
+        System.out.println(x + "^" + y + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static double inv(double x){
         //CALULATES THE INVERSE OF NUMBER
         //CASTED TO INT FOR NOW... IT'S IN ALPHA, YOU DIG?
-        double z = 1 / x;
-        System.out.println("1 / " + x + " = " + z);
-        return z;
+        double currentNumber = 1 / x;
+        System.out.println("1 / " + x + " = " + currentNumber);
+        return currentNumber;
     }
     
     public static int invert(int number){
         //TURNS NEGATIVE TO POSITIVE OR POSITIVE TO NEGATIVE
-            int invertedNumber = -number;
-            System.out.println(invertedNumber);
-            return invertedNumber;
+            currentNumber = -number;
+            System.out.println(currentNumber);
+            return currentNumber;
     }
     
 }