Neueste Version mit ersten GUI Überarbeitungen

51 files changed, 965 insertions, 835 deletions

diff --git a/Dozentenmodul/bin/GUI/ActionChooser$1.class b/Dozentenmodul/bin/GUI/ActionChooser$1.class
deleted file mode 100644
index f47c3131..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$2.class b/Dozentenmodul/bin/GUI/ActionChooser$2.class
deleted file mode 100644
index b759b25e..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser.class b/Dozentenmodul/bin/GUI/ActionChooser.class
deleted file mode 100644
index 378f708a..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class
new file mode 100644
index 00000000..05b22922
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/BillOfRights_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class
new file mode 100644
index 00000000..dfc23e83
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/BillOfRights_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class
new file mode 100644
index 00000000..190722f2
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/BillOfRights_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/BillOfRights_GUI.class b/Dozentenmodul/bin/GUI/BillOfRights_GUI.class
new file mode 100644
index 00000000..417304b3
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/BillOfRights_GUI.class
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class
index 8f5d0e63..636b9697 100644
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class
+++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class
index 78f7fcb7..f7568353 100644
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class
+++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
index 92b0ab2c..b64ceca1 100644
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
+++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$4.class
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein.class b/Dozentenmodul/bin/GUI/EingabeAllgemein.class
index a56b7215..ad90ee37 100644
--- a/Dozentenmodul/bin/GUI/EingabeAllgemein.class
+++ b/Dozentenmodul/bin/GUI/EingabeAllgemein.class
diff --git a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class
index b47caf6b..3c161449 100644
--- a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class
+++ b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$1.class b/Dozentenmodul/bin/GUI/LoginWindow$1.class
deleted file mode 100644
index 4bc17c84..00000000
--- a/Dozentenmodul/bin/GUI/LoginWindow$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$2.class b/Dozentenmodul/bin/GUI/LoginWindow$2.class
deleted file mode 100644
index ce3d3e97..00000000
--- a/Dozentenmodul/bin/GUI/LoginWindow$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$3.class b/Dozentenmodul/bin/GUI/LoginWindow$3.class
deleted file mode 100644
index b0313839..00000000
--- a/Dozentenmodul/bin/GUI/LoginWindow$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$1.class b/Dozentenmodul/bin/GUI/Login_GUI$1.class
new file mode 100644
index 00000000..80f3117b
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/Login_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$2.class b/Dozentenmodul/bin/GUI/Login_GUI$2.class
new file mode 100644
index 00000000..996bf863
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/Login_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/Login_GUI$3.class b/Dozentenmodul/bin/GUI/Login_GUI$3.class
new file mode 100644
index 00000000..af3cdd01
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/Login_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/LoginWindow.class b/Dozentenmodul/bin/GUI/Login_GUI.class
index c998765b..a5f7511a 100644
--- a/Dozentenmodul/bin/GUI/LoginWindow.class
+++ b/Dozentenmodul/bin/GUI/Login_GUI.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
new file mode 100644
index 00000000..e99580f8
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
new file mode 100644
index 00000000..82e0afb8
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
new file mode 100644
index 00000000..1a2d8dfa
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
new file mode 100644
index 00000000..1f3beb48
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
new file mode 100644
index 00000000..1ba7aa83
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class
deleted file mode 100644
index d6ba9e05..00000000
--- a/Dozentenmodul/bin/GUI/Rechtsbelehrung$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class
deleted file mode 100644
index bd84fb6a..00000000
--- a/Dozentenmodul/bin/GUI/Rechtsbelehrung$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/Rechtsbelehrung.class b/Dozentenmodul/bin/GUI/Rechtsbelehrung.class
deleted file mode 100644
index 25d9fdf7..00000000
--- a/Dozentenmodul/bin/GUI/Rechtsbelehrung.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class
new file mode 100644
index 00000000..a722eae2
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/VmWareLink_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class
index dc106192..7ece9ffa 100644
--- a/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class
+++ b/Dozentenmodul/bin/GUI/VmWareLink_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class
new file mode 100644
index 00000000..e6e1b2e0
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/VmWareLink_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/VmWareLink_GUI.class b/Dozentenmodul/bin/GUI/VmWareLink_GUI.class
new file mode 100644
index 00000000..0b662ea5
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/VmWareLink_GUI.class
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class
deleted file mode 100644
index 83e74915..00000000
--- a/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class
deleted file mode 100644
index 6cda22f5..00000000
--- a/Dozentenmodul/bin/GUI/getVMwarePlayer$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class
deleted file mode 100644
index ea0677ab..00000000
--- a/Dozentenmodul/bin/GUI/getVMwarePlayer$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer.class b/Dozentenmodul/bin/GUI/getVMwarePlayer.class
deleted file mode 100644
index 9a668f4b..00000000
--- a/Dozentenmodul/bin/GUI/getVMwarePlayer.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/searchRohling$1.class b/Dozentenmodul/bin/GUI/searchRohling$1.class
new file mode 100644
index 00000000..e203c632
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/searchRohling$1.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling$2.class b/Dozentenmodul/bin/GUI/searchRohling$2.class
new file mode 100644
index 00000000..71c323d8
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/searchRohling$2.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling$3.class b/Dozentenmodul/bin/GUI/searchRohling$3.class
new file mode 100644
index 00000000..b096e379
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/searchRohling$3.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling$4.class b/Dozentenmodul/bin/GUI/searchRohling$4.class
new file mode 100644
index 00000000..cebd554f
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/searchRohling$4.class
diff --git a/Dozentenmodul/bin/GUI/searchRohling$5.class b/Dozentenmodul/bin/GUI/searchRohling$5.class
new file mode 100644
index 00000000..f353aa56
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/searchRohling$5.class
diff --git a/Dozentenmodul/bin/thrift/communicate.thrift b/Dozentenmodul/bin/thrift/communicate.thrift
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/Dozentenmodul/bin/thrift/communicate.thrift
diff --git a/Dozentenmodul/src/GUI/ActionChooser.java b/Dozentenmodul/src/GUI/ActionChooser.java
deleted file mode 100644
index b5769ba7..00000000
--- a/Dozentenmodul/src/GUI/ActionChooser.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package GUI;

-

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import javax.swing.JRadioButton;

-import javax.swing.SwingConstants;

-import javax.swing.ButtonGroup;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-@SuppressWarnings("serial")

-public class ActionChooser extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	JRadioButton rdbtnLaborvorlageHerunterladen;

-	JRadioButton rdbtnVerfgbaresLaborHerunterladen;

-	private final ButtonGroup buttonGroup = new ButtonGroup();

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			ActionChooser dialog = new ActionChooser();

-			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public ActionChooser() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				System.exit(0);

-			}

