SQL für VL funktioniert

28 files changed, 1386 insertions, 1065 deletions

diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
index 768b1609..d7512073 100644
--- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
index 903774cd..09601747 100644
--- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
index 37e3742e..82145183 100644
--- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
+++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
index 7dbb07e9..1da4ccf2 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
index 2dab621c..3fb99365 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
index a884e957..2ccfe0bc 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
index cfba984b..f3eb6703 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
index 17930b2e..d74741a3 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class
diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
index 4b923961..768f74c0 100644
--- a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
+++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
index f2284e95..f0386d0e 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class
index 062fb71e..7b3dd158 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class
index 0d76418d..b681d9b5 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class
index 2ce28f3c..13705761 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class
index 64ebbfbe..9f7f55a7 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$5.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class
index 4b7251fa..cd35f527 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$6.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$7.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$7.class
new file mode 100644
index 00000000..6e0eb875
--- /dev/null
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$7.class
diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
index 5ae317e0..c4c5bd32 100644
--- a/Dozentenmodul/bin/GUI/SearchImage_GUI.class
+++ b/Dozentenmodul/bin/GUI/SearchImage_GUI.class
diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
index 3f984461..acb6d047 100644
--- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java
@@ -1,310 +1,345 @@
-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.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import Models.Image;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
-
-@SuppressWarnings("serial")
-public class EingabeImageTechnisch_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JSpinner spinnerCPU;
-	JSpinner spinnerRam;
-	JRadioButton rdbtnlicenseJa;
-	JRadioButton rdbtnlicenseNein;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public EingabeImageTechnisch_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		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 - 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.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");
-				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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 493);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 66, 557, 95);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		rdbtnlicenseJa = new JRadioButton("Ja");
-		rdbtnlicenseJa.setSelected(true);
-		buttonGrouplicense.add(rdbtnlicenseJa);
-		rdbtnlicenseJa.setBounds(266, 29, 109, 23);
-		panel_1.add(rdbtnlicenseJa);
-		
-		rdbtnlicenseNein = new JRadioButton("Nein");
-		buttonGrouplicense.add(rdbtnlicenseNein);
-		rdbtnlicenseNein.setBounds(377, 29, 109, 23);
-		panel_1.add(rdbtnlicenseNein);
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-		
-		JRadioButton rdbtnInternetJa = new JRadioButton("Ja");
-		buttonGroupInternet.add(rdbtnInternetJa);
-		rdbtnInternetJa.setBounds(266, 57, 109, 23);
-		panel_1.add(rdbtnInternetJa);
-		
-		JRadioButton rdbtnInternetNein = new JRadioButton("Nein");
-		rdbtnInternetNein.setSelected(true);
-		buttonGroupInternet.add(rdbtnInternetNein);
-		rdbtnInternetNein.setBounds(377, 57, 109, 23);
-		panel_1.add(rdbtnInternetNein);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				
-				EingabeImageTechnisch_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(146, 11, 46, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 172, 557, 338);
-		contentPanel.add(panel_2);
-		
-		JTextArea txtrHinweisSolltenSie = new JTextArea();
-		txtrHinweisSolltenSie.setBackground(SystemColor.menu);
-		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
-		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
-		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
-		panel_2.add(txtrHinweisSolltenSie);
-		
-		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
-		lblNewLabel_3.setBounds(10, 91, 280, 20);
-		panel_2.add(lblNewLabel_3);
-		
-		JLabel lblMindestens = new JLabel("mindestens");
-		lblMindestens.setBounds(315, 91, 60, 20);
-		panel_2.add(lblMindestens);
-		
-		spinnerRam = new JSpinner();
-		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
-		spinnerRam.setBounds(385, 88, 29, 20);
-		panel_2.add(spinnerRam);
-		
-		JLabel lblGbyte = new JLabel("GByte");
-		lblGbyte.setBounds(424, 91, 46, 20);
-		panel_2.add(lblGbyte);
-		
-		JTextArea txtrBeispielWindows = new JTextArea();
-		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");
-		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrBeispielWindows.setBackground(SystemColor.menu);
-		txtrBeispielWindows.setBounds(10, 122, 280, 55);
-		panel_2.add(txtrBeispielWindows);
-		
-		JTextArea txtrBeispielWindows_1 = new JTextArea();
-		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");
-		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtrBeispielWindows_1.setBackground(SystemColor.menu);
-		txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
-		panel_2.add(txtrBeispielWindows_1);
-		
-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
-		lblWieVieleCpus.setBounds(10, 191, 280, 20);
-		panel_2.add(lblWieVieleCpus);
-		
-		JLabel label_3 = new JLabel("mindestens");
-		label_3.setBounds(315, 191, 60, 20);
-		panel_2.add(label_3);
-		
-		spinnerCPU = new JSpinner();
-		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
-		spinnerCPU.setBounds(385, 188, 29, 20);
-		panel_2.add(spinnerCPU);
-		
-		JLabel lblKerne = new JLabel("Kerne");
-		lblKerne.setBounds(424, 191, 46, 20);
-		panel_2.add(lblKerne);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 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) {
-						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
-						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) {
-						
-
-						FTPUploader_GUI ea=new FTPUploader_GUI();
-						ea.setVisible(true);
-						dispose();
-						
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		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);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu = new JMenu("Suchen");
-		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);
-		
-	}
-}
+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.JMenuBar;

+import javax.swing.JMenu;

+import javax.swing.JMenuItem;

+import Models.Image;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import javax.swing.border.TitledBorder;

+import javax.swing.JTextArea;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import javax.swing.JRadioButton;

+import javax.swing.ButtonGroup;

+import javax.swing.JSpinner;

+import javax.swing.SpinnerNumberModel;

+

+@SuppressWarnings("serial")

+public class EingabeImageTechnisch_GUI extends JFrame {

+

+	private final JPanel contentPanel = new JPanel();

+	String[] result;

+	JSpinner spinnerCPU;

+	JSpinner spinnerRam;

+	JRadioButton rdbtnlicenseJa;

+	JRadioButton rdbtnlicenseNein;

+	JRadioButton rdbtnInternetJa;

+	JRadioButton rdbtnInternetNein;

+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();

+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();

+	/**

+	 * Launch the application.

+	 */

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

+		try {

+			EingabeImageTechnisch_GUI dialog = new EingabeImageTechnisch_GUI();

+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+			dialog.setVisible(true);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * Create the dialog.

+	 */

+	public EingabeImageTechnisch_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				System.exit(0);

+			}

+		});

+		setResizable(false);

+		

+		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 - 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.setBackground(SystemColor.menu);

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

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Eingabe Ihrer Daten");

+				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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");

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

+			panel.add(txtpnBitteWhlenSie);

+		}

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

+		contentPanel.setBackground(SystemColor.menu);

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

+		getContentPane().add(contentPanel);

+		contentPanel.setLayout(null);

+		

+		JPanel panel_1 = new JPanel();

+		panel_1.setBackground(SystemColor.menu);

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

+		panel_1.setBounds(10, 66, 557, 95);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

+		

+		JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");

+		lblNewLabel_2.setBounds(10, 30, 250, 20);

+		panel_1.add(lblNewLabel_2);

+		

+		rdbtnlicenseJa = new JRadioButton("Ja");

+		rdbtnlicenseJa.setSelected(true);

