commited

src/main/java/rocks/zipcode/calcskin/CalcSkin.java

@@ -24,10 +24,10 @@ public class CalcSkin extends Application {
         launch(args);
     }
     private static final String[][] template = {
-            { "7", "8", "9", "sin" ,"sroot","/"},
-            { "4", "5", "6", "cos","xsqu","*" },
-            { "1", "2", "3", "tan"," power","-" },
-            { "0", "c", "=", "inverse","Mod","+" }
+            { "7", "8", "9", "sin"  , "sroot", "/"},
+            { "4", "5", "6", "cos"  , "xsqu" , "*" },
+            { "1", "2", "3", "tan"  , "pwr"  , "-" },
+            { "0", "c", "=", "iver", "mod"  , "+" }
 
     };
 
@@ -85,7 +85,7 @@ public class CalcSkin extends Application {
         screen.setStyle("-fx-background-color: pink;");
         screen.setAlignment(Pos.CENTER_RIGHT);
         screen.setEditable(false);
-            screen.textProperty().bind(Bindings.format("%.0f", currentValue));
+            screen.textProperty().bind(Bindings.format("%.3f", currentValue));
         return screen;
     }
 
@@ -132,10 +132,10 @@ public class CalcSkin extends Application {
             case "sin": triggerOp.set(Op.SIN);    break;
             case "cos": triggerOp.set(Op.COS);    break;
             case "tan": triggerOp.set(Op.TAN);    break;
-            case "inverse": triggerOp.set(Op.INVERSE);   break;
+            case "iver": triggerOp.set(Op.INVERSE);   break;
             case "sroot": triggerOp.set(Op.SROOT);       break;
             case "xsqu": triggerOp.set(Op.XSQU );        break;
-            case "power": triggerOp.set(Op.POWER);       break;
+            case "pwr": triggerOp.set(Op.POWER);       break;
             case "mod": triggerOp.set(Op.MOD);           break;
 
         }
@@ -192,6 +192,7 @@ public class CalcSkin extends Application {
             @Override
             public void handle(ActionEvent actionEvent) {
                 switch (stackOp) {
+                    case POWER :  currentValue.set(calcEngine.power(previousValue.get(),currentValue.get())); break;
                     case ADD:      currentValue.set(calcEngine.add(previousValue.get(), currentValue.get())); break;
                     case SUBTRACT: currentValue.set(calcEngine.subtract(previousValue.get(), currentValue.get())); break;
                     case MULTIPLY: currentValue.set(calcEngine.multiply(previousValue.get(), currentValue.get())); break;
@@ -202,7 +203,6 @@ public class CalcSkin extends Application {
                     case INVERSE :   currentValue.set(calcEngine.inverse(currentValue.get())); break;
                     case SROOT :   currentValue.set(calcEngine.sroot(currentValue.get())); break;
                     case XSQU :  currentValue.set(calcEngine.xsqu(currentValue.get())); break;
-                    case POWER :  currentValue.set(calcEngine.power(previousValue.get(),currentValue.get())); break;
                     case MOD:   currentValue.set(calcEngine.mod(previousValue.get(),currentValue.get())); break;
                 }
             }