-		});

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("Dozentenmodul *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 545) / 2;

-		int left=(screenSize.width - 381) / 2;

-		setBounds(left, top, 545, 381);

-		//setBounds(100, 100, 545, 366);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 529, 80);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Aktionswahl");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 104, 509, 165);

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		rdbtnVerfgbaresLaborHerunterladen = new JRadioButton("Verf\u00FCgbares Labor herunterladen");

-		rdbtnVerfgbaresLaborHerunterladen.setEnabled(false);

-		buttonGroup.add(rdbtnVerfgbaresLaborHerunterladen);

-		rdbtnVerfgbaresLaborHerunterladen.setHorizontalAlignment(SwingConstants.CENTER);

-		rdbtnVerfgbaresLaborHerunterladen.setBackground(Color.WHITE);

-		rdbtnVerfgbaresLaborHerunterladen.setBounds(6, 30, 185, 23);

-		contentPanel.add(rdbtnVerfgbaresLaborHerunterladen);

-		

-		rdbtnLaborvorlageHerunterladen = new JRadioButton("Laborvorlage herunterladen");

-		rdbtnLaborvorlageHerunterladen.setSelected(true);

-		buttonGroup.add(rdbtnLaborvorlageHerunterladen);

-		rdbtnLaborvorlageHerunterladen.setBackground(Color.WHITE);

-		rdbtnLaborvorlageHerunterladen.setBounds(6, 7, 265, 23);

-		contentPanel.add(rdbtnLaborvorlageHerunterladen);

-		

-		JRadioButton rdbtnEigenschaftenEinerVl = new JRadioButton("Fertiges Labor hochladen");

-		buttonGroup.add(rdbtnEigenschaftenEinerVl);

-		rdbtnEigenschaftenEinerVl.setBackground(Color.WHITE);

-		rdbtnEigenschaftenEinerVl.setBounds(6, 53, 185, 23);

-		contentPanel.add(rdbtnEigenschaftenEinerVl);

-		

-		JRadioButton rdbtnLinkAufEin = new JRadioButton("Link auf ein bestehendes Labor erzeugen");

-		rdbtnLinkAufEin.setEnabled(false);

-		buttonGroup.add(rdbtnLinkAufEin);

-		rdbtnLinkAufEin.setBackground(Color.WHITE);

-		rdbtnLinkAufEin.setBounds(6, 105, 230, 23);

-		contentPanel.add(rdbtnLinkAufEin);

-		

-		JRadioButton rdbtnLaborLschen = new JRadioButton("Labor l\u00F6schen");

-		rdbtnLaborLschen.setEnabled(false);

-		buttonGroup.add(rdbtnLaborLschen);

-		rdbtnLaborLschen.setBackground(Color.WHITE);

-		rdbtnLaborLschen.setBounds(6, 131, 175, 23);

-		contentPanel.add(rdbtnLaborLschen);

-		

-		JRadioButton rdbtnInhaltEinerVl = new JRadioButton("Laboreigenschaften \u00E4ndern");

-		rdbtnInhaltEinerVl.setEnabled(false);

-		rdbtnInhaltEinerVl.setBackground(Color.WHITE);

-		rdbtnInhaltEinerVl.setBounds(6, 79, 185, 23);

-		contentPanel.add(rdbtnInhaltEinerVl);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 293, 529, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton cancelButton = new JButton("Weiter");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						

-						if(rdbtnLaborvorlageHerunterladen.isSelected()==true)

-						{

-						searchRohling sr=new searchRohling();

-						sr.setVisible(true);

-						dispose();

-						}else if(rdbtnVerfgbaresLaborHerunterladen.isSelected()==true)

-						{

-							EingabeAllgemein ea = new EingabeAllgemein();

-							ea.setVisible(true);

-							dispose();

-						}

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 280, 529, 2);

-			getContentPane().add(separator);

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 91, 529, 2);

-			getContentPane().add(separator);

-		}

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

-		JMenu mnNewMenu = new JMenu("Suche");

-		menuBar.add(mnNewMenu);

-		

-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

-		mnNewMenu.add(mntmVlSuche);

-		

-		JMenu mnNewMenu_1 = new JMenu("Hilfe");

-		menuBar.add(mnNewMenu_1);

-		

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mnNewMenu_1.add(mntmFaq);

-		

-		JMenuItem mntmOtrs = new JMenuItem("OTRS");

-		mnNewMenu_1.add(mntmOtrs);

-		

-		

-

-	}

-}

diff --git a/Dozentenmodul/src/GUI/BillOfRights_GUI.java b/Dozentenmodul/src/GUI/BillOfRights_GUI.java
new file mode 100644
index 00000000..beba0086
--- /dev/null
+++ b/Dozentenmodul/src/GUI/BillOfRights_GUI.java
@@ -0,0 +1,181 @@
+package GUI;
+
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JFrame;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.JCheckBox;
+import javax.swing.SwingConstants;
+import javax.swing.event.ChangeListener;
+import javax.swing.event.ChangeEvent;
+import javax.swing.JTextArea;
+
+
+
+@SuppressWarnings("serial")
+public class BillOfRights_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JButton fwdButton;
+	JCheckBox chckbxAkzeptieren;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			BillOfRights_GUI dialog = new BillOfRights_GUI();
+			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public BillOfRights_GUI() {
+
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				System.exit(0);
+			}
+		});
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("Dozentenmodul *Prototyp*");
+		
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 545) / 2;
+		int left=(screenSize.width - 381) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 545, 366);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 567, 60);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Hinweis");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 95, 567, 485);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JTextArea txtrLoremIpsumDolor = new JTextArea();
+		txtrLoremIpsumDolor.setWrapStyleWord(true);
+		txtrLoremIpsumDolor.setLineWrap(true);
+		txtrLoremIpsumDolor.setEditable(false);
+		JScrollPane scr=new JScrollPane(txtrLoremIpsumDolor);
+		scr.setBounds(0, 0, 567, 477);
+		txtrLoremIpsumDolor.setBounds(0, 0, 567, 477);
+		txtrLoremIpsumDolor.setText("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis.   \r\n\r\nAt vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, At accusam aliquyam diam diam dolore dolores duo eirmod eos erat, et nonumy sed tempor et et invidunt justo labore Stet clita ea et gubergren, kasd magna no rebum. sanctus sea sed takimata ut vero voluptua. est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat.   \r\n\r\nConsetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus.   \r\n\r\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.   \r\n\r\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.   \r\n\r\nUt wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi.   \r\n\r\nNam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo");
+		
+		contentPanel.add(scr);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 630, 587, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				fwdButton = new JButton("Weiter");
+				fwdButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						VmWareLink_GUI ac=new VmWareLink_GUI();
+						ac.setVisible(true);
+						dispose();
+					}
+				});
+				fwdButton.setEnabled(false);
+		
+				buttonPane.add(fwdButton);
+			}
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 617, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 82, 587, 2);
+			getContentPane().add(separator);
+		}
+		
+		chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.");
+		chckbxAkzeptieren.addChangeListener(new ChangeListener() {
+			public void stateChanged(ChangeEvent arg0) {
+				if(chckbxAkzeptieren.isSelected()==true)
+				{
+					fwdButton.setEnabled(true);
+
+				}
+				else
+				{
+					
+				}
+			}
+		});
+		chckbxAkzeptieren.setBackground(SystemColor.menu);
+		chckbxAkzeptieren.setBounds(10, 587, 567, 23);
+		getContentPane().add(chckbxAkzeptieren);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		mnNewMenu_1.setHorizontalAlignment(SwingConstants.CENTER);
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+		
+
+	}
+}
diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java
index 8c92966f..c04a01b5 100644
--- a/Dozentenmodul/src/GUI/EingabeAllgemein.java
+++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java
@@ -27,16 +27,17 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.JMenuBar;

 import javax.swing.JMenu;

 import javax.swing.JMenuItem;

-

 import Models.person;

 import java.awt.event.WindowAdapter;

 import java.awt.event.WindowEvent;

