Löschen der Eingabe Texte nach berechnen

Budget Projekt/src/MeinBudgetView/MeinGui.java

@@ -284,12 +284,9 @@ public class MeinGui extends JFrame implements ActionListener, KeyListener {
 		loeschen.addActionListener(this);
 		loeschen.addKeyListener(this);
 		exit.addActionListener(this);
-<<<<<<< HEAD
 		exit.addKeyListener(this);
-=======
 		hinzufuegen.addActionListener(this);
 		erspartesLoeschen.addActionListener(this);
->>>>>>> e9471140ef0f8da1cd53473243a925d48bd272c1
 
 	}
 
@@ -329,6 +326,9 @@ public class MeinGui extends JFrame implements ActionListener, KeyListener {
 				expenses += Double.parseDouble(text2.getText());
 				expensesDisplay.setText(setExpensesView());
 				balanceDisplay.setText(setBalanceView());
+				textExpensesName.setText(null);
+				text2.setText(null);
+				
 			}
 			catch (Exception e) {
 				showMessageDialog(null, "Sie müssen ihre Ausgabe eingeben!");
@@ -369,14 +369,12 @@ public class MeinGui extends JFrame implements ActionListener, KeyListener {
 	}
 
 	public static void leeren() {
-<<<<<<< HEAD
 		text1.setText("");
 		text2.setText("");
-		budgetDispaly.setText("0.0 €");
-		expensesDisplay.setText("0.0 €");
-		balanceDisplay.setText("0.0 €");
+		budgetDispaly.setText("0.0 �");
+		expensesDisplay.setText("0.0 �");
+		balanceDisplay.setText("0.0 �");
 		textExpensesName.setText("");
-=======
 		budget = 0.0;
 		expenses = 0.0;
 		balance = 0.0;
@@ -386,7 +384,6 @@ public class MeinGui extends JFrame implements ActionListener, KeyListener {
 		expensesDisplay.setText("0.0 \u20AC");
 		balanceDisplay.setText("0.0 \u20AC");
 		textExpensesName.setText(null);
->>>>>>> e9471140ef0f8da1cd53473243a925d48bd272c1
 		((DefaultTableModel) myTable.getModel()).setRowCount(0);
 	}