+		buttonGrouplicense.add(rdbtnlicenseJa);

+		rdbtnlicenseJa.setBounds(266, 29, 109, 23);

+		panel_1.add(rdbtnlicenseJa);

+		

+		rdbtnlicenseNein = new JRadioButton("Nein");

+		buttonGrouplicense.add(rdbtnlicenseNein);

+		rdbtnlicenseNein.setBounds(377, 29, 109, 23);

+		panel_1.add(rdbtnlicenseNein);

+		

+		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");

+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);

+		panel_1.add(lblInternetIstInnerhalb);

+		

+		rdbtnInternetJa = new JRadioButton("Ja");

+		buttonGroupInternet.add(rdbtnInternetJa);

+		rdbtnInternetJa.setBounds(266, 57, 109, 23);

+		panel_1.add(rdbtnInternetJa);

+		

+		rdbtnInternetNein = new JRadioButton("Nein");

+		rdbtnInternetNein.setSelected(true);

+		buttonGroupInternet.add(rdbtnInternetNein);

+		rdbtnInternetNein.setBounds(377, 57, 109, 23);

+		panel_1.add(rdbtnInternetNein);

+		

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

+		lblHauptmen.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				

+				EingabeImageTechnisch_GUI.this.setVisible(false);

+				MainMenue_GUI main=new MainMenue_GUI();

+				main.setVisible(true);

+			}

+		});

+		lblHauptmen.setForeground(Color.BLUE);

+		lblHauptmen.setBounds(10, 11, 61, 14);

+		contentPanel.add(lblHauptmen);

+		

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

+		label_1.setBounds(69, 11, 13, 14);

+		contentPanel.add(label_1);

+		

+		JLabel lblVlimage = new JLabel("VL-Image");

+		lblVlimage.setForeground(Color.BLUE);

+		lblVlimage.setBounds(81, 11, 45, 14);

+		contentPanel.add(lblVlimage);

+		

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

+		label_2.setBounds(133, 11, 13, 14);

+		contentPanel.add(label_2);

+		

+		JLabel lblNewLabel_1 = new JLabel("Neu");

+		lblNewLabel_1.setBounds(146, 11, 46, 14);

+		contentPanel.add(lblNewLabel_1);

+		

+		JPanel panel_2 = new JPanel();

+		panel_2.setLayout(null);

+		panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_2.setBackground(SystemColor.menu);

+		panel_2.setBounds(10, 172, 557, 338);

+		contentPanel.add(panel_2);

+		

+		JTextArea txtrHinweisSolltenSie = new JTextArea();

+		txtrHinweisSolltenSie.setBackground(SystemColor.menu);

+		txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));

+		txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");

+		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);

+		panel_2.add(txtrHinweisSolltenSie);

+		

+		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");

+		lblNewLabel_3.setBounds(10, 91, 280, 20);

+		panel_2.add(lblNewLabel_3);

+		

+		JLabel lblMindestens = new JLabel("mindestens");

+		lblMindestens.setBounds(315, 91, 60, 20);

+		panel_2.add(lblMindestens);

+		

+		spinnerRam = new JSpinner();

+		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));

+		spinnerRam.setBounds(385, 88, 29, 20);

+		panel_2.add(spinnerRam);

+		

+		JLabel lblGbyte = new JLabel("GByte");

+		lblGbyte.setBounds(424, 91, 46, 20);

+		panel_2.add(lblGbyte);

+		

+		JTextArea txtrBeispielWindows = new JTextArea();

+		txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit:  1 GByte");

+		txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));

+		txtrBeispielWindows.setBackground(SystemColor.menu);

+		txtrBeispielWindows.setBounds(10, 122, 280, 55);

+		panel_2.add(txtrBeispielWindows);

+		

+		JTextArea txtrBeispielWindows_1 = new JTextArea();

+		txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit:  1 Kern");

+		txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));

+		txtrBeispielWindows_1.setBackground(SystemColor.menu);

+		txtrBeispielWindows_1.setBounds(10, 222, 280, 55);

+		panel_2.add(txtrBeispielWindows_1);

+		

+		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");

+		lblWieVieleCpus.setBounds(10, 191, 280, 20);

+		panel_2.add(lblWieVieleCpus);

+		

+		JLabel label_3 = new JLabel("mindestens");

+		label_3.setBounds(315, 191, 60, 20);

+		panel_2.add(label_3);

+		

+		spinnerCPU = new JSpinner();

+		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));

+		spinnerCPU.setBounds(385, 188, 29, 20);

+		panel_2.add(spinnerCPU);

+		

+		JLabel lblKerne = new JLabel("Kerne");

+		lblKerne.setBounds(424, 191, 46, 20);

+		panel_2.add(lblKerne);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 640, 597, 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) {

+						

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

+						{

+							Image.image.setInternet(true);

+						}

+						else

+						{

+							Image.image.setInternet(false);

+						}

+						

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

+						{

+							Image.image.setLicenseneed(true);

+						}

+						else

+						{

+							Image.image.setLicenseneed(false);

+						}

+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

+						

+						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();

+						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) {

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

+						{

+							Image.image.setInternet(true);

+						}

+						else

+						{

+							Image.image.setInternet(false);

+						}

+						

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

+						{

+							Image.image.setLicenseneed(true);

+						}

+						else

+						{

+							Image.image.setLicenseneed(false);

+						}

+						Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

+						Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

+						FTPUploader_GUI ea=new FTPUploader_GUI();

+						ea.setVisible(true);

+						dispose();

+						

+					}

+				});

+				cancelButton.setActionCommand("Cancel");

+				buttonPane.add(cancelButton);

+			}

+		}

+		

+		JSeparator separator = new JSeparator();

+		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);

+		

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+		

+		JMenu mnNewMenu = new JMenu("Suchen");