+import javax.swing.border.TitledBorder;

 

 @SuppressWarnings("serial")

 public class EingabeAllgemein extends JFrame {

 

 	private final JPanel contentPanel = new JPanel();

 	String[] result;

+	JCheckBox chckbxDerVerantwortlicheEntspricht;

 	private JTextField Vorname_V;

 	private JTextField Nachname_V;

 	private JTextField Hochschule_V;

@@ -49,7 +50,6 @@ public class EingabeAllgemein extends JFrame {
 	private JTextField EMail_E;

 	private JTextField Tel_E;

 	private JTextField Fak_E;

-	JCheckBox chckbxDerVerantwortlicheEntspricht;

 	/**

 	 * Launch the application.

 	 */

@@ -82,7 +82,7 @@ public class EingabeAllgemein extends JFrame {
 			// TODO Auto-generated catch block

 			e.printStackTrace();

 		}

-		setTitle("Dozentenmodul *Prototyp*");

+		setTitle("bwLehrpool Suite *Prototyp*");

 		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

 		int top=(screenSize.height - 603) / 2;

 		int left=(screenSize.width - 722) / 2;

@@ -91,183 +91,188 @@ public class EingabeAllgemein extends JFrame {
 		getContentPane().setLayout(null);

 		{

 			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 587, 68);

+			panel.setBackground(Color.WHITE);

+			panel.setBounds(10, 11, 577, 57);

 			getContentPane().add(panel);

 			panel.setLayout(null);

 			{

 				JLabel lblNewLabel = new JLabel("Eingabe der allgemeinen Daten (Schritt 3 von 7)");

 				lblNewLabel.setBounds(10, 11, 509, 22);

 				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

 			}

 			

 			JTextPane txtpnBitteWhlenSie = new JTextPane();

 			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

+			txtpnBitteWhlenSie.setBackground(Color.WHITE);

 			txtpnBitteWhlenSie.setText("Geben Sie hier bitte die Kontaktdaten des Vernatwortlichen und des Erstellers der VMDK ein");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);

 			panel.add(txtpnBitteWhlenSie);

 		}

-		contentPanel.setBounds(10, 91, 577, 525);

+		contentPanel.setBounds(10, 85, 577, 493);

 		contentPanel.setBackground(Color.WHITE);

 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

 		getContentPane().add(contentPanel);

 		contentPanel.setLayout(null);

 		

-		JLabel lblNewLabel_1 = new JLabel("Allgemeine Informationen zum Verantwortlichen");

-		lblNewLabel_1.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblNewLabel_1.setBounds(10, 0, 338, 25);

-		contentPanel.add(lblNewLabel_1);

+		chckbxDerVerantwortlicheEntspricht = new JCheckBox("Der Verantwortliche entspricht dem Ersteller");

+		chckbxDerVerantwortlicheEntspricht.setSelected(person.verantowrtlicher.isIschecked());

+		chckbxDerVerantwortlicheEntspricht.addChangeListener(new ChangeListener() {

+			public void stateChanged(ChangeEvent arg0) {

+				if(chckbxDerVerantwortlicheEntspricht.isSelected()==true){

+				Nachname_E.setText(Nachname_V.getText());

+				Vorname_E.setText(Vorname_V.getText());

+				Hochschule_E.setText(Hochschule_V.getText());

+				EMail_E.setText(EMail_V.getText());

+				Tel_E.setText(Tel_V.getText());

+				Fak_E.setText(Fak_V.getText());

+				}else{

+					Nachname_E.setText("");

+					Vorname_E.setText("");

+					Hochschule_E.setText("");

+					EMail_E.setText("");

+					Tel_E.setText("");

+					Fak_E.setText("");

+				}

+			}

+		});

+		chckbxDerVerantwortlicheEntspricht.setBackground(Color.WHITE);

+		chckbxDerVerantwortlicheEntspricht.setBounds(10, 239, 264, 23);

+		contentPanel.add(chckbxDerVerantwortlicheEntspricht);

+		

+		JPanel panel_1 = new JPanel();

+		panel_1.setBackground(Color.WHITE);

+		panel_1.setBorder(new TitledBorder(null, "Informationen zum Verantwortlichen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_1.setBounds(10, 22, 557, 210);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

 		

-		JLabel lblNewLabel_2 = new JLabel("Vorname: *");

-		lblNewLabel_2.setBounds(10, 36, 125, 20);

-		contentPanel.add(lblNewLabel_2);

+		JLabel label = new JLabel("Vorname: *");

+		label.setBounds(10, 24, 125, 20);

+		panel_1.add(label);

 		

 		Vorname_V = new JTextField();

-		Vorname_V.setBounds(145, 36, 350, 20);

-		Vorname_V.setText(person.verantowrtlicher.getVorname());

-		contentPanel.add(Vorname_V);

+		Vorname_V.setText((String) null);

 		Vorname_V.setColumns(10);

+		Vorname_V.setBounds(145, 24, 350, 20);

+		panel_1.add(Vorname_V);

 		

-		JLabel lblNachname = new JLabel("Nachname: *");

-		lblNachname.setBounds(10, 67, 125, 20);

-		contentPanel.add(lblNachname);

+		JLabel label_7 = new JLabel("Nachname: *");

+		label_7.setBounds(10, 55, 125, 20);

+		panel_1.add(label_7);

 		

 		Nachname_V = new JTextField();

-		Nachname_V.setBounds(145, 67, 350, 20);

-		Nachname_V.setText(person.verantowrtlicher.getName());

-		contentPanel.add(Nachname_V);

+		Nachname_V.setText((String) null);

 		Nachname_V.setColumns(10);

+		Nachname_V.setBounds(145, 55, 350, 20);

+		panel_1.add(Nachname_V);

 		

-		JLabel lblHochschule = new JLabel("Hochschule: *");

-		lblHochschule.setBounds(10, 98, 125, 20);

-		contentPanel.add(lblHochschule);

+		JLabel label_8 = new JLabel("Hochschule: *");

+		label_8.setBounds(10, 86, 125, 20);

+		panel_1.add(label_8);

 		

 		Hochschule_V = new JTextField();

+		Hochschule_V.setText((String) null);

 		Hochschule_V.setColumns(10);

-		Hochschule_V.setBounds(145, 98, 350, 20);

-		Hochschule_V.setText(person.verantowrtlicher.getHochschule());

-		contentPanel.add(Hochschule_V);

+		Hochschule_V.setBounds(145, 86, 350, 20);

+		panel_1.add(Hochschule_V);

 		

-		JLabel lblEmail = new JLabel("E-Mail: *");

-		lblEmail.setBounds(10, 129, 125, 20);

-		contentPanel.add(lblEmail);

+		JLabel label_9 = new JLabel("E-Mail: *");

+		label_9.setBounds(10, 117, 125, 20);

+		panel_1.add(label_9);

 		

 		EMail_V = new JTextField();

+		EMail_V.setText((String) null);

 		EMail_V.setColumns(10);

-		EMail_V.setBounds(145, 129, 350, 20);

-		EMail_V.setText(person.verantowrtlicher.getEMail());

-		contentPanel.add(EMail_V);

+		EMail_V.setBounds(145, 117, 350, 20);

+		panel_1.add(EMail_V);

 		

-		JLabel lblTelnummer = new JLabel("Tel.-Nummer:");

-		lblTelnummer.setBounds(10, 160, 125, 20);

-		contentPanel.add(lblTelnummer);

+		JLabel label_10 = new JLabel("Tel.-Nummer:");

+		label_10.setBounds(10, 148, 125, 20);

+		panel_1.add(label_10);

 		

 		Tel_V = new JTextField();

+		Tel_V.setText((String) null);

 		Tel_V.setColumns(10);

-		Tel_V.setBounds(145, 160, 350, 20);

-		Tel_V.setText(person.verantowrtlicher.getTel());

-		contentPanel.add(Tel_V);

+		Tel_V.setBounds(145, 148, 350, 20);

+		panel_1.add(Tel_V);

 		

-		JLabel lblFakultt = new JLabel("Fakult\u00E4t:");

-		lblFakultt.setBounds(10, 191, 125, 20);

-		contentPanel.add(lblFakultt);

+		JLabel label_11 = new JLabel("Fakult\u00E4t:");

+		label_11.setBounds(10, 179, 125, 20);

+		panel_1.add(label_11);

 		

 		Fak_V = new JTextField();

+		Fak_V.setText((String) null);

 		Fak_V.setColumns(10);

-		Fak_V.setBounds(145, 191, 350, 20);

-		Fak_V.setText(person.verantowrtlicher.getFakultät());

-		contentPanel.add(Fak_V);

+		Fak_V.setBounds(145, 179, 350, 20);

+		panel_1.add(Fak_V);

 		

-		chckbxDerVerantwortlicheEntspricht = new JCheckBox("Der Verantwortliche entspricht dem Ersteller");

-		chckbxDerVerantwortlicheEntspricht.setSelected(person.verantowrtlicher.isIschecked());

-		chckbxDerVerantwortlicheEntspricht.addChangeListener(new ChangeListener() {

-			public void stateChanged(ChangeEvent arg0) {

-				if(chckbxDerVerantwortlicheEntspricht.isSelected()==true){

-				Nachname_E.setText(Nachname_V.getText());

-				Vorname_E.setText(Vorname_V.getText());

-				Hochschule_E.setText(Hochschule_V.getText());

-				EMail_E.setText(EMail_V.getText());

-				Tel_E.setText(Tel_V.getText());

-				Fak_E.setText(Fak_V.getText());

-				}else{

-					Nachname_E.setText("");

-					Vorname_E.setText("");

-					Hochschule_E.setText("");

-					EMail_E.setText("");

-					Tel_E.setText("");

-					Fak_E.setText("");

-				}

-			}

-		});

-		chckbxDerVerantwortlicheEntspricht.setBackground(Color.WHITE);

-		chckbxDerVerantwortlicheEntspricht.setBounds(6, 228, 264, 23);

-		contentPanel.add(chckbxDerVerantwortlicheEntspricht);

-		

-		JLabel lblAllgemeineInformationenZum = new JLabel("Allgemeine Informationen zum Ersteller");

-		lblAllgemeineInformationenZum.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		lblAllgemeineInformationenZum.setBounds(10, 258, 338, 25);

-		contentPanel.add(lblAllgemeineInformationenZum);

+		JPanel panel_2 = new JPanel();

+		panel_2.setBackground(Color.WHITE);

+		panel_2.setBorder(new TitledBorder(null, "Informationen zum Ersteller", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_2.setBounds(6, 269, 561, 218);

+		contentPanel.add(panel_2);

+		panel_2.setLayout(null);

 		

 		JLabel label_1 = new JLabel("Vorname: *");

-		label_1.setBounds(10, 294, 125, 20);

-		contentPanel.add(label_1);

+		label_1.setBounds(10, 21, 125, 20);

+		panel_2.add(label_1);

 		

 		Vorname_E = new JTextField();

+		Vorname_E.setText((String) null);

 		Vorname_E.setColumns(10);

-		Vorname_E.setBounds(145, 294, 350, 20);

-		Vorname_E.setText(person.ersteller.getVorname());

-		contentPanel.add(Vorname_E);

+		Vorname_E.setBounds(145, 21, 350, 20);

+		panel_2.add(Vorname_E);

 		

 		JLabel label_2 = new JLabel("Nachname: *");

-		label_2.setBounds(10, 325, 125, 20);

-		contentPanel.add(label_2);

+		label_2.setBounds(10, 52, 125, 20);

+		panel_2.add(label_2);

 		

 		Nachname_E = new JTextField();

+		Nachname_E.setText((String) null);

 		Nachname_E.setColumns(10);

-		Nachname_E.setBounds(145, 325, 350, 20);

-		Nachname_E.setText(person.ersteller.getName());

-		contentPanel.add(Nachname_E);

+		Nachname_E.setBounds(145, 52, 350, 20);

+		panel_2.add(Nachname_E);

 		

 		Hochschule_E = new JTextField();

+		Hochschule_E.setText((String) null);

 		Hochschule_E.setColumns(10);

-		Hochschule_E.setBounds(145, 356, 350, 20);

-		Hochschule_E.setText(person.ersteller.getHochschule());

-		contentPanel.add(Hochschule_E);

+		Hochschule_E.setBounds(145, 83, 350, 20);

+		panel_2.add(Hochschule_E);

 		

 		JLabel label_3 = new JLabel("Hochschule: *");

-		label_3.setBounds(10, 356, 125, 20);

-		contentPanel.add(label_3);

+		label_3.setBounds(10, 83, 125, 20);

+		panel_2.add(label_3);

 		

 		JLabel label_4 = new JLabel("E-Mail: *");

-		label_4.setBounds(10, 387, 125, 20);

-		contentPanel.add(label_4);

+		label_4.setBounds(10, 114, 125, 20);

+		panel_2.add(label_4);

 		

 		EMail_E = new JTextField();

+		EMail_E.setText((String) null);

 		EMail_E.setColumns(10);

-		EMail_E.setBounds(145, 387, 350, 20);

-		EMail_E.setText(person.ersteller.getEMail());

-		contentPanel.add(EMail_E);

+		EMail_E.setBounds(145, 114, 350, 20);

+		panel_2.add(EMail_E);

 		

 		Tel_E = new JTextField();

+		Tel_E.setText((String) null);

 		Tel_E.setColumns(10);

-		Tel_E.setBounds(145, 418, 350, 20);

-		Tel_E.setText(person.ersteller.getTel());

-		contentPanel.add(Tel_E);

+		Tel_E.setBounds(145, 145, 350, 20);

+		panel_2.add(Tel_E);

 		

 		JLabel label_5 = new JLabel("Tel.-Nummer:");

-		label_5.setBounds(10, 418, 125, 20);

-		contentPanel.add(label_5);

+		label_5.setBounds(10, 145, 125, 20);

+		panel_2.add(label_5);

 		

 		JLabel label_6 = new JLabel("Fakult\u00E4t:");

-		label_6.setBounds(10, 449, 125, 20);

-		contentPanel.add(label_6);

+		label_6.setBounds(10, 176, 125, 20);

+		panel_2.add(label_6);

 		

 		Fak_E = new JTextField();

+		Fak_E.setText((String) null);

 		Fak_E.setColumns(10);

-		Fak_E.setText(person.ersteller.getFakultät());

-		Fak_E.setBounds(145, 449, 350, 20);

-		contentPanel.add(Fak_E);

+		Fak_E.setBounds(145, 176, 350, 20);

+		panel_2.add(Fak_E);

 		{

 			JPanel buttonPane = new JPanel();

 			buttonPane.setBounds(0, 640, 597, 33);

@@ -291,7 +296,7 @@ public class EingabeAllgemein extends JFrame {
 						person.ersteller.setName(Nachname_E.getText());

 						person.ersteller.setVorname(Vorname_V.getText());

 						person.ersteller.setTel(Tel_E.getText());

-						getVMwarePlayer sr=new getVMwarePlayer();

+						VmWareLink_GUI sr=new VmWareLink_GUI();

 						sr.setVisible(true);

 						dispose();

 					}

@@ -317,7 +322,7 @@ public class EingabeAllgemein extends JFrame {
 						person.ersteller.setFakultät(Fak_E.getText());

 						person.ersteller.setHochschule(Hochschule_E.getText());

 						person.ersteller.setName(Nachname_E.getText());

-						person.ersteller.setVorname(Vorname_V.getText());

+						person.ersteller.setVorname(Vorname_E.getText());

 						person.ersteller.setTel(Tel_E.getText());

 						EingabeSystemDaten ea=new EingabeSystemDaten();

 						ea.setVisible(true);

@@ -335,13 +340,24 @@ public class EingabeAllgemein extends JFrame {
 		}

 		

 		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 597, 2);

+		separator.setBounds(0, 78, 597, 2);

 		getContentPane().add(separator);

 		

 		JSeparator separator_1 = new JSeparator();

 		separator_1.setBounds(0, 627, 597, 2);

 		getContentPane().add(separator_1);

 		

+		JPanel panel = new JPanel();

+		panel.setLayout(null);

+		panel.setBorder(new EmptyBorder(5, 5, 5, 5));

+		panel.setBackground(Color.WHITE);

+		panel.setBounds(10, 583, 577, 33);

+		getContentPane().add(panel);

+		

+		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");

+		lblPflichtfelder.setBounds(10, 11, 136, 14);

+		panel.add(lblPflichtfelder);

+		

 		JMenuBar menuBar = new JMenuBar();

 		setJMenuBar(menuBar);

 		

diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
index d18c369a..50d8e5f9 100644
--- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
+++ b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java
@@ -104,7 +104,7 @@ public class EingabeSoftwareDaten extends JFrame {
 			panel.add(txtpnBitteWhlenSie);

 		}

 		contentPanel.setBounds(10, 95, 567, 512);

-		contentPanel.setBackground(Color.WHITE);

+		contentPanel.setBackground(SystemColor.menu);

 		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

 		getContentPane().add(contentPanel);

 		contentPanel.setLayout(null);

diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/Login_GUI.java
index dbe0e7bb..9bbbe5d5 100644
--- a/Dozentenmodul/src/GUI/LoginWindow.java
+++ b/Dozentenmodul/src/GUI/Login_GUI.java
@@ -1,158 +1,152 @@
-package GUI;

-

-

-import java.awt.Dimension;

-import java.awt.EventQueue;

-import java.awt.Image;

-import java.awt.Toolkit;

-

-import javax.swing.ImageIcon;

-import javax.swing.JFrame;

-import javax.swing.JOptionPane;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import javax.swing.JLabel;

-import javax.swing.JTextField;

-import javax.swing.JButton;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JPasswordField;

-import java.awt.Color;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import java.awt.Font;

-

-@SuppressWarnings("serial")

-public class LoginWindow extends JFrame {

-

-	private JPanel contentPane;

-	private JTextField username;

-	private JPasswordField pass;

-

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					//Aufruf und Anzeige des Login Fensters

-					LoginWindow frame = new LoginWindow();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

-	}

-

-	/**

-	 * Create the frame.

-	 */

-	public LoginWindow() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		

-		//Fenster darf nicht vergrößert werden

-		setResizable(false);

-		try {

-			//Setzt das Look and Feel auf System

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		//Titel des Fensters setzen

-		setTitle("Dozentenmodul *Prototyp*");

-		//Aktion die beim Schließen durchgeführt werden soll

-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

-		//Größe des Fensters definieren

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 300) / 2;

-		int left=(screenSize.width - 300) / 2;

-		setBounds(left, top, 300, 300);

-		//Erzeugen eines Panels

-		contentPane = new JPanel();

-		//Hintergrund Farbe des Panels setzen

-		contentPane.setBackground(Color.WHITE);

-		//Rahmen des Fensters setzen

-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));

-		setContentPane(contentPane);

-		//Layout setzen

-		contentPane.setLayout(null);

-		//Label für das Logo erzeugen

-		JLabel imgLabel = new JLabel();

-		//Größe und Position des Logos festelegen

-		imgLabel.setBounds(10, 11, 270, 64);

-		//Pfadangabe des Logos

-		

-		ImageIcon icon = new ImageIcon(getClass().getResource("/Logo_bwLehrpool.png"),"Logo");

-		//Skalierung des Logos

-		Image scaled=icon.getImage().getScaledInstance(270, 64, 0);

-		imgLabel.setIcon(new ImageIcon(scaled));

-		//Hinzufügen des Logos in das Fenster

-		contentPane.add(imgLabel);

-		

-		//Erzeugen und Hinzufügen des Labels 

-		JLabel LabelUser = new JLabel("bwIDM-Benutzername:");

-		LabelUser.setBounds(10, 123, 134, 20);

-		contentPane.add(LabelUser);

-		

-		//Erzeugen und Hinzufügen des Textfeldes

-		username = new JTextField();

-		username.setBounds(154, 123, 125, 20);

-		contentPane.add(username);

-		username.setColumns(10);

-		

-		//Erzeugen und Hinzufügen des Labels

-		JLabel LabelPass = new JLabel("bwIDM-Passwort:");

-		LabelPass.setBounds(10, 154, 134, 20);

-		contentPane.add(LabelPass);

-		

-		//Erzeugen, Hinzufügen und definierung der Aktion des Buttons

-		JButton BtnLogin = new JButton("Login");

-		BtnLogin.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				//Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt

-				//Ldap check=new Ldap();

-				boolean login=true;

-				//boolean login=check.LdapAuth(username.getText(),  new String(pass.getPassword()));

-				if(login==true)

-				{

-					

-					

-					//Erstellen einer Instanz der Aktionsauswahl

-					Rechtsbelehrung re=new Rechtsbelehrung();

-					re.setVisible(true);

-					//Schließen des Fensters nach erfolgreichen Login

-					setVisible(false);

-				}

-				else

-				{

-		            JOptionPane.showMessageDialog(null,

-		                    "Login denied!", "Message",

-		                    JOptionPane.INFORMATION_MESSAGE);

-				}

-			}

-		});

-		BtnLogin.setBounds(10, 216, 134, 23);

-		contentPane.add(BtnLogin);

-		

-		//Erzeugen und Hinzufügen des Passwortfeldes

-		pass = new JPasswordField();

-		pass.setBounds(154, 154, 125, 20);

-		contentPane.add(pass);

-		

-		JLabel lblNewLabel = new JLabel("Prototyp");

-		lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

-		lblNewLabel.setBounds(10, 86, 147, 26);

-		contentPane.add(lblNewLabel);

-	}

