1 files changed, 20 insertions, 51 deletions

diff --git a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
index bfd4354c..12678e0e 100644
--- a/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/EingabeImageAllgemein_GUI.java
@@ -44,8 +44,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 	private JTextField Nachname;
 	private JTextField Hochschule;
 	private JTextField EMail;
-	private JTextField Tel;
-	private JTextField Fak;
 	private JTextField imagename;
 
 	/**
@@ -114,76 +112,60 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 		
 		JLabel label = new JLabel("Vorname: *");
 		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 183, 125, 20);
+		label.setBounds(10, 245, 125, 20);
 		panel_1.add(label);
 		
 		Vorname = new JTextField();
+		Vorname.setEnabled(false);
+		Vorname.setEditable(false);
 		Vorname.setBackground(Color.WHITE);
-		Vorname.setText((String) null);
+		Vorname.setText(person.verantowrtlicher.getVorname());
 		Vorname.setColumns(10);
-		Vorname.setBounds(145, 183, 350, 20);
+		Vorname.setBounds(145, 245, 350, 20);
 		panel_1.add(Vorname);
 		
 		JLabel label_7 = new JLabel("Nachname: *");
 		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 214, 125, 20);
+		label_7.setBounds(10, 276, 125, 20);
 		panel_1.add(label_7);
 		
 		Nachname = new JTextField();
+		Nachname.setEnabled(false);
+		Nachname.setEditable(false);
 		Nachname.setBackground(Color.WHITE);
-		Nachname.setText((String) null);
+		Nachname.setText(person.verantowrtlicher.getName());
 		Nachname.setColumns(10);
-		Nachname.setBounds(145, 214, 350, 20);
+		Nachname.setBounds(145, 276, 350, 20);
 		panel_1.add(Nachname);
 		
 		JLabel label_8 = new JLabel("Hochschule: *");
 		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 245, 125, 20);
+		label_8.setBounds(10, 307, 125, 20);
 		panel_1.add(label_8);
 		
 		Hochschule = new JTextField();
+		Hochschule.setEnabled(false);
+		Hochschule.setEditable(false);
 		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText((String) null);
+		Hochschule.setText(person.verantowrtlicher.getHochschule());
 		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 245, 350, 20);
+		Hochschule.setBounds(145, 307, 350, 20);
 		panel_1.add(Hochschule);
 		
 		JLabel label_9 = new JLabel("E-Mail: *");
 		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 276, 125, 20);
+		label_9.setBounds(10, 338, 125, 20);
 		panel_1.add(label_9);
 		
 		EMail = new JTextField();
+		EMail.setEnabled(false);
+		EMail.setEditable(false);
 		EMail.setBackground(Color.WHITE);
-		EMail.setText((String) null);
+		EMail.setText(person.verantowrtlicher.getEMail());
 		EMail.setColumns(10);
-		EMail.setBounds(145, 276, 350, 20);
+		EMail.setBounds(145, 338, 350, 20);
 		panel_1.add(EMail);
 		
-		JLabel label_10 = new JLabel("Tel.-Nummer:");
-		label_10.setBackground(SystemColor.menu);
-		label_10.setBounds(10, 307, 125, 20);
-		panel_1.add(label_10);
-		
-		Tel = new JTextField();
-		Tel.setBackground(Color.WHITE);
-		Tel.setText((String) null);
-		Tel.setColumns(10);
-		Tel.setBounds(145, 307, 350, 20);
-		panel_1.add(Tel);
-		
-		JLabel lblFakulttinstitution = new JLabel("Fakult\u00E4t/Institution:");
-		lblFakulttinstitution.setBackground(SystemColor.menu);
-		lblFakulttinstitution.setBounds(10, 338, 125, 20);
-		panel_1.add(lblFakulttinstitution);
-		
-		Fak = new JTextField();
-		Fak.setBackground(Color.WHITE);
-		Fak.setText((String) null);
-		Fak.setColumns(10);
-		Fak.setBounds(145, 338, 350, 20);
-		panel_1.add(Fak);
-		
 		JLabel lblImagename = new JLabel("Imagename: *");
 		lblImagename.setBackground(SystemColor.menu);
 		lblImagename.setBounds(10, 31, 125, 20);
@@ -255,13 +237,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						//schreibt die Daten in das Model
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
 						Image.image.setImagename(imagename.getText());
 						MainMenue_GUI sr=new MainMenue_GUI();
 						sr.setVisible(true);
@@ -280,12 +255,6 @@ public class EingabeImageAllgemein_GUI extends JFrame {
 						if(Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false)
 						{
 						//Schreibt die Daten in das Model
-						person.verantowrtlicher.setVorname(Vorname.getText());
-						person.verantowrtlicher.setName(Nachname.getText());
-						person.verantowrtlicher.setEMail(EMail.getText());
-						person.verantowrtlicher.setFakultät(Fak.getText());
-						person.verantowrtlicher.setHochschule(Hochschule.getText());
-						person.verantowrtlicher.setTel(Tel.getText());
 						Image.image.setImagename(imagename.getText());
 						EingabeImageTechnisch_GUI ea=new EingabeImageTechnisch_GUI();
 						ea.setVisible(true);