+		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/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
index 8baf19aa..33b31667 100644
--- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java
@@ -1,373 +1,393 @@
-package GUI;
-
-import java.awt.BorderLayout;
-import rmi.*;
-import server.ServerInterface;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.EventQueue;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import java.io.File;
-import java.rmi.RemoteException;
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import downloader.UploadTask;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import Models.User;
-import java.awt.SystemColor;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import javax.swing.JMenuBar;
-import javax.swing.JMenu;
-import javax.swing.JSeparator;
-
-
-@SuppressWarnings("serial")
-public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {
-
-	@SuppressWarnings("unused")
-	private JPanel contentPane;
-	private final JPanel contentPanel = new JPanel();
-	JLabel lblNewLabel;
-	JProgressBar progressBar;
-	String host="141.79.128.121";
-	int port=21;
-	User user;
-	String filename="";
-	File uploadFile;
-	static String arg="";
-	UploadTask task;
-	JLabel UpSpeed;
-	JLabel labelfertig;
-	JLabel labelfilesize;
-	JLabel labelZeit;
-	JLabel labelverbleibend;
-	long filesize;
-	double speed;
-	long bytesread;
-	boolean taskrun=false;
-    RmiClientMethods rmi=new RmiClientMethods();
-    ServerInterface sint=rmi.getInterface();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPUploader_GUI frame = new FTPUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPUploader_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				if(taskrun==true)
-				{
-					try {
-						sint.DeleteFtpUser(user.getUsername());
-					} catch (RemoteException e1) {
-						// TODO Auto-generated catch block
-						e1.printStackTrace();
-					}
-				task.cancel(true);
-				}
-			}
-		});
-		setResizable(false);
-		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-		
-		
-		
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-		//filename=name;
-		setBackground(Color.WHITE);
-		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, 250);
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(null);
-		{
-			JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					JFileChooser fc=new JFileChooser();
-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-					
-					fc.showOpenDialog(getParent());
-					File dir=fc.getSelectedFile();
-					uploadFile=dir;
-					filename=uploadFile.getName();
-					lblNewLabel.setText(dir.getAbsolutePath());
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-		
-		lblNewLabel = new JLabel("");
-		lblNewLabel.setBounds(184, 124, 255, 23);
-		contentPanel.add(lblNewLabel);
-		
-		JButton btnDownloadStarten = new JButton("Upload starten");
-		btnDownloadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonUploadActionPerformed(arg0);
-				
-			}
-		});
-
-		btnDownloadStarten.setBounds(10, 330, 141, 23);
-		contentPanel.add(btnDownloadStarten);
-		
-		progressBar = new JProgressBar(0,100);
-		progressBar.setStringPainted(true);
-
-		
-		progressBar.setBounds(10, 158, 577, 30);
-		contentPanel.add(progressBar);
-		
-		JLabel label = new JLabel("Downloadgeschwindigkeit:");
-		label.setBounds(10, 199, 141, 14);
-		contentPanel.add(label);
-		
-		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(10, 249, 46, 14);
-		contentPanel.add(label_1);
-		
-		labelfertig = new JLabel("0");
-		labelfertig.setBounds(66, 249, 108, 14);
-		contentPanel.add(labelfertig);
-		
-		UpSpeed = new JLabel("0");
-		UpSpeed.setBounds(329, 199, 95, 14);
-		contentPanel.add(UpSpeed);
-		
-		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(184, 249, 46, 14);
-		contentPanel.add(label_4);
-		
-		labelfilesize = new JLabel("0");
-		labelfilesize.setBounds(240, 249, 108, 14);
-		contentPanel.add(labelfilesize);
-		
-		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(10, 274, 71, 14);
-		contentPanel.add(label_6);
-		
-		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
-		label_7.setBounds(10, 224, 150, 14);
-		contentPanel.add(label_7);
-		
-		labelZeit = new JLabel("0");
-		labelZeit.setBounds(329, 224, 117, 14);
-		contentPanel.add(labelZeit);
-		
-		labelverbleibend = new JLabel("0");
-		labelverbleibend.setBounds(91, 274, 108, 14);
-		contentPanel.add(labelverbleibend);
-		
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 11, 577, 57);
-		contentPanel.add(panel);
-		
-		JLabel label_2 = new JLabel("Eingabe Ihrer Daten");
-		label_2.setFont(new Font("Tahoma", Font.BOLD, 18));
-		label_2.setBounds(10, 11, 509, 22);
-		panel.add(label_2);
-		
-		JTextPane textPane = new JTextPane();
-		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");
-		textPane.setEditable(false);
-		textPane.setBackground(SystemColor.menu);
-		textPane.setBounds(10, 36, 509, 32);
-		panel.add(textPane);
-		
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 597, 2);
-		contentPanel.add(separator);
-		
-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
-		lblNewLabel_1.setForeground(Color.BLUE);
-		lblNewLabel_1.setBounds(20, 88, 61, 20);
-		contentPanel.add(lblNewLabel_1);
-		
-		JLabel label_3 = new JLabel(">");
-		label_3.setBounds(80, 91, 14, 14);
-		contentPanel.add(label_3);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(91, 88, 46, 20);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_5 = new JLabel(">");
-		label_5.setBounds(139, 91, 14, 14);
-		contentPanel.add(label_5);
-		
-		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");
-		lblNeubearbeiten.setBounds(149, 91, 108, 14);
-		contentPanel.add(lblNeubearbeiten);
-		
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		contentPanel.add(separator_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				JButton ButtonReady = new JButton("Abschlie\u00DFen");
-				ButtonReady.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						dispose();
-						if(taskrun==true)
-						{
-						try {
-							sint.DeleteFtpUser(user.getUsername());
-						} catch (RemoteException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-						task.cancel(true);
-						}
-						
-					}
-				});
-				
-				JButton buttonCancel = new JButton("Schlie\u00DFen");
-				buttonCancel.setActionCommand("Cancel");
-				buttonPane.add(buttonCancel);
-				ButtonReady.setActionCommand("Cancel");
-				buttonPane.add(ButtonReady);
-			}
-		}
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnHillfe = new JMenu("Hillfe");
-		menuBar.add(mnHillfe);
-		setVisible(true);
-		
-	}
-	
-    private void buttonUploadActionPerformed(ActionEvent event) {
-		// File (or directory) with old name
-	   // File file = new File(lblNewLabel.getText());
-
-	    // File (or directory) with new name
-	    //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");
-	    //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");
-	    
-
-	    // Rename file (or directory)
-	    //boolean success = file.renameTo(file2);
-	    //if (!success) {
-	        // File was not successfully renamed
-	    	//System.out.println("Not OK");
-	    //}
-	    //else
-	    //{
-	    	//System.out.println("OK");
-	    //}
-        progressBar.setValue(0);
-
-        try {
-			user=sint.getFtpUser();
-		} catch (RemoteException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-        task=new UploadTask(host,port,user.getUsername(),user.getPass(),user.getPath(), uploadFile);
-        task.addPropertyChangeListener(this);
-        task.execute();
-        taskrun=true;
-        
-        //createXML();
-        //TransferToSatellit();
-        
-    	
-    }
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-        if ("progress" == arg0.getPropertyName()) {
-            int progress = (Integer) arg0.getNewValue();
-            progressBar.setValue(progress);
-        }
-        if("speed"==arg0.getPropertyName()){
-        	speed=(double)arg0.getNewValue();
-        	//if(speed<=1){
-        		
-        		UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");
-        		
-        //	}else
-        	//{
-        		//double MBSpeed=speed/1024;
-        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));
-        	//}
-        	
-        }
-        if("bytesread"==arg0.getPropertyName())
-        {
-        	bytesread=(long)arg0.getNewValue();
-        	labelfertig.setText((bytesread/1024/1024)+" MB");
-        	labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");
-        	
-        	
-        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");
-        	
-        
-        }
-        if("filesize"==arg0.getPropertyName())
-        {
-        	filesize=(long)arg0.getNewValue();
-        	labelfilesize.setText((filesize/1024/1024)+" MB");
-        	
-        }
-		
-	}
+package GUI;

+

+import java.awt.BorderLayout;

+import rmi.*;

+import server.ServerInterface;

+import java.awt.Color;

+import java.awt.Dimension;

+import java.awt.EventQueue;

+import java.awt.FlowLayout;

+import java.awt.Toolkit;

+import java.io.File;

+import java.rmi.RemoteException;

+import javax.swing.JButton;

+import javax.swing.JFileChooser;

+import javax.swing.JFrame;

+import javax.swing.JLabel;

+import javax.swing.JPanel;

+import javax.swing.JProgressBar;

+import javax.swing.SwingConstants;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

+import downloader.UploadTask;

+import java.awt.event.ActionListener;

+import java.awt.event.ActionEvent;

+import java.beans.PropertyChangeEvent;

+import java.beans.PropertyChangeListener;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+