-}

+package GUI;
+
+
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.Image;
+import java.awt.Toolkit;
+import javax.swing.ImageIcon;
+import javax.swing.JFrame;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.JButton;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JPasswordField;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.SystemColor;
+
+
+@SuppressWarnings("serial")
+public class Login_GUI extends JFrame {
+
+	private JPanel contentPane;
+	private JTextField username;
+	private JPasswordField pass;
+
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		EventQueue.invokeLater(new Runnable() {
+			public void run() {
+				try {
+					//Aufruf und Anzeige des Login Fensters
+					Login_GUI frame = new Login_GUI();
+					frame.setVisible(true);
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		});
+	}
+
+	/**
+	 * Create the frame.
+	 */
+	public Login_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				System.exit(0);
+			}
+		});
+		
+		//Fenster darf nicht vergrößert werden
+		setResizable(false);
+		try {
+			//Setzt das Look and Feel auf System
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		//Titel des Fensters setzen
+		setTitle("Dozentenmodul *Prototyp*");
+		//Aktion die beim Schließen durchgeführt werden soll
+		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		//Größe des Fensters definieren
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 300) / 2;
+		int left=(screenSize.width - 300) / 2;
+		setBounds(left, top, 603, 400);
+		//Erzeugen eines Panels
+		contentPane = new JPanel();
+		//Hintergrund Farbe des Panels setzen
+		contentPane.setBackground(SystemColor.menu);
+		//Rahmen des Fensters setzen
+		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));
+		setContentPane(contentPane);
+		//Layout setzen
+		contentPane.setLayout(null);
+		//Label für das Logo erzeugen
+		JLabel imgLabel = new JLabel();
+		//Größe und Position des Logos festelegen
+		imgLabel.setBounds(150, 11, 350, 142);
+		//Pfadangabe des Logos
+		
+		ImageIcon icon = new ImageIcon(getClass().getResource("/Logo_bwLehrpool.png"),"Logo");
+		//Skalierung des Logos
+		Image scaled=icon.getImage().getScaledInstance(270, 64, 0);
+		imgLabel.setIcon(new ImageIcon(scaled));
+		//Hinzufügen des Logos in das Fenster
+		contentPane.add(imgLabel);
+		
+		//Erzeugen und Hinzufügen des Labels 
+		JLabel LabelUser = new JLabel("bwIDM-Benutzername:");
+		LabelUser.setBounds(150, 164, 134, 20);
+		contentPane.add(LabelUser);
+		
+		//Erzeugen und Hinzufügen des Textfeldes
+		username = new JTextField();
+		username.setBounds(343, 164, 125, 20);
+		contentPane.add(username);
+		username.setColumns(10);
+		
+		//Erzeugen und Hinzufügen des Labels
+		JLabel LabelPass = new JLabel("bwIDM-Passwort:");
+		LabelPass.setBounds(150, 195, 134, 20);
+		contentPane.add(LabelPass);
+		
+		//Erzeugen, Hinzufügen und definierung der Aktion des Buttons
+		JButton BtnLogin = new JButton("Login");
+		BtnLogin.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				//Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt
+				//Ldap check=new Ldap();
+				boolean login=true;
+				//boolean login=check.LdapAuth(username.getText(),  new String(pass.getPassword()));
+				if(login==true)
+				{
+					
+					
+					//Erstellen einer Instanz der Aktionsauswahl
+					BillOfRights_GUI re=new BillOfRights_GUI();
+					re.setVisible(true);
+					//Schließen des Fensters nach erfolgreichen Login
+					setVisible(false);
+				}
+				else
+				{
+		            JOptionPane.showMessageDialog(null,
+		                    "Login denied!", "Message",
+		                    JOptionPane.INFORMATION_MESSAGE);
+				}
+			}
+		});
+		BtnLogin.setBounds(343, 244, 125, 23);
+		contentPane.add(BtnLogin);
+		
+		//Erzeugen und Hinzufügen des Passwortfeldes
+		pass = new JPasswordField();
+		pass.setBounds(343, 195, 125, 20);
+		contentPane.add(pass);
+	}
+}
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
new file mode 100644
index 00000000..2e0dadb9
--- /dev/null
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -0,0 +1,313 @@
+package GUI;

