From 4da107448eea70af6c0ee7826b24c2277699bc65 Mon Sep 17 00:00:00 2001
From: Dennis Eisold <de@itstall.de>
Date: Tue, 5 Nov 2019 16:39:08 +0100
Subject: [PATCH] Some little replacement work
---
src/de/itstall/TaschenrechnerGui.java | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/de/itstall/TaschenrechnerGui.java b/src/de/itstall/TaschenrechnerGui.java
index 7c021b6..c38f56a 100644
--- a/src/de/itstall/TaschenrechnerGui.java
+++ b/src/de/itstall/TaschenrechnerGui.java
@@ -68,11 +68,29 @@ public class TaschenrechnerGui extends JFrame {
panel.add(button);
}
+ public String replaceSigns(String strDisplay) {
+
+ if(strDisplay.startsWith("= ") && !(strDisplay.endsWith("+") || strDisplay.endsWith("-") || strDisplay.endsWith("*") || strDisplay.endsWith("/"))) {
+ strDisplay = strDisplay.substring(strDisplay.length()-1);
+ } else {
+ strDisplay = strDisplay.replace("= ", "");
+ strDisplay = strDisplay.replace("**", "*");
+ strDisplay = strDisplay.replace("//", "/");
+ strDisplay = strDisplay.replace("/*", "*");
+ strDisplay = strDisplay.replace("++", "+");
+ strDisplay = strDisplay.replace("--", "-");
+ strDisplay = strDisplay.replace("-+-", "-");
+ strDisplay = strDisplay.replace("+-+", "+");
+ }
+
+ return strDisplay;
+ }
+
private class InsertAction implements ActionListener {
@Override
public void actionPerformed(ActionEvent actionEvent) {
- txtCalculation.setText(txtCalculation.getText() + ((JButton) actionEvent.getSource()).getText());
+ txtCalculation.setText(replaceSigns(txtCalculation.getText() + ((JButton) actionEvent.getSource()).getText()));
}
}
@@ -80,7 +98,7 @@ public class TaschenrechnerGui extends JFrame {
@Override
public void actionPerformed(ActionEvent actionEvent) {
- txtCalculation.setText(" = " + String.valueOf(berechnen(txtCalculation.getText())));
+ txtCalculation.setText("= " + String.valueOf(berechnen(txtCalculation.getText())));
}
}
--
GitLab