+import Models.Image;

+import Models.User;

+import Models.person;

+

+import java.awt.SystemColor;

+import java.awt.Font;

+import javax.swing.JTextPane;

+import javax.swing.JMenuBar;

+import javax.swing.JMenu;

+import javax.swing.JSeparator;

+

+

+@SuppressWarnings("serial")

+public class FTPUploader_GUI extends JFrame implements PropertyChangeListener {

+

+	@SuppressWarnings("unused")

+	private JPanel contentPane;

+	private final JPanel contentPanel = new JPanel();

+	JLabel lblNewLabel;

+	JProgressBar progressBar;

+	String host="141.79.128.121";

+	int port=21;

+	User user;

+	String filename="";

+	File uploadFile;

+	static String arg="";

+	UploadTask task;

+	JLabel UpSpeed;

+	JLabel labelfertig;

+	JLabel labelfilesize;

+	JLabel labelZeit;

+	JLabel labelverbleibend;

+	long filesize;

+	double speed;

+	long bytesread;

+	boolean taskrun=false;

+    RmiClientMethods rmi=new RmiClientMethods();

+    ServerInterface sint=rmi.getInterface();

+	/**

+	 * Launch the application.

+	 */

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

+		EventQueue.invokeLater(new Runnable() {

+			public void run() {

+				try {

+					FTPUploader_GUI frame = new FTPUploader_GUI();

+					frame.setVisible(true);

+				} catch (Exception e) {

+					e.printStackTrace();

+				}

+			}

+		});

+	}

+

+	/**

+	 * Create the frame.

+	 */

+	public FTPUploader_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				if(taskrun==true)

+				{

+					try {

+						sint.DeleteFtpUser(user.getUsername());

+					} catch (RemoteException e1) {

+						// TODO Auto-generated catch block

+						e1.printStackTrace();

+					}

+				task.cancel(true);

+				}

+			}

+		});

+		setResizable(false);

+		//setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+		

+		

+		

+		try {

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

+		} catch (ClassNotFoundException | InstantiationException

+				| IllegalAccessException | UnsupportedLookAndFeelException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+

+		//filename=name;

+		setBackground(Color.WHITE);

+		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, 250);

+		getContentPane().setLayout(new BorderLayout());

+		contentPanel.setBackground(SystemColor.menu);

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

+		getContentPane().add(contentPanel, BorderLayout.CENTER);

+		contentPanel.setLayout(null);

+		{

+			JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");

+			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {

+				public void actionPerformed(ActionEvent arg0) {

+					JFileChooser fc=new JFileChooser();

+					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);

+					

+					fc.showOpenDialog(getParent());

+					File dir=fc.getSelectedFile();

+					uploadFile=dir;

+					filename=uploadFile.getName();

+					lblNewLabel.setText(dir.getAbsolutePath());

+				}

+			});

+

+			btnSpeicherortAuswhlen.setBounds(10, 124, 141, 23);

+			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

+			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);

+			contentPanel.add(btnSpeicherortAuswhlen);

+		}

+		

+		lblNewLabel = new JLabel("");

+		lblNewLabel.setBounds(184, 124, 255, 23);

+		contentPanel.add(lblNewLabel);

+		

+		JButton btnDownloadStarten = new JButton("Upload starten");

+		btnDownloadStarten.addActionListener(new ActionListener() {

+			public void actionPerformed(ActionEvent arg0) {

+				buttonUploadActionPerformed(arg0);

+				

+			}

+		});

+

+		btnDownloadStarten.setBounds(10, 330, 141, 23);

+		contentPanel.add(btnDownloadStarten);

+		

+		progressBar = new JProgressBar(0,100);

+		progressBar.setStringPainted(true);

+

+		

+		progressBar.setBounds(10, 158, 577, 30);

+		contentPanel.add(progressBar);

+		

+		JLabel label = new JLabel("Downloadgeschwindigkeit:");

+		label.setBounds(10, 199, 141, 14);

+		contentPanel.add(label);

+		

+		JLabel label_1 = new JLabel("Fertig:");

+		label_1.setBounds(10, 249, 46, 14);

+		contentPanel.add(label_1);

+		

+		labelfertig = new JLabel("0");

+		labelfertig.setBounds(66, 249, 108, 14);

+		contentPanel.add(labelfertig);

+		

+		UpSpeed = new JLabel("0");

+		UpSpeed.setBounds(329, 199, 95, 14);

+		contentPanel.add(UpSpeed);

+		

+		JLabel label_4 = new JLabel("von:");

+		label_4.setBounds(184, 249, 46, 14);

+		contentPanel.add(label_4);

+		

+		labelfilesize = new JLabel("0");

+		labelfilesize.setBounds(240, 249, 108, 14);

+		contentPanel.add(labelfilesize);

+		

+		JLabel label_6 = new JLabel("Verbleibend:");

+		label_6.setBounds(10, 274, 71, 14);

+		contentPanel.add(label_6);

+		

+		JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");

+		label_7.setBounds(10, 224, 150, 14);

+		contentPanel.add(label_7);

+		

+		labelZeit = new JLabel("0");

+		labelZeit.setBounds(329, 224, 117, 14);

+		contentPanel.add(labelZeit);

+		

+		labelverbleibend = new JLabel("0");

+		labelverbleibend.setBounds(91, 274, 108, 14);

+		contentPanel.add(labelverbleibend);

+		

+		JPanel panel = new JPanel();

+		panel.setLayout(null);

+		panel.setBackground(SystemColor.menu);

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

+		contentPanel.add(panel);

+		

+		JLabel label_2 = new JLabel("Eingabe Ihrer Daten");

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

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

+		panel.add(label_2);

+		

+		JTextPane textPane = new JTextPane();

+		textPane.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an");

+		textPane.setEditable(false);

+		textPane.setBackground(SystemColor.menu);

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

+		panel.add(textPane);

+		

+		JSeparator separator = new JSeparator();

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

+		contentPanel.add(separator);

+		

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

+		lblNewLabel_1.setForeground(Color.BLUE);

+		lblNewLabel_1.setBounds(20, 88, 61, 20);

+		contentPanel.add(lblNewLabel_1);

+		

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

+		label_3.setBounds(80, 91, 14, 14);

+		contentPanel.add(label_3);

+		

+		JLabel lblVlimage = new JLabel("VL-Image");

+		lblVlimage.setForeground(Color.BLUE);

+		lblVlimage.setBounds(91, 88, 46, 20);

+		contentPanel.add(lblVlimage);

+		

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

+		label_5.setBounds(139, 91, 14, 14);

+		contentPanel.add(label_5);

+		

+		JLabel lblNeubearbeiten = new JLabel("Neu/Bearbeiten");

+		lblNeubearbeiten.setBounds(149, 91, 108, 14);

+		contentPanel.add(lblNeubearbeiten);

+		

+		JSeparator separator_1 = new JSeparator();

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

+		contentPanel.add(separator_1);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBackground(UIManager.getColor("Button.background"));

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

+			getContentPane().add(buttonPane, BorderLayout.SOUTH);

+			{

+				JButton ButtonReady = new JButton("Abschlie\u00DFen");

+				ButtonReady.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent e) {

+						writeData();

+						dispose();

+						if(taskrun==true)

+						{

+						try {

+							sint.DeleteFtpUser(user.getUsername());

+							

+						} catch (RemoteException e1) {

+							// TODO Auto-generated catch block

+							e1.printStackTrace();

+						}

+						task.cancel(true);

+						}

+						

+					}