+

+import java.awt.Dimension;

+import java.awt.FlowLayout;

+import java.awt.Toolkit;

+import javax.swing.JFrame;

+import javax.swing.JButton;

+import javax.swing.JDialog;

+import javax.swing.JPanel;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

+import java.awt.Color;

+import javax.swing.JLabel;

+import java.awt.Font;

+import javax.swing.JTextPane;

+import java.awt.SystemColor;

+import java.awt.event.ActionListener;

+import java.awt.event.ActionEvent;

+import javax.swing.JSeparator;

+import javax.swing.JRadioButton;

+import javax.swing.SwingConstants;

+import javax.swing.ButtonGroup;

+import javax.swing.JMenuBar;

+import javax.swing.JMenu;

+import javax.swing.JMenuItem;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import javax.swing.border.TitledBorder;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import java.awt.ScrollPane;

+import javax.swing.JTextArea;

+

+@SuppressWarnings("serial")

+public class MainMenue_GUI extends JFrame {

+

+	private final JPanel contentPanel = new JPanel();

+	String[] result;

+	JRadioButton rdbtnImageNew;

+	JRadioButton rdbtnImageEdit;

+	private final ButtonGroup buttonGroup = new ButtonGroup();

+	/**

+	 * Launch the application.

+	 */

+	public static void main(String[] args) {

+		try {

+			MainMenue_GUI dialog = new MainMenue_GUI();

+			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);

+			dialog.setVisible(true);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * Create the dialog.

+	 */

+	public MainMenue_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				System.exit(0);

+			}

+		});

