From 695c870f18e5cecfe8da7033c8db7c9c70a42c4d Mon Sep 17 00:00:00 2001
From: tspitzer
Date: Mon, 30 Sep 2013 11:40:02 +0200
Subject: working

---
 Dozentenmodul/src/GUI/AddOS.java              | 1 +
 Dozentenmodul/src/GUI/AddSoftware.java        | 6 ++++--
 Dozentenmodul/src/GUI/EingabeSystemDaten.java | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'Dozentenmodul/src/GUI')

diff --git a/Dozentenmodul/src/GUI/AddOS.java b/Dozentenmodul/src/GUI/AddOS.java
index 5039a4e1..045031bd 100644
--- a/Dozentenmodul/src/GUI/AddOS.java
+++ b/Dozentenmodul/src/GUI/AddOS.java
@@ -124,6 +124,7 @@ public class AddOS extends JDialog {
 						}
 						Connection con=sql.getConnection();
 						sql.AddOS(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString());
+						dispose();
 					}
 				});
 				okButton.setActionCommand("OK");
diff --git a/Dozentenmodul/src/GUI/AddSoftware.java b/Dozentenmodul/src/GUI/AddSoftware.java
index c3a41227..c04c5012 100644
--- a/Dozentenmodul/src/GUI/AddSoftware.java
+++ b/Dozentenmodul/src/GUI/AddSoftware.java
@@ -31,7 +31,7 @@ public class AddSoftware extends JDialog {
 	/**
 	 * Launch the application.
 	 */
-	public static void main(String[] args) {
+	/*public static void main(String[] args) {
 		try {
 			AddSoftware dialog = new AddSoftware();
 			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
@@ -39,7 +39,7 @@ public class AddSoftware extends JDialog {
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-	}
+	}*/
 
 	/**
 	 * Create the dialog.
@@ -124,7 +124,9 @@ public class AddSoftware extends JDialog {
 						}
 						Connection con=sql.getConnection();
 						sql.AddSoftware(con, textField_1.getText().toString(), textField_2.getText().toString(), comboBox.getSelectedItem().toString(), Kosten, textField.getText().toString());
+						dispose();
 					}
+					
 				});
 				okButton.setActionCommand("OK");
 				buttonPane.add(okButton);
diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
index 9e370328..4a70d4b3 100644
--- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java
@@ -177,6 +177,7 @@ public class EingabeSystemDaten extends JDialog {
 			public void actionPerformed(ActionEvent arg0) {
 				AddOS os=new AddOS();
 				os.setVisible(true);
+				
 			}
 		});
 		btnHinzufgen.setBounds(326, 372, 118, 23);
-- 
cgit v1.2.3-55-g7522