+				});

+				

+				JButton buttonCancel = new JButton("Schlie\u00DFen");

+				buttonCancel.setActionCommand("Cancel");

+				buttonPane.add(buttonCancel);

+				ButtonReady.setActionCommand("Cancel");

+				buttonPane.add(ButtonReady);

+			}

+		}

+		

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+		

+		JMenu mnHillfe = new JMenu("Hillfe");

+		menuBar.add(mnHillfe);

+		setVisible(true);

+		

+	}

+	

+    private void buttonUploadActionPerformed(ActionEvent event) {

+		// File (or directory) with old name

+	   // File file = new File(lblNewLabel.getText());

+

+	    // File (or directory) with new name

+	    //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");

+	    //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");

+	    

+

+	    // Rename file (or directory)

+	    //boolean success = file.renameTo(file2);

+	    //if (!success) {

+	        // File was not successfully renamed

+	    	//System.out.println("Not OK");

+	    //}

+	    //else

+	    //{

+	    	//System.out.println("OK");

+	    //}

+        progressBar.setValue(0);

+

+        try {

+			user=sint.getFtpUser();

+		} catch (RemoteException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+

+        task=new UploadTask(host,port,user.getUsername(),user.getPass(),user.getPath(), uploadFile);

+        task.addPropertyChangeListener(this);

+        task.execute();

+        taskrun=true;

+        

+        //createXML();

+        //TransferToSatellit();

+        

+    	

+    }

+

+	public void propertyChange(PropertyChangeEvent arg0) {

+        if ("progress" == arg0.getPropertyName()) {

+            int progress = (Integer) arg0.getNewValue();

+            progressBar.setValue(progress);

+        }

+        if("speed"==arg0.getPropertyName()){

+        	speed=(double)arg0.getNewValue();

+        	//if(speed<=1){

+        		

+        		UpSpeed.setText(String.valueOf(speed).substring(0,String.valueOf(speed).lastIndexOf(".")+3)+" MB/s");

+        		

+        //	}else

+        	//{

+        		//double MBSpeed=speed/1024;

+        		//downspeed.setText(String.valueOf((MBSpeed)).substring(0, String.valueOf(MBSpeed).indexOf(".")));

+        	//}

+        	

+        }

+        if("bytesread"==arg0.getPropertyName())

+        {

+        	bytesread=(long)arg0.getNewValue();

+        	labelfertig.setText((bytesread/1024/1024)+" MB");

+        	labelverbleibend.setText(((filesize/1024/1024)-(bytesread/1024/1024))+" MB");

+        	

+        	

+        	labelZeit.setText(String.valueOf(((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60)+1).substring(0,String.valueOf((((filesize/1024/1024)-(bytesread/1024/1024))/speed)/60).lastIndexOf("."))+ " Minuten");

+        	

+        

+        }

+        if("filesize"==arg0.getPropertyName())

+        {

+        	filesize=(long)arg0.getNewValue();

+        	labelfilesize.setText((filesize/1024/1024)+" MB");

+        	

+        }

+		        	

+        }

+	

+    public boolean writeData(){

+    	

+    	try {

+			sint.writeVLdata(Image.image.getImagename(), person.verantowrtlicher.getVorname(), person.verantowrtlicher.getName(), person.verantowrtlicher.getHochschule(), person.verantowrtlicher.getEMail(), person.verantowrtlicher.getTel(), person.verantowrtlicher.getFakultät(), Image.image.isLicenseneed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu());

+		} catch (RemoteException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+			return false;

+		}

+		return true;

+    	

+    	

+    }

 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java
index ca3329b2..e995c214 100644
--- a/Dozentenmodul/src/GUI/SearchImage_GUI.java
+++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java
@@ -1,375 +1,403 @@
-package GUI;
-
-
-import java.awt.BorderLayout;
-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.ScrollPaneLayout;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.Border;
-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 Models.Image;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import javax.swing.JTextArea;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import javax.swing.JRadioButton;
-import javax.swing.ButtonGroup;
-import javax.swing.JSpinner;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.JTextField;
-import javax.swing.JTabbedPane;
-import java.awt.Panel;
-import javax.swing.JTable;
-import javax.swing.plaf.basic.BasicTabbedPaneUI.TabbedPaneLayout;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.JScrollPane;
-import java.awt.ScrollPane;
-
-@SuppressWarnings("serial")
-public class SearchImage_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	private JTextField textFieldName;
-	private JTextField textFieldOS;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			SearchImage_GUI dialog = new SearchImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchImage_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		setResizable(false);
-		
-		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 - 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.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
-				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 531);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 49, 557, 131);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-		
-		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
-		lblNewLabel_2.setBounds(10, 30, 250, 20);
-		panel_1.add(lblNewLabel_2);
-		
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-		
-		textFieldName = new JTextField();
-		textFieldName.setBounds(270, 30, 250, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-		
-		textFieldOS = new JTextField();
-		textFieldOS.setColumns(10);
-		textFieldOS.setBounds(270, 58, 250, 20);
-		panel_1.add(textFieldOS);
-		
-		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
-		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
-				es.setVisible(true);
-			}
-		});
-		lblErweiterteSuche.setForeground(Color.BLUE);
-		
-		lblErweiterteSuche.setBounds(431, 106, 89, 14);
-		panel_1.add(lblErweiterteSuche);
-		
-		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				
-				SearchImage_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
-				main.setVisible(true);
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 11, 61, 14);
-		contentPanel.add(lblHauptmen);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 11, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblVlimage = new JLabel("VL-Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-		
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 11, 13, 14);
-		contentPanel.add(label_2);
-		
-		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
-		lblNewLabel_1.setBounds(146, 11, 85, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-
-		tabbedPane.setBounds(10, 197, 557, 300);
-		contentPanel.add(tabbedPane);
-		
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		JTable tablemyImages=new JTable();
-		tablemyImages.setModel(new DefaultTableModel(
-			new Object[][] {
-			},
-			new String[] {
-				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
-			}
-		));
-		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-		
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-		JTable tableCoopImages=new JTable();
-		tableCoopImages.setModel(new DefaultTableModel(
-			new Object[][] {
-			},
-			new String[] {
-				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
-			}
-		));
-		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
-		
-		JScrollPane scrollPanePublicImages = new JScrollPane();
-		JTable tablePublicImages=new JTable();
-		tablePublicImages.setModel(new DefaultTableModel(
-			new Object[][] {
-			},
-			new String[] {
-				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
-			}
-		));
-		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicImages.setViewportView(tablePublicImages);
-		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
-		
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		JTable tablePublicVorlagen=new JTable();
-		tablePublicVorlagen.setModel(new DefaultTableModel(
-			new Object[][] {
-			},
-			new String[] {
-				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
-			}
-		));
-		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
-		
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		JTable tableAllImages=new JTable();
-		tableAllImages.setModel(new DefaultTableModel(
-			new Object[][] {
-			},
-			new String[] {
-				"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"
-			}
-		));
-		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
-		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
-
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-		
-		JButton btnDownload = new JButton("Download");
-		btnDownload.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
-				down.setVisible(true);
-				SearchImage_GUI.this.setVisible(false);
-			}
-		});
-		btnDownload.setBounds(478, 508, 89, 23);
-		contentPanel.add(btnDownload);
-		
-		JButton btnFilterLschen = new JButton("Filter l\u00F6schen");
-		btnFilterLschen.setBounds(358, 508, 110, 23);
-		contentPanel.add(btnFilterLschen);
-
-
-
-		
-
-
-		
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 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) {
-						//Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());
-						//Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());
-						
-						MainMenue_GUI main=new MainMenue_GUI();
-						main.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) {
-						
-
-						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
-						ea.setVisible(true);
-						dispose();
-						
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		
-		JSeparator separator = new JSeparator();
-		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);
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		JMenu mnNewMenu = new JMenu("Suchen");
-		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);
-		
-	}
-}
+package GUI;