+		try {

+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

+		} catch (ClassNotFoundException | InstantiationException

+				| IllegalAccessException | UnsupportedLookAndFeelException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		setTitle("bwLehrpool Suite *Prototyp*");

+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

+		int top=(screenSize.height - 545) / 2;

+		int left=(screenSize.width - 381) / 2;

+		setBounds(left, top, 603, 722);

+		//setBounds(100, 100, 545, 366);

+		getContentPane().setLayout(null);

+		{

+			JPanel panel = new JPanel();

+			panel.setBackground(SystemColor.menu);

+			panel.setBounds(10, 11, 567, 69);

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Hauptmen\u00FC");

+				lblNewLabel.setBounds(10, 11, 509, 22);

+				panel.add(lblNewLabel);

+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));

+			}

+			

+			JTextPane txtpnBitteWhlenSie = new JTextPane();

+			txtpnBitteWhlenSie.setEditable(false);

+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

+			txtpnBitteWhlenSie.setText("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion");

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);

+			panel.add(txtpnBitteWhlenSie);

+		}

+		contentPanel.setBounds(10, 104, 567, 502);

+		contentPanel.setBackground(SystemColor.menu);

+		

+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

+		getContentPane().add(contentPanel);

+		contentPanel.setLayout(null);

+		

+		JPanel panelImage = new JPanel();

+		panelImage.setBackground(SystemColor.menu);

+		panelImage.setBorder(new TitledBorder(null, "VL-Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panelImage.setBounds(10, 86, 270, 200);

+		contentPanel.add(panelImage);

+		panelImage.setLayout(null);

+		

+		rdbtnImageNew = new JRadioButton("Neu");

+		rdbtnImageNew.setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden");

+		rdbtnImageNew.setBounds(6, 22, 159, 23);

+		panelImage.add(rdbtnImageNew);

+		rdbtnImageNew.setSelected(true);

+		buttonGroup.add(rdbtnImageNew);

+		rdbtnImageNew.setBackground(SystemColor.menu);

+		

+		

+		

+		rdbtnImageEdit = new JRadioButton("Bearbeiten");

+		rdbtnImageEdit.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

+		rdbtnImageEdit.setBounds(6, 48, 185, 23);

+		panelImage.add(rdbtnImageEdit);

+		buttonGroup.add(rdbtnImageEdit);

+		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);

+		rdbtnImageEdit.setBackground(SystemColor.menu);

+		

+		JRadioButton rdbtnImageDelete = new JRadioButton("L\u00F6schen");

+		buttonGroup.add(rdbtnImageDelete);

+		rdbtnImageDelete.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

+		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);

+		rdbtnImageDelete.setBackground(SystemColor.menu);

+		rdbtnImageDelete.setBounds(6, 74, 185, 23);

+		panelImage.add(rdbtnImageDelete);

+		

+		JRadioButton rdbtnImageSearchDownload = new JRadioButton("Suche und Download");

+		buttonGroup.add(rdbtnImageSearchDownload);

+		rdbtnImageSearchDownload.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");

+		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);

+		rdbtnImageSearchDownload.setBackground(SystemColor.menu);

+		rdbtnImageSearchDownload.setBounds(6, 100, 185, 23);

+		panelImage.add(rdbtnImageSearchDownload);

+		

+		JPanel panelDesc = new JPanel();

+		panelDesc.setLayout(null);

+		panelDesc.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Erklärung", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panelDesc.setBackground(SystemColor.menu);

+		panelDesc.setBounds(290, 86, 270, 200);

+		contentPanel.add(panelDesc);

+		

+		ScrollPane scrollPaneDesc = new ScrollPane();

+		scrollPaneDesc.setBounds(5, 15, 260, 180);

+		JTextArea txtDesc=new JTextArea();

+		txtDesc.setBackground(SystemColor.menu);

+		txtDesc.setWrapStyleWord(true);

+		txtDesc.setLineWrap(true);

+		scrollPaneDesc.add(txtDesc);

+		//Pro AUswahl

+		txtDesc.setText("Hier steht irgendwann die Beschreibung der einzelnen Punkte\r\n");

+		panelDesc.add(scrollPaneDesc);

+		

+		JPanel panelVeranstaltung = new JPanel();

+		panelVeranstaltung.setLayout(null);

+		panelVeranstaltung.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panelVeranstaltung.setBackground(SystemColor.menu);

+		panelVeranstaltung.setBounds(10, 297, 270, 200);

+		contentPanel.add(panelVeranstaltung);

+		

+		JRadioButton rdbtnVeranstaltungNew = new JRadioButton("Neu");

+		buttonGroup.add(rdbtnVeranstaltungNew);

+		rdbtnVeranstaltungNew.setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben");

+		rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23);

+		panelVeranstaltung.add(rdbtnVeranstaltungNew);

+		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);

+		

+		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");

+		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");

+		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);

+		panelVeranstaltung.add(rdbtnVeranstaltungEdit);

+		buttonGroup.add(rdbtnVeranstaltungEdit);

+		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);

+		

+		JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen");

+		rdbtnVeranstaltungDelete.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");

+		rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23);

+		panelVeranstaltung.add(rdbtnVeranstaltungDelete);

+		buttonGroup.add(rdbtnVeranstaltungDelete);

+		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);

+		

+		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");

+		buttonGroup.add(rdbtnVeranstaltungSearch);

+		rdbtnVeranstaltungSearch.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");

+		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);

+		rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23);

+		panelVeranstaltung.add(rdbtnVeranstaltungSearch);

+		

+		JLabel lblCrumbStart = new JLabel("Startseite");

+		lblCrumbStart.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				Login_GUI lw=new Login_GUI();

+				lw.setVisible(true);

+				MainMenue_GUI.this.setVisible(false);

+			}

+		});

+		lblCrumbStart.setForeground(Color.BLUE);

+		lblCrumbStart.setBounds(10, 0, 52, 14);

+		contentPanel.add(lblCrumbStart);

