From 8ff14d35af177950a905f9712d2151d88ae51d7a Mon Sep 17 00:00:00 2001 From: eduardD Date: Sun, 9 Feb 2020 20:46:14 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Namen=20und=20Matrikelnummer=20hinzuge?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Namen und MatrNr.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Namen und MatrNr.txt b/Namen und MatrNr.txt index 2750302..224365a 100644 --- a/Namen und MatrNr.txt +++ b/Namen und MatrNr.txt @@ -2,3 +2,7 @@ Name: Mohamed El Boukhari(User_MyGitBash:Adah Boukhari) Matrikel-Nr: 344691 fdlt3054 + +Name: Eduard Dercho (User_MyGitBash: eduardD) +matrikel-Nr: 442080 +fdai4607 From 7dd524841709f2d6778b8e8abf2b6ee46c985535 Mon Sep 17 00:00:00 2001 From: eduardD Date: Sun, 9 Feb 2020 20:55:55 +0100 Subject: [PATCH 2/2] =?UTF-8?q?L=C3=B6schen=20der=20Eingabe=20Texte=20nach?= =?UTF-8?q?=20berechnen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bin/MeinBudgetView/LoginFrame.class | Bin 4801 -> 4801 bytes .../bin/MeinBudgetView/MeinGui$1.class | Bin 1110 -> 1110 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 8794 -> 9480 bytes .../bin/MeinBudgetView/MyTest.class | Bin 2362 -> 2362 bytes .../src/MeinBudgetView/MeinGui.java | 15 ++++++--------- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/LoginFrame.class b/Budget Projekt/bin/MeinBudgetView/LoginFrame.class index b56d6dbbf47790c0c4b4b4cb63de85ea6cfb1500..400d1718277e5aecbd358a9235c42704db3e618d 100644 GIT binary patch delta 17 ZcmX@8dQg?))W2Q(7#J9gHgfC~0susv2Fm~d delta 17 ZcmX@8dQg?))W2Q(7#JALHgfC~0sus@2G0Nh diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index ec1aa8f1763c58e6ea2661676c5111c2d14b229f..c185614db7e6e7e8883c690b916b19c26f4052a1 100644 GIT binary patch delta 37 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 literal 8794 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 Q(bn_2saIZ+2uJ?>4?9Fj>Hq)$ diff --git a/Budget Projekt/bin/MeinBudgetView/MyTest.class b/Budget Projekt/bin/MeinBudgetView/MyTest.class index d118b035a92158f056e9c266c26709465f4e5887..24a670766ac3b5ee28088836256b26cae3917d84 100644 GIT binary patch delta 174 zcmdlbv`dKN)W2Q(7#J9gHgXs{vw7JzVr7#X;r@<8d$!OYKD0e?3;G5`Po delta 174 zcmdlbv`dKN)W2Q(7#JALHgXs3hI1OV*-3qZI*j0{{*d7$*>VCLtn0OS!imjD0& diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 1ef568e..0157dc5 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/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); }