+

+

+import java.awt.BorderLayout;

+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.ScrollPaneLayout;

+import javax.swing.UIManager;

+import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.Border;

+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 Models.Image;

+import java.awt.event.WindowAdapter;

+import java.awt.event.WindowEvent;

+import javax.swing.border.TitledBorder;

+import javax.swing.JTextArea;

+import java.awt.event.MouseAdapter;

+import java.awt.event.MouseEvent;

+import javax.swing.JRadioButton;

+import javax.swing.ButtonGroup;

+import javax.swing.JSpinner;

+import javax.swing.SpinnerNumberModel;

+import javax.swing.JTextField;

+import javax.swing.JTabbedPane;

+import java.awt.Panel;

+import javax.swing.JTable;

+import javax.swing.plaf.basic.BasicTabbedPaneUI.TabbedPaneLayout;

+import javax.swing.table.DefaultTableModel;

+import javax.swing.table.TableModel;

+import javax.swing.JScrollPane;

+

+import rmi.RmiClientMethods;

+import server.ServerInterface;

+

+import java.awt.ScrollPane;

+import java.rmi.RemoteException;

+import java.sql.ResultSet;

+import java.sql.SQLException;

+import java.util.ArrayList;

+import java.util.Iterator;

+import java.util.List;

+import javax.swing.JComboBox;

+

+@SuppressWarnings("serial")

+public class SearchImage_GUI extends JFrame {

+

+	private final JPanel contentPanel = new JPanel();

+	String[] result;

+	JRadioButton rdbtnInternetJa;

+	JRadioButton rdbtnInternetNein;

+	private final ButtonGroup buttonGrouplicense = new ButtonGroup();

+	private final ButtonGroup buttonGroupInternet = new ButtonGroup();

+	private JTextField textFieldName;

+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};

+    RmiClientMethods rmi=new RmiClientMethods();

+    ServerInterface sint=rmi.getInterface();

+    

+	/**

+	 * Launch the application.

+	 */

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

+		try {

+			SearchImage_GUI dialog = new SearchImage_GUI();

+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+			dialog.setVisible(true);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

+	}

+

+	/**

+	 * Create the dialog.

+	 */

+	public SearchImage_GUI() {

+		addWindowListener(new WindowAdapter() {

+			@Override

+			public void windowClosing(WindowEvent arg0) {

+				System.exit(0);

+			}

+		});

+		setResizable(false);

+		

+		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 - 603) / 2;

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

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

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

+		

+

+		final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );

+		final DefaultTableModel model = new DefaultTableModel( titles, 0 );

+		

+		

+		getContentPane().setLayout(null);

+		{

+			JPanel panel = new JPanel();

+			panel.setBackground(SystemColor.menu);

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

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");

+				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("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");

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

+			panel.add(txtpnBitteWhlenSie);

+		}

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

+		contentPanel.setBackground(SystemColor.menu);

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

+		getContentPane().add(contentPanel);

+		contentPanel.setLayout(null);

+		

+		JPanel panel_1 = new JPanel();

+		panel_1.setBackground(SystemColor.menu);

+		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));

+		panel_1.setBounds(10, 49, 557, 131);

+		contentPanel.add(panel_1);

+		panel_1.setLayout(null);

+		

+		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");

+		lblNewLabel_2.setBounds(10, 30, 250, 20);

+		panel_1.add(lblNewLabel_2);

+		

+		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");

+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);

+		panel_1.add(lblInternetIstInnerhalb);

+		

+		textFieldName = new JTextField();

+		textFieldName.setBounds(270, 30, 250, 20);

+		panel_1.add(textFieldName);

+		textFieldName.setColumns(10);

+		

+		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");

+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				ExtendedSearch_GUI es=new ExtendedSearch_GUI();

+				es.setVisible(true);

+			}

+		});

+		lblErweiterteSuche.setForeground(Color.BLUE);

+		

+		lblErweiterteSuche.setBounds(431, 106, 89, 14);

+		panel_1.add(lblErweiterteSuche);

+		

+		JComboBox comboBox = new JComboBox();

+		try {

+			List<String> list=sint.getAllOS();

+			for(int i=0;i<list.size();i++)

+			{

+			comboBox.addItem(list.get(i));

+			}

+		} catch (RemoteException e2) {

+			// TODO Auto-generated catch block

+			e2.printStackTrace();

+		}

+		comboBox.addActionListener(new ActionListener() {

+			public void actionPerformed(ActionEvent arg0) {

+				DefaultTableModel modeltemp = new DefaultTableModel( titles, 0 );

+				//todo

+			}

+		});

+		comboBox.setBounds(270, 58, 250, 20);

+		panel_1.add(comboBox);

+		

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

+		lblHauptmen.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseClicked(MouseEvent arg0) {

+				

+				SearchImage_GUI.this.setVisible(false);

+				MainMenue_GUI main=new MainMenue_GUI();

+				main.setVisible(true);

+			}

+		});

+		lblHauptmen.setForeground(Color.BLUE);

+		lblHauptmen.setBounds(10, 11, 61, 14);

+		contentPanel.add(lblHauptmen);

+		

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

+		label_1.setBounds(69, 11, 13, 14);

+		contentPanel.add(label_1);

+		

+		JLabel lblVlimage = new JLabel("VL-Image");

+		lblVlimage.setForeground(Color.BLUE);

+		lblVlimage.setBounds(81, 11, 45, 14);

+		contentPanel.add(lblVlimage);

+		

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

+		label_2.setBounds(133, 11, 13, 14);

+		contentPanel.add(label_2);

+		

+		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");

+		lblNewLabel_1.setBounds(146, 11, 85, 14);

+		contentPanel.add(lblNewLabel_1);

+		

+		JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);

+

+		tabbedPane.setBounds(10, 197, 557, 300);

+		contentPanel.add(tabbedPane);

+		

+		JScrollPane scrollPaneMyImage = new JScrollPane();

+		JTable tablemyImages=new JTable();

+		tablemyImages.setModel(model);

+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPaneMyImage.setViewportView(tablemyImages);

+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);

+		

+		JScrollPane scrollPaneCoopImages = new JScrollPane();

+		JTable tableCoopImages=new JTable();

+		tableCoopImages.setModel(model);

+		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPaneCoopImages.setViewportView(tableCoopImages);

+		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);

+		

+		JScrollPane scrollPanePublicImages = new JScrollPane();

+		JTable tablePublicImages=new JTable();

+		tablePublicImages.setModel(model);

+		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPanePublicImages.setViewportView(tablePublicImages);

+		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);

+		

+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();

