From a65f7127f90c48d08e43c292fa5caf4179d9e656 Mon Sep 17 00:00:00 2001 From: Adah Boukhari Date: Mon, 3 Feb 2020 15:39:05 +0100 Subject: [PATCH] Commit_23 JTable hinzugefuegt --- .../bin/MeinBudgetView/MeinGui$1.class | Bin 738 -> 738 bytes .../bin/MeinBudgetView/MeinGui.class | Bin 6253 -> 6623 bytes .../src/MeinBudgetView/MeinGui.java | 44 +++++++++++------- Hinweis El Boukhari.txt | 7 ++- 4 files changed, 32 insertions(+), 19 deletions(-) diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class b/Budget Projekt/bin/MeinBudgetView/MeinGui$1.class index 3aee88919b2a034d79a94491b4da2c1c46af3a21..aa9e0ef08f89fc41cf34292298b93a824c5eaa8a 100644 GIT binary patch delta 35 qcmaFF`iOOd3KOHnWL2h6L2CvM1{(%m23rO}20I2(28YSrOyK~JS_a|( delta 35 qcmaFF`iOOd3KOI0WL2h6K??>B21^EB1}g?Z25SaU2HVNqOyK~IMh4IT diff --git a/Budget Projekt/bin/MeinBudgetView/MeinGui.class b/Budget Projekt/bin/MeinBudgetView/MeinGui.class index 3c5ffdb501d6cb762b0eb0e4886981b0a5d9bde3..4e78d04b844be59911855831c2e9ab9366e25d9d 100644 GIT binary patch literal 6623 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 literal 6253 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 diff --git a/Budget Projekt/src/MeinBudgetView/MeinGui.java b/Budget Projekt/src/MeinBudgetView/MeinGui.java index cde50bf..970035b 100644 --- a/Budget Projekt/src/MeinBudgetView/MeinGui.java +++ b/Budget Projekt/src/MeinBudgetView/MeinGui.java @@ -20,6 +20,8 @@ import javax.swing.JComboBox; import javax.swing.JTextArea; import java.awt.Color; import javax.swing.JSeparator; +import javax.swing.JScrollPane; +import javax.swing.JTable; public class MeinGui extends JFrame implements ActionListener { @@ -45,6 +47,7 @@ public class MeinGui extends JFrame implements ActionListener { private JLabel ausgabenName; private JLabel ausgabenBetrag; private JLabel budgetBetrag; + private JTable myTable; /** * Launch the application. @@ -75,8 +78,8 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.setLayout(null); this.berechne = new JButton("Berechne"); - berechne.setToolTipText(""); berechne.setBounds(78, 281, 110, 23); + berechne.setToolTipText(""); contentPane.add(berechne); this.senden = new JButton("Senden"); @@ -94,16 +97,16 @@ public class MeinGui extends JFrame implements ActionListener { text2.setColumns(10); labelHauptImage = new JLabel(""); + labelHauptImage.setBounds(10, 0, 86, 61); Image image0 = new ImageIcon(this.getClass().getResource("/budgetapp.png")).getImage(); labelHauptImage.setIcon(new ImageIcon(image0)); labelHauptImage.setFont(new Font("Tahoma", Font.BOLD, 13)); - labelHauptImage.setBounds(10, 0, 86, 61); contentPane.add(labelHauptImage); JLabel budgetEingeben = new JLabel("Budget eingeben"); - budgetEingeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); budgetEingeben.setBounds(10, 72, 110, 20); + budgetEingeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(budgetEingeben); JLabel labelBudget = new JLabel("Budget"); @@ -119,34 +122,31 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(labelBalance); labelBudgetImage = new JLabel(""); + labelBudgetImage.setBounds(255, 22, 46, 55); Image image1 = new ImageIcon(this.getClass().getResource("/money.png")).getImage(); labelBudgetImage.setIcon(new ImageIcon(image1)); - - labelBudgetImage.setBounds(255, 22, 46, 55); contentPane.add(labelBudgetImage); labelExpensesImage = new JLabel(""); + labelExpensesImage.setBounds(400, 22, 46, 55); Image image2 = new ImageIcon(this.getClass().getResource("/wings-icon.png")).getImage(); labelExpensesImage.setIcon(new ImageIcon(image2)); - - labelExpensesImage.setBounds(400, 22, 46, 55); contentPane.add(labelExpensesImage); labelBalancetImage = new JLabel("New labelBalance"); + labelBalancetImage.setBounds(543, 22, 34, 55); Image image3 = new ImageIcon(this.getClass().getResource("/Money-icon.png")).getImage(); labelBalancetImage.setIcon(new ImageIcon(image3)); - - labelBalancetImage.setBounds(543, 22, 34, 55); contentPane.add(labelBalancetImage); JLabel budgetAusgeben = new JLabel("Ausgaben"); - budgetAusgeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); budgetAusgeben.setBounds(10, 185, 63, 14); + budgetAusgeben.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(budgetAusgeben); this.leeren = new JLabel("Eintr\u00E4ge leeren"); - leeren.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); leeren.setBounds(363, 246, 115, 14); + leeren.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(leeren); this.loeschen = new JButton("L\u00F6schen"); @@ -158,28 +158,28 @@ public class MeinGui extends JFrame implements ActionListener { contentPane.add(exit); JLabel beendne = new JLabel("Beenden"); - beendne.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); beendne.setBounds(508, 246, 81, 14); + beendne.setFont(new Font("Estrangelo Edessa", Font.BOLD, 14)); contentPane.add(beendne); budgetDispaly = new JLabel("0.0 \u20AC"); - budgetDispaly.setFont(new Font("Tahoma", Font.BOLD, 12)); budgetDispaly.setBounds(255, 82, 86, 14); + budgetDispaly.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(budgetDispaly); expensesDisplay = new JLabel("0.0 \u20AC"); - expensesDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); expensesDisplay.setBounds(390, 82, 110, 14); + expensesDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(expensesDisplay); balanceDisplay = new JLabel("0.0 \u20AC"); - balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); balanceDisplay.setBounds(543, 82, 85, 14); + balanceDisplay.setFont(new Font("Tahoma", Font.BOLD, 12)); contentPane.add(balanceDisplay); textExpensesName = new JTextField(); - textExpensesName.setToolTipText(""); textExpensesName.setBounds(60, 221, 128, 20); + textExpensesName.setToolTipText(""); contentPane.add(textExpensesName); textExpensesName.setColumns(10); @@ -194,6 +194,17 @@ public class MeinGui extends JFrame implements ActionListener { budgetBetrag = new JLabel(" Betrag"); budgetBetrag.setBounds(10, 100, 46, 14); contentPane.add(budgetBetrag); + + JScrollPane scrollPane = new JScrollPane(); + scrollPane.setBounds(511, 205, -186, -67); + contentPane.add(scrollPane); + + JScrollPane scrollPane_1 = new JScrollPane(); + scrollPane_1.setBounds(323, 126, 197, 88); + contentPane.add(scrollPane_1); + + myTable = new JTable(); + scrollPane_1.setViewportView(myTable); text1.addActionListener(this); text2.addActionListener(this); @@ -255,5 +266,4 @@ public class MeinGui extends JFrame implements ActionListener { String result = balance + " €"; return result; } - } diff --git a/Hinweis El Boukhari.txt b/Hinweis El Boukhari.txt index c5819b2..ca25228 100644 --- a/Hinweis El Boukhari.txt +++ b/Hinweis El Boukhari.txt @@ -1,2 +1,5 @@ -Ich möchte hier darauf hinweisen, dass ich sowohl von meinem git Bash(User: Adah Boukhari) als auch direkt auf der Webseite(Mohamed El Boukhari) pushen werde. -Vielen Dank. +Ich möchte hier darauf hinweisen, dass ich meistens von meinem git Bash(User: Adah Boukhari) pushen werde. + +Name: Mohamed El Boukhari +Matrikel-Nr: 344691 +fdlt3054