+		

+		JLabel label = new JLabel(">");

+		label.setBounds(60, 0, 13, 14);

+		contentPanel.add(label);

+		

+		JLabel lblRechtshinweis = new JLabel("Rechtshinweis");

+		lblRechtshinweis.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent e) {

+				BillOfRights_GUI rb=new BillOfRights_GUI();

+				rb.setVisible(true);

+				MainMenue_GUI.this.setVisible(false);

+			}

+		});

+		lblRechtshinweis.setForeground(Color.BLUE);

+		lblRechtshinweis.setBounds(72, 0, 68, 14);

+		contentPanel.add(lblRechtshinweis);

+		

+		JLabel label_1 = new JLabel(">");

+		label_1.setBounds(142, 0, 13, 14);

+		contentPanel.add(label_1);

+		

+		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");

+		lblNewLabel_1.setBounds(150, 0, 74, 14);

+		contentPanel.add(lblNewLabel_1);

+		

+		JLabel lblNewLabel_2 = new JLabel("*Platzhalter Bild*");

+		lblNewLabel_2.setBounds(10, 25, 557, 59);

+		contentPanel.add(lblNewLabel_2);

+		

+		JPanel panelNews = new JPanel();

+		panelNews.setLayout(null);

+		panelNews.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "News", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panelNews.setBackground(SystemColor.menu);

+		panelNews.setBounds(290, 297, 270, 200);

+		contentPanel.add(panelNews);

+		

+		ScrollPane scrollPaneNews = new ScrollPane();

+		scrollPaneNews.setBounds(5, 15, 260, 180);

+		JTextArea txtNews=new JTextArea();

+		txtNews.setBackground(SystemColor.menu);

+		txtNews.setWrapStyleWord(true);

+		txtNews.setLineWrap(true);

+		txtNews.setText("Hier werden mal die Neuigkeiten stehen");

+		scrollPaneNews.add(txtNews);

+		panelNews.add(scrollPaneNews);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 630, 587, 33);

+			buttonPane.setBackground(SystemColor.menu);

+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

+			getContentPane().add(buttonPane);

+			{

+				JButton cancelButton = new JButton("Weiter");

+				cancelButton.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent e) {

+						

+						if(rdbtnImageNew.isSelected()==true)

+						{

+						searchRohling sr=new searchRohling();

+						sr.setVisible(true);

+						dispose();

+						}else if(rdbtnImageEdit.isSelected()==true)

+						{

+							EingabeAllgemein ea = new EingabeAllgemein();

+							ea.setVisible(true);

+							dispose();

+						}

+					}

+				});

+				cancelButton.setActionCommand("Cancel");

+				buttonPane.add(cancelButton);

+			}

+		}

+		{

+			JSeparator separator = new JSeparator();

+			separator.setBounds(0, 617, 587, 2);

+			getContentPane().add(separator);

+		}

+		{

+			JSeparator separator = new JSeparator();

+			separator.setBounds(0, 91, 587, 2);

+			getContentPane().add(separator);

+		}

+		

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+		

+		JMenu mnNewMenu_1 = new JMenu("Hilfe");

+		menuBar.add(mnNewMenu_1);

+		

+		JMenuItem mntmFaq = new JMenuItem("FAQ");

+		mnNewMenu_1.add(mntmFaq);

+		

+		JMenuItem mntmOtrs = new JMenuItem("OTRS");

+		mnNewMenu_1.add(mntmOtrs);

+		

+		

+

+	}

+}

diff --git a/Dozentenmodul/src/GUI/Rechtsbelehrung.java b/Dozentenmodul/src/GUI/Rechtsbelehrung.java
deleted file mode 100644
index 4728e8a3..00000000
--- a/Dozentenmodul/src/GUI/Rechtsbelehrung.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package GUI;

-

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JFrame;

-import javax.swing.JOptionPane;

-import javax.swing.JSeparator;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-import javax.swing.JCheckBox;

-

-

-@SuppressWarnings("serial")

-public class Rechtsbelehrung extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	

-	JCheckBox chckbxAkzeptieren;

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			Rechtsbelehrung dialog = new Rechtsbelehrung();

-			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public Rechtsbelehrung() {

-

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent arg0) {

-				System.exit(0);

-			}

-		});

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("Dozentenmodul *Prototyp*");

-		

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 545) / 2;

-		int left=(screenSize.width - 381) / 2;

-		setBounds(left, top, 545, 381);

-		//setBounds(100, 100, 545, 366);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 529, 80);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Hinweis");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte lesen und best\u00E4tigen Sie folgende rechtliche Hinweise");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 33);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 104, 509, 135);

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JTextPane txtpnJaIchBin = new JTextPane();

-		txtpnJaIchBin.setText("Ja, ich bin verantwortlich f\u00FCr die in meiner VL genutzen Lizenzen.");

-		txtpnJaIchBin.setBounds(10, 11, 489, 113);

-		contentPanel.add(txtpnJaIchBin);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 289, 529, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton cancelButton = new JButton("Weiter");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						if(chckbxAkzeptieren.isSelected()==true)

-						{

-							ActionChooser ac=new ActionChooser();

-							ac.setVisible(true);

-							dispose();

-						}

-						else

-						{

-							JOptionPane.showMessageDialog(null, "Bitte bestätigen Sie folgende Hinweise",

-									"Error", JOptionPane.ERROR_MESSAGE);

-						}

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 276, 529, 2);

-			getContentPane().add(separator);

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 91, 529, 2);

-			getContentPane().add(separator);

-		}

-		

-		chckbxAkzeptieren = new JCheckBox("Akzeptieren");

-		chckbxAkzeptieren.setBounds(0, 246, 97, 23);

-		getContentPane().add(chckbxAkzeptieren);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

-		JMenu mnNewMenu = new JMenu("Suche");

-		menuBar.add(mnNewMenu);

-		

-		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

-		mnNewMenu.add(mntmVlSuche);

-		

-		JMenu mnNewMenu_1 = new JMenu("Hilfe");

-		menuBar.add(mnNewMenu_1);

-		

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mnNewMenu_1.add(mntmFaq);

-		

-		JMenuItem mntmOtrs = new JMenuItem("OTRS");

-		mnNewMenu_1.add(mntmOtrs);

-		

-		

-

-	}

-}

diff --git a/Dozentenmodul/src/GUI/getVMwarePlayer.java b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
index ad6ae894..a7005880 100644
--- a/Dozentenmodul/src/GUI/getVMwarePlayer.java
+++ b/Dozentenmodul/src/GUI/VmWareLink_GUI.java
@@ -1,195 +1,190 @@
-package GUI;

-

-import java.awt.Desktop;

-import java.awt.Dimension;

-import java.awt.FlowLayout;

-import java.awt.Toolkit;

-import javax.swing.JFrame;

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.JLabel;

-import java.awt.Font;

-import javax.swing.JTextPane;

-import java.awt.SystemColor;

-import java.awt.event.ActionListener;

-import java.awt.event.ActionEvent;

-import javax.swing.JSeparator;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import java.io.IOException;

-import java.net.URI;

-import java.net.URISyntaxException;

-import java.awt.event.WindowAdapter;

-import java.awt.event.WindowEvent;

-

-

-@SuppressWarnings("serial")

-public class getVMwarePlayer extends JFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	String[] result;

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			getVMwarePlayer dialog = new getVMwarePlayer();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public getVMwarePlayer() {

-		addWindowListener(new WindowAdapter() {

-			@Override

-			public void windowClosing(WindowEvent e) {

-				System.exit(0);

-			}

-		});

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setTitle("Dozentenmodul *Prototyp*");

-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();

-		int top=(screenSize.height - 603) / 2;

-		int left=(screenSize.width - 722) / 2;

-		setBounds(left, top, 603, 722);

-		//setBounds(100, 100, 603, 722);

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBounds(0, 0, 577, 80);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Bearbeiten der VMDK (Schritt 2 von 7)");

-				lblNewLabel.setBounds(10, 11, 509, 22);

-				panel.add(lblNewLabel);

-				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

-			}