+		JTable tablePublicVorlagen=new JTable();

+		tablePublicVorlagen.setModel(model);

+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();

+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();

+

+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);

+		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);

+		

+		JScrollPane scrollPaneAllImages = new JScrollPane();

+		JTable tableAllImages=new JTable();

+		tableAllImages.setModel(modelAll);

+		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();

+		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();

+		

+		List<Object[]> images;

+		try {

+			images = sint.getImageList();

+			Iterator<Object[]> i=images.iterator();

+			int x=0;

+			

+			while(i.hasNext())

+			{

+				i.next();

+				

+				modelAll.addRow(images.get(x));

+				x++;

+			}

+		} catch (RemoteException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+

+		

+

+		scrollPaneAllImages.setViewportView(tableAllImages);

+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);

+		

+		JButton btnDownload = new JButton("Download");

+		btnDownload.addActionListener(new ActionListener() {

+			public void actionPerformed(ActionEvent arg0) {

+				FTPDownloader_GUI down=new FTPDownloader_GUI("Test");

+				down.setVisible(true);

+				SearchImage_GUI.this.setVisible(false);

+			}

+		});

+		btnDownload.setBounds(478, 508, 89, 23);

+		contentPanel.add(btnDownload);

+		

+		JButton btnFilterLschen = new JButton("Filter l\u00F6schen");

+		btnFilterLschen.setBounds(358, 508, 110, 23);

+		contentPanel.add(btnFilterLschen);

+

+

+

+		

+

+

+		

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 640, 597, 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) {

+						//Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue());

+						//Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue());

+						

+						MainMenue_GUI main=new MainMenue_GUI();

+						main.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) {

+						

+

+						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();

+						ea.setVisible(true);

+						dispose();

+						

+					}

+				});

+				cancelButton.setActionCommand("Cancel");

+				buttonPane.add(cancelButton);

+			}

+		}

+		

+		JSeparator separator = new JSeparator();

+		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);

+		

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+		

+		JMenu mnNewMenu = new JMenu("Suchen");

+		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_V1/WebContent/GUI/de/menü.html b/Dozentenmodul_V1/WebContent/GUI/de/menü.html
new file mode 100644
index 00000000..ee5f3f96
--- /dev/null
+++ b/Dozentenmodul_V1/WebContent/GUI/de/menü.html
@@ -0,0 +1,9 @@
+<!-- Erzeugt das Navigationsmenü für die Webanwendung -->

+<ul class="vertical-list">

+    <li><a href='/Dozentenmodul_V1/GUI/de/Home.jsp' class='button'>Home</a></li>

+    <li><a href='/Dozentenmodul_V1/GUI/de/createVL_allgemein.jsp' class='button'>VL erzeugen</a></li>

+    <!--<li><a href='/' class='button'>VL bearbeiten</a></li>

+    <li><a href='/' class='button'>Einstellungen</a></li>-->

+    <li><a href='/Dozentenmodul_V1/GUI/de/OTRS.jsp' class='button'>Wartung</a></li>

+    <li><a href='/' class='button'>Logout</a></li>

+</ul>

diff --git a/Dozentenmodul_V1/bin/WebContent/GUI/de/menü.html b/Dozentenmodul_V1/bin/WebContent/GUI/de/menü.html
new file mode 100644
index 00000000..ee5f3f96
--- /dev/null
+++ b/Dozentenmodul_V1/bin/WebContent/GUI/de/menü.html
@@ -0,0 +1,9 @@
+<!-- Erzeugt das Navigationsmenü für die Webanwendung -->

+<ul class="vertical-list">

+    <li><a href='/Dozentenmodul_V1/GUI/de/Home.jsp' class='button'>Home</a></li>

+    <li><a href='/Dozentenmodul_V1/GUI/de/createVL_allgemein.jsp' class='button'>VL erzeugen</a></li>

+    <!--<li><a href='/' class='button'>VL bearbeiten</a></li>

+    <li><a href='/' class='button'>Einstellungen</a></li>-->

+    <li><a href='/Dozentenmodul_V1/GUI/de/OTRS.jsp' class='button'>Wartung</a></li>

+    <li><a href='/' class='button'>Logout</a></li>

+</ul>

diff --git a/Dozentenmodulserver/bin/server/ServerInterface.class b/Dozentenmodulserver/bin/server/ServerInterface.class
index 411a676d..146aa871 100644
--- a/Dozentenmodulserver/bin/server/ServerInterface.class
+++ b/Dozentenmodulserver/bin/server/ServerInterface.class
diff --git a/Dozentenmodulserver/bin/server/ServerMethod.class b/Dozentenmodulserver/bin/server/ServerMethod.class
index 4b4096d1..01b5288c 100644
--- a/Dozentenmodulserver/bin/server/ServerMethod.class
+++ b/Dozentenmodulserver/bin/server/ServerMethod.class
diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class
index 245013e2..cb55c2de 100644
--- a/Dozentenmodulserver/bin/sql/SQL.class
+++ b/Dozentenmodulserver/bin/sql/SQL.class
diff --git a/Dozentenmodulserver/src/server/ServerInterface.java b/Dozentenmodulserver/src/server/ServerInterface.java
index bce713c0..49d7adb9 100644
--- a/Dozentenmodulserver/src/server/ServerInterface.java
+++ b/Dozentenmodulserver/src/server/ServerInterface.java
@@ -2,6 +2,7 @@ package server;
 import java.rmi.*;

 import java.sql.ResultSet;

 import java.util.ArrayList;

+import java.util.List;

 

 import Models.User;

 

@@ -11,5 +12,7 @@ public interface ServerInterface extends Remote
         public int DeleteFtpUser(String user) throws RemoteException;

         public ArrayList<String> getImages() throws RemoteException;

         public String getPathOfImage(String name) throws RemoteException;

-        

+        public boolean writeVLdata(String imagename, String firstname, String lastname,String university, String Mail, String Tel, String Fak, boolean license, boolean internet, int ram, int cpu) throws RemoteException;

+        public List<Object[]> getImageList() throws RemoteException;

+        public List<String> getAllOS() throws RemoteException;

 }

diff --git a/Dozentenmodulserver/src/server/ServerMethod.java b/Dozentenmodulserver/src/server/ServerMethod.java
index 1039e238..1f66fb6b 100644
--- a/Dozentenmodulserver/src/server/ServerMethod.java
+++ b/Dozentenmodulserver/src/server/ServerMethod.java
@@ -7,8 +7,11 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

 import java.sql.Connection;

 import java.sql.ResultSet;

+import java.sql.ResultSetMetaData;

 import java.sql.SQLException;

 import java.util.ArrayList;

+import java.util.Date;

+import java.util.List;

 import java.util.UUID;

 import Models.*;

 import sql.SQL;

