Make CLX enter newNumber before clear and add TestCase for that

1 files changed, 20 insertions, 20 deletions

diff --git a/src/de/fhswf/in/inf/upnfx/view/MainViewController.java b/src/de/fhswf/in/inf/upnfx/view/MainViewController.java
index 76ab51a..9f6b5b4 100644
--- a/src/de/fhswf/in/inf/upnfx/view/MainViewController.java
+++ b/src/de/fhswf/in/inf/upnfx/view/MainViewController.java
@@ -101,17 +101,21 @@ public class MainViewController
    @FXML
    private void initialize()
    {
-      txtField.textProperty().addListener(e -> {
-         btnComma.setDisable(newNumber.isEmpty().get() || newNumber.get().contains("."));
-         btnZero.setDisable(!newNumber.isEmpty().get() && !newNumber.get().contains(".") && newNumber.get().startsWith("0"));
-      });
+      txtField.textProperty().addListener(
+            e -> {
+               btnComma.setDisable(newNumber.isEmpty().get()
+                     || newNumber.get().contains("."));
+               btnZero.setDisable(!newNumber.isEmpty().get()
+                     && !newNumber.get().contains(".")
+                     && newNumber.get().startsWith("0"));
+            });
 
       newNumber.addListener(e -> {
-         if(upnStack.isEmpty())
+         if (upnStack.isEmpty())
          {
             txtField.clear();
          }
-         if(!newNumber.isEmpty().get())
+         if (!newNumber.isEmpty().get())
          {
             txtField.setText(newNumber.get());
 
@@ -133,7 +137,7 @@ public class MainViewController
 
       upnStack.sizeProperty().addListener(e -> {
          txtField.clear();
-         if(upnStack.size() > 0)
+         if (upnStack.size() > 0)
          {
             txtField.setText(upnStack.peek().toString());
          }
@@ -160,7 +164,7 @@ public class MainViewController
    {
       if (!newNumber.isEmpty().get())
       {
-         if(newNumber.get().contains("-"))
+         if (newNumber.get().contains("-"))
          {
             newNumber.setValue(newNumber.get().replaceAll("-", ""));
          }
@@ -171,7 +175,7 @@ public class MainViewController
       }
       else
       {
-         if(upnStack.size() > 0)
+         if (upnStack.size() > 0)
          {
             upnClass.addDouble(-1.0);
             upnClass.calculate(operators.get("*"));
@@ -189,16 +193,13 @@ public class MainViewController
    @FXML
    private void handleClx()
    {
-      if (newNumber.isEmpty().get())
+      if (!newNumber.isEmpty().get())
       {
-         if(upnStack.size() > 0)
-         {
-            upnStack.pop();
-         }
+         handleEnt();
       }
-      else
+      if (upnStack.size() > 0)
       {
-         newNumber.setValue("");
+         upnStack.pop();
       }
    }
 
@@ -211,7 +212,7 @@ public class MainViewController
    @FXML
    private void handleXY()
    {
-      if(!newNumber.isEmpty().get())
+      if (!newNumber.isEmpty().get())
       {
          handleEnt();
       }
@@ -222,7 +223,7 @@ public class MainViewController
    @FXML
    private void handleEnt()
    {
-      if(!newNumber.isEmpty().get())
+      if (!newNumber.isEmpty().get())
       {
          upnClass.addDouble(Double.parseDouble(newNumber.get().trim()));
          newNumber.setValue("");
@@ -231,7 +232,7 @@ public class MainViewController
 
    private void handleNumber(String number)
    {
-      if(newNumber.get().equals("0") && !number.equals("."))
+      if (newNumber.get().equals("0") && !number.equals("."))
       {
          newNumber.set(number);
       }
@@ -319,7 +320,6 @@ public class MainViewController
       upnClass.calculate(operators.get("/"));
    }
 
-
    private void handleOp(Operator operator)
    {
       if (!newNumber.isEmpty().get())