Basic perations added, need to refine UX

Console.java

@@ -85,6 +85,9 @@ public class Console {
     public static String getOp(){
         //GET OPERATION FROM PERSON
             String operation = getStringInput("Please choose your operation.");
+            if (operation == null) {
+                System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");
+            }
             quit(operation);
             opSwitch.choose(operation);
             //return opSwitch.choose(operation1);
@@ -94,6 +97,8 @@ public class Console {
     public static void quit(String answer){
         if(answer.equals("quit") || answer.equals("exit")){
                System.exit(0);
+        } else if(answer.equals("clear")) {
+            System.out.print('\f');
         }
     }
    

opSwitch.java

@@ -8,14 +8,75 @@
 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));
+        String x;
+        String y;
+        // switchboard for operations
+        switch (opInput) {
+            case "?":
+                System.out.println("Commands include:\n"
+                +"+"+"\n"
+                +"-"+"\n"
+                +"*"+"\n"
+                +"/"+"\n"
+                +"square"+"\n"
+                +"square root"+"\n"
+                +"exponent"+"\n"
+                +"inverse"+"\n"
+                +"quit"+"\n"
+                +"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));
+                break;
+            case "-": 
+                x = Console.getStringInput("Please enter first number.");
+                y = Console.getStringInput("Please enter second number.");
+                simpleOp.sub(Console.getNumber(x), Console.getNumber(y));
+                break;
+            case "*": 
+                x = Console.getStringInput("Please enter multiplicand.");
+                y = Console.getStringInput("Please enter multiplier.");
+                simpleOp.mul(Console.getNumber(x), Console.getNumber(y));
+                break;
+            case "/": 
+                x = Console.getStringInput("Please enter dividend.");
+                y = Console.getStringInput("Please enter divisor.");
+                simpleOp.div(Console.getNumber(x), Console.getNumber(y));
+                break;
+            case "square": 
+                x = Console.getStringInput("Please enter your number.");
+                simpleOp.squ(Console.getNumber(x));
+                break;
+            case "square root": 
+                x = Console.getStringInput("Please enter your number.");
+                simpleOp.sqrt(Console.getNumber(x));
+                break;
+            case "exponent": 
+                x = Console.getStringInput("Please enter base.");
+                y = Console.getStringInput("Please enter exponent.");
+                simpleOp.exp(Console.getNumber(x), Console.getNumber(y));
+                break;
+            case "inverse":
+                x = Console.getStringInput("Please enter your number.");
+                simpleOp.inv(Console.getNumber(x));
+                break;
+            // default:
+                // System.out.println("You have not provided valid input. Please enter \"?\" for a list of commands.");
+                // break;
         }
+        
+        // //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));
+        // 
     }
+    
+    
 }

simpleOp.java

@@ -5,13 +5,67 @@
  * @author (your name)
  * @version (a version number or a date)
  */
+import java.util.*;
 public class simpleOp
 {
-    public static int add(int num1, int num2){
+    public static int add(int x, int y){
         //CALULATES THE SUM OF TWO NUMBERS
-        int num3 = num1 + num2;
-        System.out.println(num1 + " + " +num2 + " = " + num3);
-        return num3;
+        int z = x + y;
+        System.out.println(x + " + " + y + " = " + z);
+        return z;
+    }
+    
+    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;
+    }
+    
+    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;
+    }
+    
+    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;
+    }
+    
+    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;
+    }
+    
+    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;
+    }
+    
+    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;
+    }
+    
+    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;
     }
     
     public static int invert(int number){
@@ -20,4 +74,5 @@ public class simpleOp
             System.out.println(invertedNumber);
             return invertedNumber;
     }
+    
 }