@@ -17,7 +20,8 @@ import sql.SQL;
 public class ServerMethod extends UnicastRemoteObject implements ServerInterface

 {

     protected static String          m_strName;

- 

+    SQL sql=new SQL();

+    Connection con=sql.getConnection();

 

     public ServerMethod() throws RemoteException

     {

@@ -63,8 +67,8 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 

 	@Override

 	public int DeleteFtpUser(String user) throws RemoteException {

-		SQL sql=new SQL();

-		Connection con=sql.getConnection();

+		

+		

 		int ret = sql.DeleteUser(con, user);

 		return ret;

 	}

@@ -86,8 +90,7 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 	public ArrayList<String> getImages(){

 		

 		

-		SQL sql=new SQL();

-		Connection con=sql.getConnection();

+

 		ResultSet rs= sql.getImage(con);

 		ArrayList<String> al=new ArrayList<String>();

 		try {

@@ -107,8 +110,7 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 	public String getPathOfImage(String name){

 		

 		String path = null;

-		SQL sql=new SQL();

-		Connection con=sql.getConnection();

+

 		ResultSet rs= sql.getPathOfImage(con, name);

 		

 		try {

@@ -125,4 +127,77 @@ public class ServerMethod extends UnicastRemoteObject implements ServerInterface
 		return path;

 	}

 

+	@Override

+	public boolean writeVLdata(String imagename, String firstname,

+			String lastname, String university, String Mail, String Tel,

+			String Fak, boolean license, boolean internet, int ram, int cpu)

+			throws RemoteException {

+		String login="tete";

+		System.out.println("1");

+		int pk_institution=sql.setInstitution(con, university);

+		System.out.println("2");

+		int pk_person=sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution);

+		System.out.println("3");

+		sql.setImageData(con, pk_person, license, internet, cpu, ram, imagename);

+		System.out.println("4");

+		// TODO Auto-generated method stub

+		return true;

+	}

+

+

+

+	@Override

+	public List<Object[]> getImageList() throws RemoteException {

+		

+		ResultSet resWith=sql.getImageListWithLectures(con);

+		ResultSet resWithout=sql.getImageListWithoutLectures(con);

+		 

+		try {

+			List<Object[]> listWith = ResSetToObject(resWith);

+			List<Object[]> listWithout=ResSetToObject(resWithout);

+			listWith.addAll(listWith.size(), listWithout);

+			return listWith;

+		} catch (SQLException e1) {

+			// TODO Auto-generated catch block

+			e1.printStackTrace();

+		}

+

+		return null;

+	}

+

+	public List<Object[]> ResSetToObject(ResultSet res) throws SQLException

+	{

+		

+		ResultSetMetaData rsmd = res.getMetaData();

+		List<Object[]> list=new ArrayList<>();

+		while(res.next()){

+			 Object[] objects = new Object[rsmd.getColumnCount()];

+			 // tanks to umit ozkan for the bug fix!

+			 for(int i=0;i<rsmd.getColumnCount();i++){

+			  objects[i]=res.getObject(i+1);

+			  }

+			 list.add(objects);

+			 

+	}

+		return list;

+	}

+

+

+

+	@Override

+	public List<String> getAllOS() throws RemoteException {

+		List<String> list=new ArrayList<>();

+		ResultSet rs=sql.getAllOS(con);

+		try {

+			while(rs.next())

+			{

+				list.add(rs.getString("name"));

+			}

+			return list;

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

 }
\ No newline at end of file
diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java
index 7d990116..af99b36b 100644
--- a/Dozentenmodulserver/src/sql/SQL.java
+++ b/Dozentenmodulserver/src/sql/SQL.java
@@ -5,6 +5,10 @@ import java.sql.DriverManager;
 import java.sql.ResultSet;

 import java.sql.SQLException;

 import java.sql.Statement;

+import java.text.DateFormat;

+import java.text.SimpleDateFormat;

+import java.util.Date;

+import java.util.Random;

 

 

 public class SQL {

@@ -94,4 +98,142 @@ public class SQL {
 		

 		return null;

 	}

+	

+	public int setInstitution(Connection con,String university)

+	{

+		try {

+			Statement stm=con.createStatement();

+			

+			

+			

+			ResultSet ret=stm.executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'"+university+"';");

+			if(ret.next()==false)

+			{

+				Random rand=new Random();

+				int id=rand.nextInt();

+				stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('"+id+"','"+university+"');");

+				con.commit();

+				ResultSet rs=stm.executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '"+university+"';");

+				rs.next();

+				return rs.getInt("institutionID");

+			}

+			else

+			{

+				return ret.getInt("institutionID");

+			}

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return -1;

+	}

+	

+	

+	

+	public int setPerson(Connection con,String login, String lastname, String firstname, String mail, Date lastlogin,int Institution)

+	{

+		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

+		try {

+			Statement stm=con.createStatement();

+			

+			ResultSet ret=stm.executeQuery("SELECT userID FROM bwLehrpool.m_user where Nachname like '"+lastname+"' and Vorname like '"+firstname+"';");

+			if(ret.next()==false)

+			{

+			Random rand=new Random();

+			int id=rand.nextInt();

+			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('"+id+"','Platzhalter','"+lastname+"','"+firstname+"','"+mail+"','"+formatter.format(new Date())+"','"+Institution+"');");

+			con.commit();

+			ResultSet rs=stm.executeQuery("SELECT userID FROM bwLehrpool.m_user where Nachname like '"+lastname+"' and Vorname like '"+firstname+"';");

+			rs.next();

+			return rs.getInt("userID");

+			}

+			else

+			{

+				return ret.getInt("userID");

+			}

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return -1;

+	}

+	

+	public int setImageData(Connection con, int pk_person, boolean license, boolean internet, int cpu, int ram, String imagename)

+	{

+		

+		DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");

+		

+		int internet_bol=0;

+		int license_bol=0;

+		if(internet==true)

+		{

+			internet_bol=1;

+		}

+		else if(license==true)

+		{

+			license_bol=1;

+		}

+

+		try {

+			Statement stm=con.createStatement();

+			Random random=new Random();

+			int uid=random.nextInt();

+			stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('"+uid+"',1,'"+imagename+"','/srv/openslx/nfs/temp/','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"','"+formatter.format(new Date())+"','"+formatter.format(new Date())+"','"+pk_person+"','"+pk_person+"',1,1,1,1,1,1,0,0,'"+license_bol+"','"+internet_bol+"','"+ram+"','"+cpu+"');");

+			con.commit();

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return ram;

+		

+	}

+	

+	public ResultSet getImageListWithoutLectures(Connection con){

+		try {

+			Statement stm=con.createStatement();

+			

+			return stm.executeQuery("SELECT distinct vl.image_name, vl.cond_hasLicenseRestriction, os.name,  vl.image_update_time, '', Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.lectureID!=vl.GUID_imageID and vl.image_owner=u.userID;");

+			

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

+	

+	public ResultSet getImageListWithLectures(Connection con){

+		try {

+			Statement stm=con.createStatement();

+			

+			return stm.executeQuery("SELECT vl.image_name, vl.cond_hasLicenseRestriction, os.name,  vl.image_update_time, lect.name, Concat(u.Nachname,' ',u.Vorname) FROM bwLehrpool.m_VLData_imageInfo vl, bwLehrpool.m_operatingSystem os, bwLehrpool.m_VLData_lecture lect, bwLehrpool.m_user u Where vl.content_operatingSystem=os.operatingSystemID and lect.imageID=vl.GUID_imageID and vl.image_owner=u.userID;");

+			

+			

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		return null;

+	}

+	

+	public ResultSet getAllOS(Connection con)

+	{

+		

+		

+		try {

+			Statement stm=con.createStatement();

+			return stm.executeQuery("SELECT name FROM bwLehrpool.m_operatingSystem;");

+		} catch (SQLException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

+		

+		

+

+		return null;

+		

+	}

 }