diff --git a/Budget Projekt/bin/MeinBudgetView/LoginFrame.class b/Budget Projekt/bin/MeinBudgetView/LoginFrame.class index aa71114..2ea4074 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/LoginFrame.class and b/Budget Projekt/bin/MeinBudgetView/LoginFrame.class differ diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index f08c24e..4cab5b7 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class and b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class differ diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 053a750..3c3f323 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/MeinGui.class and b/Budget Projekt/bin/MeinBudgetView/MeinGui.class differ diff --git a/Budget Projekt/bin/MeinBudgetView/MyTest.class b/Budget Projekt/bin/MeinBudgetView/MyTest.class index 7d13131..2903a50 100644 Binary files a/Budget Projekt/bin/MeinBudgetView/MyTest.class and b/Budget Projekt/bin/MeinBudgetView/MyTest.class differ 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()); + } }