From 951df223d59a206aee94bc6e537b8265cd53d38e Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Fri, 7 Feb 2020 10:27:36 +0100 Subject: [PATCH] Nur Einreihen des Codes --- .../bin/MeinBudgetView/LoginFrame.class | Bin 3654 -> 3656 bytes .../bin/MeinBudgetView/MeinGui$1.class | Bin 1110 -> 1110 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 7282 -> 7284 bytes .../bin/MeinBudgetView/MyTest.class | Bin 2171 -> 2171 bytes .../src/MeinBudgetView/LoginFrame.java | 4 +-- .../src/MeinBudgetView/MeinGui.java | 3 +-- Budget Projekt/src/MeinBudgetView/MyMain.java | 4 +-- Budget Projekt/src/MeinBudgetView/MyTest.java | 23 +++++++++--------- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/LoginFrame.class b/Budget Projekt/bin/MeinBudgetView/LoginFrame.class index aa71114e53c04c39ca994589609e838f469a7de2..2ea4074ea3ce23619c263f9fd0138b9e6a379ce0 100644 GIT binary patch delta 20 bcmX>mb3$grXGV6m{G!CX^wiBi82xwvSj7kW delta 18 ZcmX>hb4+H#XGT^Q=SWAt&A%A^cmPE-2B!c3 diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index f08c24e14db86f3d6b69430463129b847d3a3fc3..4cab5b77a776b4a8f062901eda8cfa7cabe58cf6 100644 GIT binary patch delta 37 tcmcb{agAd`GBfXC25yEU46+QT7*rSzPcC2%VmvZ diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 053a750ffa6b47a22c521e27785fc964981024f7..3c3f323cf4929295e18bce2acdfa8a918a9ac918 100644 GIT binary patch delta 638 zcmWNPTTBgb0LFj+TW2eG5?wa82a^Xgm&i4`h%jZ9r5x)}Mk-4gT4C90ayf6`%lGZK{l1?8Jpt8HS=_d!TT?dLoEFtFJbN~pK-`(b zVCLe-JSH-qsVrbI3t2`GQLbbqm^4DjB$NXz!A>|OETxJFYFJJqD`;XR?X2P>k@UD) z|5z<7M2iu`h;hV<8LSb(#EBTzibN7b3hP8>Hdc|(dSNF~T)-wO*dUxFiF%U7Gd77< zHj8&`5#6MSK2oI{X>ug#(w}WIknJ**9WsiYGLc;}gAAERrYvB$EMbpykR=<*mTl~n zAIOni?34ZMR|CmaUK~^tIHaR0C&J zGiTK+3e{K6sb0=&cZ#$p7xh?*^%O4YATH|&uIN}wbrM%~Cf9T>W%@Yfx|j-mog3Og zrLLt)KjNltp*l{##i2WK>fhWlZrnD*xMRjpWBjQ#)2K6xxN9P)H__ZP@!U5y9+*@b zOb!oCDbGzMO~y&HspW-fpv63))ilv&+Ii`GI?5_$y~cw#4B{Q5d5+{X8*RM({ql01sBJKTE=gF38IMgqJl(WXQQ~wCh>&L;ssm8 z8u;s!SzKX0u1;vsadoF009q4eXPx?3W!J zlwUX`f0L?id)8)Ix~gaCWt#Gf_r8e_f0GhOak?08xPF^ z9+^^}nM#_Co#&>O7E{j)(@3jn;-zV$&Hi*moS5;N0kkuSw~V9%Z{9nEKRBE}IxIU` zO&1&aOg7z|qK9(6QcW*)e76!kV@;pqA3v=|&jg=8IP=%B^AC3c-a;@|NG1rybfK+q guMp#mhv;V&c-hQAyo9UO;}vCw;3?d!Fz<=~0kJ@)+yDRo diff --git a/Budget Projekt/bin/MeinBudgetView/MyTest.class b/Budget Projekt/bin/MeinBudgetView/MyTest.class index 7d131318972e77190ed830f9c44ebbf418bd97dd..2903a5033b6c794c6114483933566c52ed82b3bd 100644 GIT binary patch delta 59 zcmew@@LOQRc6LEy26hG$20jK;26YBA20aFg$tT!r1Z{w#wm?xkpr}1i)Db8u&tA#E Jz`(>%1ps`Y3l{(Y delta 59 zcmew@@LOQRc6LD{26hHx20jK826YBg20aGz$tT!r1g(LhHb7BZpr{>C)Bz|e&tA#E Jz`(>%1ps?s3k?7O diff --git a/Budget Projekt/src/MeinBudgetView/LoginFrame.java b/Budget Projekt/src/MeinBudgetView/LoginFrame.java index 6703b10..57d0027 100644 --- a/Budget Projekt/src/MeinBudgetView/LoginFrame.java +++ b/Budget Projekt/src/MeinBudgetView/LoginFrame.java @@ -31,7 +31,7 @@ public class LoginFrame extends JFrame implements ActionListener { setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds(100, 100, 450, 300); contentPane = new JPanel(); - contentPane.setBackground(Color.CYAN); + contentPane.setBackground(Color.orange); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); contentPane.setLayout(null); @@ -85,7 +85,7 @@ public class LoginFrame extends JFrame implements ActionListener { } if (ae.getSource() == this.anmelden && benutzername.getText().length() > 0 && passwordField.getText().length() > 0) { - MeinGui run = new MeinGui(); + MeinGui run = new MeinGui(); run.setVisible(true); } diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index 13a69e7..3e90678 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -55,13 +55,12 @@ public class MeinGui extends JFrame implements ActionListener { private static JLabel budgetBetrag; private static JTable myTable; - public MeinGui() { setTitle("Budget"); setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); setBounds(100, 100, 654, 368); contentPane = new JPanel(); - contentPane.setBackground(Color.CYAN); + contentPane.setBackground(Color.orange); contentPane.setBorder(new EmptyBorder(5, 5, 5, 5)); setContentPane(contentPane); contentPane.setLayout(null); diff --git a/Budget Projekt/src/MeinBudgetView/MyMain.java b/Budget Projekt/src/MeinBudgetView/MyMain.java index 50c2e4e..ff6f233 100644 --- a/Budget Projekt/src/MeinBudgetView/MyMain.java +++ b/Budget Projekt/src/MeinBudgetView/MyMain.java @@ -1,9 +1,9 @@ package MeinBudgetView; public class MyMain { - + public static void main(String[] args) { - LoginFrame myFrame = new LoginFrame(); + LoginFrame myFrame = new LoginFrame(); myFrame.setVisible(true); } diff --git a/Budget Projekt/src/MeinBudgetView/MyTest.java b/Budget Projekt/src/MeinBudgetView/MyTest.java index 939797c..a4a5e72 100644 --- a/Budget Projekt/src/MeinBudgetView/MyTest.java +++ b/Budget Projekt/src/MeinBudgetView/MyTest.java @@ -45,22 +45,23 @@ class MyTest { assertNotEquals("-" + 4321.0 + "€", MeinGui.setExpensesView()); } - @Test + + @Test public void testSetBenutzername() { - String result = String.valueOf(LoginFrame.benutzername); - assertEquals(result, LoginFrame.setBenutzername()); - assertNotEquals(result + " ", LoginFrame.setBenutzername()); - assertNotEquals(null, LoginFrame.setBenutzername()); - + String result = String.valueOf(LoginFrame.benutzername); + assertEquals(result, LoginFrame.setBenutzername()); + assertNotEquals(result + " ", LoginFrame.setBenutzername()); + assertNotEquals(null, LoginFrame.setBenutzername()); + } - + @Test public void testSetPassword() { String result = String.valueOf(LoginFrame.passwordField); - assertEquals(result, LoginFrame.setPassword()); - assertNotEquals(result + " ", LoginFrame.setPassword()); - assertNotEquals(null, LoginFrame.setPassword()); - + assertEquals(result, LoginFrame.setPassword()); + assertNotEquals(result + " ", LoginFrame.setPassword()); + assertNotEquals(null, LoginFrame.setPassword()); + } }