updated commit

Console.java

@@ -1,6 +1,6 @@
 import java.util.Scanner;
 
-public class Console {
+public class Console{
 
     public static void print(String output, Object... args) {
         System.out.printf(output, args);

Main.java

@@ -10,30 +10,21 @@ public class Main{
         Calculator calc = new Calculator();
         Memory memo = new Memory();
         Display disp = new Display();
-        
-        
+
         //User input
         Scanner reader = new Scanner(System.in);
         Console.println("Welcome to Calculator!");        
         double value = 0; 
         double saveValue = 0;
-        
+
         while(true){               
-            Console.println("Pick Operation: Clear  (-)    OFF");      
-            Console.println("                Sq   SqRt   !   ^");      
-            Console.println("                +    -    *     /");      
-            Console.println("                Cos    Sin    Tan");       
-            Console.println("               -Cos   -Sin   -Tan");       
-            Console.println("                log   -log     ln");       
-            Console.println("                M+     MC     MRC");
-            Console.println("                Deg   Round     %");
-            Console.println("                   Display Mode");
+            Console.println("Pick Operation: Clear  (-)    OFF\n                Sq   SqRt   !   ^\n                +    -    *     /");      
+            Console.println("                Cos    Sin    Tan\n               -Cos   -Sin   -Tan\n                log   -log     ln");      
+            Console.println("                M+     MC     MRC\n                Deg    Round    %\n                   Display Mode");      
             String button = reader.nextLine();
-            
+
             double x = saveValue;
-            int z = 0;
-            
-            
+
             List<String> button1 = Arrays.asList("(-)", "Sq", "SqRt", "Cos", "Sin", "Tan", "-Cos", "-Sin", "-Tan");
             List<String> button2 = Arrays.asList("Bin", "Oct", "Hex", "Dec");
 
@@ -52,166 +43,166 @@ public class Main{
                 Console.println(memo.recallNumber(saveValue));
                 continue;
             }
-                                    
+
             if(button1.contains(button)){                                               
                 switch(button){                
                     case "(-)":
-                        value = calc.invert(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.invert(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Sq":
-                        value = calc.square(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.square(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "SqRt":
-                        value = calc.squareRoot(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.squareRoot(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Cos":
-                        value = calc.getCosine(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.getCosine(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Sin":
-                        value = calc.getSine(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.getSine(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Tan":
-                        value = calc.getTan(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.getTan(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "-Cos":
-                        value = calc.inverseCos(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.inverseCos(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "-Sin":
-                        value = calc.inverseSin(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.inverseSin(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "-Tan":
-                        value = calc.inverseTan(x);   
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.inverseTan(x);   
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "!":
-                        value = calc.factorial(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.factorial(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "log":
-                        value = calc.log(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.log(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "-log":
-                        value = calc.inverseLog(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.inverseLog(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "ln":
-                        value = calc.natLog(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.natLog(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Round":
-                        value = calc.round(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.round(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "Deg":
-                        value = disp.makeDegree(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
-                    case "%": 
-                        value = disp.convertPercent(x);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;     
-                    case "Display Mode":
-                    if(button2.contains(button)){
-                        
-                        Console.println("Binary     Octal     Hexadecimal     Decimal");
-                    
-                        switch(button){
-                            case "Binary":
-                                value = disp.toBinary(z);
-                                Console.println("Binary: ", Double.toString(value));
-                            case "Octal":
-                                value = disp.toOctal(z);
-                                Console.println("Octal: ", Double.toString(value));
-                            case "Hexadecimal":
-                                value = disp.toHexadecimal(z);
-                                Console.println("Hexadecimal: ", Double.toString(value));
-                            case "Decimal":
-                                value = disp.decimal(x);  
-                    }
-                 }else{
+                    value = disp.makeDegree(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
                     break;
-                    }
+                    case "%": 
+                    value = disp.convertPercent(x);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;     
+
                 }
             }
-            
-            else{
 
+            else{
                 double y = Console.getDoubleInput("Input Number:");            
-
                 switch(button){                                                         
                     case "+":
-                        value = calc.add(x, y);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.add(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "-":
-                        value = calc.subtract(x, y);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.subtract(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "*":
-                        value = calc.multiply(x, y);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;
+                    value = calc.multiply(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;
                     case "/":
-                        value = calc.divide(x, y);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;                                                   
+                    value = calc.divide(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;                                                   
                     case "^":
-                        value = calc.getPow(x, y);
-                        saveValue = value;
-                        Console.println(Double.toString(value));
-                        break;                  
+                    value = calc.getPow(x, y);
+                    saveValue = value;
+                    Console.println(Double.toString(value));
+                    break;                  
                     default:
-                        Console.print("Err"); 
-                        break;                   
+                    Console.print("Err"); 
+                    break;                   
                 }   
             }
             
             switch(button){
-                case "Clear":
+                case "Display Mode":
+                    if(button2.contains(button)){
+                        int z = 0;
+                        Console.println("Binary     Octal     Hexadecimal     Decimal");
+                    switch(button){
+                        case "Binary":
+                        value = disp.toBinary(z);
+                        Console.println("Binary: ", Double.toString(value));
+                        case "Octal":
+                        value = disp.toOctal(z);
+                        Console.println("Octal: ", Double.toString(value));
+                        case "Hexadecimal":
+                        value = disp.toHexadecimal(z);
+                        Console.println("Hexadecimal: ", Double.toString(value));
+                        case "Decimal":
+                        value = disp.decimal(x);  
+                    }
+                }else{
+                    break;
+                }
+                
+                switch(button){
+                    case "Clear":
                     value = 0; 
                     break;
-                case "M+":
+                    case "M+":
                     memo.saveNumber(saveValue);
                     break;
-                case "MC":
+                    case "MC":
                     memo.eraseNumber(saveValue);
                     break;
-                case "MRC":
+                    case "MRC":
                     memo.recallNumber(saveValue);                    
                     break;
-                case "OFF":
+                    case "OFF":
                     return;
-            }
-        }                       
+                }
+            }                       
+        }
     }
 }
-