-			

-			JTextPane txtpnBitteWhlenSie = new JTextPane();

-			txtpnBitteWhlenSie.setEditable(false);

-			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

-			txtpnBitteWhlenSie.setText("Bitte bearbeiten Sie nun die heruntergeladene VMDK");

-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

-			panel.add(txtpnBitteWhlenSie);

-		}

-		contentPanel.setBounds(10, 104, 567, 502);

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel);

-		contentPanel.setLayout(null);

-		

-		JTextPane txtpnUmIhreVmdk = new JTextPane();

-		txtpnUmIhreVmdk.setEditable(false);

-		txtpnUmIhreVmdk.setText("Um Ihre VMDK zu bearbeiten bzw. die notwendigen Programme zu installieren, ben\u00F6tigen sie den VMware Player. Den VMware Player k\u00F6nnen Sie unter folgendem Link downloaden.");

-		txtpnUmIhreVmdk.setBounds(0, 0, 499, 66);

-		contentPanel.add(txtpnUmIhreVmdk);

-		

-		JLabel lblNewLabel_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");

-		lblNewLabel_1.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseReleased(MouseEvent arg0) {

-				URI url;

-				try {

-					url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0");

-					Desktop.getDesktop().browse(url);

-				} catch (URISyntaxException | IOException e) {

-					// TODO Auto-generated catch block

-					e.printStackTrace();

-				}

-				

-			}

-		});

-	

-		lblNewLabel_1.setBounds(10, 93, 499, 14);

-		contentPanel.add(lblNewLabel_1);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 630, 587, 33);

-			buttonPane.setBackground(SystemColor.menu);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane);

-			{

-				JButton okButton = new JButton("Zur\u00FCck");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						searchRohling sr=new searchRohling();

-						sr.setVisible(true);

-						dispose();

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

-				JButton cancelButton = new JButton("Weiter");

-				cancelButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						EingabeAllgemein ea=new EingabeAllgemein();

-						ea.setVisible(true);

-						dispose();

-					}

-				});

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 617, 587, 2);

-			getContentPane().add(separator);

-		}

-		{

-			JSeparator separator = new JSeparator();

-			separator.setBounds(0, 91, 587, 2);

-			getContentPane().add(separator);

-		}

-		{

-			JMenuBar menuBar = new JMenuBar();

-			setJMenuBar(menuBar);

-			{

-				JMenu mnSuchen = new JMenu("Suchen");

-				menuBar.add(mnSuchen);

-				{

-					JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

-					mnSuchen.add(mntmVlSuche);

-				}

-			}

-			{

-				JMenu mnHilfe = new JMenu("Hilfe");

-				menuBar.add(mnHilfe);

-				{

-					JMenuItem mntmFaq = new JMenuItem("FAQ");

-					mnHilfe.add(mntmFaq);

-				}

-				{

-					JMenuItem mntmHilfe = new JMenuItem("Hilfe");

-					mnHilfe.add(mntmHilfe);

-				}

-			}

-		}

-		

-		

-

-	}

-}

+package GUI;
+
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Toolkit;
+import javax.swing.JFrame;
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import javax.swing.border.EmptyBorder;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import javax.swing.JCheckBox;
+
+
+@SuppressWarnings("serial")
+public class VmWareLink_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	/**
+	 * Launch the application.
+	 */
+	public static void main(String[] args) {
+		try {
+			VmWareLink_GUI dialog = new VmWareLink_GUI();
+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+			dialog.setVisible(true);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+
+	/**
+	 * Create the dialog.
+	 */
+	public VmWareLink_GUI() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent e) {
+				System.exit(0);
+			}
+		});
+		try {
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		setTitle("Dozentenmodul *Prototyp*");
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 603) / 2;
+		int left=(screenSize.width - 722) / 2;
+		setBounds(left, top, 603, 722);
+		//setBounds(100, 100, 603, 722);
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBounds(0, 0, 577, 80);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Hinweis VMWare Player");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 104, 567, 502);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JTextPane txtpnUmIhreVmdk = new JTextPane();
+		txtpnUmIhreVmdk.setBackground(SystemColor.menu);
+		txtpnUmIhreVmdk.setEditable(false);
+		txtpnUmIhreVmdk.setText("F\u00FCr die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player ben\u00F6tigt. Diesen k\u00F6nnen Sie sich unter folgendem Link kostenfrei downloaden.");
+		txtpnUmIhreVmdk.setBounds(10, 16, 499, 66);
+		contentPanel.add(txtpnUmIhreVmdk);
+		
+		JLabel lblNewLabel_1 = new JLabel("<html><b>Windows: </b></html>");
+		lblNewLabel_1.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseReleased(MouseEvent arg0) {
+				URI url;
+				try {
+					url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0");
+					Desktop.getDesktop().browse(url);
+				} catch (URISyntaxException | IOException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
+				
+			}
+		});
+	
+		lblNewLabel_1.setBounds(10, 93, 499, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		JCheckBox chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
+		chckbxNewCheckBox.setBounds(6, 472, 555, 23);
+		contentPanel.add(chckbxNewCheckBox);
+		
+		JLabel lbllinuxvmwarePlayer = new JLabel("<html><b>Linux:    </b></html>");
+		lbllinuxvmwarePlayer.setBounds(10, 178, 499, 14);
+		contentPanel.add(lbllinuxvmwarePlayer);
+		
+		JLabel lblvmwarePlayerDownload = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
+		lblvmwarePlayerDownload.setBounds(10, 118, 499, 14);
+		contentPanel.add(lblvmwarePlayerDownload);
+		
+		JLabel lblvmwarePlayerDownload_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
+		lblvmwarePlayerDownload_1.setBounds(10, 203, 499, 14);
+		contentPanel.add(lblvmwarePlayerDownload_1);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 630, 587, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton cancelButton = new JButton("Weiter");
+				cancelButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						MainMenue_GUI ea=new MainMenue_GUI();
+						ea.setVisible(true);
+						dispose();
+					}
+				});
+				cancelButton.setActionCommand("Cancel");
+				buttonPane.add(cancelButton);
+			}
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 617, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JSeparator separator = new JSeparator();
+			separator.setBounds(0, 91, 587, 2);
+			getContentPane().add(separator);
+		}
+		{
+			JMenuBar menuBar = new JMenuBar();
+			setJMenuBar(menuBar);
+			{
+				JMenu mnHilfe = new JMenu("Hilfe");
+				menuBar.add(mnHilfe);
+				{
+					JMenuItem mntmFaq = new JMenuItem("FAQ");
+					mnHilfe.add(mntmFaq);
+				}
+				{
+					JMenuItem mntmHilfe = new JMenuItem("Hilfe");
+					mnHilfe.add(mntmHilfe);
+				}
+			}
+		}
+		
+		
+
+	}
+}
diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java
index e0c0a9ba..60637039 100644
--- a/Dozentenmodul/src/GUI/searchRohling.java
+++ b/Dozentenmodul/src/GUI/searchRohling.java
@@ -134,7 +134,7 @@ public class searchRohling extends JFrame {
 				JButton okButton = new JButton("Zur\u00FCck");

 				okButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent arg0) {

-						ActionChooser ac=new ActionChooser();

+						MainMenue_GUI ac=new MainMenue_GUI();

 						ac.setVisible(true);

 						dispose();

 					}

@@ -147,7 +147,7 @@ public class searchRohling extends JFrame {
 				JButton cancelButton = new JButton("Weiter");

 				cancelButton.addActionListener(new ActionListener() {

 					public void actionPerformed(ActionEvent arg0) {

-						getVMwarePlayer vp=new getVMwarePlayer();

+						VmWareLink_GUI vp=new VmWareLink_GUI();

 						vp.setVisible(true);

 						dispose();

 					}

diff --git a/Dozentenmodul/src/thrift/communicate.thrift b/Dozentenmodul/src/thrift/communicate.thrift
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/Dozentenmodul/src/thrift/communicate.thrift