[client] rebasing the whole app...

47 files changed, 123 insertions, 15298 deletions

diff --git a/dozentenmodul/src/main/java/App.java b/dozentenmodul/src/main/java/App.java
index 0eb9b847..96c9c335 100644
--- a/dozentenmodul/src/main/java/App.java
+++ b/dozentenmodul/src/main/java/App.java
@@ -1,17 +1,18 @@
-import java.awt.EventQueue;
+import gui.GuiManager;
+
 import java.io.File;
 import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
-import javax.swing.JOptionPane;
-
+import org.apache.commons.io.FileUtils;
+import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.FileAppender;
 import org.apache.log4j.Logger;
 import org.apache.log4j.PatternLayout;
-import org.openslx.thrifthelper.ThriftManager;
-import org.openslx.thrifthelper.ThriftManager.ErrorCallback;
+import org.apache.log4j.spi.LoggingEvent;
 
-import util.GuiManager;
 import config.Config;
 import config.ConfigProxy;
 
@@ -29,11 +30,14 @@ public class App {
 		final File logFile = new File(logFilePath);
 		if (logFile.exists() && !logFile.isDirectory()) {
 			// we have one, rename it to 'bwSuite.log.old'
+			LOGGER.info("renaming old log file");
 			try {
-				logFile.renameTo(new File(logFilePath + ".old"));
+				File oldFile = new File(logFilePath + ".old");
+				FileUtils.forceDelete(oldFile);
+				logFile.renameTo(oldFile);
+				FileUtils.forceDelete(logFile);
 			} catch (Exception e) {
-				LOGGER.error("Could not move '" + logFilePath + "' to '" + logFilePath + ".old':");
-				e.printStackTrace();
+				LOGGER.error("Could not move '" + logFilePath + "' to '" + logFilePath + ".old'", e);
 			}
 		}
 
@@ -42,12 +46,49 @@ public class App {
 		try {
 			fa = new FileAppender(new PatternLayout("%d [%F:%M] %m%n"), logFilePath);
 			// All classes should log to file, configure global file appender.
-			BasicConfigurator.configure(fa);
-			LOGGER.info("Starting logging to: " + logFilePath);
 		} catch (IOException e) {
 			e.printStackTrace();
+			BasicConfigurator.configure();
+			return;
 		}
-		LOGGER.info("Logger initialised.");
+		
+		final FileAppender ffa = fa;
+		final Pattern re = Pattern.compile("authorization:(\\w|\\+|/|\\s)+", Pattern.CASE_INSENSITIVE
+				| Pattern.MULTILINE);
+
+		AppenderSkeleton ap = new AppenderSkeleton() {
+
+			@Override
+			public boolean requiresLayout() {
+				return ffa.requiresLayout();
+			}
+
+			@Override
+			public void close() {
+				ffa.close();
+			}
+
+			@Override
+			protected void append(LoggingEvent event) {
+				String s = event.getRenderedMessage();
+				if (s.contains("uthorization")) {
+					Matcher m = re.matcher(s);
+					if (!m.find()) {
+						LOGGER.warn("Could not match pattern!");
+					} else {
+						s = m.replaceAll("Authorization: ***********");
+						LOGGER.info("Patched log message");
+					}
+				}
+				ffa.append(new LoggingEvent(event.getFQNOfLoggerClass(), event.getLogger(),
+						event.getTimeStamp(), event.getLevel(), s, event.getThreadName(),
+						event.getThrowableInformation(), event.getNDC(), event.getLocationInformation(),
+						event.getProperties()));
+			}
+		};
+
+		BasicConfigurator.configure(ap);
+		LOGGER.info("Starting logging to: " + logFilePath);
 	}
 
 	public static void main(final String[] args) {
@@ -57,7 +98,6 @@ public class App {
 			Config.init();
 		} catch (IOException e) {
 			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, e.getMessage(), "Fehler", JOptionPane.ERROR_MESSAGE);
 			return;
 		}
 
@@ -70,35 +110,26 @@ public class App {
 			LOGGER.error("IOException when trying to initialise the proxy, see trace: ", e);
 		}
 
-		// Set up thrift error message displaying
-		ThriftManager.setErrorCallback(new ErrorCallback() {
-
-			@Override
-			public void thriftError(Throwable t, String message) {
-				EventQueue.invokeLater(new Runnable() {
-
-					@Override
-					public void run() {
-						JOptionPane.showMessageDialog(null, "Die Kommunikation mit dem Server ist fehlgeschlagen.\n"
-								+ "Bitte stellen Sie sicher, dass Sie mit dem Internet verbunden sind.\n"
-								+ "Sofern das Problem weiterhin besteht, liegt möglicherweise eine serverseitige\n"
-								+ "Störung vor.", "Fehler", JOptionPane.ERROR_MESSAGE);
-					}
-				});
-			}
-		});
+//		// Set up thrift error message displaying
+//		ThriftManager.setErrorCallback(new ErrorCallback() {
+//
+//			@Override
+//			public void thriftError(Throwable t, String message) {
+//				EventQueue.invokeLater(new Runnable() {
+//
+//					@Override
+//					public void run() {
+//						JOptionPane.showMessageDialog(null, "Die Kommunikation mit dem Server ist fehlgeschlagen.\n"
+//								+ "Bitte stellen Sie sicher, dass Sie mit dem Internet verbunden sind.\n"
+//								+ "Sofern das Problem weiterhin besteht, liegt möglicherweise eine serverseitige\n"
+//								+ "Störung vor.", "Fehler", JOptionPane.ERROR_MESSAGE);
+//					}
+//				});
+//			}
+//		});
 
 		// start the GUI
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					GuiManager.initGui();
-				} catch (Exception e) {
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(null, e.getStackTrace(), "Message", JOptionPane.ERROR_MESSAGE);
-				}
-			}
+		GuiManager.initGui();
 
-		});
 	}
-}
+}
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/ftp/DownloadTask.java b/dozentenmodul/src/main/java/ftp/DownloadTask.java
index 95e74169..481ea75a 100644
--- a/dozentenmodul/src/main/java/ftp/DownloadTask.java
+++ b/dozentenmodul/src/main/java/ftp/DownloadTask.java
@@ -13,8 +13,8 @@ import java.util.Map;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
-import models.Image;
-import models.SessionData;
+import org.openslx.bwlp.thrift.iface.*;
+
 
 import org.apache.commons.io.FileUtils;
 import org.apache.log4j.Logger;
@@ -191,6 +191,9 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 	 * @return true|false indicating the success of the file creation
 	 */
 	private boolean generateVmx() {
+		return false;
+		
+		/* BROKEN CODE - FIXME class imports
 		String vmxTemplate = ResourceLoader.getTextFile("/txt/vmx_template");
 		// TODO: sanity checks on vmxTemplate would be good here... just to be safe
 
@@ -198,6 +201,7 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 		// for this, we first need to get the image information from the server
 		LOGGER.debug("Image's ID: " + Image.ImageId);
 		Map<String, String> imageData = null;
+
 		try {
 			imageData = ThriftManager.getSatClient().getImageData(Image.ImageId, Image.Version,
 					SessionData.authToken);
@@ -213,6 +217,8 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 			LOGGER.error("Image's version: " + Image.Version);
 			return false;
 		}
+
+		
 		int hardwareVersion = extractHardwareVersion(saveDir + File.separator
 				+ imageData.get("path").replaceFirst("^prod/", ""));
 		if (hardwareVersion == 0) {
@@ -242,6 +248,8 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 			return false;
 		}
 		return true;
+		 * BROKEN CODE - FIXME
+		 */
 	}
 
 	/**
diff --git a/dozentenmodul/src/main/java/ftp/UploadTask.java b/dozentenmodul/src/main/java/ftp/UploadTask.java
index 7069db29..7babb5f6 100644
--- a/dozentenmodul/src/main/java/ftp/UploadTask.java
+++ b/dozentenmodul/src/main/java/ftp/UploadTask.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import javax.swing.JOptionPane;
 import javax.swing.SwingWorker;
 
-import models.Image;
+import org.openslx.bwlp.thrift.iface.*;
 
 import org.apache.log4j.Logger;
 import org.openslx.filetransfer.UploadStatusCallback;
@@ -50,12 +50,18 @@ public class UploadTask extends SwingWorker<Void, Void> {
 	 */
 	@Override
 	protected Void doInBackground() {
+		
 		Uploader upload = null;
 		try {
 			upload = new Uploader(host, port, null, uploadToken); // TODO: SSL
 
 			final Uploader ul = upload;
+			/* BROKEN CODE - FIXME class imports
 			final long fileSize = Image.Filesize = uploadFile.length();
+			BROKEN CODE - FIXME class imports */
+			final long fileSize = 1000000;
+			
+			
 			firePropertyChange("filesize", 0, fileSize); // Updates GUI
 
 			final boolean ret = upload.upload(uploadFile.getAbsolutePath(), new UploadStatusCallback() {
diff --git a/dozentenmodul/src/main/java/gui/GuiManager.java b/dozentenmodul/src/main/java/gui/GuiManager.java
new file mode 100644
index 00000000..41d5c711
--- /dev/null
+++ b/dozentenmodul/src/main/java/gui/GuiManager.java
@@ -0,0 +1,31 @@
+package gui;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+
+public abstract class GuiManager {
+
+	private static Display _display;
+	private static Shell _mainShell;
+	private static Shell _containerShell;
+
+	public static void initGui() {
+		// init display, shell
+		_display = new Display();
+		_mainShell = new Shell(_display);
+
+		// add static gui elements
+		_containerShell = _mainShell;
+
+		// pack (aka size widgets) and open
+		_mainShell.pack();
+		_mainShell.open();
+
+		// main loop
+		while (!_mainShell.isDisposed()) {
+			if (!_display.readAndDispatch())
+				_display.sleep();
+		}
+		_display.dispose();
+	}
+}
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/helper/TableFiller.java b/dozentenmodul/src/main/java/gui/helper/TableFiller.java
deleted file mode 100644
index 2884ea37..00000000
--- a/dozentenmodul/src/main/java/gui/helper/TableFiller.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package gui.helper;
-
-import java.util.List;
-
-import javax.swing.table.DefaultTableModel;
-
-import org.openslx.sat.thrift.iface.Image;
-import org.openslx.sat.thrift.iface.Lecture;
-
-import util.FormatHelper;
-
-public class TableFiller {
-
-	public static void fillModelWithImageList(DefaultTableModel model, List<Image> images) {
-		// TODO: Create model for image JTable
-		for (Image img : images) {
-			// erzeuge Objekte fuer die Tabelle
-			String[] obj = { img.imageName, img.licenseRestriction, img.osName, img.imageName, img.userData,
-					FormatHelper.mysqlDateToGerman(img.updateTime), img.id, img.version, img.isTemplate,
-					img.description, FormatHelper.byteToGigabyte((Long.parseLong(img.imageSize)), false) };
-			// Fuege diese Objekte der Tabelle hinzu
-			model.addRow(obj);
-		}
-	}
-
-	public static void fillModelWithLectureList(DefaultTableModel model, List<Lecture> lectures) {
-		for (Lecture lct : lectures) {
-			// erzeuge Objekte fuer die Tabelle
-			String[] obj = {
-					lct.lecturename,
-					lct.desc,
-					FormatHelper.mysqlDateToGerman(lct.starttime) + " "
-							+ FormatHelper.mysqlDateToGerman(lct.endtime), lct.isActive,
-					FormatHelper.mysqlDateToGerman(lct.lastused), lct.username, lct.imagename, " ", lct.id, };
-			// Fuege diese Objekte der Tabelle hinzu
-			model.addRow(obj);
-
-		}
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
deleted file mode 100644
index 225904a1..00000000
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package gui.image;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-
-import models.Image;
-import models.person;
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class CreateImageAllgemein_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField imagename;
-	private JTextArea textAreadesc;
-	private final int MAX_DESCRIPTION_LENGTH = 254;
-	private JTextArea txtrGebenSieBitte_1;
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Hier legen Sie zunächst ein Image an. <br />"
-			+ "Dieses stellt die Grundlage Ihres Labors dar. Das Image ist der \"PC\", mit dem die Studenten arbeiten. <br />"
-			+ "Installieren Sie alle benötigte Software und laden Sie am Ende dieses Prozesses die .vmdk-Datei hoch, um sie zu verwenden.<br />"
-			+ "Um das Image richtig zuordnen zu können, werden hier einige grundlegende Informationen benötigt.<br />"
-			+ "Geben Sie daher bitte einen allgemeinen Namen, sowie eine genauere Beschreibung ihres Images (Labors) an.<br />"
-			+ "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public CreateImageAllgemein_GUI() {
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				imagename.requestFocusInWindow();
-			}
-		});
-		// Verhindert das Vergroessern des Fensters
-		setResizable(false);
-
-		// Setzt den Titel
-		setTitle("bwLehrpool Suite - Image erzeugen - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster
-		setBounds(0, 0, 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 Imagenamen 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, 369);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 245, 125, 20);
-		panel_1.add(label);
-
-		Vorname = new JTextField();
-		Vorname.setEnabled(false);
-		Vorname.setEditable(false);
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 245, 350, 20);
-		panel_1.add(Vorname);
-
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 276, 125, 20);
-		panel_1.add(label_7);
-
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 276, 350, 20);
-		panel_1.add(Nachname);
-
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 307, 125, 20);
-		panel_1.add(label_8);
-
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 307, 350, 20);
-		panel_1.add(Hochschule);
-
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 338, 125, 20);
-		panel_1.add(label_9);
-
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setBackground(Color.WHITE);
-		EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setColumns(10);
-		EMail.setBounds(145, 338, 350, 20);
-		panel_1.add(EMail);
-
-		JLabel lblImagename = new JLabel("Imagename: *");
-		lblImagename.setBackground(SystemColor.menu);
-		lblImagename.setBounds(10, 23, 125, 20);
-		panel_1.add(lblImagename);
-
-		imagename = new JTextField();
-		imagename.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				textAreadesc.requestFocusInWindow();
-			}
-		});
-		imagename.setBackground(Color.WHITE);
-		imagename.setText((String) null);
-		imagename.setColumns(10);
-		imagename.setBounds(145, 23, 350, 20);
-		// null am Anfang, aber speichert die Eingabe, wenn man zurueck kommt zur Seite
-		imagename.setText(Image.Imagename);
-		panel_1.add(imagename);
-
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setEditable(false);
-		txtrGebenSieBitte.setFocusable(false);
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte
-				.setText("Geben Sie bitte einen sprechenden Namen für das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Java Wintersemester bei...\"");
-		txtrGebenSieBitte.setBounds(145, 48, 350, 49);
-		panel_1.add(txtrGebenSieBitte);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung: *");
-		lblBeschreibung.setBackground(SystemColor.menu);
-		lblBeschreibung.setBounds(10, 110, 125, 20);
-		panel_1.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(145, 110, 350, 60);
-		panel_1.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setText((String) null);
-		// null am Anfang, aber speichert die Eingabe, wenn man zurueck kommt zur Seite
-		textAreadesc.setText(Image.Desc);
-
-		scrollPane.setViewportView(textAreadesc);
-
-		txtrGebenSieBitte_1 = new JTextArea();
-		txtrGebenSieBitte_1
-				.setText("Geben Sie bitte eine Beschreibung für das Image an.\r\nDiese soll jedoch recht spezifisch gehalten werden.\r\nBeispiel: \"Java-Entwicklung mit Eclipse und MySQL\"");
-		txtrGebenSieBitte_1.setLineWrap(true);
-		txtrGebenSieBitte_1.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte_1.setEditable(false);
-		txtrGebenSieBitte_1.setBackground(SystemColor.menu);
-		txtrGebenSieBitte_1.setBounds(145, 177, 350, 49);
-		panel_1.add(txtrGebenSieBitte_1);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(10, 442, 136, 14);
-		contentPanel.add(lblPflichtfelder);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("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, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton backButton = new JButton("Zurück");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						Image.Imagename = imagename.getText().trim();
-						Image.Desc = textAreadesc.getText().trim();
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				backButton.setActionCommand("Cancel");
-				buttonPane.add(backButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// Prüfe Eingabe
-						if (validateContent()) {
-							// Schreibt die Daten in das Model
-							Image.Imagename = imagename.getText().trim();
-							Image.Desc = textAreadesc.getText().trim();
-
-							// Zeige nächsten Schritt an
-							GuiManager.show(new CreateImageTechnisch_GUI());
-						}
-					}
-				});
-				continueButton.setActionCommand("OK");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		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);
-
-	}// end main
-
-	/**
-	 * Checks if the fields of the form have content,
-	 * if the image name has only alpha-numerical characters and
-	 * if the image description has less than 254 characters.
-	 * 
-	 * @return true if all fields are set, false otherwise.
-	 */
-	private boolean validateContent() {
-		// check if any text field is empty
-		if (imagename.getText().trim().isEmpty() || textAreadesc.getText().trim().isEmpty()
-				|| Vorname.getText().trim().isEmpty() || Nachname.getText().trim().isEmpty()
-				|| Hochschule.getText().trim().isEmpty() || EMail.getText().trim().isEmpty()) {
-			// missing some fields
-			//LOGGER.info("Form has missing fields, warning user.");
-			JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
-					"Daten unvollständig", JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-
-		// only allow letter from alphabet and numbers for the image name and certain special chars
-		// x2B= "+"   x2C="-"   x3A=":"   x5F="_"    
-		// 
-		if (!imagename.getText().trim().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
-			//LOGGER.info("Image name not alpha-numerical, warn user.");
-			JOptionPane.showMessageDialog(null,
-					"Der Imagename darf nur aus Buchstaben, Zahlen und den Zeichen +  -  _  :  bestehen.",
-					"Unerlaubte Zeichen", JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-
-		// max length for image description is 254 chars
-		if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
-			JOptionPane.showMessageDialog(null,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ textAreadesc.getText().trim().length() + ".", "Beschreibung zu umfangreich",
-					JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-
-		// we passed all tests, return true!
-		return true;
-	}
-}// end Class
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
deleted file mode 100644
index 82705b21..00000000
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package gui.image;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JOptionPane;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.JSpinner;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.Image;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class CreateImageTechnisch_GUI extends JInternalFrame {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(CreateImageTechnisch_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JSpinner spinnerCPU;
-	private JSpinner spinnerRam;
-	private JCheckBox chckbxIsLicensed;
-	private JCheckBox chckbxIsInternetBlocked;
-	private JComboBox<String> comboBox;
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Geben Sie hier bitte einige technische Daten an, die dann mit dem Image angezeigt werden.<br />"
-			+ "Dies wird beispielsweise benötigt, wenn ein Dozent eine Veranstaltung hat,<br />"
-			+ "die eine hohe Rechnerleistung voraussetzt. Er hat dann die Möglichkeit, sich an diesen Daten zu orientieren und<br />"
-			+ "sie mit den technischen Daten des PC-Pools zu vergleichen." + "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public CreateImageTechnisch_GUI() {
-		setResizable(false);
-		setTitle("bwLehrpool Suite - Image erzeugen - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 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 technischer 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 einige technische Daten ein");
-			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, "Informationen zum Image", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 36, 557, 166);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist für dieses Image gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 82, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		JButton btnInternetSettings = new JButton("Einstellungen...");
-		btnInternetSettings.setEnabled(false);
-		btnInternetSettings.setBounds(439, 81, 108, 23);
-		panel_1.add(btnInternetSettings);
-
-		JLabel lblNewLabel_2 = new JLabel("Image enthält lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 54, 250, 20);
-		panel_1.add(lblNewLabel_2);
-
-		chckbxIsLicensed = new JCheckBox("");
-		chckbxIsLicensed.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				//if windows is selected, always set isLicensed()=true
-				if (comboBox.getSelectedItem().toString().startsWith("Windows")) {
-					chckbxIsLicensed.setSelected(true);
-				}
-			}
-		});
-		chckbxIsLicensed.setSelected(true);
-		chckbxIsLicensed.setBounds(266, 52, 97, 23);
-		panel_1.add(chckbxIsLicensed);
-
-		chckbxIsInternetBlocked = new JCheckBox("");
-		chckbxIsInternetBlocked.setSelected(Image.Internet);
-		chckbxIsInternetBlocked.setBounds(266, 80, 97, 23);
-		chckbxIsInternetBlocked.setEnabled(false);
-		panel_1.add(chckbxIsInternetBlocked);
-
-		JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
-		lblLizenzserverEintragen.setBounds(10, 109, 250, 20);
-		panel_1.add(lblLizenzserverEintragen);
-
-		JButton btnLicenseServer = new JButton("Server-Adresse...");
-		btnLicenseServer.setEnabled(false);
-		btnLicenseServer.setBounds(266, 108, 157, 23);
-		panel_1.add(btnLicenseServer);
-
-		JLabel lblBetriebssystem = new JLabel("Betriebssystem:");
-		lblBetriebssystem.setBounds(10, 21, 250, 20);
-		panel_1.add(lblBetriebssystem);
-
-		// populate comboBox with list of supported OS we get
-		// from the server ...
-		comboBox = new JComboBox<String>();
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				//if windows is selected, always set isLicensed()=true
-				if (comboBox.getSelectedItem().toString().startsWith("Windows")) {
-					chckbxIsLicensed.setSelected(true);
-				}
-			}
-		});
-		List<String> os = null;
-		try {
-			os = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			for (int i = 0; i < os.size(); i++) {
-				comboBox.addItem(os.get(i).toString());
-			}
-		} catch (TException e1) {
-			e1.printStackTrace();
-			LOGGER.error("Could not fetch list of supported OSs from server!");
-		}
-		comboBox.setBounds(270, 21, 277, 20);
-		comboBox.setSelectedItem(Image.OS == null ? os.get(0) : Image.OS);
-		panel_1.add(comboBox);
-
-		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, 207, 557, 324);
-		contentPanel.add(panel_2);
-
-		JLabel lblGbyte = new JLabel("GByte");
-		lblGbyte.setBounds(424, 91, 46, 20);
-		panel_2.add(lblGbyte);
-
-		spinnerCPU = new JSpinner();
-		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
-		spinnerCPU.setBounds(385, 188, 29, 20);
-		panel_2.add(spinnerCPU);
-
-		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);
-
-		JLabel lblKerne = new JLabel("Kerne");
-		lblKerne.setBounds(424, 191, 46, 20);
-		panel_2.add(lblKerne);
-
-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie für das Image:");
-		lblWieVieleCpus.setBounds(10, 191, 280, 20);
-		panel_2.add(lblWieVieleCpus);
-
-		spinnerRam = new JSpinner();
-		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
-		spinnerRam.setBounds(385, 88, 29, 20);
-		panel_2.add(spinnerRam);
-
-		JLabel label_3 = new JLabel("mindestens");
-		label_3.setBounds(315, 191, 60, 20);
-		panel_2.add(label_3);
-
-		JLabel lblMindestens = new JLabel("mindestens");
-		lblMindestens.setBounds(315, 91, 60, 20);
-		panel_2.add(lblMindestens);
-
-		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 lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie für das Image:");
-		lblNewLabel_3.setBounds(10, 91, 280, 20);
-		panel_2.add(lblNewLabel_3);
-
-		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ötigt,\r\nkönnen Sie sich an den Beispielwerten orientieren.");
-		txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
-		panel_2.add(txtrHinweisSolltenSie);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("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, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			ActionListener saveSettings = new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					// werte die angebenen Optionen aus
-					Image.Internet = chckbxIsInternetBlocked.isSelected();
-					Image.Licensed = chckbxIsLicensed.isSelected();
-					Image.Vorlage = chckbxIsLicensed.isSelected();
-					Image.Cpu = Integer.valueOf(spinnerCPU.getValue().toString()).intValue();
-					Image.Ram = Integer.valueOf(spinnerRam.getValue().toString()).intValue();
-					Image.OS = comboBox.getSelectedItem().toString();
-					if (e.getActionCommand().equals("OK"))
-						GuiManager.show(new CreateImageAllgemein_GUI());
-					else if (e.getActionCommand().equals("Cancel"))
-						GuiManager.show(new PermissionCreateImage_GUI());
-					else {
-						// real bad
-						LOGGER.error("ActionEvent triggered has an unknown action command '"
-									+ e.getActionCommand() == null ? "null" : e.getActionCommand()
-									+ "'. Contact developper.");
-						JOptionPane.showMessageDialog(null, "Kritischer Fehler, kontaktieren Sie einen Entwickler.", "Fehler", JOptionPane.ERROR_MESSAGE);
-					}
-				}
-			};
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(saveSettings);
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(saveSettings);
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		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);
-
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
deleted file mode 100644
index cf448f70..00000000
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ /dev/null
@@ -1,634 +0,0 @@
-package gui.image;
-
-import gui.helper.TableFiller;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Image;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class DeleteImage_GUI extends JInternalFrame {
-
-	private final static Logger LOGGER = Logger.getLogger(DeleteImage_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel labelName;
-	private JLabel labelUpdate;
-	private JLabel labelVerantwortlicher;
-	private JLabel labelWeitereVerantwortliche;
-	private JLabel labelVorlage;
-	private JLabel labelLizenzSoftware;
-	private JLabel labelInternet;
-	private JLabel labelRam;
-	private JLabel labelCPU;
-	private JLabel labelID;
-	private JLabel labelVersion;
-	private JTextArea textAreadesc;
-	private JLabel labelOS;
-	private JComboBox<String> comboBox;
-	private JTable tablemyImages;
-	private JTextField textFieldName;
-	private JLabel lblTotalResults = new JLabel("Anzahl:");
-	private String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",
-			"Letztes Update", "ID", "Version", "Template", "Beschreibung" };
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Löschen Sie hier die Images, die nicht mehr benötigt werden.<br />"
-			+ "Ein gelöschtes Image wird auch tatsächlich physisch gelöscht und kann nicht wiederhergestellt werden.<br />"
-			+ "Wird das Image nach dem Löschen nochmal benötigt, muss es erneut hochgeladen werden."
-			+ "</div></html>";
-
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages);
-
-	RowFilter<Object, Object> rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
-
-	/**
-	 * Create the dialog.
-	 */
-	public DeleteImage_GUI() {
-
-		filters.add(RowFilter.regexFilter(".", 0));
-		rf = RowFilter.orFilter(filters);
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-
-				initTableModel(modelMyImages);
-				// auszublendende Angaben
-				// 1=Lizenzpflichtig
-				// 3=Veranstaltung
-				// 6=ID
-				// 7=Version
-				// 8=Template
-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tablemyImages.getTableHeader().setReorderingAllowed(false);
-
-				// bis hier
-				textFieldName.requestFocusInWindow();
-			}
-		});
-
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Image löschen - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 918, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 892, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Zu löschendes Image wählen");
-				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("Wählen Sie bitte aus der unten stehenden Liste das zu löschende Image aus.");
-			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, 98);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		textFieldName = new JTextField();
-		// Key Listener der Tastatureingabe registriert
-
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-				String stext = textFieldName.getText().trim();
-
-				// Wenn Textfield nicht leer
-				if (!stext.isEmpty()) {
-					// Filtere nach der Eingabe
-					filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0));
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 9));
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyImages.setRowFilter(rf);
-				} else {
-					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0));
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyImages.setRowFilter(rf);
-				}
-				tablemyImages.clearSelection();
-
-				resetImageInfo();
-			}
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		comboBox = new JComboBox<String>();
-		try {
-			// Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			// Leeres Item hinzufuegen
-			comboBox.addItem("");
-			for (int i = 0; i < list.size(); i++) {
-				// Hinzufuegen der verfuegbaren Betriebssysteme
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-
-			e2.printStackTrace();
-			JOptionPane.showMessageDialog(null, e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		// Registriert Auswahlaenderungen der Box
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString() != "") {
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()
-							.toString(), 2));
-				} else {
-					rowSorterMyImages.setRowFilter(null);
-				}
-			}
-
-		});
-		comboBox.setBounds(133, 58, 191, 20);
-		panel_1.add(comboBox);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(115, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Löschen");
-		lblNewLabel_1.setBounds(128, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JButton btnDelete = new JButton("Löschen");
-		btnDelete.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-
-				String imageid = "";
-				String imageversion = "";
-				int eingabe;
-
-				if (tablemyImages.getSelectedRowCount() != 1) {
-					JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image aus", "Info",
-							JOptionPane.INFORMATION_MESSAGE);
-					return;
-				}
-
-				// frage, soll das selektierte Daten geloescht werden?
-				eingabe = JOptionPane.showConfirmDialog(null, "Wollen Sie diese Daten löschen?", "Löschen?",
-						JOptionPane.YES_NO_OPTION);
-
-				if (eingabe != JOptionPane.YES_OPTION) {
-					return;
-				}
-
-				imageid = modelMyImages.getValueAt(
-						tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6).toString();
-
-				imageversion = modelMyImages.getValueAt(
-						tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7).toString();
-
-				// Image darf nur geloescht werden, wenn keine
-				// Veranstaltung mehr auf das Image verweist.
-				// Unbdingt abfragen!
-				// TODO: Check this server side on delete, then using exceptions...
-				try {
-					if (ThriftManager.getSatClient().connectedToLecture(imageid, imageversion,
-							SessionData.authToken)) {
-						LOGGER.info("Image '" + imageid
-								+ "' konnte nicht gelöscht werden, da mindestens eine Veranstaltung mit"
-								+ " diesem Image verlinkt ist.");
-
-						JOptionPane.showMessageDialog(null,
-								"Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit"
-										+ " diesem Image verlinkt ist.", "Verlinkung vorhanden",
-								JOptionPane.INFORMATION_MESSAGE);
-						return;
-					}
-				} catch (Exception e) {
-				}
-
-				try {
-
-					//  try to delete file from file system
-					if (ThriftManager.getSatClient()
-							.deleteImage(imageid, imageversion, SessionData.authToken) == true) {
-						LOGGER.info("Image '" + imageid + "' erfolgreich gelöscht.");
-
-						GuiManager.show(new DeleteImage_GUI());
-					} else {
-						// could not delete file from file
-						// system
-						LOGGER.info("Image '" + imageid + "' konnte nicht gelöscht werden.");
-
-						JOptionPane.showMessageDialog(null, "Image konnte nicht gelöscht werden.", "Fehler",
-								JOptionPane.INFORMATION_MESSAGE);
-					}
-
-				} catch (TException e) {
-
-					e.printStackTrace();
-					JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(),
-							"Debug-Message", JOptionPane.ERROR_MESSAGE);
-				}
-
-			}
-
-		});
-		btnDelete.setBounds(449, 508, 118, 23);
-		contentPanel.add(btnDelete);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(10, 158, 557, 339);
-		contentPanel.add(scrollPaneMyImage);
-		tablemyImages = new JTable();
-		tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tablemyImages.getSelectedRow() != -1) {
-					String imageid = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)
-							.toString();
-					String version = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-							.toString();
-					writeImageData(imageid, version);
-				}
-			}
-
-		});
-		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-		tablemyImages.setModel(modelMyImages);
-		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();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-
-		lblTotalResults.setBounds(10, 512, 131, 20);
-		contentPanel.add(lblTotalResults);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 902, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zurück");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 912, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 912, 2);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(586, 85, 316, 531);
-		getContentPane().add(panel);
-
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 87, 130, 14);
-		panel.add(lblName);
-
-		labelName = new JLabel("");
-		labelName.setBounds(10, 102, 296, 14);
-		panel.add(labelName);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 259, 130, 14);
-		panel.add(lblVerantwortlicher);
-
-		labelOS = new JLabel("");
-		labelOS.setBounds(10, 216, 296, 14);
-		panel.add(labelOS);
-
-		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
-		panel.add(lblWeitereVerantwortliche);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 272, 296, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 284, 130, 14);
-		panel.add(label);
-
-		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
-		panel.add(labelWeitereVerantwortliche);
-
-		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(10, 245, 296, 14);
-		panel.add(labelUpdate);
-
-		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 231, 130, 14);
-		panel.add(lblLetztesUpdate);
-
-		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 334, 130, 14);
-		panel.add(lblImageIstVorlage);
-
-		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 348, 296, 14);
-		panel.add(labelVorlage);
-
-		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(10, 383, 296, 14);
-		panel.add(labelLizenzSoftware);
-
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
-		panel.add(lblLizenzpflichtigeSoftware);
-
-		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
-		lblInternet.setBounds(10, 400, 130, 14);
-		panel.add(lblInternet);
-
-		labelInternet = new JLabel("");
-		labelInternet.setBounds(10, 417, 296, 14);
-		panel.add(labelInternet);
-
-		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
-		panel.add(lblEmpfehlungRam);
-
-		labelRam = new JLabel("");
-		labelRam.setBounds(10, 455, 296, 14);
-		panel.add(labelRam);
-
-		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
-		panel.add(lblEmpfehlungCpu);
-
-		labelCPU = new JLabel("");
-		labelCPU.setBounds(10, 487, 296, 14);
-		panel.add(labelCPU);
-
-		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 312, 296, 14);
-		panel.add(lblTechnischeDaten);
-
-		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 296, 14);
-		panel.add(lblId);
-
-		labelID = new JLabel("");
-		labelID.setBounds(10, 37, 296, 14);
-		panel.add(labelID);
-
-		labelVersion = new JLabel("");
-		labelVersion.setBounds(10, 73, 296, 14);
-		panel.add(labelVersion);
-
-		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 57, 296, 14);
-		panel.add(lblVersion);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 119, 130, 14);
-		panel.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 135, 296, 65);
-		panel.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setEditable(false);
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setBackground(SystemColor.menu);
-		scrollPane.setViewportView(textAreadesc);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-
-		List<Image> images;
-		try {
-
-			// Hole eine Liste der Images
-			if (person.verantwortlicher.getRole() == "Admin") {
-				// get complete list
-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),
-						SessionData.authToken);
-			} else {
-				// get permitted list
-				images = ThriftManager.getSatClient().getImageListPermissionAdmin(
-						person.verantwortlicher.getUserID(), SessionData.authToken);
-			}
-
-			TableFiller.fillModelWithImageList(model, images);
-
-			// show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
-
-			return model;
-		} catch (TException e1) {
-
-			e1.printStackTrace();
-			JOptionPane.showMessageDialog(null, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		return model;
-	}
-
-	private void resetImageInfo() {
-		// reset the detailed information on the right hand side when changing
-		// search string
-		labelID.setText("");
-		labelVersion.setText("");
-		labelName.setText("");
-		textAreadesc.setText("");
-		labelOS.setText("");
-		labelUpdate.setText("");
-		labelVerantwortlicher.setText("");
-		labelWeitereVerantwortliche.setText("");
-		labelVorlage.setText("");
-		labelLizenzSoftware.setText("");
-		labelInternet.setText("");
-		labelRam.setText("");
-		labelCPU.setText("");
-
-	}
-
-	public void writeImageData(String id, String version) {
-		try {
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
-					SessionData.authToken);
-			labelName.setText(res.get("name"));
-			labelOS.setText(res.get("os"));
-			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
-			labelVerantwortlicher.setText(res.get("owner"));
-			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
-			if (res.get("template").equals("true")) {
-				labelVorlage.setText("Ja");
-			} else {
-				labelVorlage.setText("Nein");
-			}
-			if (res.get("license").equals("1")) {
-				labelLizenzSoftware.setText("Ja");
-			} else {
-				labelLizenzSoftware.setText("Nein");
-			}
-			if (res.get("internet").equals("1")) {
-				labelInternet.setText("Ja");
-			} else {
-				labelInternet.setText("Nein");
-			}
-			labelRam.setText(res.get("ram"));
-			labelCPU.setText(res.get("cpu"));
-			labelID.setText(res.get("id"));
-			labelVersion.setText(res.get("version"));
-			textAreadesc.setText(res.get("desc"));
-		} catch (TException | ParseException e1) {
-
-			e1.printStackTrace();
-		}
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
deleted file mode 100644
index d8c907be..00000000
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ /dev/null
@@ -1,413 +0,0 @@
-package gui.image;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.Image;
-import models.ItemOwner;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class EditImageAllgemein_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField imagename;
-	private JTextArea textAreadesc;
-	private JPanel panel_2;
-	private JLabel lblNewLabel;
-	private JTextPane txtpnBitteWhlenSie;
-	private JPanel buttonPane;
-	private JButton backButton;
-	private JButton okButton;
-	private boolean textfieldsHaveContent = false; //no textfield is empty
-	private boolean nameIsOK = false; //imagename only contains letters
-	private boolean descriptionLengthOK = false; //description may not be longer than MAX_DESCRIPTION_LENGTH
-	private final int MAX_DESCRIPTION_LENGTH = 254;
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Bearbeiten Sie hier die allgemeinen Angaben, die Sie beim Erzeugen des Images hinterlegt haben.<br />"
-			+ "Sie können sowohl den Anzeigenamen als auch die Beschreibung ändern.<br />"
-			+ "Änderungen der Informationen zum Besitzer sind nicht zulässig." + "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditImageAllgemein_GUI() {
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Image bearbeiten - " + person.verantwortlicher.getUserID());
-
-		// Zentriert das Fenster in der Bildmitte
-		setBounds(0, 0, 603, 722);
-		initData();
-		getContentPane().setLayout(null);
-		{
-			panel_2 = new JPanel();
-			panel_2.setBackground(SystemColor.menu);
-			panel_2.setBounds(10, 11, 577, 57);
-			getContentPane().add(panel_2);
-			panel_2.setLayout(null);
-			{
-				lblNewLabel = new JLabel("Bearbeiten Ihrer Daten");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel_2.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-
-			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_2.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, 369);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 245, 125, 20);
-		panel_1.add(label);
-
-		Vorname = new JTextField();
-		Vorname.setEditable(false);
-		Vorname.setEnabled(false);
-		Vorname.setBackground(Color.WHITE);
-		//Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setText(ItemOwner.itemOwner.getVorname());
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 245, 350, 20);
-		panel_1.add(Vorname);
-
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 276, 125, 20);
-		panel_1.add(label_7);
-
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setBackground(Color.WHITE);
-		//Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setText(ItemOwner.itemOwner.getNachname());
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 276, 350, 20);
-		panel_1.add(Nachname);
-
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 307, 125, 20);
-		panel_1.add(label_8);
-
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setBackground(Color.WHITE);
-		//Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 307, 350, 20);
-		panel_1.add(Hochschule);
-
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 338, 125, 20);
-		panel_1.add(label_9);
-
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setBackground(Color.WHITE);
-		//EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setText(ItemOwner.itemOwner.getEmail());
-		EMail.setColumns(10);
-		EMail.setBounds(145, 338, 350, 20);
-		panel_1.add(EMail);
-
-		JLabel lblImagename = new JLabel("Imagename: *");
-		lblImagename.setBackground(SystemColor.menu);
-		lblImagename.setBounds(10, 23, 125, 20);
-		panel_1.add(lblImagename);
-
-		imagename = new JTextField();
-		imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\".");
-		imagename.setBackground(Color.WHITE);
-		imagename.setText(Image.Imagename);
-		imagename.setColumns(10);
-		imagename.setBounds(145, 23, 350, 20);
-		panel_1.add(imagename);
-
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte
-				.setText("Geben Sie bitte einen sprechenden Namen für das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Java Wintersemester bei...\"");
-		txtrGebenSieBitte.setBounds(145, 48, 350, 55);
-		panel_1.add(txtrGebenSieBitte);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung: *");
-		lblBeschreibung.setBackground(SystemColor.menu);
-		lblBeschreibung.setBounds(10, 110, 125, 20);
-		panel_1.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(145, 110, 350, 60);
-		panel_1.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setText((String) null);
-		textAreadesc.setText(Image.Desc);// null am Anfang, aber
-											// speichert die Eingabe,
-											// wenn man zurueck kommt
-											// zur Seite
-		scrollPane.setViewportView(textAreadesc);
-
-		JTextArea textArea = new JTextArea();
-		textArea.setText("Geben Sie bitte eine Beschreibung für das Image an.\r\nDiese soll jedoch recht spezifisch gehalten werden.\r\nBeispiel: \"Java-Enticklung mit eclipse und MySQL\"");
-		textArea.setLineWrap(true);
-		textArea.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		textArea.setEditable(false);
-		textArea.setBackground(SystemColor.menu);
-		textArea.setBounds(145, 177, 350, 49);
-		panel_1.add(textArea);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(10, 442, 136, 14);
-		contentPanel.add(lblPflichtfelder);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// Durch den Klick auf Button Hauptmenpue wird dieses Fenster
-				// unsichtbar und das Hauptmenue sichtbar
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("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("Bearbeiten");
-		lblNewLabel_1.setBounds(146, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-		{
-			buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				backButton = new JButton("Zurück");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// Setzen der Eingabe im Model, dadurch bleiben die
-						// Daten bei einem erneuten Aufruf verfuegbar
-						// Image.Imagename(imagename.getText().trim = );
-						GuiManager.show(new SearchEditImage_GUI());
-					}
-				});
-				backButton.setActionCommand("CANCEL");
-				buttonPane.add(backButton);
-
-			}
-			{
-				okButton = new JButton("Weiter");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-						// Prueft die Eingabe und leitet weiter zur naechsten
-						// Seite
-						if (checkContent() == true && checkNameIsLettersOrNumbers() == true
-								&& descriptionLenghtOK() == true) {
-
-							// setze Namen, egal ob alt oder nicht
-							Image.Imagename = imagename.getText().trim();
-							Image.Desc = textAreadesc.getText().trim();
-							// Info
-
-							GuiManager.show(new EditImageTechnisch_GUI());
-
-						} else {
-
-						}// end else
-					}
-				});
-
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-		}
-
-		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);
-
-	}
-
-	public void initData() {
-		try {
-
-			Map<String, String> map = ThriftManager.getSatClient().getImageData(Image.ImageId, Image.Version,
-					SessionData.authToken);
-
-			if (map.get("internet").equals("0")) {
-				Image.Internet = false;
-			} else {
-				Image.Internet = true;
-			}
-			if (map.get("license").equals("0")) {
-				Image.Licensed = false;
-			} else {
-				Image.Licensed = true;
-			}
-			//LOGGER.debug(map.get("template"));
-			if (map.get("template").equals("false")) {
-				Image.Vorlage = false;
-			} else {
-				Image.Vorlage = true;
-			}
-			Image.Imagename = map.get("name");
-			Image.Ram = Integer.parseInt(map.get("ram"));
-			Image.Cpu = Integer.parseInt(map.get("cpu"));
-			Image.Imagepath = map.get("path");
-			Image.Desc = map.get("desc");
-			Image.Filesize = Long.parseLong(map.get("filesize"));
-			int mode = 0;
-			if (map.get("shareMode").equals("only_local")) {
-				mode = 0;
-			} else {
-				mode = 1;
-			}
-			Image.ShareMode = mode;
-			Image.OS = map.get("os");
-		} catch (TException e) {
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-	}//end initData()
-
-	public boolean checkNameIsLettersOrNumbers() {
-		nameIsOK = false;
-
-		//only allow letter from alphabet and nothing else
-		if (imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) {
-			nameIsOK = true;
-		} else {
-			JOptionPane.showMessageDialog(null,
-					"Der Imagename darf nur aus Buchstaben, Zahlen und den Zeichen +  -  _  :  bestehen.",
-					"Unerlaubte Zeichen", JOptionPane.INFORMATION_MESSAGE);
-		}// if
-
-		return nameIsOK;
-	}// end nameIsOK
-
-	public boolean checkContent() {
-		textfieldsHaveContent = false;
-
-		//check if any textfield is empty
-		if (imagename.getText().trim().isEmpty() == false && textAreadesc.getText().trim().isEmpty() == false
-				&& Vorname.getText().trim().isEmpty() == false
-				&& Nachname.getText().trim().isEmpty() == false
-				&& Hochschule.getText().trim().isEmpty() == false
-				&& EMail.getText().trim().isEmpty() == false) {
-			//all textfields have content
-			textfieldsHaveContent = true;
-		} else {
-			JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
-					"Daten unvollständig", JOptionPane.INFORMATION_MESSAGE);
-		}//end if
-
-		return textfieldsHaveContent;
-	}//end checkContent
-
-	public boolean descriptionLenghtOK() {
-		descriptionLengthOK = false;
-
-		//max length is 254 chars
-		if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
-			descriptionLengthOK = false;
-			JOptionPane.showMessageDialog(null,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ textAreadesc.getText().trim().length() + ".", "Beschreibung zu umfangreich",
-					JOptionPane.ERROR_MESSAGE);
-		} else {
-			descriptionLengthOK = true;
-
-		}
-
-		return descriptionLengthOK;
-	}// enddescriptionLenghtOK()
-
-}//end class
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
deleted file mode 100644
index 75719cce..00000000
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ /dev/null
@@ -1,351 +0,0 @@
-package gui.image;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.JSpinner;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SpinnerNumberModel;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.Image;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class EditImageTechnisch_GUI extends JInternalFrame {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(EditImageTechnisch_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JSpinner spinnerCPU;
-	private JSpinner spinnerRam;
-	private JCheckBox chckbxIsLicensed;
-	private JCheckBox chckbxIsInternetBlocked;
-	private JComboBox<String> comboBox;
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Bearbeiten Sie hier die technischen Angaben zu Ihrem Image, die Sie beim Erzeugen des Images hinterlegt haben.<br />"
-			+ "Wenn sich die technischen Anforderungen an Ihr Image geändert haben, müssen Sie es nicht erneut hochladen,<br />"
-			+ "sondern können die Angaben direkt hier korrigieren. Die Daten werden dann für Ihr Image übernommen."
-			+ "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditImageTechnisch_GUI() {
-		// Verhindert das Vergrößern des Fensters
-		setResizable(false);
-
-		// Setzt den Titel des Fensters
-		setTitle("bwLehrpool Suite - Image bearbeiten - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster
-		setBounds(0, 0, 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 technischer 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 einige technische Daten ein.");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 577, 532);
-		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, 25, 557, 167);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Image enthält lizenzpflichtige Software:");
-		lblNewLabel_2.setBounds(10, 58, 250, 20);
-		panel_1.add(lblNewLabel_2);
-
-		chckbxIsLicensed = new JCheckBox("");
-		chckbxIsLicensed.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				//if windows is selected, always set isLicensed()=true
-				if (comboBox.getSelectedItem().toString().startsWith("Windows")) {
-					chckbxIsLicensed.setSelected(true);
-				}
-			}
-		});
-		chckbxIsLicensed.setBounds(266, 57, 97, 23);
-		panel_1.add(chckbxIsLicensed);
-
-		chckbxIsInternetBlocked = new JCheckBox("");
-		chckbxIsInternetBlocked.setBounds(266, 85, 97, 23);
-		chckbxIsInternetBlocked.setEnabled(false);
-		panel_1.add(chckbxIsInternetBlocked);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Images gesperrt:");
-		lblInternetIstInnerhalb.setBounds(10, 86, 250, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		JLabel label = new JLabel("Lizenzserver eintragen:");
-		label.setBounds(10, 115, 250, 20);
-		panel_1.add(label);
-
-		JButton button = new JButton("Server-Adresse...");
-		button.setEnabled(false);
-		button.setBounds(266, 114, 157, 23);
-		panel_1.add(button);
-
-		JLabel lblBetriebssystem = new JLabel("Betriebssystem:");
-		lblBetriebssystem.setBounds(10, 26, 250, 20);
-		panel_1.add(lblBetriebssystem);
-
-		comboBox = new JComboBox<String>();
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				//if windows is selected, always set isLicensed()=true
-				if (comboBox.getSelectedItem().toString().startsWith("Windows")) {
-					chckbxIsLicensed.setSelected(true);
-				}
-			}
-		});
-
-		List<String> os = null;
-		try {
-			os = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			for (int i = 0; i < os.size(); i++) {
-				comboBox.addItem(os.get(i).toString());
-			}
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		}
-		LOGGER.info("OS of this image: " + Image.OS);
-		// since the name of the OS is mapped to an internal value
-		// ex: 'Ubuntu x.x 64 Bit' to 'ubuntu-64' it needs a bit
-		// more work to set this box correctly...
-		// TODO: use getOS(key) from the client to get the string from the key
-		//comboBox.setSelectedItem(Client.getOs(Image.OS));
-		comboBox.setBounds(270, 26, 277, 20);
-		panel_1.add(comboBox);
-
-		try {
-			comboBox.setSelectedItem(ThriftManager.getSatClient().getOsNameForGuestOs(Image.OS,
-					SessionData.authToken));
-		} catch (TException e1) {
-			// TODO Auto-generated catch block
-			//e1.printStackTrace();
-			comboBox.setSelectedItem(Image.OS);
-		}
-
-		chckbxIsInternetBlocked.setSelected(Image.Internet);
-		chckbxIsLicensed.setSelected(Image.Licensed);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// Macht dieses Fenster unsichtbar und das vorhergehende Fenster
-				// sichtbar
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		lblHauptmen.setForeground(Color.BLUE);
-		lblHauptmen.setBounds(10, 0, 61, 14);
-		contentPanel.add(lblHauptmen);
-
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(69, 0, 13, 14);
-		contentPanel.add(label_1);
-
-		JLabel lblVlimage = new JLabel("Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 0, 45, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(133, 0, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(146, 0, 155, 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, 203, 557, 329);
-		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ötigt,\r\nkönnen Sie sich an den Beispielwerten orientieren.");
-		txtrHinweisSolltenSie.setBounds(10, 43, 537, 55);
-		panel_2.add(txtrHinweisSolltenSie);
-
-		JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie für das Image:");
-		lblNewLabel_3.setBounds(10, 109, 280, 20);
-		panel_2.add(lblNewLabel_3);
-
-		JLabel lblMindestens = new JLabel("mindestens");
-		lblMindestens.setBounds(315, 109, 60, 20);
-		panel_2.add(lblMindestens);
-
-		spinnerRam = new JSpinner();
-		spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
-		spinnerRam.setBounds(385, 106, 29, 20);
-		spinnerRam.setValue(Image.Ram);
-		panel_2.add(spinnerRam);
-
-		JLabel lblGbyte = new JLabel("GByte");
-		lblGbyte.setBounds(424, 109, 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(20, 129, 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(20, 244, 280, 55);
-		panel_2.add(txtrBeispielWindows_1);
-
-		JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie für das Image:");
-		lblWieVieleCpus.setBounds(10, 219, 280, 20);
-		panel_2.add(lblWieVieleCpus);
-
-		JLabel label_3 = new JLabel("mindestens");
-		label_3.setBounds(315, 219, 60, 20);
-		panel_2.add(label_3);
-
-		spinnerCPU = new JSpinner();
-		spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
-		spinnerCPU.setBounds(385, 216, 29, 20);
-		spinnerCPU.setValue(Image.Cpu);
-		panel_2.add(spinnerCPU);
-
-		JLabel lblKerne = new JLabel("Kerne");
-		lblKerne.setBounds(424, 219, 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ück");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// Setzt die Imagewerte in das Model
-						Image.Cpu = Integer.valueOf(spinnerCPU.getValue().toString()).intValue();
-						Image.Ram = Integer.valueOf(spinnerRam.getValue().toString()).intValue();
-						Image.Internet = chckbxIsInternetBlocked.isSelected();
-						Image.Licensed = chckbxIsLicensed.isSelected();
-						Image.OS = comboBox.getSelectedItem().toString();
-						// oeffnet das vorherige Fenster
-						GuiManager.show(new EditImageAllgemein_GUI());
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						Image.Cpu = Integer.valueOf(spinnerCPU.getValue().toString()).intValue();
-						Image.Ram = Integer.valueOf(spinnerRam.getValue().toString()).intValue();
-						Image.Internet = chckbxIsInternetBlocked.isSelected();
-						Image.Licensed = chckbxIsLicensed.isSelected();
-						Image.OS = comboBox.getSelectedItem().toString();
-
-						LOGGER.info("user is '" + person.verantwortlicher.getUserID() + "' and imageID is '"
-								+ Image.ImageId + "'.");
-
-						try {
-							//check if user may change permissions and choose window
-							if (ThriftManager.getSatClient().userIsImageAdmin(Image.ImageId,
-									SessionData.authToken, person.verantwortlicher.getUserID()) == true
-									|| (person.verantwortlicher.getRole().equals("Admin"))) {
-								//user has permission, go to permission GUI
-								GuiManager.show(new PermissionEditImage_GUI());
-							} else {
-								// user does not have permission, go straight to upload GUI
-								GuiManager.show(new FTPEditUploader_GUI());
-							}
-						} catch (TException e1) {
-							e1.printStackTrace();
-						}
-
-					}
-				});
-				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);
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
deleted file mode 100644
index ee0de205..00000000
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ /dev/null
@@ -1,586 +0,0 @@
-package gui.image;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
-import models.Image;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.TransferInformation;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-import config.Config;
-import ftp.UploadTask;
-import gui.intro.MainMenue_GUI;
-import gui.lecture.CreateLectureAllgemein_GUI;
-
-@SuppressWarnings("serial")
-public class FTPCreateUploader_GUI extends JInternalFrame implements PropertyChangeListener {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-
-	private JLabel lblPath;
-	private JProgressBar progressBar;
-	private final String host = SessionData.serverAdress;
-	private File uploadFile;
-	private UploadTask task;
-	private JLabel lblUpSpeed;
-	private JLabel lblFertig;
-	private JLabel lblFilesize;
-	private JLabel lblZeit;
-	private JLabel lblVerbleibend;
-	private JFileChooser fc;
-	private long filesize;
-	private double speed;
-	private long bytesread;
-	private boolean taskrun = false;
-	private JButton btnFinish = new JButton("Fertigstellen");
-	private JButton btnUploadStarten = new JButton("Upload auf Server starten");
-	private JButton btnZurck = new JButton("Zurück");
-	private JButton btnUploadStoppen = new JButton("Upload abbrechen");
-	private int progress = 0; // progress of upload
-	private boolean isCurrentlyLoading = false; // currently up or downloading file
-	private boolean isAborted = false; // down- or upload was manually aborted
-	private TransferInformation transferInfo = null;
-
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Laden Sie hier Ihre .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />"
-			+ "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />"
-			+ "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />"
-			+ "werden die Daten NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet."
-			+ "</div></html>";
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPCreateUploader_GUI() {
-
-		final String[] options = { "Beenden", "Abbrechen" };
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameClosing(InternalFrameEvent arg0) {
-				if (taskrun == true) {
-					// check if user wants to quit.
-					int choice = JOptionPane.showOptionDialog(
-							null,
-							"Aktuell ist ein Upload aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?",
-							"Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
-							null, options, options[1]);
-					// 0=beenden, 1=abbrechen
-					if (choice == 0) {
-						task.cancel(true);
-						// TODO: Generic exit callback?
-						System.exit(0);
-					}// end if choice
-				}
-			}
-		});
-
-		setResizable(false);
-
-		// filename=name;
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image erzeugen - " + person.verantwortlicher.getUserID());
-		// Aktion die beim Schliessen durchgefuehrt werden soll
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-
-		setBounds(0, 0, 603, 722);
-
-		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("Image auswählen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-
-					fc = new JFileChooser(Config.getLastUploadPath());
-					FileNameExtensionFilter filter = new FileNameExtensionFilter("VMDK-Container", "vmdk");
-					fc.setFileFilter(filter);
-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-
-					fc.showOpenDialog(getParent());
-					File file = fc.getSelectedFile();
-					// check if a file is selected and exists
-					if (file != null) {
-						// file selected
-						uploadFile = file;
-						uploadFile.getName();
-						lblPath.setText(file.getAbsolutePath());
-					} else {
-						// no file selected
-						lblPath.setText("");
-					}// end if
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-		lblPath = new JLabel("");
-		lblPath.setText(Config.getLastUploadPath());
-
-		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText().trim() == null || !lblPath.getText().trim().endsWith(".vmdk")) {
-					// Keine Auswahl oder Auswahl ist keine vmdk
-					btnUploadStarten.setEnabled(false);
-					btnUploadStarten.setText("Kein Image!");
-				} else {
-					// ok, enable it
-					btnUploadStarten.setEnabled(true);
-					btnUploadStarten.setText("Upload starten");
-				}
-			}
-		});
-		lblPath.setHorizontalAlignment(SwingConstants.LEFT);
-		lblPath.setBounds(102, 158, 485, 23);
-		contentPanel.add(lblPath);
-
-		btnUploadStarten.setEnabled(false);
-
-		btnUploadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonUploadActionPerformed(arg0);
-
-			}
-		});
-
-		btnUploadStarten.setBounds(102, 200, 173, 23);
-		contentPanel.add(btnUploadStarten);
-
-		progressBar = new JProgressBar(0, 100);
-		progressBar.setStringPainted(true);
-
-		progressBar.setBounds(102, 234, 485, 30);
-		contentPanel.add(progressBar);
-
-		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
-		lblUploadgeschwindigkeit.setBounds(102, 275, 141, 14);
-		contentPanel.add(lblUploadgeschwindigkeit);
-
-		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(102, 325, 46, 14);
-		contentPanel.add(label_1);
-
-		lblFertig = new JLabel("0");
-		lblFertig.setHorizontalAlignment(SwingConstants.LEFT);
-		lblFertig.setBounds(183, 325, 108, 14);
-		contentPanel.add(lblFertig);
-
-		lblUpSpeed = new JLabel("0");
-		lblUpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
-		lblUpSpeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(lblUpSpeed);
-
-		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(318, 325, 46, 14);
-		contentPanel.add(label_4);
-
-		lblFilesize = new JLabel("0");
-		lblFilesize.setHorizontalAlignment(SwingConstants.LEFT);
-		lblFilesize.setBounds(374, 325, 117, 14);
-		contentPanel.add(lblFilesize);
-
-		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(102, 350, 71, 14);
-		contentPanel.add(label_6);
-
-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Geschätzte verbleibende Zeit:");
-		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
-		contentPanel.add(lblGeschtzteVerbleibendeZeit);
-
-		lblZeit = new JLabel("0");
-		lblZeit.setHorizontalAlignment(SwingConstants.LEFT);
-		lblZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(lblZeit);
-
-		lblVerbleibend = new JLabel("0");
-		lblVerbleibend.setHorizontalAlignment(SwingConstants.LEFT);
-		lblVerbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(lblVerbleibend);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 11, 577, 57);
-		contentPanel.add(panel);
-
-		JLabel lblUploadIhresImage = new JLabel("Upload Ihres Images");
-		lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18));
-		lblUploadIhresImage.setBounds(10, 11, 509, 22);
-		panel.add(lblUploadIhresImage);
-
-		JTextPane txtpnFhreSieBitte = new JTextPane();
-		txtpnFhreSieBitte.setText("Führen Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
-		txtpnFhreSieBitte.setEditable(false);
-		txtpnFhreSieBitte.setBackground(SystemColor.menu);
-		txtpnFhreSieBitte.setBounds(10, 36, 509, 32);
-		panel.add(txtpnFhreSieBitte);
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 597, 2);
-		contentPanel.add(separator);
-
-		JLabel lblNewLabel_1 = new JLabel("Hauptmenü");
-		lblNewLabel_1.setForeground(Color.BLUE);
-		lblNewLabel_1.setBounds(20, 88, 61, 20);
-		contentPanel.add(lblNewLabel_1);
-		lblNewLabel_1.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-
-		JLabel label_3 = new JLabel(">");
-		label_3.setBounds(80, 91, 14, 14);
-		contentPanel.add(label_3);
-
-		JLabel lblVlimage = new JLabel("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");
-		lblNeubearbeiten.setBounds(149, 91, 155, 14);
-		contentPanel.add(lblNeubearbeiten);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		contentPanel.add(separator_1);
-
-		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
-		lblSchritt_1.setBounds(24, 128, 57, 14);
-		contentPanel.add(lblSchritt_1);
-
-		JLabel lblSchritt_2 = new JLabel("Schritt 2:");
-		lblSchritt_2.setBounds(24, 204, 57, 14);
-		contentPanel.add(lblSchritt_2);
-
-		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
-		lblSchritt_3.setBounds(20, 423, 57, 14);
-		contentPanel.add(lblSchritt_3);
-
-		JLabel lblKlickenSieAuf = new JLabel("Klicken Sie auf \"Fertigstellen\".");
-		lblKlickenSieAuf.setBounds(98, 423, 241, 14);
-		contentPanel.add(lblKlickenSieAuf);
-
-		btnUploadStoppen = new JButton("Upload abbrechen");
-		btnUploadStoppen.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				isAborted = true; // set flag
-				cancelUpload();
-				resetValues();
-
-				// reset buttons
-				resetButtons();
-
-			}
-		});
-		btnUploadStoppen.setEnabled(false);
-		btnUploadStoppen.setBounds(307, 200, 173, 23);
-		contentPanel.add(btnUploadStoppen);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				btnFinish.setEnabled(false);
-				btnFinish.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// save data
-						boolean success = writeData();
-						if (success == true) {
-							LOGGER.info("Neues Image '" + Image.Imagename + "' erfolgreich gespeichert.");
-							JOptionPane.showMessageDialog(null, "Die Daten wurden erfolgreich gespeichert.",
-									"Daten gespeichert", JOptionPane.INFORMATION_MESSAGE);
-						} else {
-							LOGGER.info("Neues Image '" + Image.Imagename
-									+ "' konnte nicht gespeichert werden.");
-							JOptionPane.showMessageDialog(null,
-									"Die Daten konnten nicht gespeichert werden.", "Fehler",
-									JOptionPane.ERROR_MESSAGE);
-						}
-
-						File f = new File(lblPath.getText().trim());
-						if (f.isDirectory()) {
-							// shouldn't be a directory, but let's check that
-							// case anyway
-							Config.setLastUploadPath(f.toString());
-						} else if (f.getParentFile().isDirectory()) {
-							Config.setLastUploadPath(f.getParentFile().toString());
-						}
-
-						// save configuration
-						Config.store();
-
-						if (taskrun == true) {
-							cancelUpload();
-						}
-
-						// Erstellung Array vom Datentyp Object, Hinzufügen der
-						// Optionen
-						Object[] options = { "Neue Veranstaltung erstellen", "Zum Hauptmenü zurückkehren" };
-
-						int choice = JOptionPane.showOptionDialog(
-								null,
-								"Möchten Sie eine neue Veranstaltung zu diesem Image erstellen oder in das Hauptmenü zurückkehren?",
-								"Alternativen", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE,
-								null, options, options[0]);
-
-						// 0=New Lecture, 1=Main Menu
-						if (choice == 0) {
-							GuiManager.show(new CreateLectureAllgemein_GUI());
-						} else {
-							GuiManager.show(new MainMenue_GUI());
-						}
-					}
-				});
-
-				btnZurck.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// check if loading file or not
-						if (isCurrentlyLoading() == true) {
-							int choice = JOptionPane.showOptionDialog(null,
-									"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
-									"Warnung", JOptionPane.YES_NO_CANCEL_OPTION,
-									JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
-							// 0=beenden, 1=abbrechen
-							if (choice == 0) {
-								cancelUpload();
-								// not loading files, go back one page
-								dispose();
-							}// end if choice
-						} else {
-
-							int selectedOption = JOptionPane.showConfirmDialog(
-									null,
-									"<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
-									"Abbrechen und zurück", JOptionPane.YES_NO_OPTION);
-							if (selectedOption == JOptionPane.YES_OPTION) {
-								GuiManager.show(new PermissionCreateImage_GUI());
-							} else {
-								// for actions if "no" is selected. tbd.
-							}
-
-						}// end else
-					}// end action
-				});
-				btnZurck.setActionCommand("Cancel");
-				buttonPane.add(btnZurck);
-				btnFinish.setActionCommand("Cancel");
-				buttonPane.add(btnFinish);
-			}
-		}
-
-	}
-
-	protected void cancelUpload() {
-		try {
-			ThriftManager.getSatClient().cancelUpload(transferInfo.token);
-		} catch (TException e1) {
-			// Don't care if it fails, will time out eventually....
-		}
-		task.cancel(true);
-		transferInfo = null;
-	}
-
-	private void buttonUploadActionPerformed(ActionEvent event) {
-
-		isAborted = false;
-		progressBar.setValue(0);
-		btnUploadStarten.setEnabled(false); // verhindert einen weiteren klick
-		btnUploadStarten.setText("Bitte warten");
-
-		try {
-			transferInfo = ThriftManager.getSatClient().requestUpload(SessionData.authToken,
-					uploadFile.length(), null);
-			LOGGER.info("Received FTP user.");
-		} catch (TException e) {
-
-			LOGGER.error("Konnte vom Satellit kein upload token erhalten!");
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, "Konnte vom Satellit kein upload token erhalten!",
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
-			transferInfo = null;
-			return;
-		}
-
-		LOGGER.info("Uploading to host: " + host);
-
-		task = new UploadTask(host, transferInfo.plainPort, transferInfo.token, uploadFile);
-
-		task.addPropertyChangeListener(this);
-		task.execute();
-		taskrun = true;
-
-	}
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-
-		if (isAborted == false) {
-			progress = 0;
-			if ("progress" == arg0.getPropertyName()) {
-				progress = (Integer) arg0.getNewValue();
-				progressBar.setValue(progress);
-
-			}
-
-			// Fertigstellen erlauben wenn upload abgeschlossen und abbrechen
-			// erlauben wenn kein load aktiv ist
-			if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
-				// no upload
-				btnUploadStoppen.setEnabled(false);
-				btnFinish.setEnabled(true);
-			} else {
-				// upload
-				btnUploadStoppen.setEnabled(true);
-				btnFinish.setEnabled(false);
-			}
-
-			if ("speed".equals(arg0.getPropertyName())) {
-				speed = (double) arg0.getNewValue();
-				lblUpSpeed.setText(String.format("%.2f", speed) + " MB/s");
-
-			}
-			if (arg0.getPropertyName().equals("bytesread")) {
-				bytesread = (long) arg0.getNewValue();
-				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
-				lblVerbleibend.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + " MB");
-
-				lblZeit.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 (arg0.getPropertyName().equals("filesize")) {
-				filesize = (long) arg0.getNewValue();
-				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
-
-			}
-		} // end if(isAborted==false)
-	}// end propertyChange
-
-	public boolean writeData() {
-
-		try {
-
-			Image.ImageId = ThriftManager.getSatClient().finishImageUpload(Image.Imagename, Image.Desc,
-					Image.Licensed, Image.Internet, Image.Filesize, Image.ShareMode, Image.OS,
-					transferInfo.token);
-
-			if (Image.ImageId == null) {
-				// Should never happen, but let's handle it
-				throw new TException("no image id returned");
-			}
-
-			ThriftManager.getSatClient().writeImageRights(Image.ImageId, SessionData.authToken,
-					person.verantwortlicher.getRole(), person.verantwortlicher.getHochschule(),
-					person.verantwortlicher.getUserID());
-
-			for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) {
-				ThriftManager.getSatClient().writeAdditionalImageRights(Image.ImageId,
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
-						SessionData.authToken);
-
-			}// end for
-
-		} catch (TException e) {
-
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-		return true;
-
-	}// end writeData()
-
-	public boolean isCurrentlyLoading() {
-		isCurrentlyLoading = false;
-
-		if (lblVerbleibend.getText().trim().equals("0 MB") || lblVerbleibend.getText().trim().equals("0")) {
-			isCurrentlyLoading = false;
-		} else {
-			isCurrentlyLoading = true;
-		}
-
-		return isCurrentlyLoading;
-	}// end isCurrentlyLoading()
-
-	public void resetValues() {
-		lblUpSpeed.setText("0");
-		lblZeit.setText("0");
-		lblFertig.setText("0");
-		lblFilesize.setText("0");
-		lblVerbleibend.setText("0");
-		progressBar.setValue(0);
-	}// end resetValues
-
-	public void resetButtons() {
-		btnFinish.setEnabled(false);
-		btnUploadStarten.setEnabled(true);
-		btnUploadStarten.setText("Upload starten");
-		btnUploadStoppen.setEnabled(false);
-
-	}// end resetButtons
-}// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
deleted file mode 100644
index 11aed0f9..00000000
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ /dev/null
@@ -1,489 +0,0 @@
-package gui.image;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JMenuBar;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-
-import models.Image;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.TransferInformation;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-import util.OpenLinks;
-import config.Config;
-import ftp.DownloadTask;
-import gui.intro.MainMenue_GUI;
-
-@SuppressWarnings("serial")
-public class FTPEditDownloader_GUI extends JInternalFrame implements PropertyChangeListener {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPEditDownloader_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel lblPath;
-	private JLabel lblDownSpeed;
-	private JProgressBar progressBar;
-	private String host = SessionData.serverAdress;
-	private DownloadTask task;
-	private JLabel lblFertig;
-	private JLabel lblFilesize;
-	private JLabel lblVerbleibend;
-	private JFileChooser fc;
-	private long filesize;
-	private double speed;
-	private int progress = 0; // progress of download
-	private long bytesread;
-	private JLabel lblZeit;
-	private boolean taskrun = false;
-	private JButton btnZurck = new JButton("Zurück");
-	private JButton btnDownloadStarten = new JButton("Download starten");
-	private JButton btnDownloadStoppen = new JButton("Download abbrechen");
-	private JLabel lblAnleitung;
-	private boolean isCurrentlyLoading = false; // currently up or downloading file
-	private boolean isAborted = false; // down- or upload was manually aborted
-	private TransferInformation transferInfo = null;
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Hier können Sie Images herunterladen.<br />"
-			+ "Klicken Sie anschließend auf \"Zurück\", um zu Ihrer vorherigen Auswahl zurückzugelangen.<br />"
-			+ "</div></html>";
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPEditDownloader_GUI() {
-
-		final String[] options = { "Beenden", "Abbrechen" };
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameClosing(InternalFrameEvent arg0) {
-				if (taskrun == true) {
-					// check if user wants to quit.
-					int choice = JOptionPane.showOptionDialog(
-							null,
-							"Aktuell ist ein Download aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?",
-							"Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
-							null, options, options[1]);
-					// 0=beenden, 1=abbrechen
-					if (choice == 0) {
-						try {
-							ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-							ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
-						} catch (TException e1) {
-							LOGGER.error("Error cancelling download..", e1);
-						}
-						task.cancel(true);
-						System.exit(0);
-					}// end if coice
-				}
-			}
-		});
-		setResizable(false);
-
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image herunterladen - " + person.verantwortlicher.getUserID());
-		// Aktion die beim Schliessen durchgefuehrt werden soll
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-
-		setBounds(0, 0, 603, 722);
-
-		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("Speicherort auswählen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				@Override
-				public void actionPerformed(ActionEvent arg0) {
-
-					fc = new JFileChooser(Config.getLastDownloadPath());
-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-					fc.showOpenDialog(getParent());
-
-					File dir = fc.getSelectedFile();
-					// check if directory is selected
-					if (dir != null) {
-						// is selected
-						// create dir if it does not exists.
-						if (!dir.exists())
-							dir.mkdirs();
-						lblPath.setText(dir.getAbsolutePath());
-					} else {
-						// no directory selected
-						lblPath.setText("");
-					}// end if
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-
-		lblPath = new JLabel("");
-		lblPath.setText(Config.getLastDownloadPath());
-
-		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
-			@Override
-			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText().trim().isEmpty()) {
-					// wenn leer, dann upload button nicht freigeben
-					btnDownloadStarten.setEnabled(false);
-					btnDownloadStarten.setText("Bitte warten");
-				} else {
-					// wenn NICHT leer, dann upload button freigeben
-					btnDownloadStarten.setEnabled(true);
-					btnDownloadStarten.setText("Download starten");
-				}
-			}
-		});
-		lblPath.setBounds(102, 158, 485, 23);
-		contentPanel.add(lblPath);
-
-		btnDownloadStarten.setEnabled(false);
-		btnDownloadStarten.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent arg0) {
-				buttonDownloadActionPerformed(arg0);
-			}
-		});
-
-		btnDownloadStarten.setBounds(102, 200, 173, 23);
-		contentPanel.add(btnDownloadStarten);
-
-		progressBar = new JProgressBar(0, 100);
-		progressBar.setStringPainted(true);
-
-		progressBar.setBounds(102, 234, 485, 30);
-		contentPanel.add(progressBar);
-
-		JLabel lblDownloadgeschwindigkeit = new JLabel("Downloadgeschwindigkeit:");
-		lblDownloadgeschwindigkeit.setBounds(102, 275, 141, 14);
-		contentPanel.add(lblDownloadgeschwindigkeit);
-
-		lblDownSpeed = new JLabel("0");
-		lblDownSpeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(lblDownSpeed);
-
-		JLabel lblFertig_1 = new JLabel("Fertig:");
-		lblFertig_1.setBounds(102, 325, 46, 14);
-		contentPanel.add(lblFertig_1);
-
-		lblFertig = new JLabel("0");
-		lblFertig.setBounds(183, 325, 108, 14);
-		contentPanel.add(lblFertig);
-
-		JLabel lblVon = new JLabel("von:");
-		lblVon.setBounds(318, 325, 46, 14);
-		contentPanel.add(lblVon);
-
-		lblFilesize = new JLabel("0");
-		lblFilesize.setBounds(374, 325, 117, 14);
-		contentPanel.add(lblFilesize);
-
-		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
-		lblMbVerbleibend.setBounds(102, 350, 71, 14);
-		contentPanel.add(lblMbVerbleibend);
-
-		lblVerbleibend = new JLabel("0");
-		lblVerbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(lblVerbleibend);
-
-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Geschätzte Verbleibende Zeit:");
-		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
-		contentPanel.add(lblGeschtzteVerbleibendeZeit);
-
-		lblZeit = new JLabel("0");
-		lblZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(lblZeit);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 24, 577, 57);
-		contentPanel.add(panel);
-
-		JLabel lblImageDownloader = new JLabel("Image Downloader");
-		lblImageDownloader.setFont(new Font("Tahoma", Font.BOLD, 18));
-		lblImageDownloader.setBounds(10, 11, 509, 22);
-		panel.add(lblImageDownloader);
-
-		JTextPane txtpnWhlenSieEinen = new JTextPane();
-		txtpnWhlenSieEinen.setText("Wählen Sie einen Ort aus, um das von Ihnen gewählte Image herunterzuladen.");
-		txtpnWhlenSieEinen.setEditable(false);
-		txtpnWhlenSieEinen.setBackground(SystemColor.menu);
-		txtpnWhlenSieEinen.setBounds(10, 36, 509, 32);
-		panel.add(txtpnWhlenSieEinen);
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 88, 597, 2);
-		contentPanel.add(separator);
-
-		JLabel label_1 = new JLabel("Hauptmenü");
-		label_1.setForeground(Color.BLUE);
-		label_1.setBounds(20, 92, 61, 20);
-		contentPanel.add(label_1);
-		label_1.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(80, 95, 14, 14);
-		contentPanel.add(label_2);
-
-		JLabel label_3 = new JLabel("Image");
-		label_3.setForeground(Color.BLUE);
-		label_3.setBounds(91, 92, 46, 20);
-		contentPanel.add(label_3);
-
-		JLabel label_4 = new JLabel(">");
-		label_4.setBounds(139, 95, 14, 14);
-		contentPanel.add(label_4);
-
-		JLabel lblNeuBearbeiten = new JLabel("Bearbeiten");
-		lblNeuBearbeiten.setBounds(149, 95, 155, 14);
-		contentPanel.add(lblNeuBearbeiten);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(-10, 648, 597, 2);
-		contentPanel.add(separator_1);
-
-		JLabel lblSchritt = new JLabel("Schritt 1:");
-		lblSchritt.setBounds(24, 128, 57, 14);
-		contentPanel.add(lblSchritt);
-
-		JLabel lblSchritt_1 = new JLabel("Schritt 2:");
-		lblSchritt_1.setBounds(24, 204, 57, 14);
-		contentPanel.add(lblSchritt_1);
-
-		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
-		lblSchritt_3.setBounds(20, 423, 57, 14);
-		contentPanel.add(lblSchritt_3);
-
-		JLabel lblKlickenSieAuf = new JLabel("Klicken Sie auf \"Zurück\".");
-		lblKlickenSieAuf.setBounds(102, 423, 241, 14);
-		contentPanel.add(lblKlickenSieAuf);
-
-		JMenuBar menuBar = new JMenuBar();
-		menuBar.setBounds(0, 0, 597, 21);
-		contentPanel.add(menuBar);
-
-		lblAnleitung = new JLabel(
-				"<HTML><U>Anleitung zum Erstellen einer virtuellen Maschine herunterladen</U></HTML>");
-		lblAnleitung.setForeground(Color.BLUE);
-		lblAnleitung.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				OpenLinks.openWebpage("intro");
-			}
-		});
-		lblAnleitung.setBounds(102, 448, 311, 14);
-		contentPanel.add(lblAnleitung);
-		btnDownloadStoppen.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-
-				isAborted = true; // set flag
-				try {
-					ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-				} catch (TException e1) {
-				}
-				task.cancel(true);
-				resetValues();
-
-				// reset buttons
-				resetButtons();
-			}
-		});
-
-		btnDownloadStoppen.setEnabled(false);
-		btnDownloadStoppen.setBounds(305, 200, 173, 23);
-		contentPanel.add(btnDownloadStoppen);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				btnZurck.addActionListener(new ActionListener() {
-					@Override
-					public void actionPerformed(ActionEvent e) {
-						// check if loading file or not
-						if (isCurrentlyLoading() == true) {
-							int choice = JOptionPane.showOptionDialog(null,
-									"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
-									"Warnung", JOptionPane.YES_NO_CANCEL_OPTION,
-									JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
-							// 0=beenden, 1=abbrechen
-							if (choice == 0) {
-								task.cancel(true);
-								try {
-									ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-								} catch (TException e1) {
-								}
-
-								// go back one page
-								GuiManager.show(new SearchEditImage_GUI());
-							}// end choice
-
-						} else {
-
-							// go back one page
-							GuiManager.show(new SearchEditImage_GUI());
-
-						}// end else
-							// always save download path
-						File f = new File(lblPath.getText().trim().trim());
-						if (f.isDirectory()) {
-							Config.setLastDownloadPath(f.toString());
-						} else if (f.getParentFile().isDirectory()) {
-							Config.setLastDownloadPath(f.getParentFile().toString());
-						}
-						Config.store();
-
-					}
-				});
-				btnZurck.setActionCommand("Cancel");
-				buttonPane.add(btnZurck);
-			}
-		}
-		setVisible(true);
-
-	}
-
-	private void buttonDownloadActionPerformed(ActionEvent event) {
-
-		isAborted = false;
-		progressBar.setValue(0);
-		btnDownloadStarten.setEnabled(false); // verhindert schnellen zweiten
-												// Klick
-		btnDownloadStarten.setText("Bitte warten");
-		try {
-			transferInfo = ThriftManager.getSatClient().requestDownload(SessionData.authToken, Image.ImageId);
-		} catch (TException e) {
-			transferInfo = null;
-			JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-
-		task = new DownloadTask(host, transferInfo.plainPort, transferInfo.token, lblPath.getText().trim(), Image.Filesize);
-		task.addPropertyChangeListener(this);
-		task.execute();
-		taskrun = true;
-
-	}
-
-	@Override
-	public void propertyChange(PropertyChangeEvent arg0) {
-
-		if (isAborted)
-			return;
-		progress = 0;
-		if ("progress".equals(arg0.getPropertyName())) {
-			progress = (Integer) arg0.getNewValue();
-			progressBar.setValue(progress);
-		}
-
-		if ("speed".equals(arg0.getPropertyName())) {
-			speed = (double) arg0.getNewValue();
-			lblDownSpeed.setText(String.format("%.2f", speed) + " MB/s");
-		}
-
-		// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-		if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
-			// no download
-			btnDownloadStoppen.setEnabled(false);
-		} else {
-			// currently uploading, don't let user interact
-			btnDownloadStoppen.setEnabled(true);
-		}
-
-		if (arg0.getPropertyName().equals("bytesread")) {
-			bytesread = (long) arg0.getNewValue();
-			lblFertig.setText((bytesread / 1024 / 1024) + " MB");
-			lblVerbleibend.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + " MB");
-
-			lblZeit.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 (arg0.getPropertyName().equals("filesize")) {
-			filesize = (long) arg0.getNewValue();
-			lblFilesize.setText((filesize / 1024 / 1024) + " MB");
-
-		}
-
-	}// end PropertyChange()
-
-	private boolean isCurrentlyLoading() {
-		isCurrentlyLoading = false;
-
-		if (lblVerbleibend.getText().trim().equals("0 MB") || lblVerbleibend.getText().trim().equals("0")) {
-			isCurrentlyLoading = false;
-		} else {
-			isCurrentlyLoading = true;
-		}
-		return isCurrentlyLoading;
-	}// end isCurrentlyLoading()
-
-	private void resetValues() {
-		lblDownSpeed.setText("0");
-		lblZeit.setText("0");
-		lblFertig.setText("0");
-		lblFilesize.setText("0");
-		lblVerbleibend.setText("0");
-		progressBar.setValue(0);
-	}// end resetValues
-
-	private void resetButtons() {
-		btnDownloadStarten.setEnabled(true);
-		btnDownloadStarten.setText("Download starten");
-		btnDownloadStoppen.setEnabled(false);
-
-	}// end resetButtons
-
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
deleted file mode 100644
index 27f3d7ce..00000000
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ /dev/null
@@ -1,626 +0,0 @@
-package gui.image;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.filechooser.FileNameExtensionFilter;
-
-import models.Image;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.TransferInformation;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-import util.MessageType;
-import config.Config;
-import ftp.UploadTask;
-import gui.intro.MainMenue_GUI;
-
-@SuppressWarnings("serial")
-public class FTPEditUploader_GUI extends JInternalFrame implements PropertyChangeListener {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(FTPEditUploader_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel lblPath;
-	private JProgressBar progressBar;
-	private String host = SessionData.serverAdress;
-	private File uploadFile;
-	private UploadTask task = null;
-	private JLabel lblUpSpeed;
-	private JLabel lblFertig;
-	private JLabel lblFilesize;
-	private JLabel lblZeit;
-	private JLabel lblVerbleibend;
-	private JFileChooser fc;
-	private long filesize;
-	private double speed;
-	private long bytesread;
-	private int progress = 0;
-	private JButton btnUploadStarten = new JButton("Upload auf Server starten");
-	private JButton btnSpeicherortAuswhlen = new JButton("Image auswählen");
-	private JButton btnFinish = new JButton("Fertigstellen");
-	private JButton btnZurck = new JButton("Zurück");
-	private JButton btnUploadStoppen = new JButton("Upload abbrechen");
-	private TransferInformation transferInfo = null;
-	// file
-	private boolean isAborted = false; // down- or upload was manually aborted
-	public static final String HELP_MESSAGE = "<html><div align = \"center\">"
-			+ "Laden Sie hier Ihre bearbeitete .vmdk-Datei hoch, die dann als virtuelles Labor geladen werden kann.<br />"
-			+ "Wichtig ist, dass Sie zum Schluss auf \"Fertigstellen\" klicken, damit die Daten übernommen werden.<br />"
-			+ "Wenn Sie die Datei hochgeladen haben, dann aber auf \"zurück\" klicken, oder die Anwendung beenden,<br />"
-			+ "werden die Änderungen NICHT übernommen und auch die .vmdk-Datei wird nicht aktiv geschaltet."
-			+ "</div></html>";
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPEditUploader_GUI() {
-
-		final String[] options = { "Beenden", "Abbrechen" };
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameClosing(InternalFrameEvent arg0) {
-				if (!isCurrentlyLoading())
-					return;
-				// check if user wants to quit.
-				int choice = JOptionPane.showOptionDialog(
-						null,
-						"Aktuell ist ein Upload aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?",
-						"Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, null,
-						options, options[1]);
-				// 0=beenden, 1=abbrechen
-				if (choice == 0) {
-					try {
-						ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-						ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
-					} catch (TException e1) {
-					}
-					task.cancel(true);
-					System.exit(0);
-				}// end if choice
-			}
-		});
-		setResizable(false);
-		// Aktion die beim Schliessen durchgefuehrt werden soll
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image bearbeiten  - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 603, 722);
-
-		getContentPane().setLayout(new BorderLayout());
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel, BorderLayout.CENTER);
-		contentPanel.setLayout(null);
-		{
-
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					fc = new JFileChooser(Config.getLastUploadPath());
-					fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-					FileNameExtensionFilter filter = new FileNameExtensionFilter("VMDK-Container", "vmdk");
-					fc.setFileFilter(filter);
-
-					fc.showOpenDialog(getParent());
-					File file = fc.getSelectedFile();
-					// check if a file is selected and exists
-					if (file != null) {
-						// file selected
-						uploadFile = file;
-						uploadFile.getName();
-						lblPath.setText(file.getAbsolutePath());
-					} else {
-						// no file selected
-						lblPath.setText("");
-					}// end if
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(102, 162, 173, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-
-		lblPath = new JLabel("");
-		lblPath.setText(Config.getLastUploadPath());
-
-		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText().trim().isEmpty()) {
-					// wenn leer, dann upload button nicht freigeben
-					btnUploadStarten.setEnabled(false);
-					btnUploadStarten.setText("Bitte warten");
-				} else if (lblPath.getText().trim().endsWith(".vmdk")) {
-					// wenn leer, dann upload button freigeben
-					btnUploadStarten.setEnabled(true);
-					btnUploadStarten.setText("Upload auf Server starten");
-				}
-			}
-		});
-		lblPath.setBounds(102, 196, 485, 23);
-		contentPanel.add(lblPath);
-
-		btnUploadStarten.setEnabled(false);
-		btnUploadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonUploadActionPerformed(arg0);
-
-			}
-		});
-
-		btnUploadStarten.setBounds(102, 238, 173, 23);
-		contentPanel.add(btnUploadStarten);
-
-		progressBar = new JProgressBar(0, 100);
-		progressBar.setStringPainted(true);
-
-		progressBar.setBounds(102, 272, 485, 30);
-		contentPanel.add(progressBar);
-
-		JLabel lblUploadgeschwindigkeit = new JLabel("Uploadgeschwindigkeit:");
-		lblUploadgeschwindigkeit.setBounds(102, 313, 141, 14);
-		contentPanel.add(lblUploadgeschwindigkeit);
-
-		JLabel label_1 = new JLabel("Fertig:");
-		label_1.setBounds(102, 363, 46, 14);
-		contentPanel.add(label_1);
-
-		lblFertig = new JLabel("0");
-		lblFertig.setBounds(183, 363, 108, 14);
-		contentPanel.add(lblFertig);
-
-		lblUpSpeed = new JLabel("0");
-		lblUpSpeed.setBounds(374, 313, 117, 14);
-		contentPanel.add(lblUpSpeed);
-
-		JLabel label_4 = new JLabel("von:");
-		label_4.setBounds(318, 363, 46, 14);
-		contentPanel.add(label_4);
-
-		lblFilesize = new JLabel("0");
-		lblFilesize.setBounds(374, 363, 117, 14);
-		contentPanel.add(lblFilesize);
-
-		JLabel label_6 = new JLabel("Verbleibend:");
-		label_6.setBounds(102, 388, 71, 14);
-		contentPanel.add(label_6);
-
-		JLabel label_7 = new JLabel("Geschätzte Verbleibende Zeit:");
-		label_7.setBounds(102, 338, 150, 14);
-		contentPanel.add(label_7);
-
-		lblZeit = new JLabel("0");
-		lblZeit.setBounds(374, 338, 117, 14);
-		contentPanel.add(lblZeit);
-
-		lblVerbleibend = new JLabel("0");
-		lblVerbleibend.setBounds(183, 388, 108, 14);
-		contentPanel.add(lblVerbleibend);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 11, 577, 73);
-		contentPanel.add(panel);
-
-		JLabel lblUploadIhresImage = new JLabel("Upload Ihres Images");
-		lblUploadIhresImage.setFont(new Font("Tahoma", Font.BOLD, 18));
-		lblUploadIhresImage.setBounds(10, 11, 509, 22);
-		panel.add(lblUploadIhresImage);
-
-		JTextPane txtpnFhreSieBitte = new JTextPane();
-		txtpnFhreSieBitte.setText("Laden Sie optional ein neues Image hoch, oder klicken Sie direkt auf \"Fertigstellen\", um reine Änderungen der Angaben direkt zu übernehmen.");
-		txtpnFhreSieBitte.setEditable(false);
-		txtpnFhreSieBitte.setBackground(SystemColor.menu);
-		txtpnFhreSieBitte.setBounds(10, 36, 509, 42);
-		panel.add(txtpnFhreSieBitte);
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(10, 88, 597, 14);
-		contentPanel.add(separator);
-
-		JLabel lblNewLabel_1 = new JLabel("Hauptmenü");
-		lblNewLabel_1.setForeground(Color.BLUE);
-		lblNewLabel_1.setBounds(20, 88, 61, 20);
-		contentPanel.add(lblNewLabel_1);
-		lblNewLabel_1.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-
-		JLabel label_3 = new JLabel(">");
-		label_3.setBounds(80, 91, 14, 14);
-		contentPanel.add(label_3);
-
-		JLabel lblVlimage = new JLabel("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("Bearbeiten");
-		lblNeubearbeiten.setBounds(149, 91, 155, 14);
-		contentPanel.add(lblNeubearbeiten);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 597, 2);
-		contentPanel.add(separator_1);
-
-		JLabel lblSchritt_1 = new JLabel("Schritt 1:");
-		lblSchritt_1.setBounds(24, 166, 61, 14);
-		contentPanel.add(lblSchritt_1);
-
-		JLabel lblSchritt_2 = new JLabel("Schritt 2:");
-		lblSchritt_2.setBounds(24, 242, 57, 14);
-		contentPanel.add(lblSchritt_2);
-
-		JLabel label = new JLabel("Schritt 3:");
-		label.setBounds(20, 461, 57, 14);
-		contentPanel.add(label);
-
-		JLabel label_2 = new JLabel("Klicken Sie auf \"Fertigstellen\".");
-		label_2.setBounds(98, 461, 241, 14);
-		contentPanel.add(label_2);
-		btnUploadStoppen.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				isAborted = true; // set flag
-				try {
-					ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-				} catch (TException e1) {
-				}
-				task.cancel(true);
-				resetValues();
-
-				// reset buttons
-				resetButtons();
-
-			}
-		});
-
-		btnUploadStoppen.setEnabled(false);
-		btnUploadStoppen.setBounds(307, 238, 173, 23);
-		contentPanel.add(btnUploadStoppen);
-
-		JLabel lblNewLabel = new JLabel(" (opt.)");
-		lblNewLabel.setBounds(20, 179, 46, 14);
-		contentPanel.add(lblNewLabel);
-
-		JLabel lblopt = new JLabel(" (opt.)");
-		lblopt.setBounds(20, 257, 46, 14);
-		contentPanel.add(lblopt);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-
-				// finishButton.setEnabled(false);
-				btnFinish.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// save data
-						boolean success = updateData();
-						if (!success)
-							return;
-						LOGGER.info("Bearbeitetes Image '" + Image.Imagename + "' erfolgreich gespeichert.");
-						JOptionPane.showMessageDialog(null, "Die Änderungen wurden erfolgreich gespeichert.",
-								"Änderungen gespeichert", JOptionPane.INFORMATION_MESSAGE);
-
-						if (lblPath.getText().trim().length() > 0) {
-							File f = new File(lblPath.getText().trim());
-
-							if (f.isDirectory()) {
-								Config.setLastUploadPath(f.toString());
-							} else if (f.getParentFile().isDirectory()) {
-								Config.setLastUploadPath(f.getParentFile().toString());
-							}
-						}
-
-						Config.store();
-
-						GuiManager.show(new MainMenue_GUI());
-
-						if (isCurrentlyLoading()) {
-							task.cancel(true);
-						}
-
-					}
-				});
-				btnZurck.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent arg0) {
-
-						// check if loading file or not
-						if (isCurrentlyLoading() == true) {
-							int choice = JOptionPane.showOptionDialog(null,
-									"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
-									"Warnung", JOptionPane.YES_NO_CANCEL_OPTION,
-									JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
-							// 0=beenden, 1=abbrechen
-							if (choice == 0) {
-								try {
-									ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-								} catch (TException e1) {
-									e1.printStackTrace();
-								}
-								task.cancel(true);
-								// not loading files, go back one page
-
-								try {
-
-									if (ThriftManager.getSatClient().userIsImageAdmin(Image.ImageId,
-											SessionData.authToken, person.verantwortlicher.getUserID()) == true
-											|| person.verantwortlicher.getRole().equals("Admin")) {
-
-										//user is admin and may change permissions
-										GuiManager.show(new PermissionEditImage_GUI());
-									} else {
-										//user may not change permissions
-										GuiManager.show(new EditImageTechnisch_GUI());
-									}
-								} catch (TException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-								}
-
-							}// end if coice
-						} else {
-
-							int selectedOption = JOptionPane.showConfirmDialog(
-									null,
-									"<html>Achtung: Alle Änderungen gehen verloren!<br />Klicken Sie auf fertigstellen, wenn Sie die Änderungen dauerhaft speichern möchten.<br /><br />Möchten Sie jetzt abbrechen und zurück?</html>",
-									"Abbrechen und zurück", JOptionPane.YES_NO_OPTION);
-							if (selectedOption == JOptionPane.YES_OPTION) {
-								try {
-									System.out.println("userID in editimageuploader is : "
-											+ person.verantwortlicher.getUserID());
-
-									if (ThriftManager.getSatClient().userIsImageAdmin(Image.ImageId,
-											SessionData.authToken, person.verantwortlicher.getUserID()) == true) {
-										//user is admin and may change permissions
-										GuiManager.show(new PermissionEditImage_GUI());
-									} else {
-										//user may not change permissions
-										GuiManager.show(new EditImageTechnisch_GUI());
-									}
-								} catch (TException e) {
-									// TODO Auto-generated catch block
-									e.printStackTrace();
-								}
-							} else {
-								// for actions if "no" is selected. tbd.
-							}
-
-						}// end else
-					}// end action
-				});
-
-				btnZurck.setActionCommand("Cancel");
-				buttonPane.add(btnZurck);
-				btnFinish.setActionCommand("Cancel");
-				buttonPane.add(btnFinish);
-			}
-		}
-
-	}
-
-	private void buttonUploadActionPerformed(ActionEvent event) {
-
-		isAborted = false;
-		progressBar.setValue(0);
-		btnUploadStarten.setEnabled(false); // verhindert einen weiteren Klick
-		btnUploadStarten.setText("Bitte warten");
-
-		try {
-			transferInfo = ThriftManager.getSatClient().requestUpload(SessionData.authToken,
-					uploadFile.length(), null);
-		} catch (TException e) {
-			transferInfo = null;
-			JOptionPane.showMessageDialog(null, "Konnte vom Satelliten keine FTP-User erhalten!",
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
-		}
-
-		task = new UploadTask(host, transferInfo.plainPort, transferInfo.token, uploadFile);
-
-		task.addPropertyChangeListener(this);
-		task.execute();
-
-	}
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-
-		if (isAborted == false) {
-			// set progressbar
-			if ("progress".equals(arg0.getPropertyName())) {
-				progress = (Integer) arg0.getNewValue();
-				progressBar.setValue(progress);
-			}
-
-			// Fertigstellen erlauben wenn upload abgeschlossen
-			if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
-				// no upload
-				// LOGGER.info("finished uploading file");
-				btnUploadStoppen.setEnabled(false);
-				btnFinish.setEnabled(true);
-			} else {
-				// upload
-				btnUploadStoppen.setEnabled(true);
-				btnFinish.setEnabled(false);
-			}
-
-			if ("speed".equals(arg0.getPropertyName())) {
-				speed = (double) arg0.getNewValue();
-				// if(speed<=1){
-
-				lblUpSpeed.setText(String.format("%.2f", speed) + " MB/s");
-
-			}
-			if ("bytesread".equals(arg0.getPropertyName())) {
-				bytesread = (long) arg0.getNewValue();
-				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
-				lblVerbleibend.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + " MB");
-
-				lblZeit.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".equals(arg0.getPropertyName())) {
-				filesize = (long) arg0.getNewValue();
-				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
-
-			}
-		}// end if
-	}// end propertyChange
-
-	public boolean updateData() {
-		if (isCurrentlyLoading()) {
-			JOptionPane.showMessageDialog(null, "Vorgang noch nicht abgeschlossen!!", "Fehler",
-					JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-		boolean ret;
-		Exception ex;
-		//if a new file has been uploaded and new filename is set
-		if (task != null && task.isDone()) {
-			LOGGER.debug("New file uploaded, updating DB entry...");
-
-			ret = false;
-			ex = null;
-			try {
-				ret = ThriftManager.getSatClient().updateImageFile(transferInfo.token, Image.ImageId);
-			} catch (Exception e) {
-				ex = e;
-			}
-			if (!ret) {
-				GuiManager.showMessageBox(
-						"Die Metadaten des Images konnten nicht auf das neue Image umgeschrieben werden.",
-						MessageType.ERROR, LOGGER, ex);
-				return false;
-			}
-		}
-
-		LOGGER.debug("old file should remain");
-
-		ret = false;
-		ex = null;
-		try {
-			ret = ThriftManager.getSatClient().updateImageData(SessionData.authToken, Image.ImageId,
-					Image.Imagename, Image.Desc, Image.Licensed, Image.Internet, Image.ShareMode, Image.OS);
-		} catch (TException e) {
-			ex = e;
-		}
-		if (!ret) {
-			GuiManager.showMessageBox("Serverseitiger Fehler beim Aktualisieren der Metadaten",
-					MessageType.ERROR, LOGGER, ex);
-			return false;
-		}
-
-		// remove all additional user permissions on first stage
-		ret = false;
-		ex = null;
-		try {
-			ThriftManager.getSatClient().deleteAllAdditionalImagePermissions(Image.ImageId,
-					SessionData.authToken, person.verantwortlicher.getUserID());
-		} catch (TException e) {
-			ex = e;
-		}
-		if (ex != null) {
-			GuiManager.showMessageBox("Konnte alte Permissions nicht aus der Datenbank entfernen.",
-					MessageType.WARNING, LOGGER, ex);
-		}
-
-		// then, add user permissions as they have been set new
-		ret = true; // (sic)
-		ex = null;
-		for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList().size(); i++) {
-			try {
-				ret = ThriftManager.getSatClient().writeAdditionalImageRights(Image.ImageId,
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageRead(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageWrite(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageLinkAllowed(),
-						RightsManagement.rightsManagement.getPermittedUserList().get(i).isImageAdmin(),
-						SessionData.authToken)
-						&& ret;
-			} catch (TException e) {
-				ex = e;
-			}
-		}// end for
-		if (!ret) {
-			GuiManager.showMessageBox("Serverseitiger Fehler beim Schreiben der neuen Berechtigungen.",
-					MessageType.WARNING, LOGGER, ex);
-		}
-
-		return true;
-
-	}
-
-	public boolean isCurrentlyLoading() {
-		return task != null && !task.isDone();
-	}// end isCurrentlyLoading()
-
-	public void resetValues() {
-		lblUpSpeed.setText("0");
-		lblZeit.setText("0");
-		lblFertig.setText("0");
-		lblFilesize.setText("0");
-		lblVerbleibend.setText("0");
-		progressBar.setValue(0);
-	}// end resetValues
-
-	public void resetButtons() {
-		btnFinish.setEnabled(false);
-		btnUploadStarten.setEnabled(true);
-		btnUploadStarten.setText("Upload starten");
-		btnUploadStoppen.setEnabled(false);
-
-	}// end resetButtons
-}// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
deleted file mode 100644
index c4b79d0d..00000000
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ /dev/null
@@ -1,473 +0,0 @@
-package gui.image;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.io.File;
-
-import javax.swing.JButton;
-import javax.swing.JFileChooser;
-import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JProgressBar;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-
-import models.Image;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.TransferInformation;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-import util.MessageType;
-import util.OpenLinks;
-import config.Config;
-import ftp.DownloadTask;
-import gui.intro.MainMenue_GUI;
-
-@SuppressWarnings("serial")
-public class FTPSearchDownloader_GUI extends JInternalFrame implements PropertyChangeListener {
-
-	private final static Logger LOGGER = Logger.getLogger(FTPEditDownloader_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel lblPath;
-	private JLabel lblDownSpeed;
-	private JProgressBar progressBar;
-	private String host = SessionData.serverAdress;
-	private DownloadTask task;
-	private JLabel lblFertig;
-	private JLabel lblFilesize;
-	private JLabel lblVerbleibend;
-	private JFileChooser fc;
-	private long filesize;
-	private double speed;
-	private int progress = 0; // progress of download
-	private long bytesread;
-	private JLabel lblZeit;
-	private boolean taskrun = false;
-	private JButton btnZurck = new JButton("Zurück");
-	private JButton btnDownloadStarten = new JButton("Download starten");
-	private JButton btnMainMenu = new JButton("Hauptmenü");
-	private JButton btnDownloadStoppen = new JButton("Download abbrechen");
-	private JLabel lblAnleitung;
-	private boolean isAborted = false; // down- or upload was manually aborted
-	private TransferInformation transferInfo = null;
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Hier können Sie Images herunterladen.<br />"
-			+ "Klicken Sie anschließend auf \"Zurück\" oder \"Hauptmenü\", um zu Ihrer vorherigen Auswahl oder zum Menü zurückzugelangen.<br />"
-			+ "</div></html>";
-
-	/**
-	 * Create the frame.
-	 */
-	public FTPSearchDownloader_GUI() {
-
-		final String[] options = { "Beenden", "Abbrechen" };
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameClosing(InternalFrameEvent arg0) {
-				if (taskrun == true) {
-					// check if user wants to quit.
-					int choice = JOptionPane.showOptionDialog(
-							null,
-							"Aktuell ist ein Download aktiv. Wollen Sie diesen Abbrechen und das Programm beenden?",
-							"Upload aktiv", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
-							null, options, options[1]);
-					// 0=beenden, 1=abbrechen
-					if (choice == 0) {
-
-						try {
-							ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-							ThriftManager.getSatClient().setSessionInvalid(SessionData.authToken);
-						} catch (TException e1) {
-						}
-						task.cancel(true);
-
-						System.exit(0);
-					}// end if choice
-				}
-			}
-		});
-
-		setResizable(false);
-
-		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image herunterladen - " + person.verantwortlicher.getUserID());
-		// Aktion die beim Schliessen durchgefuehrt werden soll
-		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
-		setBounds(0, 0, 603, 722);
-
-		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("Speicherort auswählen");
-			btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					fc = new JFileChooser(Config.getLastDownloadPath());
-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-					fc.showOpenDialog(getParent());
-
-					File dir = fc.getSelectedFile();
-					// check if directory is selected
-					if (dir != null) {
-						// is selected
-						// create dir if it does not exists.
-						if (!dir.exists())
-							dir.mkdirs();
-						lblPath.setText(dir.getAbsolutePath());
-					} else {
-						// no directory selected
-						lblPath.setText("");
-					}// end if
-				}
-			});
-
-			btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
-			contentPanel.add(btnSpeicherortAuswhlen);
-		}
-
-		// read last download path from config
-		lblPath = new JLabel("");
-		lblPath.setText(Config.getLastDownloadPath());
-
-		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText().trim().isEmpty()) {
-					// wenn leer, dann upload button nicht freigeben
-					btnDownloadStarten.setEnabled(false);
-					btnDownloadStarten.setText("Bitte warten");
-				} else {
-					// wenn leer, dann upload button nicht freigeben
-					btnDownloadStarten.setEnabled(true);
-					btnDownloadStarten.setText("Download starten");
-				}
-			}
-		});
-		lblPath.setBounds(102, 158, 485, 23);
-		contentPanel.add(lblPath);
-
-		btnDownloadStarten.setEnabled(false);
-		btnDownloadStarten.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				buttonDownloadActionPerformed(arg0);
-			}
-		});
-
-		btnDownloadStarten.setBounds(102, 200, 173, 23);
-		contentPanel.add(btnDownloadStarten);
-
-		progressBar = new JProgressBar(0, 100);
-		progressBar.setStringPainted(true);
-
-		progressBar.setBounds(102, 234, 485, 30);
-		contentPanel.add(progressBar);
-
-		JLabel lblDownloadgeschwindigkeit = new JLabel("Downloadgeschwindigkeit:");
-		lblDownloadgeschwindigkeit.setBounds(102, 275, 141, 14);
-		contentPanel.add(lblDownloadgeschwindigkeit);
-
-		lblDownSpeed = new JLabel("0");
-		lblDownSpeed.setBounds(374, 275, 117, 14);
-		contentPanel.add(lblDownSpeed);
-
-		JLabel lblFertig_1 = new JLabel("Fertig:");
-		lblFertig_1.setBounds(102, 325, 46, 14);
-		contentPanel.add(lblFertig_1);
-
-		lblFertig = new JLabel("0");
-		lblFertig.setBounds(183, 325, 108, 14);
-		contentPanel.add(lblFertig);
-
-		JLabel lblVon = new JLabel("von:");
-		lblVon.setBounds(318, 325, 46, 14);
-		contentPanel.add(lblVon);
-
-		lblFilesize = new JLabel("0");
-		lblFilesize.setBounds(374, 325, 117, 14);
-		contentPanel.add(lblFilesize);
-
-		JLabel lblMbVerbleibend = new JLabel("Verbleibend:");
-		lblMbVerbleibend.setBounds(102, 350, 71, 14);
-		contentPanel.add(lblMbVerbleibend);
-
-		lblVerbleibend = new JLabel("0");
-		lblVerbleibend.setBounds(183, 350, 108, 14);
-		contentPanel.add(lblVerbleibend);
-
-		JLabel lblGeschtzteVerbleibendeZeit = new JLabel("Geschätzte Verbleibende Zeit:");
-		lblGeschtzteVerbleibendeZeit.setBounds(102, 300, 150, 14);
-		contentPanel.add(lblGeschtzteVerbleibendeZeit);
-
-		lblZeit = new JLabel("0");
-		lblZeit.setBounds(374, 300, 117, 14);
-		contentPanel.add(lblZeit);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 24, 577, 57);
-		contentPanel.add(panel);
-
-		JLabel lblImageDownloader = new JLabel("Image Downloader");
-		lblImageDownloader.setFont(new Font("Tahoma", Font.BOLD, 18));
-		lblImageDownloader.setBounds(10, 11, 509, 22);
-		panel.add(lblImageDownloader);
-
-		JTextPane txtpnWhlenSieEinen = new JTextPane();
-		txtpnWhlenSieEinen.setText("Wählen Sie einen Ort aus, um das von Ihnen gwählte Image zu speichern.");
-		txtpnWhlenSieEinen.setEditable(false);
-		txtpnWhlenSieEinen.setBackground(SystemColor.menu);
-		txtpnWhlenSieEinen.setBounds(10, 36, 509, 32);
-		panel.add(txtpnWhlenSieEinen);
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 88, 597, 2);
-		contentPanel.add(separator);
-
-		JLabel label_1 = new JLabel("Hauptmenü");
-		label_1.setForeground(Color.BLUE);
-		label_1.setBounds(20, 92, 61, 20);
-		contentPanel.add(label_1);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(80, 95, 14, 14);
-		contentPanel.add(label_2);
-
-		JLabel label_3 = new JLabel("Image");
-		label_3.setForeground(Color.BLUE);
-		label_3.setBounds(91, 92, 46, 20);
-		contentPanel.add(label_3);
-
-		JLabel label_4 = new JLabel(">");
-		label_4.setBounds(139, 95, 14, 14);
-		contentPanel.add(label_4);
-
-		JLabel label_5 = new JLabel("Suche und Download");
-		label_5.setBounds(149, 95, 155, 14);
-		contentPanel.add(label_5);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(-10, 648, 597, 2);
-		contentPanel.add(separator_1);
-
-		JLabel lblSchritt = new JLabel("Schritt 1:");
-		lblSchritt.setBounds(24, 128, 57, 14);
-		contentPanel.add(lblSchritt);
-
-		JLabel lblSchritt_1 = new JLabel("Schritt 2:");
-		lblSchritt_1.setBounds(24, 204, 57, 14);
-		contentPanel.add(lblSchritt_1);
-
-		JLabel lblSchritt_3 = new JLabel("Schritt 3:");
-		lblSchritt_3.setBounds(20, 423, 57, 14);
-		contentPanel.add(lblSchritt_3);
-
-		JLabel lblKlickenSieAuf = new JLabel("Klicken Sie auf \"Zurück\" oder \"Hauptmenü\".");
-		lblKlickenSieAuf.setBounds(102, 423, 241, 14);
-		contentPanel.add(lblKlickenSieAuf);
-
-		lblAnleitung = new JLabel(
-				"<HTML><U>Anleitung zum erstellen einer virtuellen Maschine herunterladen</U></HTML>");
-		lblAnleitung.setForeground(Color.BLUE);
-		lblAnleitung.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				OpenLinks.openWebpage("vmware");
-			}
-		});
-		lblAnleitung.setBounds(102, 448, 311, 14);
-		contentPanel.add(lblAnleitung);
-		btnDownloadStoppen.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				isAborted = true; // set flag
-				try {
-					ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-				} catch (TException e1) {
-				}
-				task.cancel(true);
-				resetValues();
-
-				// reset buttons
-				resetButtons();
-			}
-		});
-
-		btnDownloadStoppen.setEnabled(false);
-		btnDownloadStoppen.setBounds(306, 200, 173, 23);
-		contentPanel.add(btnDownloadStoppen);
-
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBackground(UIManager.getColor("Button.background"));
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane, BorderLayout.SOUTH);
-			{
-				btnZurck.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// check if loading file or not
-						if (isCurrentlyLoading() == true) {
-							int choice = JOptionPane.showOptionDialog(null,
-									"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
-									"Warnung", JOptionPane.YES_NO_CANCEL_OPTION,
-									JOptionPane.QUESTION_MESSAGE, null, options, options[1]);
-							// 0=beenden, 1=abbrechen
-							if (choice == 0) {
-								task.cancel(true);
-								try {
-									ThriftManager.getSatClient().cancelDownload(transferInfo.token);
-								} catch (TException e1) {
-								}
-								// go back one page
-								GuiManager.show(new SearchImage_GUI());
-							}// end choice
-
-						} else {
-							// go back one page
-							GuiManager.show(new SearchImage_GUI());
-						}// end else
-							// save config in any case
-						Config.setLastDownloadPath(lblPath.getText().trim());
-						Config.store();
-					}// end action
-				});
-				btnZurck.setActionCommand("Cancel");
-				buttonPane.add(btnZurck);
-			}
-
-			btnMainMenu.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent arg0) {
-					Config.setLastDownloadPath(lblPath.getText().trim());
-					Config.store();
-
-					GuiManager.show(new MainMenue_GUI());
-				}
-			});
-			btnMainMenu.setActionCommand("Cancel");
-			buttonPane.add(btnMainMenu);
-		}
-
-	}
-
-	private void buttonDownloadActionPerformed(ActionEvent event) {
-
-		isAborted = false;
-		progressBar.setValue(0);
-		btnDownloadStarten.setEnabled(false); // verhindert schnellen zweiten Klick
-		btnDownloadStarten.setText("Bitte warten");
-		try {
-			transferInfo = ThriftManager.getSatClient().requestDownload(SessionData.authToken, Image.ImageId);
-		} catch (TException e) {
-			transferInfo = null;
-			GuiManager.showMessageBox("Satellit verweigert den Download", MessageType.ERROR, LOGGER, e);
-			return;
-		}
-
-		task = new DownloadTask(host, transferInfo.plainPort, transferInfo.token, lblPath.getText(),
-				Image.Filesize);
-		task.addPropertyChangeListener(this);
-		task.execute();
-		taskrun = true;
-
-	}
-
-	public void propertyChange(PropertyChangeEvent arg0) {
-
-		if (isAborted == false) {
-			progress = 0;
-			if ("progress" == arg0.getPropertyName()) {
-				progress = (Integer) arg0.getNewValue();
-				progressBar.setValue(progress);
-			}
-
-			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
-			if (isCurrentlyLoading() == false || progressBar.getPercentComplete() == 1.0) {
-				// not downloading currently
-				//LOGGER.info("finished downloading file");
-				btnDownloadStoppen.setEnabled(false);
-				btnMainMenu.setEnabled(true);
-			} else {
-				// currently downloading, don't let user interact
-				btnDownloadStoppen.setEnabled(true);
-				btnMainMenu.setEnabled(false);
-			}
-
-			if ("speed" == arg0.getPropertyName()) {
-				speed = (double) arg0.getNewValue();
-				// if(speed<=1){
-
-				lblDownSpeed.setText(String.valueOf(speed).substring(0,
-						String.valueOf(speed).lastIndexOf(".") + 3)
-						+ " MB/s");
-
-			}
-			if ("bytesread" == arg0.getPropertyName()) {
-				bytesread = (long) arg0.getNewValue();
-				lblFertig.setText((bytesread / 1024 / 1024) + " MB");
-				lblVerbleibend.setText(((filesize / 1024 / 1024) - (bytesread / 1024 / 1024)) + " MB");
-
-				lblZeit.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();
-				lblFilesize.setText((filesize / 1024 / 1024) + " MB");
-
-			}
-		}// end if
-	}// end propertyChange
-
-	private boolean isCurrentlyLoading() {
-		return task != null && !task.isDone();
-	}// end isCurrentlyLoading()
-
-	public void resetValues() {
-		lblDownSpeed.setText("0");
-		lblZeit.setText("0");
-		lblFertig.setText("0");
-		lblFilesize.setText("0");
-		lblVerbleibend.setText("0");
-		progressBar.setValue(0);
-	}// end resetValues
-
-	public void resetButtons() {
-		// btnFinish.setEnabled(false);
-		btnDownloadStarten.setEnabled(true);
-		btnDownloadStarten.setText("Download starten");
-		btnDownloadStoppen.setEnabled(false);
-
-	}// end resetButtons
-
-}// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
deleted file mode 100644
index 25848bde..00000000
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ /dev/null
@@ -1,514 +0,0 @@
-package gui.image;
-
-import gui.helper.ColumnSelector;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-
-import models.Image;
-import models.RightsManagement;
-import models.person;
-import util.CheckIntegrity;
-import util.GuiManager;
-import util.ListAllOtherUsers_GUI;
-
-@SuppressWarnings("serial")
-public class PermissionCreateImage_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTable table = null;
-	private String[] titles = { "Name", "Lesen", "Schreiben", "Link", "Admin", "userID" };
-
-	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
-
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			if (mColIndex >= 1) {
-				return true;
-			}
-			return false;
-		}
-
-		public Class<?> getColumnClass(int c) {
-			switch (c) {
-			case 0:
-				return String.class;
-			default:
-				return Boolean.class;
-			}
-		}
-
-	};
-
-	private JLabel lblRead;
-	private JLabel lblWrite;
-	private JLabel lblAdmin;
-	private JLabel lblLinkallowed;
-	private JLabel lblReadDesc;
-	private JLabel lblWriteDesc;
-	private JLabel lblAdminDesc;
-	private JLabel lblLinkallowedDesc;
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Legen Sie fest, welche Personen welche Rechte an Ihrem Image haben.<br />"
-			+ "Sie können die Rechte Lesen, Schreiben, Link und Admin vergeben.<br />"
-			+ "Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />"
-			+ "implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />"
-			+ "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." + "</div></html>";
-	private JButton btnAddUser;
-	private JButton btnDeleteUser;
-
-	public PermissionCreateImage_GUI() {
-
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Image bearbeiten - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 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("Image Berechtigungen");
-				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("Definieren Sie hier bitte die gewünschten Berechtigungen für Ihr Image");
-			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, "Weitere Berechtigungen", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 170, 557, 361);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 185);
-		panel_1.add(scrollPane);
-
-		table = new JTable();
-
-		table.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				checkIntegrity(-1);
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
-
-				table.clearSelection(); // just one row is selectable
-				table.setRowSelectionInterval(table.rowAtPoint(e.getPoint()), table.rowAtPoint(e.getPoint()));
-			}
-		});
-
-		table.setModel(model);
-		table.setSelectionForeground(Color.WHITE);
-		table.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-		table.getTableHeader().setReorderingAllowed(false);
-		// invisible attribute userID for identifying selected user
-		table.getColumnModel().getColumn(5).setWidth(0);
-		table.getColumnModel().getColumn(5).setMinWidth(0);
-		table.getColumnModel().getColumn(5).setMaxWidth(0);
-
-		// if new session, get values for table from database -> initialiting
-		// users
-		if (RightsManagement.rightsManagement.getPermittedUserList().size() > 0) {
-
-			List<person> listt = RightsManagement.rightsManagement.getPermittedUserList();
-			Iterator<person> i = listt.iterator();
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				person temp = i.next();
-
-				Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
-						temp.isImageRead(), // Read
-						temp.isImageWrite(), // Write
-						temp.isImageLinkAllowed(), // Link
-						temp.isImageAdmin(), // Admin
-						temp.getUserID() // userID
-				};
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-			}
-		}// end set list of permitted users
-
-		TableColumn tc1 = table.getColumnModel().getColumn(1);
-		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1), titles[1]));
-
-		TableColumn tc2 = table.getColumnModel().getColumn(2);
-		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2), titles[2]));
-
-		TableColumn tc3 = table.getColumnModel().getColumn(3);
-		tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 3), titles[3]));
-
-		TableColumn tc4 = table.getColumnModel().getColumn(4);
-		tc4.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc4.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2, 3, 4), titles[4]));
-
-		scrollPane.setViewportView(table);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 260, 537, 80);
-		panel_1.add(panel);
-
-		JLabel label = new JLabel("Freigabemodus:");
-		label.setBounds(10, 30, 250, 20);
-		panel.add(label);
-
-		final JComboBox<String> comboBox_1 = new JComboBox<>();
-		comboBox_1.setModel(new DefaultComboBoxModel<String>(new String[] { "Lokal (Eigene Hochschule)",
-				"Öffentlich (Alle Hochschulen)" }));
-		comboBox_1.setSelectedIndex(0);
-		comboBox_1.setBounds(270, 30, 250, 20);
-		panel.add(comboBox_1);
-
-		btnAddUser = new JButton("Hinzufügen...");
-		btnAddUser.setBounds(10, 217, 113, 23);
-		panel_1.add(btnAddUser);
-
-		btnDeleteUser = new JButton("Löschen");
-		btnDeleteUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// delete selected users from table
-				int[] deletableRows = table.getSelectedRows();
-				// after deleting a row, the length  of selected rows is reduced by 1.  This pointer
-				// counts the already deleted rows and correct the  offset of i
-				int pointerCorrection = 0;
-
-				for (int i = 0; i < deletableRows.length; i++) {
-					model.removeRow(deletableRows[i - pointerCorrection]);
-					pointerCorrection++;
-				}
-			}
-		});
-		btnDeleteUser.setBounds(134, 217, 113, 23);
-		panel_1.add(btnDeleteUser);
-		btnAddUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				// show list of all other relevant users
-				// give access to the table model and inform that the userID is
-				// position 5 in the model
-				GuiManager.openPopup(new ListAllOtherUsers_GUI(table, 5));
-			}
-		});
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("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, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP,
-				null, null));
-		panel_2.setBounds(10, 35, 557, 124);
-		contentPanel.add(panel_2);
-		panel_2.setLayout(null);
-
-		lblRead = new JLabel("Lesen");
-		lblRead.setBounds(28, 18, 90, 20);
-		panel_2.add(lblRead);
-
-		lblWrite = new JLabel("Schreiben");
-		lblWrite.setBounds(28, 38, 90, 20);
-		panel_2.add(lblWrite);
-
-		lblAdmin = new JLabel("Admin");
-		lblAdmin.setBounds(28, 78, 90, 20);
-		panel_2.add(lblAdmin);
-
-		lblLinkallowed = new JLabel("Link");
-		lblLinkallowed.setBounds(28, 58, 90, 20);
-		panel_2.add(lblLinkallowed);
-
-		lblReadDesc = new JLabel("Benutzer kann Image in bwLehrpool Suite sehen.");
-		lblReadDesc.setBounds(128, 18, 380, 20);
-		panel_2.add(lblReadDesc);
-
-		lblWriteDesc = new JLabel("Image sehen, anpassen und überschreiben, jedoch nicht löschen.");
-		lblWriteDesc.setBounds(128, 38, 380, 20);
-		panel_2.add(lblWriteDesc);
-
-		lblAdminDesc = new JLabel(
-				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblAdminDesc.setBounds(128, 78, 380, 40);
-		panel_2.add(lblAdminDesc);
-
-		lblLinkallowedDesc = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		lblLinkallowedDesc.setBounds(128, 58, 380, 20);
-		panel_2.add(lblLinkallowedDesc);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new CreateImageTechnisch_GUI());
-					}
-				});
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-				// getRootPane().setDefaultButton(cancelButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// before save, check integrity to avoid dblClick errors
-						// of rights
-						for (int i = 0; i < table.getRowCount(); i++) {
-							checkIntegrity(i); // check integrity of each line
-												// again
-							// System.out.println("in auto-correct");
-						}
-
-						saveTableToList();
-
-						Image.ShareMode = comboBox_1.getSelectedIndex();
-						GuiManager.show(new FTPCreateUploader_GUI());
-
-					}
-				});
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		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);
-
-	}// end constructor
-
-	private void checkIntegrity(int row) {
-
-		int selectedRow;
-
-		if (row == -1) {
-			selectedRow = table.getSelectedRow();
-		} else {
-			selectedRow = row;
-		}
-
-		boolean isRead, isWrite, isLink, isAdmin;
-
-		// collect all row data
-		isRead = (boolean) table.getValueAt(selectedRow, 1);
-		isWrite = (boolean) table.getValueAt(selectedRow, 2);
-		isLink = (boolean) table.getValueAt(selectedRow, 3);
-		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
-
-		boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin);
-
-		table.setValueAt(checkedVals[0], selectedRow, 1);
-		table.setValueAt(checkedVals[1], selectedRow, 2);
-		table.setValueAt(checkedVals[2], selectedRow, 3);
-		table.setValueAt(checkedVals[3], selectedRow, 4);
-	}// end checkIntegrity()
-
-	// save the entered rights into the model and prepare them to be written to
-	// the database
-	private void saveTableToList() {
-		// System.out.println("Saving Table to List");
-
-		List<person> list = new ArrayList<person>();
-
-		int seperatorIndex = 0;
-
-		// for (int i = 0; i < map.size(); i++) {
-		for (int i = 0; i < table.getRowCount(); i++) {
-			person temp = new person();
-
-			temp.setUserID(table.getModel().getValueAt(i, 5).toString()); // get
-																			// userID
-			temp.setImageAdmin(Boolean.parseBoolean(table.getModel().getValueAt(i, 4).toString())); // get Admin
-			temp.setImageLinkAllowed(Boolean.parseBoolean(table.getModel().getValueAt(i, 3).toString()));// get Link
-			temp.setImageWrite(Boolean.parseBoolean(table.getModel().getValueAt(i, 2).toString()));// get Write
-			temp.setImageRead(Boolean.parseBoolean(table.getModel().getValueAt(i, 1).toString()));// get Read
-			seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(",");
-			temp.setName(table.getModel().getValueAt(i, 0).toString().substring(0, seperatorIndex));
-			temp.setVorname(table.getModel().getValueAt(i, 0).toString().substring(seperatorIndex + 2));
-
-			// check if at least one checkbox is checked. If yes, save this
-			// entry into list, if not ignore this entry
-			if (temp.isImageAdmin() || temp.isImageLinkAllowed() || temp.isImageWrite() || temp.isImageRead()) {
-				// save entry
-				list.add(temp);
-			}
-		}
-
-		RightsManagement.rightsManagement.setPermittedUserList(list);
-	}// end saveTableToList()
-} // end class
-
-class CheckBoxHeader extends JCheckBox implements TableCellRenderer, MouseListener {
-	private static final long serialVersionUID = 6189969287264710386L;
-	protected int column;
-	protected boolean mousePressed = false;
-
-	// protected boolean readFlag = false, writeFlag = false, linkFlag = false,
-	// adminFlag = false;
-
-	public CheckBoxHeader(ItemListener itemListener, String text) {
-		this.addItemListener(itemListener);
-		this.setText(text);
-	}
-
-	public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
-			boolean hasFocus, int row, int column) {
-		if (table != null) {
-			JTableHeader header = table.getTableHeader();
-			if (header != null) {
-				this.setForeground(header.getForeground());
-				this.setBackground(header.getBackground());
-				this.setFont(header.getFont());
-				this.setBorder(header.getBorder());
-				header.addMouseListener(this);
-			}
-		}
-		setColumn(column);
-
-		return this;
-	}
-
-	protected void setColumn(int column) {
-		this.column = column;
-	}
-
-	public int getColumn() {
-		return column;
-	}
-
-	protected void handleClickEvent(MouseEvent e) {
-
-		if (mousePressed) {
-			mousePressed = false;
-			JTableHeader header = (JTableHeader) (e.getSource());
-			JTable tableView = header.getTable();
-			TableColumnModel columnModel = tableView.getColumnModel();
-			int viewColumn = columnModel.getColumnIndexAtX(e.getX());
-			int column = tableView.convertColumnIndexToModel(viewColumn);
-
-			if (viewColumn == this.column && e.getClickCount() == 1 && column != -1)
-				doClick();
-		}
-	}
-
-	public void mouseClicked(MouseEvent e) {
-		handleClickEvent(e);
-		((JTableHeader) e.getSource()).repaint();
-	}
-
-	public void mousePressed(MouseEvent e) {
-		mousePressed = true;
-	}
-
-	public void mouseReleased(MouseEvent e) {
-	}
-
-	public void mouseEntered(MouseEvent e) {
-	}
-
-	public void mouseExited(MouseEvent e) {
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
deleted file mode 100644
index eb7a7769..00000000
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ /dev/null
@@ -1,461 +0,0 @@
-package gui.image;
-
-import gui.helper.ColumnSelector;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-
-import models.Image;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Person;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.CheckIntegrity;
-import util.GuiManager;
-import util.ListAllOtherUsers_GUI;
-
-@SuppressWarnings("serial")
-public class PermissionEditImage_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTable table;
-	private static final String[] titles = { "Name", "Lesen", "Schreiben", "Link", "Admin", "userID" };
-	private List<Person> map = null; // List of people who have rights
-
-	private final DefaultTableModel model = new DefaultTableModel(titles, 0) {
-
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			if (mColIndex >= 1) {
-				return true;
-			}
-			return false;
-		}
-
-		public Class<?> getColumnClass(int c) {
-			switch (c) {
-			case 0:
-				return String.class;
-			default:
-				return Boolean.class;
-			}
-		}
-
-	};
-	private JLabel lblLinkAllowed;
-	private JLabel label_5;
-	private JLabel label_6;
-	private JLabel lblvolleRechteRead;
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Verändern Sie die Berechtigungen für Ihr Image.<br />"
-			+ "Sie können die Rechte Lesen, Schreiben, Link und Admin vergeben.<br />"
-			+ "Link bedeutet, dass diese Person Veranstaltungen auf Ihr Image verlinken darf und dieses somit<br />"
-			+ "implizit freigeben darf. Eine Person mit Adminrechten darf zusätzlich das Image löschen und Berechtigungen<br />"
-			+ "für andere Benutzer festlegen und ist somit wie der Besitzer zu betrachten." + "</div></html>";
-
-	public PermissionEditImage_GUI() {
-
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Image bearbeiten - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 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("Image Berechtigungen");
-				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("Definieren Sie hier bitte die gewünschten Berechtigungen für Ihr Image");
-			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, "Weitere Berechtigungen", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 170, 557, 354);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 21, 537, 185);
-		panel_1.add(scrollPane);
-
-		table = new JTable();
-		table.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				checkIntegrity(-1);
-			}
-
-		});
-		table.setModel(model);
-		table.setSelectionForeground(Color.WHITE);
-
-		// invisible attribute userID for identifying selected user
-		table.getColumnModel().getColumn(5).setWidth(0);
-		table.getColumnModel().getColumn(5).setMinWidth(0);
-		table.getColumnModel().getColumn(5).setMaxWidth(0);
-
-		table.getTableHeader().setReorderingAllowed(false);
-
-		// if new session, get values for table from database
-		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
-			//System.out.println("Loading data from db");
-			try {
-
-				map = ThriftManager.getSatClient().getPermissionForUserAndImage(SessionData.authToken,
-						Image.ImageId, person.verantwortlicher.getUserID());
-				Iterator<Person> i = map.iterator();
-
-				int x = 0;
-
-				while (i.hasNext()) {
-					// erzeuge Objekte fuer die Tabelle
-					Object[] obj = { map.get(x).getNachname() + ", " + map.get(x).getVorname(), // Name
-							(boolean) map.get(x).isImage_read(), // Read
-							(boolean) map.get(x).isImage_write(), // Write
-							(boolean) map.get(x).isImage_link(), // Link
-							(boolean) map.get(x).isImage_admin(), // Admin
-							map.get(x).getUserID() // userID
-					};
-					// Fuege diese Objekte der Tabelle hinzu
-					model.addRow(obj);
-
-					i.next();
-					x++;
-
-				}
-
-			} catch (TException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
-			}
-		} else // read from model
-		{
-
-			List<person> listt = RightsManagement.rightsManagement.getPermittedUserList();
-			Iterator<person> i = listt.iterator();
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				person temp = i.next();
-
-				Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
-						temp.isImageRead(), // Read
-						temp.isImageWrite(), // Write
-						temp.isImageLinkAllowed(), // Link
-						temp.isImageAdmin(), // Admin
-						temp.getUserID() // userID
-				};
-
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-			}
-		}// end set list of permitted users
-
-		TableColumn tc1 = table.getColumnModel().getColumn(1);
-		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1), titles[1]));
-
-		TableColumn tc2 = table.getColumnModel().getColumn(2);
-		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2), titles[2]));
-
-		TableColumn tc3 = table.getColumnModel().getColumn(3);
-		tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 3), titles[3]));
-
-		TableColumn tc4 = table.getColumnModel().getColumn(4);
-		tc4.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc4.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2, 3, 4), titles[4]));
-
-		scrollPane.setViewportView(table);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Freigabe", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 260, 537, 80);
-		panel_1.add(panel_2);
-
-		JLabel label_7 = new JLabel("Freigabemodus:");
-		label_7.setBounds(10, 30, 250, 20);
-		panel_2.add(label_7);
-
-		final JComboBox<String> comboBox_1 = new JComboBox<>();
-		comboBox_1.setModel(new DefaultComboBoxModel<String>(new String[] { "Lokal (Eigene Hochschule)",
-				"Öffentlich (Alle Hochschulen)" }));
-		comboBox_1.setSelectedIndex(Image.ShareMode);
-		comboBox_1.setBounds(270, 30, 250, 20);
-		panel_2.add(comboBox_1);
-
-		JButton btnAddUser = new JButton("Hinzufügen...");
-		btnAddUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				//show list of all other relevant users
-				GuiManager.openPopup(new ListAllOtherUsers_GUI(table, 5));
-			}
-		});
-		btnAddUser.setBounds(10, 217, 113, 23);
-		panel_1.add(btnAddUser);
-
-		JButton btnDeleteUser = new JButton("Löschen");
-		btnDeleteUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// delete selected users from table
-				int[] deletableRows = table.getSelectedRows();
-				int pointerCorrection = 0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i
-				//LOGGER.info("deletabelRows.length="+deletableRows.length);
-
-				for (int i = 0; i < deletableRows.length; i++) {
-
-					//LOGGER.info("Deleting rowCount["+i+"], tableRow number "+deletableRows[i-pointerCorrection]);
-					model.removeRow(deletableRows[i - pointerCorrection]);
-					pointerCorrection++;
-				}
-			}
-		});
-		btnDeleteUser.setBounds(133, 217, 113, 23);
-		panel_1.add(btnDeleteUser);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("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("Bearbeiten");
-		lblNewLabel_1.setBounds(146, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 35, 557, 124);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel label = new JLabel("Lesen");
-		label.setBounds(28, 18, 90, 20);
-		panel.add(label);
-
-		JLabel label_3 = new JLabel("Schreiben");
-		label_3.setBounds(28, 38, 90, 20);
-		panel.add(label_3);
-
-		JLabel lblImageLesenUnd = new JLabel("Benutzer kann Image in bwLehrpool Suite sehen.");
-		lblImageLesenUnd.setBounds(128, 18, 380, 20);
-		panel.add(lblImageLesenUnd);
-
-		JLabel lblImageAnpassenUnd = new JLabel(
-				"Image sehen, anpassen und überschreiben, jedoch nicht löschen.");
-		lblImageAnpassenUnd.setBounds(128, 38, 380, 20);
-		panel.add(lblImageAnpassenUnd);
-
-		lblLinkAllowed = new JLabel("Link");
-		lblLinkAllowed.setBounds(28, 58, 90, 20);
-		panel.add(lblLinkAllowed);
-
-		label_5 = new JLabel("Admin");
-		label_5.setBounds(28, 78, 90, 20);
-		panel.add(label_5);
-
-		label_6 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		label_6.setBounds(128, 58, 380, 20);
-		panel.add(label_6);
-
-		lblvolleRechteRead = new JLabel(
-				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen, Link und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblvolleRechteRead.setBounds(128, 78, 380, 40);
-		panel.add(lblvolleRechteRead);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new EditImageTechnisch_GUI());
-					}
-				});
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// before save, check integrity to avoid dblClick errors
-						// of rights
-						for (int i = 0; i < table.getRowCount(); i++) {
-							checkIntegrity(i); // check integrity of each line again
-						}
-
-						saveTableToList();
-
-						Image.ShareMode = comboBox_1.getSelectedIndex();
-						GuiManager.show(new FTPEditUploader_GUI());
-					}
-				});
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		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);
-
-	}
-
-	// save the entered rights into the model and prepare them to be written to
-	// the database
-	private void saveTableToList() {
-		List<person> list = new ArrayList<person>();
-
-		int seperatorIndex = 0;
-
-		// for (int i = 0; i < map.size(); i++) {
-		for (int i = 0; i < table.getRowCount(); i++) {
-			// System.out.println("in for, rowcount="+table.getRowCount());
-			person temp = new person();
-
-			// table.getModel().setValueAt(map.get, i, 5);
-
-			temp.setUserID(table.getModel().getValueAt(i, 5).toString()); // get
-																			// userID
-			temp.setImageAdmin(Boolean.parseBoolean(table.getModel().getValueAt(i, 4).toString())); // get Admin
-			temp.setImageLinkAllowed(Boolean.parseBoolean(table.getModel().getValueAt(i, 3).toString()));// get Link
-			temp.setImageWrite(Boolean.parseBoolean(table.getModel().getValueAt(i, 2).toString()));// get Write
-			temp.setImageRead(Boolean.parseBoolean(table.getModel().getValueAt(i, 1).toString()));// get Read
-			seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(",");
-			temp.setName(table.getModel().getValueAt(i, 0).toString().substring(0, seperatorIndex));
-			temp.setVorname(table.getModel().getValueAt(i, 0).toString().substring(seperatorIndex + 2));
-
-			// check if at least one checkbox is checked. If yes, save this
-			// entry into list, if not ignore this entry
-			if (temp.isImageAdmin() || temp.isImageLinkAllowed() || temp.isImageWrite() || temp.isImageRead()) {
-				// save entry
-				list.add(temp);
-			} else {
-				// do nothing
-			}
-		}
-
-		//permissions could have changed, compare vals at the end and update in db (quick and dirty due to time limitations)
-		RightsManagement.rightsManagement.setPermittedUserList(list);
-	}// end saveTableToList()
-
-	private void checkIntegrity(int row) {
-
-		int selectedRow;
-
-		if (row == -1) {
-			selectedRow = table.getSelectedRow();
-		} else {
-			selectedRow = row;
-		}
-
-		boolean isRead, isWrite, isLink, isAdmin;
-
-		// collect all row data
-		isRead = (boolean) table.getValueAt(selectedRow, 1);
-		isWrite = (boolean) table.getValueAt(selectedRow, 2);
-		isLink = (boolean) table.getValueAt(selectedRow, 3);
-		isAdmin = (boolean) table.getValueAt(selectedRow, 4);
-
-		boolean[] checkedVals = CheckIntegrity.isIntegreForImage(isRead, isWrite, isLink, isAdmin);
-
-		table.setValueAt(checkedVals[0], selectedRow, 1);
-		table.setValueAt(checkedVals[1], selectedRow, 2);
-		table.setValueAt(checkedVals[2], selectedRow, 3);
-		table.setValueAt(checkedVals[3], selectedRow, 4);
-	}// end checkIntegrity()
-
-}// end class
-
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
deleted file mode 100644
index 455213c7..00000000
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ /dev/null
@@ -1,702 +0,0 @@
-package gui.image;
-
-import gui.helper.TableFiller;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.Image;
-import models.ItemOwner;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-//import models.person;
-
-@SuppressWarnings("serial")
-public class SearchEditImage_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel labelName;
-	private JLabel labelUpdate;
-	private JLabel labelVerantwortlicher;
-	private JLabel labelWeitereVerantwortliche;
-	private JLabel labelVorlage;
-	private JLabel labelLizenzSoftware;
-	private JLabel labelInternet;
-	private JLabel labelRam;
-	private JLabel labelCPU;
-	private JLabel labelID;
-	private JLabel labelVersion;
-	private JLabel lblNewLabel = new JLabel("Imageauswahl");
-	private JTextArea textAreadesc;
-	private JLabel labelOS;
-	private JComboBox<String> comboBox;
-	private JTable tablemyImages;
-	private JLabel lblTotalResults;
-	private JTextField textFieldName;
-	private Component c = null;
-	private String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",
-			"Letztes Update", "ID", "Version", "Template", "Beschreibung", "Größe" };
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Suchen Sie Images und laden Sie sie direkt herunter.<br />"
-			+ "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />"
-			+ "Die Volltextsuche sucht in den Feldern Name und Beschreibung.<br />"
-			+ "Klicken Sie auf \"Weiter\" um das Image für weitere Schritte auszuwählen." + "</div></html>";
-
-	private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages);
-
-	RowFilter<Object, Object> rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
-
-	/**
-	 * Create the dialog.
-	 */
-	public SearchEditImage_GUI() {
-
-		filters.add(RowFilter.regexFilter(".", 0));
-		rf = RowFilter.orFilter(filters);
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				initTableModel(modelMyImages);
-
-				// auszublendende Angaben
-				// 1=Lizenzpflichtig
-				// 3=Veranstaltung
-				// 6=ID
-				// 7=Version
-				// 8=Template
-				// 9=Beschreibung (needed for full text search)
-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tablemyImages.getTableHeader().setReorderingAllowed(false);
-				tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				textFieldName.requestFocusInWindow();
-			}
-		});
-
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Image bearbeiten - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 918, 722);
-
-		//final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 892, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-
-				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önnen Sie nach Ihrem gewünschten Image suchen und dieses für weitere Schritte auswählen");
-			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, 98);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		textFieldName = new JTextField();
-
-		// Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-
-				String stext = textFieldName.getText().trim();
-
-				//System.out.println("Help, I don't want to be filtered yet....");
-
-				// Wenn Textfield nicht leer
-				if (!stext.isEmpty()) {
-					// Filtere nach der Eingabe
-
-					filters.clear();
-
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive
-
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyImages.setRowFilter(rf);
-
-				} else {
-					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
-
-					rf = RowFilter.orFilter(filters);
-
-					rowSorterMyImages.setRowFilter(rf);
-
-				}
-
-				tablemyImages.clearSelection();
-
-				resetImageInfo();
-			}
-
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		comboBox = new JComboBox<String>();
-		try {
-			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
-			// Server
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			// Leeres Item hinzufuegen
-			comboBox.addItem("");
-			for (int i = 0; i < list.size(); i++) {
-				// Hinzufuegen der verfuegbaren Betriebssysteme
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-			e2.printStackTrace();
-			JOptionPane.showMessageDialog(c,
-					"Konnte die Liste der Betriebssysteme vom Server nicht abfragen!", "Fehlermeldung",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		// Registriert Auswahlaenderungen der Box
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString().isEmpty() == false) {
-					// Filtert nach dem ausgewaehlten Betriebssystem
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()
-							.toString(), 2));
-
-				} else {
-					rowSorterMyImages.setRowFilter(null);
-
-				}
-			}
-
-		});
-		comboBox.setBounds(133, 58, 191, 20);
-		panel_1.add(comboBox);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauuetmenue
-				GuiManager.show(new MainMenue_GUI());
-
-			}
-		});
-		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("Image");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 45, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(116, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(129, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JButton btnDownload = new JButton("Download");
-		btnDownload.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// oeffnet den Downloader
-
-				// check if user is in correct tab
-				// check if a row is selected
-				if (tablemyImages.getSelectedRow() != -1) {
-					String imageid = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)
-							.toString();
-
-					Image.ImageId = imageid;
-					String imageversion = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-							.toString();
-
-					Image.Version = imageversion;
-
-					GuiManager.show(new FTPEditDownloader_GUI());
-
-				} else {
-					JOptionPane.showMessageDialog(c, "Bitte wählen Sie ein Image für den Download aus",
-							"Message", JOptionPane.INFORMATION_MESSAGE);
-				}
-			}
-		});
-		btnDownload.setBounds(449, 508, 118, 23);
-		contentPanel.add(btnDownload);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(10, 158, 557, 339);
-		contentPanel.add(scrollPaneMyImage);
-		tablemyImages = new JTable();
-
-		tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				//tablemyImages.clearSelection();
-				//tablemyImages.setRowSelectionInterval(e.getLastIndex(), e.getLastIndex());
-
-				if (tablemyImages.getSelectedRow() != -1) {
-					//zeige die ganzen Details an
-					String imageid = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)
-							.toString();
-					String version = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-							.toString();
-
-					//write the values into the information pane on the right hand side
-					writeImageData(imageid, version);
-
-					//fill the itemOwnder model with information from selected item
-					setItemOwnerInformation(imageid);
-				}
-			}
-		});
-
-		tablemyImages.addMouseListener(new MouseAdapter() {
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
-
-				tablemyImages.clearSelection(); //just one row is selectable
-				tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()),
-						tablemyImages.rowAtPoint(e.getPoint()));
-			}
-		});
-
-		tablemyImages.setModel(modelMyImages);
-		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_INTERVAL_SELECTION);
-		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();
-
-		rowSorterMyImages.setRowFilter(rf);
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-
-		lblTotalResults = new JLabel("Anzahl:");
-		lblTotalResults.setBounds(10, 512, 131, 20);
-		contentPanel.add(lblTotalResults);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 902, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton okButton = new JButton("Zurück");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// oeffnet das Hauptmenue
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// check if user is in correct tab
-						// if (tabbedPane.getSelectedIndex() == 0) {
-						// check if a row is selected
-						if (tablemyImages.getSelectedRow() != -1) {
-							String imageid = modelMyImages.getValueAt(
-									tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)
-									.toString();
-
-							Image.ImageId = imageid;
-							String imageversion = modelMyImages.getValueAt(
-									tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-									.toString();
-
-							Image.Version = imageversion;
-							GuiManager.show(new EditImageAllgemein_GUI());
-						}
-
-					}// end actionPerformed
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 912, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 912, 2);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(586, 85, 316, 531);
-		getContentPane().add(panel);
-
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 87, 130, 14);
-		panel.add(lblName);
-
-		labelName = new JLabel("");
-		labelName.setBounds(10, 102, 296, 14);
-		panel.add(labelName);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 259, 130, 14);
-		panel.add(lblVerantwortlicher);
-
-		labelOS = new JLabel("");
-		labelOS.setBounds(10, 216, 296, 14);
-		panel.add(labelOS);
-
-		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
-		panel.add(lblWeitereVerantwortliche);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 272, 296, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel lblWeitereAnsprechpartner = new JLabel("Weitere Ansprechpartner:");
-		lblWeitereAnsprechpartner.setBounds(10, 284, 130, 14);
-		panel.add(lblWeitereAnsprechpartner);
-
-		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setToolTipText("Weitere Personen die Zugriff auf dieses Image haben");
-		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
-		panel.add(labelWeitereVerantwortliche);
-
-		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(10, 245, 296, 14);
-		panel.add(labelUpdate);
-
-		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 231, 130, 14);
-		panel.add(lblLetztesUpdate);
-
-		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 334, 130, 14);
-		panel.add(lblImageIstVorlage);
-
-		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 348, 296, 14);
-		panel.add(labelVorlage);
-
-		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(10, 383, 296, 14);
-		panel.add(labelLizenzSoftware);
-
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
-		panel.add(lblLizenzpflichtigeSoftware);
-
-		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
-		lblInternet.setBounds(10, 400, 130, 14);
-		panel.add(lblInternet);
-
-		labelInternet = new JLabel("");
-		labelInternet.setBounds(10, 417, 296, 14);
-		panel.add(labelInternet);
-
-		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
-		panel.add(lblEmpfehlungRam);
-
-		labelRam = new JLabel("");
-		labelRam.setBounds(10, 455, 296, 14);
-		panel.add(labelRam);
-
-		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
-		panel.add(lblEmpfehlungCpu);
-
-		labelCPU = new JLabel("");
-		labelCPU.setBounds(10, 487, 296, 14);
-		panel.add(labelCPU);
-
-		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 312, 296, 14);
-		panel.add(lblTechnischeDaten);
-
-		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 296, 14);
-		panel.add(lblId);
-
-		labelID = new JLabel("");
-		labelID.setBounds(10, 37, 296, 14);
-		panel.add(labelID);
-
-		labelVersion = new JLabel("");
-		labelVersion.setBounds(10, 73, 296, 14);
-		panel.add(labelVersion);
-
-		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 57, 296, 14);
-		panel.add(lblVersion);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 119, 130, 14);
-		panel.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 135, 296, 65);
-		panel.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setEditable(false);
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		textAreadesc.setBackground(SystemColor.menu);
-		scrollPane.setViewportView(textAreadesc);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-
-		List<org.openslx.sat.thrift.iface.Image> images;
-		try {
-
-			// Hole eine Liste der passenden Images,
-			if (person.verantwortlicher.getRole() == "Admin") {
-				//get complete list
-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),
-						SessionData.authToken);
-			} else {
-				//only get permitted list
-				images = ThriftManager.getSatClient().getImageListPermissionWrite(
-						person.verantwortlicher.getEMail(), SessionData.authToken);
-			}
-
-			TableFiller.fillModelWithImageList(model, images);
-			//show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
-
-			return model;
-		} catch (TException e1) {
-			e1.printStackTrace();
-			JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		return model;
-	}
-
-	private void resetImageInfo() {
-		//reset the detailed information on the right hand side when changing search string
-		labelID.setText("");
-		labelVersion.setText("");
-		labelName.setText("");
-		textAreadesc.setText("");
-		labelOS.setText("");
-		labelUpdate.setText("");
-		labelVerantwortlicher.setText("");
-		labelWeitereVerantwortliche.setText("");
-		labelVorlage.setText("");
-		labelLizenzSoftware.setText("");
-		labelInternet.setText("");
-		labelRam.setText("");
-		labelCPU.setText("");
-
-	}
-
-	public void writeImageData(String id, String version) {
-		try {
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			String additionalContacts = "";
-			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
-					SessionData.authToken);
-			labelName.setText(res.get("name"));
-			labelOS.setText(res.get("os"));
-			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
-			labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")");
-			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
-			if (res.get("template").equals("true")) {
-				labelVorlage.setText("Ja");
-			} else {
-				labelVorlage.setText("Nein");
-			}
-			if (res.get("license").equals("1")) {
-				labelLizenzSoftware.setText("Ja");
-			} else {
-				labelLizenzSoftware.setText("Nein");
-			}
-			if (res.get("internet").equals("1")) {
-				labelInternet.setText("Ja");
-			} else {
-				labelInternet.setText("Nein");
-			}
-			labelRam.setText(res.get("ram"));
-			labelCPU.setText(res.get("cpu"));
-			labelID.setText(res.get("id"));
-			labelVersion.setText(res.get("version"));
-			textAreadesc.setText(res.get("desc"));
-			res.clear();
-
-			List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,
-					SessionData.authToken);
-			labelWeitereVerantwortliche.setText("");
-			
-			for(int i = 0; i < contacts.size(); i++)
-			{
-				additionalContacts += contacts.get(i);
-				if(i != contacts.size() -1)
-				{
-					additionalContacts += " / ";
-				}
-			}
-			labelWeitereVerantwortliche.setText(additionalContacts);
-			labelWeitereVerantwortliche.setToolTipText(additionalContacts);
-
-		} catch (TException | ParseException e1) {
-			e1.printStackTrace();
-		}
-	}//end writeImageData
-
-	public void setItemOwnerInformation(String imageid) {
-		Map<String, String> map = new HashMap<String, String>();
-
-		try {
-			//get values from server and set them in model
-			map = ThriftManager.getSatClient().getItemOwner(imageid, SessionData.authToken);
-
-			ItemOwner.itemOwner.setUserID(map.get("userID"));
-			ItemOwner.itemOwner.setUsername(map.get("loginName"));
-			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
-			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
-			ItemOwner.itemOwner.setEmail(map.get("mail"));
-			ItemOwner.itemOwner.setHochschule(map.get("institution"));
-
-		} catch (TException e) {
-			e.printStackTrace();
-		}
-
-	}//end setItemInformation
-
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
deleted file mode 100644
index 282e48ec..00000000
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ /dev/null
@@ -1,919 +0,0 @@
-package gui.image;

-

-import gui.helper.TableFiller;

-import gui.intro.MainMenue_GUI;

-

-import java.awt.Color;

-import java.awt.Component;

-import java.awt.FlowLayout;

-import java.awt.Font;

-import java.awt.SystemColor;

-import java.awt.event.ActionEvent;

-import java.awt.event.ActionListener;

-import java.awt.event.KeyAdapter;

-import java.awt.event.KeyEvent;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import java.text.ParseException;

-import java.text.SimpleDateFormat;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import javax.swing.JButton;

-import javax.swing.JComboBox;

-import javax.swing.JInternalFrame;

-import javax.swing.JLabel;

-import javax.swing.JOptionPane;

-import javax.swing.JPanel;

-import javax.swing.JScrollPane;

-import javax.swing.JSeparator;

-import javax.swing.JTabbedPane;

-import javax.swing.JTable;

-import javax.swing.JTextArea;

-import javax.swing.JTextField;

-import javax.swing.JTextPane;

-import javax.swing.ListSelectionModel;

-import javax.swing.RowFilter;

-import javax.swing.border.EmptyBorder;

-import javax.swing.border.TitledBorder;

-import javax.swing.event.InternalFrameAdapter;

-import javax.swing.event.InternalFrameEvent;

-import javax.swing.event.ListSelectionEvent;

-import javax.swing.event.ListSelectionListener;

-import javax.swing.table.DefaultTableModel;

-import javax.swing.table.TableModel;

-import javax.swing.table.TableRowSorter;

-

-import models.Image;

-import models.SessionData;

-import models.person;

-

-import org.apache.thrift.TException;

-import org.openslx.thrifthelper.ThriftManager;

-

-import util.GuiManager;

-

-@SuppressWarnings("serial")

-public class SearchImage_GUI extends JInternalFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	private JLabel labelName;

-	private JLabel labelUpdate;

-	private JLabel labelVerantwortlicher;

-	private JLabel labelWeitereVerantwortliche;

-	private JLabel labelVorlage;

-	private JLabel labelLizenzSoftware;

-	private JLabel labelInternet;

-	private JLabel labelRam;

-	private JLabel labelCPU;

-	private JLabel labelID;

-	private JLabel labelVersion;

-	private JTextArea textAreadesc;

-	private JLabel labelOS;

-	private JComboBox<String> comboBox;

-	private JTable tableAllImages;

-	private JTable tablemyImages;

-	private JTable tablePublicVorlagen;

-	private JTextField textFieldName;

-	private JTabbedPane tabbedPane;

-	private JButton btnDownload;

-	private Component c = null;

-	// Angezeigt werden aber nur Name (0), OS (2), Verantwortlicher (4), Letztes Update (5)

-	private String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",

-			"Letztes Update", "ID", "Version", "Template", "Beschreibung", "Größe" };

-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"

-			+ "Suchen Sie Images und laden Sie sie direkt herunter.<br />"

-			+ "Sie können die Volltextsuche nutzen und nach Betriebssystemen filtern.<br />"

-			+ "Die Volltextsuche sucht in den Feldern Name und Beschreibung." + "</div></html>";

-

-	private final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {

-		public boolean isCellEditable(int rowIndex, int mColIndex) {

-			return false;

-		}

-	};

-	private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {

-		public boolean isCellEditable(int rowIndex, int mColIndex) {

-			return false;

-		}

-	};

-	private final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0) {

-		public boolean isCellEditable(int rowIndex, int mColIndex) {

-			return false;

-		}

-	};

-

-	private final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelAll);

-	private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages);

-	private final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(

-			modelPublicVorlagen);

-

-	RowFilter<Object, Object> orFilter = null;

-	List<RowFilter<Object, Object>> orFilters = new ArrayList<>();

-

-	//needed for templates, filter for name OR desc AND temp_flag --> (name || desc) && (temp_flag)

-	RowFilter<Object, Object> andFilter = null;

-	List<RowFilter<Object, Object>> andFilters = new ArrayList<>();

-

-	//the final filter which handles the search in the templates

-	RowFilter<Object, Object> templateFilter = null;

-	ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<>();

-

-	/**

-	 * Create the dialog.

-	 */

-	public SearchImage_GUI() {

-

-		addInternalFrameListener(new InternalFrameAdapter() {

-			@Override

-			public void internalFrameActivated(InternalFrameEvent arg0) {

-				initTableModelAll(modelAll);

-				initTableModel(modelMyImages);

-				initTableModelTemplates(modelPublicVorlagen);

-

-				// auszublendende Angaben

-				// 1=Lizenzpflichtig

-				// 3=Veranstaltung

-				// 6=ID

-				// 7=Version

-				// 8=Template

-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);

-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);

-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);

-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);

-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);

-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);

-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);

-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);

-

-				tablemyImages.getTableHeader().setReorderingAllowed(false);

-				tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

-				tablemyImages.addMouseListener(new MouseAdapter() {

-

-					@Override

-					public void mouseReleased(MouseEvent e) {

-

-						tablemyImages.clearSelection(); //just one row is selectable

-						tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()),

-								tablemyImages.rowAtPoint(e.getPoint()));

-					}

-				});

-

-				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(3).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(3).setMaxWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(9).setWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(9).setMinWidth(0);

-				tablePublicVorlagen.getColumnModel().getColumn(9).setMaxWidth(0);

-

-				tablePublicVorlagen.getTableHeader().setReorderingAllowed(false);

-				tablePublicVorlagen.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

-				tablePublicVorlagen.addMouseListener(new MouseAdapter() {

-

-					@Override

-					public void mouseReleased(MouseEvent e) {

-

-						tablePublicVorlagen.clearSelection(); //just one row is selectable

-						tablePublicVorlagen.setRowSelectionInterval(

-								tablePublicVorlagen.rowAtPoint(e.getPoint()),

-								tablePublicVorlagen.rowAtPoint(e.getPoint()));

-					}

-				});

-

-				tableAllImages.getColumnModel().getColumn(1).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);

-				tableAllImages.getColumnModel().getColumn(3).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(3).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0);

-				tableAllImages.getColumnModel().getColumn(8).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);

-				tableAllImages.getColumnModel().getColumn(6).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);

-				tableAllImages.getColumnModel().getColumn(7).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);

-				tableAllImages.getColumnModel().getColumn(9).setWidth(0);

-				tableAllImages.getColumnModel().getColumn(9).setMinWidth(0);

-				tableAllImages.getColumnModel().getColumn(9).setMaxWidth(0);

-

-				tableAllImages.getTableHeader().setReorderingAllowed(false);

-				tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

-				tableAllImages.addMouseListener(new MouseAdapter() {

-

-					@Override

-					public void mouseReleased(MouseEvent e) {

-

-						tableAllImages.clearSelection(); //just one row is selectable

-						tableAllImages.setRowSelectionInterval(tableAllImages.rowAtPoint(e.getPoint()),

-								tableAllImages.rowAtPoint(e.getPoint()));

-					}

-				});

-

-				textFieldName.requestFocusInWindow();

-			}

-		});

-

-		// Verhindert das Vergroessern Des Fensters

-		setResizable(false);

-

-		// Setzt den Fenstertitel

-		setTitle("bwLehrpool Suite - Image suchen - " + person.verantwortlicher.getUserID());

-		// Zentriert das Fenster in die Bildmitte

-		setBounds(0, 0, 918, 722);

-

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

-

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBackground(SystemColor.menu);

-			panel.setBounds(10, 11, 892, 57);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

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

-				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önnen Sie nach Ihrem gewünschten Image suchen und dieses für weitere Schritte auswählen");

-			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, 98);

-		contentPanel.add(panel_1);

-		panel_1.setLayout(null);

-

-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");

-		lblNewLabel_2.setBounds(30, 30, 80, 20);

-		panel_1.add(lblNewLabel_2);

-

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

-		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);

-		panel_1.add(lblInternetIstInnerhalb);

-

-		textFieldName = new JTextField();

-		// Key Listener der Tastatureingabe registriert

-		textFieldName.addKeyListener(new KeyAdapter() {

-			@Override

-			public void keyReleased(KeyEvent e) {

-				// Textfield eingabe auslesen

-				String stext = textFieldName.getText().trim();

-

-				// Wenn Textfield nicht leer

-				if (!stext.isEmpty()) {

-					// Filtere nach der Eingabe

-

-					orFilters.clear();

-					andFilters.clear();

-					finalFilters.clear();

-

-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive

-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive

-

-					orFilter = RowFilter.orFilter(orFilters);

-

-					rowSorterAll.setRowFilter(orFilter);

-					rowSorterMyImages.setRowFilter(orFilter);

-

-					andFilters.add(RowFilter.regexFilter("1", 8));

-					andFilter = RowFilter.andFilter(andFilters);

-

-					finalFilters.add(andFilter);

-					finalFilters.add(orFilter);

-					templateFilter = RowFilter.andFilter(finalFilters);

-					rowSorterPublicVorlagen.setRowFilter(templateFilter); //füttere finalFilter mit andFilter und orFilter

-

-				} else { //refresh list 

-					String username = person.verantwortlicher.getName() + " "

-							+ person.verantwortlicher.getVorname();

-

-					orFilters.clear();

-					andFilters.clear();

-					orFilters.add(RowFilter.regexFilter(username, 4)); //case insensitive, filter for anything

-					orFilter = RowFilter.andFilter(orFilters);

-

-					rowSorterMyImages.setRowFilter(orFilter);

-					rowSorterAll.setRowFilter(orFilter);

-

-					//in addition, templates can only be shown when they really are templates!

-					orFilters.clear();

-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive

-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive

-					orFilters.add(RowFilter.regexFilter("1", 8));

-					orFilter = RowFilter.orFilter(orFilters);

-					rowSorterPublicVorlagen.setRowFilter(orFilter);

-

-				}

-

-				tablemyImages.clearSelection();

-				tableAllImages.clearSelection();

-				tablePublicVorlagen.clearSelection();

-

-				resetImageInfo();

-			}

-		});

-

-		textFieldName.setBounds(133, 30, 400, 20);

-		panel_1.add(textFieldName);

-		textFieldName.setColumns(10);

-

-		comboBox = new JComboBox<String>();

-		try {

-			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom

-			// Server

-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);

-			// Leeres Item hinzufuegen

-			comboBox.addItem("");

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

-				// Hinzufuegen der verfuegbaren Betriebssysteme

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

-			}

-		} catch (TException e2) {

-

-			e2.printStackTrace();

-			JOptionPane.showMessageDialog(c, e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",

-					JOptionPane.ERROR_MESSAGE);

-		}

-		// Registriert Auswahlaenderungen der Box

-		comboBox.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				// Prueft das die Auswahl nicht leer ist

-				if (comboBox.getSelectedItem().toString() != "") {

-					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));

-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()

-							.toString(), 2));

-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()

-							.toString(), 2));

-				} else {

-					rowSorterMyImages.setRowFilter(null);

-					rowSorterPublicVorlagen.setRowFilter(null);

-					rowSorterAll.setRowFilter(null);

-				}

-			}

-

-		});

-		comboBox.setBounds(133, 58, 191, 20);

-		panel_1.add(comboBox);

-

-		JLabel lblHauptmen = new JLabel("Hauptmenü");

-		lblHauptmen.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent arg0) {

-				// oeffnet das Hauptmenue

-				GuiManager.show(new MainMenue_GUI());

-			}

-		});

-		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("Image");

-		lblVlimage.setForeground(Color.BLUE);

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

-		contentPanel.add(lblVlimage);

-

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

-		label_2.setBounds(116, 11, 13, 14);

-		contentPanel.add(label_2);

-

-		JLabel lblNewLabel_1 = new JLabel("Suche und Download");

-		lblNewLabel_1.setBounds(129, 11, 155, 14);

-		contentPanel.add(lblNewLabel_1);

-

-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

-

-		tabbedPane.setBounds(10, 158, 557, 339);

-		contentPanel.add(tabbedPane);

-

-		JScrollPane scrollPaneAllImages = new JScrollPane();

-		tableAllImages = new JTable();

-		tableAllImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

-			public void valueChanged(ListSelectionEvent e) {

-

-				if (tableAllImages.getSelectedRow() != -1) {

-					String imageid = modelAll.getValueAt(

-							tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 6)

-							.toString();

-					String version = modelAll.getValueAt(

-							tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 7)

-							.toString();

-					writeImageData(imageid, version);

-

-				}

-			}

-		});

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

-

-		JScrollPane scrollPaneMyImage = new JScrollPane();

-		tablemyImages = new JTable();

-		tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

-			public void valueChanged(ListSelectionEvent e) {

-				if (tablemyImages.getSelectedRow() != -1) {

-					String imageid = modelMyImages.getValueAt(

-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)

-							.toString();

-					String version = modelMyImages.getValueAt(

-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)

-							.toString();

-					writeImageData(imageid, version);

-				}

-			}

-

-		});

-		tablemyImages.setModel(modelMyImages);

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

-

-		tablemyImages.setRowSorter(rowSorterMyImages);

-

-		scrollPaneMyImage.setViewportView(tablemyImages);

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

-

-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();

-		tablePublicVorlagen = new JTable();

-		tablePublicVorlagen.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

-			public void valueChanged(ListSelectionEvent e) {

-

-				if (tablePublicVorlagen.getSelectedRow() != -1) {

-					String imageid = modelPublicVorlagen.getValueAt(

-							tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()),

-							6).toString();

-					String version = modelPublicVorlagen.getValueAt(

-							tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()),

-							7).toString();

-					writeImageData(imageid, version);

-

-				}

-			}

-

-		});

-		tablePublicVorlagen.setModel(modelPublicVorlagen);

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

-

-		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);

-

-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);

-

-		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);

-		tableAllImages.setRowSorter(rowSorterAll);

-

-		scrollPaneAllImages.setViewportView(tableAllImages);

-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, 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("bwLehrpool", null, scrollPaneCoopImages, null);

-		tabbedPane.setEnabledAt(3, false);

-

-		btnDownload = new JButton("Download");

-		btnDownload.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				// oeffnet den Downloader

-				String username = person.verantwortlicher.getName() + " "

-						+ person.verantwortlicher.getVorname();

-				//

-				// meine Images

-				//

-				if (tabbedPane.getSelectedIndex() == 0) {

-					if (tablemyImages.getSelectedRow() != -1) {

-						String imageid = modelMyImages.getValueAt(

-								tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)

-								.toString();

-

-						Image.ImageId = imageid;

-						String imageversion = modelMyImages.getValueAt(

-								tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)

-								.toString();

-

-						Image.Version = imageversion;

-						GuiManager.show(new FTPSearchDownloader_GUI());

-

-					}

-				} else if (tabbedPane.getSelectedIndex() == 1) {

-					//

-					// Vorlagen Images

-					//

-

-					if (tablePublicVorlagen.getSelectedRow() != -1) {

-						String imageid = modelPublicVorlagen.getValueAt(

-								tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen

-										.getSelectedRow()), 6).toString();

-

-						Image.ImageId = imageid;

-						String imageversion = modelPublicVorlagen.getValueAt(

-								tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen

-										.getSelectedRow()), 7).toString();

-

-						Image.Version = imageversion;

-						GuiManager.show(new FTPSearchDownloader_GUI());

-					}

-				} else if (tabbedPane.getSelectedIndex() == 2) {

-					//

-					// Alle Images

-					//

-					if (tableAllImages.getSelectedRow() != -1) {

-						// nur eigene Images downloadbar

-						if (modelAll.getValueAt(

-								tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 4)

-								.equals(username) == true

-								|| modelAll

-										.getValueAt(

-												tableAllImages.convertRowIndexToModel(tableAllImages

-														.getSelectedRow()), 8).equals("true") == true

-								|| person.verantwortlicher.getRole().equals("Admin")) {

-							String imageid = modelAll

-									.getValueAt(

-											tableAllImages.convertRowIndexToModel(tableAllImages

-													.getSelectedRow()), 6).toString();

-

-							Image.ImageId = imageid;

-							String imageversion = modelAll

-									.getValueAt(

-											tableAllImages.convertRowIndexToModel(tableAllImages

-													.getSelectedRow()), 7).toString();

-

-							Image.Version = imageversion;

-

-							GuiManager.show(new FTPSearchDownloader_GUI());

-						} else {

-							JOptionPane.showMessageDialog(c,

-									"Sie haben keine Berechtigung fremde Images herunterzuladen.", "Message",

-									JOptionPane.INFORMATION_MESSAGE);

-						}

-

-					}

-

-				} else {

-					//

-					// nichts markiert

-					//

-					JOptionPane.showMessageDialog(c, "Bitte wählen Sie ein Image für den Download aus",

-							"Message", JOptionPane.INFORMATION_MESSAGE);

-				}

-			}

-		});

-		btnDownload.setBounds(449, 508, 118, 23);

-		contentPanel.add(btnDownload);

-

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 640, 902, 33);

-			buttonPane.setBackground(SystemColor.menu);

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

-			getContentPane().add(buttonPane);

-			{

-				JButton okButton = new JButton("Zurück");

-				okButton.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						// oeffnet das Hauptmenue

-						GuiManager.show(new MainMenue_GUI());

-					}

-				});

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-			}

-		}

-

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 912, 1);

-		getContentPane().add(separator);

-

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 627, 912, 2);

-		getContentPane().add(separator_1);

-

-		JPanel panel = new JPanel();

-		panel.setLayout(null);

-		panel.setBorder(new TitledBorder(null, "Detailinformationen",

-

-		TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel.setBackground(SystemColor.menu);

-		panel.setBounds(586, 85, 316, 531);

-		getContentPane().add(panel);

-

-		JLabel lblName = new JLabel("Name:");

-		lblName.setBounds(10, 87, 130, 14);

-		panel.add(lblName);

-

-		labelName = new JLabel("");

-		labelName.setBounds(10, 102, 296, 14);

-		panel.add(labelName);

-

-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");

-		lblVerantwortlicher.setBounds(10, 259, 130, 14);

-		panel.add(lblVerantwortlicher);

-

-		labelOS = new JLabel("");

-		labelOS.setBounds(10, 216, 296, 14);

-		panel.add(labelOS);

-

-		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");

-		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);

-		panel.add(lblWeitereVerantwortliche);

-

-		labelVerantwortlicher = new JLabel("");

-		labelVerantwortlicher.setBounds(10, 272, 296, 14);

-		panel.add(labelVerantwortlicher);

-

-		JLabel label = new JLabel("Weitere Ansprechpartner:");

-		label.setBounds(10, 284, 130, 14);

-		panel.add(label);

-

-		labelWeitereVerantwortliche = new JLabel("");

-		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);

-		panel.add(labelWeitereVerantwortliche);

-

-		labelUpdate = new JLabel("");

-		labelUpdate.setBounds(10, 245, 296, 14);

-		panel.add(labelUpdate);

-

-		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");

-		lblLetztesUpdate.setBounds(10, 231, 130, 14);

-		panel.add(lblLetztesUpdate);

-

-		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");

-		lblImageIstVorlage.setBounds(10, 334, 130, 14);

-		panel.add(lblImageIstVorlage);

-

-		labelVorlage = new JLabel("");

-		labelVorlage.setBounds(10, 348, 296, 14);

-		panel.add(labelVorlage);

-

-		labelLizenzSoftware = new JLabel("");

-		labelLizenzSoftware.setBounds(10, 383, 296, 14);

-		panel.add(labelLizenzSoftware);

-

-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");

-		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);

-		panel.add(lblLizenzpflichtigeSoftware);

-

-		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");

-		lblInternet.setBounds(10, 400, 130, 14);

-		panel.add(lblInternet);

-

-		labelInternet = new JLabel("");

-		labelInternet.setBounds(10, 417, 296, 14);

-		panel.add(labelInternet);

-

-		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");

-		lblEmpfehlungRam.setBounds(10, 432, 130, 14);

-		panel.add(lblEmpfehlungRam);

-

-		labelRam = new JLabel("");

-		labelRam.setBounds(10, 455, 296, 14);

-		panel.add(labelRam);

-

-		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");

-		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);

-		panel.add(lblEmpfehlungCpu);

-

-		labelCPU = new JLabel("");

-		labelCPU.setBounds(10, 487, 296, 14);

-		panel.add(labelCPU);

-

-		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");

-		lblTechnischeDaten.setBounds(10, 312, 296, 14);

-		panel.add(lblTechnischeDaten);

-

-		JLabel lblId = new JLabel("ID:");

-		lblId.setBounds(10, 23, 296, 14);

-		panel.add(lblId);

-

-		labelID = new JLabel("");

-		labelID.setBounds(10, 37, 296, 14);

-		panel.add(labelID);

-

-		labelVersion = new JLabel("");

-		labelVersion.setBounds(10, 73, 296, 14);

-		panel.add(labelVersion);

-

-		JLabel lblVersion = new JLabel("Version:");

-		lblVersion.setBounds(10, 57, 296, 14);

-		panel.add(lblVersion);

-

-		JLabel lblBeschreibung = new JLabel("Beschreibung:");

-		lblBeschreibung.setBounds(10, 119, 130, 14);

-		panel.add(lblBeschreibung);

-

-		JScrollPane scrollPane = new JScrollPane();

-		scrollPane.setBounds(10, 135, 296, 65);

-		panel.add(scrollPane);

-

-		textAreadesc = new JTextArea();

-		textAreadesc.setEditable(false);

-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		textAreadesc.setLineWrap(true);

-		textAreadesc.setBackground(SystemColor.menu);

-		scrollPane.setViewportView(textAreadesc);

-

-	}

-

-	// Initiale Beffuelung eines Table models

-	public DefaultTableModel initTableModel(DefaultTableModel model) {

-		List<org.openslx.sat.thrift.iface.Image> images;

-		try {

-

-			// Hole eine Liste der Images

-			if (person.verantwortlicher.getRole().equals("Admin")) {

-				//get complete list

-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),

-						SessionData.authToken);

-			} else {

-				images = ThriftManager.getSatClient().getImageListPermissionRead(

-						person.verantwortlicher.getUserID(), SessionData.authToken);

-			}

-			TableFiller.fillModelWithImageList(model, images);

-

-			//show number of rows in GUI

-			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0) + " (" + model.getRowCount() + ") ");

-

-			return model;

-		} catch (TException e1) {

-

-			e1.printStackTrace();

-			JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

-					JOptionPane.ERROR_MESSAGE);

-		}

-		return model;

-	}

-

-	public DefaultTableModel initTableModelAll(DefaultTableModel model) {

-		try {

-			// Hole eine Liste der Images

-			List<org.openslx.sat.thrift.iface.Image> images = ThriftManager.getSatClient().getImageList(

-					person.verantwortlicher.getUserID(), SessionData.authToken);

-			TableFiller.fillModelWithImageList(model, images);

-			//show number of rows in GUI

-			tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2) + " (" + model.getRowCount() + ") ");

-

-			return model;

-		} catch (TException e1) {

-

-			e1.printStackTrace();

-			JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

-					JOptionPane.ERROR_MESSAGE);

-		}

-		return model;

-	}

-

-	// Initiale Beffuelung eines Table models

-	public DefaultTableModel initTableModelTemplates(DefaultTableModel model) {

-		try {

-			// Hole eine Liste der Images

-			List<org.openslx.sat.thrift.iface.Image> images = ThriftManager.getSatClient()

-					.getImageListAllTemplates(SessionData.authToken);

-			TableFiller.fillModelWithImageList(model, images);

-			//show number of rows in GUI

-			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1) + " (" + model.getRowCount() + ") ");

-

-			return model;

-		} catch (TException e1) {

-

-			e1.printStackTrace();

-			JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",

-					JOptionPane.ERROR_MESSAGE);

-		}

-		return model;

-	}// end initTableModelTemplates

-

-	private void resetImageInfo() {

-		//reset the detailed information on the right hand side when changing search string

-		labelID.setText("");

-		labelVersion.setText("");

-		labelName.setText("");

-		textAreadesc.setText("");

-		labelOS.setText("");

-		labelUpdate.setText("");

-		labelVerantwortlicher.setText("");

-		labelWeitereVerantwortliche.setText("");

-		labelVorlage.setText("");

-		labelLizenzSoftware.setText("");

-		labelInternet.setText("");

-		labelRam.setText("");

-		labelCPU.setText("");

-	}

-

-	public void writeImageData(String id, String version) {

-		try {

-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-			String additionalContacts = "";

-			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,

-					SessionData.authToken);

-			labelName.setText(res.get("name"));

-			labelOS.setText(res.get("os"));

-			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));

-			labelVerantwortlicher.setText(res.get("owner") + " (" + res.get("mail") + ")");

-			labelWeitereVerantwortliche.setText("Keine");

-			if (res.get("template").equals("true")) {

-				labelVorlage.setText("Ja");

-			} else {

-				labelVorlage.setText("Nein");

-			}

-			if (res.get("license").equals("1")) {

-				labelLizenzSoftware.setText("Ja");

-			} else {

-				labelLizenzSoftware.setText("Nein");

-			}

-			if (res.get("internet").equals("1")) {

-				labelInternet.setText("Ja");

-			} else {

-				labelInternet.setText("Nein");

-			}

-			labelRam.setText(res.get("ram"));

-			labelCPU.setText(res.get("cpu"));

-			labelID.setText(res.get("id"));

-			labelVersion.setText(res.get("version"));

-			textAreadesc.setText(res.get("desc"));

-

-			List<String> contacts = ThriftManager.getSatClient().getAdditionalImageContacts(id,

-					SessionData.authToken);

-			labelWeitereVerantwortliche.setText("");

-			

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

-			{

-				additionalContacts += contacts.get(i);

-				if(i != contacts.size() -1)

-				{

-					additionalContacts += " / ";

-				}

-			}

-			labelWeitereVerantwortliche.setText(additionalContacts);

-			labelWeitereVerantwortliche.setToolTipText(additionalContacts);

-

-			

-			if (person.verantwortlicher.getRole().equals("Student") && res.get("license").equals("1")) {

-				btnDownload.setEnabled(false);

-			} else {

-				btnDownload.setEnabled(true);

-			}

-		} catch (TException | ParseException e1) {

-			e1.printStackTrace();

-		}

-	}

-}

diff --git a/dozentenmodul/src/main/java/gui/intro/About_GUI.java b/dozentenmodul/src/main/java/gui/intro/About_GUI.java
deleted file mode 100644
index c2bb850e..00000000
--- a/dozentenmodul/src/main/java/gui/intro/About_GUI.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package gui.intro;
-
-import java.awt.Image;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTextPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-
-import models.Version;
-
-import util.ResourceLoader;
-
-@SuppressWarnings("serial")
-public class About_GUI extends JFrame {
-
-	private JPanel contentPane;
-	private JTextPane txtpnVersionVBuilddate;
-
-	/**
-	 * Create the frame.
-	 */
-	public About_GUI() {
-		// Fenster darf nicht vergroessert 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();
-			JOptionPane.showMessageDialog(this,
-					e.getCause() + "\n" + e.getStackTrace(), "Debug-Message ",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		// Titel des Fensters setzen
-		setTitle("Dozentenmodul - About");
-		// Aktion die beim Schliessen durchgefuehrt werden soll
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-		// Groesse des Fensters definieren
-		setBounds(0, 0, 355, 309);
-		// 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 fuer das Logo erzeugen
-		JLabel imgLabel = new JLabel();
-		// Groesse und Position des Logos festelegen
-		imgLabel.setBounds(30, 18, 294, 80);
-		// Pfadangabe des Logos
-
-		ImageIcon icon = ResourceLoader.getIcon("/img/Logo_bwLehrpool.png", "Logo");
-		// Skalierung des Logos
-		Image scaled = icon.getImage().getScaledInstance(270, 64, 0);
-		imgLabel.setIcon(new ImageIcon(scaled));
-		// Hinzufuegen des Logos in das Fenster
-		contentPane.add(imgLabel);
-
-		// Erzeugen, Hinzufuegen und definierung der Aktion des Buttons
-		JButton BtnClose = new JButton("Close");
-		BtnClose.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				dispose();
-
-			}// end actionPerformed
-		});
-
-		BtnClose.setBounds(62, 226, 237, 23);
-		contentPane.add(BtnClose);
-
-		txtpnVersionVBuilddate = new JTextPane();
-		txtpnVersionVBuilddate
-				.setText("Version: "+Version.getVersion()+"\r\n\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
-		txtpnVersionVBuilddate.setEditable(false);
-		txtpnVersionVBuilddate.setBackground(SystemColor.menu);
-		txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);
-		contentPane.add(txtpnVersionVBuilddate);
-	}// end LoginGUI()
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java b/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
deleted file mode 100644
index f62ccf3a..00000000
--- a/dozentenmodul/src/main/java/gui/intro/BillOfRights_GUI.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package gui.intro;
-
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import util.GuiManager;
-import config.Config;
-
-@SuppressWarnings("serial")
-public class BillOfRights_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JButton fwdButton;
-	private JCheckBox chckbxAkzeptieren;
-
-	/**
-	 * Create the dialog.
-	 */
-	public BillOfRights_GUI() {
-		setResizable(false);
-
-		//Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite");
-
-		//Zentiert das Fenster in der Bildschirmmitte
-		setBounds(0, 0, 603, 722);
-
-		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ätigen 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) {
-						Config.setBillOfRights(true);
-						Config.store();
-						GuiManager.show(new VmWareLink_GUI());
-					}
-				});
-				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) {
-				//Beim Akzeptieren der Bestaetigung wird der Weiter-Button verfuegbar gemacht
-				if (chckbxAkzeptieren.isSelected() == true) {
-					fwdButton.setEnabled(true);
-				} else {
-					fwdButton.setEnabled(false);
-				}
-			}
-		});
-		chckbxAkzeptieren.setBackground(SystemColor.menu);
-		chckbxAkzeptieren.setBounds(10, 587, 567, 23);
-		getContentPane().add(chckbxAkzeptieren);
-
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
deleted file mode 100644
index 7035f057..00000000
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ /dev/null
@@ -1,746 +0,0 @@
-package gui.intro;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Image;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import javax.swing.AbstractButton;
-import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.DefaultListCellRenderer;
-import javax.swing.ImageIcon;
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-import javax.swing.JRadioButton;
-import javax.swing.JTextField;
-import javax.swing.SwingConstants;
-import javax.swing.SwingWorker;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.imagemaster.thrift.iface.ImageServer;
-import org.openslx.imagemaster.thrift.iface.OrganizationData;
-import org.openslx.imagemaster.thrift.iface.UserInfo;
-import org.openslx.sat.thrift.version.Version;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-import util.ResourceLoader;
-import util.ShibbolethECP;
-import config.Config;
-
-@SuppressWarnings("serial")
-public class Login_GUI extends JInternalFrame {
-
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(Login_GUI.class);
-	// String constants representing the different login methods
-	private final static String LOGIN_TYPE_BWIDM = "bwidm";
-	private final static String LOGIN_TYPE_BWLEHRPOOL = "bwlp";
-	private final static String LOGIN_TYPE_SATELLITE = "sat";
-
-	private JPanel contentPane;
-	private JTextField lblusername;
-	private JPasswordField lblpass;
-	private JLabel lblConnectionInfo = new JLabel("");
-	private JCheckBox chckbxBenutzernameSpeichern;
-
-	private JPanel panel;
-	private JPanel panel_1;
-	private JLabel LabelUser;
-	private JLabel LabelPass;
-
-	// radio button and group for login types.
-	private ButtonGroup bgLoginType;
-	private JRadioButton rdbtnBwIDM;
-	private JRadioButton rdbtnDirekteVerbindung;
-	private JRadioButton rdbtnMasterserver;
-	// its action listener
-	private ActionListener loginTypeActionListener;
-
-	// bwIDM label and dropdown
-	private JComboBox<OrganizationData> idpChoice;
-	private JLabel lblIdp;
-	private List<OrganizationData> organizations;
-
-	// Satellite IP label and text field
-	private JLabel lblSatellitenIp;
-	private JTextField lblSatIP;
-
-	/**
-	 * Create the frame.
-	 */
-	public Login_GUI() {
-		// Titel des Fensters setzen
-		setTitle("bwLehrpool Suite");
-
-		// Größe setzen und mittig ausrichten
-		setBounds(0, 0, 785, 430);
-
-		// 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 fuer das Logo erzeugen
-		JLabel imgLabel = new JLabel();
-		// Groesse und Position des Logos festelegen
-		imgLabel.setBounds(231, 11, 350, 142);
-		// Pfadangabe des Logos
-
-		ImageIcon icon = ResourceLoader.getIcon("/img/Logo_bwLehrpool.png", "Logo");
-		// Skalierung des Logos
-		Image scaled = icon.getImage().getScaledInstance(270, 64, 0);
-		imgLabel.setIcon(new ImageIcon(scaled));
-		// Hinzufuegen des Logos in das Fenster
-		contentPane.add(imgLabel);
-
-		lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT);
-		lblConnectionInfo.setBounds(10, 359, 449, 20);
-		lblConnectionInfo.setEnabled(true);
-		lblConnectionInfo.setText("Info: Bereit für Login");
-
-		contentPane.add(lblConnectionInfo);
-
-		// Erzeugen, Hinzufuegen und definierung der Aktion des Buttons
-		JButton BtnLogin = new JButton("Login");
-		BtnLogin.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				performLogin(bgLoginType.getSelection().getActionCommand());
-			}// end actionPerformed
-		});
-
-		BtnLogin.setBounds(488, 358, 239, 23);
-		contentPane.add(BtnLogin);
-
-		// Start of the actual content of the right panel
-		panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Zugangsdaten", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(354, 143, 400, 181);
-		contentPane.add(panel);
-
-		chckbxBenutzernameSpeichern = new JCheckBox("Benutzername speichern");
-		chckbxBenutzernameSpeichern.setBounds(135, 137, 237, 23);
-		chckbxBenutzernameSpeichern.setSelected(Config.getSaveUsername());
-		panel.add(chckbxBenutzernameSpeichern);
-
-		// Erzeugen und Hinzufuegen des Labels
-		LabelUser = new JLabel("Benutzername:");
-		LabelUser.setBounds(25, 60, 82, 20);
-		panel.add(LabelUser);
-		
-		// Erzeugen und Hinzufuegen des Textfeldes
-		lblusername = new JTextField();
-		lblusername.setBounds(135, 60, 237, 20);
-		lblusername.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
-		lblusername.setColumns(10);
-		// Lese Benutzername aus der Konfigurationsdatei
-		lblusername.setText(Config.getUsername());
-		lblusername.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				performLogin(bgLoginType.getSelection().getActionCommand());
-			}
-		});
-		panel.add(lblusername);
-
-		// Erzeugen und Hinzufuegen des Labels
-		LabelPass = new JLabel("Passwort:");
-		LabelPass.setBounds(25, 85, 82, 20);
-		panel.add(LabelPass);
-
-		// Erzeugen und Hinzufuegen des Passwortfeldes
-		lblpass = new JPasswordField();
-		lblpass.setBounds(135, 85, 237, 20);
-		lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
-		lblpass.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				performLogin(bgLoginType.getSelection().getActionCommand());
-			}
-		});
-		panel.add(lblpass);
-
-		lblSatellitenIp = new JLabel("Satelliten IP:");
-		lblSatellitenIp.setBounds(25, 105, 82, 20);
-		// panel.add(lblSatellitenIp);
-
-		lblSatIP = new JTextField();
-		lblSatIP.setBounds(135, 110, 237, 20);
-		lblSatIP.setToolTipText("Bitte geben Sie die IP-Adresse des Satelliten ein.");
-		// panel.add(lblSatIP);
-
-		idpChoice = new JComboBox<OrganizationData>();
-		idpChoice.setBounds(135, 35, 237, 20);
-		// panel.add(choice);
-
-		lblIdp = new JLabel("IdP:");
-		lblIdp.setBounds(25, 35, 82, 20);
-		// panel.add(lblIdp);
-
-		// action listener for the radio buttons to
-		// toggle the gui elements depending on the login type
-		loginTypeActionListener = new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				toggleLoginType(e.getActionCommand());
-			}
-		};
-
-		panel_1 = new JPanel();
-		panel_1.setLayout(null);
-		panel_1.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"),
-				"Authentifizierungsart", TitledBorder.LEADING, TitledBorder.TOP, null, new Color(0, 0, 0)));
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBounds(10, 143, 334, 181);
-		contentPane.add(panel_1);
-
-		// group radio button for the login type together
-		bgLoginType = new ButtonGroup();
-
-		rdbtnBwIDM = new JRadioButton("Authentifizierung über bwIDM");
-		rdbtnBwIDM.setBounds(32, 35, 244, 23);
-		rdbtnBwIDM.setActionCommand(LOGIN_TYPE_BWIDM);
-		rdbtnBwIDM.addActionListener(loginTypeActionListener);
-		bgLoginType.add(rdbtnBwIDM);
-		panel_1.add(rdbtnBwIDM);
-
-		rdbtnMasterserver = new JRadioButton("Test-Zugang mit festem Benutzer");
-		//rdbtnMasterserver.setSelected(true);
-		rdbtnMasterserver.setActionCommand(LOGIN_TYPE_BWLEHRPOOL);
-		rdbtnMasterserver.addActionListener(loginTypeActionListener);
-		rdbtnMasterserver.setBounds(32, 60, 244, 23);
-		bgLoginType.add(rdbtnMasterserver);
-		panel_1.add(rdbtnMasterserver);
-
-		rdbtnDirekteVerbindung = new JRadioButton("Direkte Verbindung zum Satelliten");
-		rdbtnDirekteVerbindung.setBounds(32, 85, 244, 23);
-		rdbtnDirekteVerbindung.setActionCommand(LOGIN_TYPE_SATELLITE);
-		rdbtnDirekteVerbindung.addActionListener(loginTypeActionListener);
-		rdbtnDirekteVerbindung.setEnabled(false);
-		bgLoginType.add(rdbtnDirekteVerbindung);
-		panel_1.add(rdbtnDirekteVerbindung);
-
-		setSelectedRadioButton();
-		
-		panel.setVisible(true);
-		panel_1.setVisible(true);
-		contentPane.setVisible(true);
-		
-
-	}// end LoginGUI()
-
-	// Versuche den Benutzer einzuloggen
-	public void performLogin(final String loginType) {
-		LOGGER.info("Trying login of type: " + loginType);
-
-		if (loginType == LOGIN_TYPE_BWLEHRPOOL) {
-
-			// start the authentication process against the masterserver
-			org.openslx.imagemaster.thrift.iface.SessionData result = null;
-			// Connect to Master
-			ImageServer.Iface client = ThriftManager.getMasterClient();
-			String passText = new String(lblpass.getPassword());
-			UserInfo user = null;
-			// Log user in
-			try {
-				setStatus(Color.black, "Authentifiziere - warte auf Antwort von Server...", null);
-
-				result = client.authenticate(lblusername.getText(), passText);
-
-				// Sanity checks
-				if (result.authToken == null || result.sessionId == null) {
-					setStatus(Color.red, "Antwort des Masterservers korrupt.", null);
-					LOGGER.info("Antwort des Masterservers korrupt");
-					return;
-				}
-
-				// User-Info
-				LOGGER.info("Authentifizierung von '" + lblusername.getText() + "' erfolgreich.");
-				user = client.getUserFromToken(result.authToken);
-
-			} catch (org.openslx.imagemaster.thrift.iface.AuthenticationException e) {
-				setStatus(Color.red, "Fehler: Zugangsdaten nicht akzeptiert.",
-						"Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.\n"
-								+ e.message);
-				e.printStackTrace();
-				return;
-			} catch (TException e) {
-				e.printStackTrace();
-				setStatus(Color.red, "Kommunikation mit Masterserver fehlgeschlagen.", null);
-				LOGGER.error("Thrift-communication to the masterserver failed, see trace: ", e);
-				return;
-			}
-
-			// set Information
-			SessionData.authToken = result.authToken;
-			SessionData.sessionID = result.sessionId;
-			SessionData.serverAdress = result.serverAddress;
-			if (!ThriftManager.setSatellite(result.serverAddress)) {
-				LOGGER.error("Setting satellite IP to '"
-						+ result.serverAddress
-						+ "' failed. Appears to be empty. Is the satellite IP returned from masterserver correct?");
-				setStatus(Color.green, "IP vom Satelliten ungültig.", null);
-				System.exit(1);
-			}
-
-			// User-Info
-			setStatus(Color.green, "Daten erhalten.", null);
-
-			String hochschule = user.eMail.substring(user.eMail.indexOf("@") + 1);
-
-			person.verantwortlicher.setUsername(lblusername.getText().trim());
-			person.verantwortlicher.setUserID(lblusername.getText().trim());
-			person.verantwortlicher.setName(user.lastName);
-			person.verantwortlicher.setVorname(user.firstName);
-			person.verantwortlicher.setEMail(user.eMail);
-			person.verantwortlicher.setHochschule(hochschule);
-
-			// Spaeter ueber result.getRole zum Beispiel die Rolle holen
-			if (lblusername.getText().trim().startsWith("admin@")) {
-				person.verantwortlicher.setRole("Admin");
-			} else {
-				person.verantwortlicher.setRole("Dozent");
-				// person.verantwortlicher.setRole("Student");
-			}
-			postLogin();
-
-			// }
-		} // end bwLehrpool-Login
-
-		if (loginType == LOGIN_TYPE_BWIDM) {
-			// try the shibbo login in its own SwingWorker to avoid GUI lockups
-			SwingWorker<ShibbolethECP.ReturnCode, String> worker = new SwingWorker<ShibbolethECP.ReturnCode, String>() {
-				@Override
-				protected ShibbolethECP.ReturnCode doInBackground() throws Exception {
-					publish("Info: Initialisiere Shibboleth-Client ...");
-					OrganizationData selectedOrg = (OrganizationData) idpChoice.getSelectedItem();
-					publish("Info: Überprüfe Zugangdaten über bwIDM ...");
-					return ShibbolethECP.doLogin(selectedOrg.getEcpUrl(), lblusername.getText().trim(),
-							String.valueOf(lblpass.getPassword()));
-				}
-
-				protected void done() {
-					try {
-						ShibbolethECP.ReturnCode ecpReturn = get();
-						switch (ecpReturn) {
-						case NO_ERROR:
-							setStatus(Color.green, "Info: bwIDM-Anmeldung erfolgreich.", null);
-							/*
-							 * Login successful
-							 */
-							person.verantwortlicher.setUsername(lblusername.getText().trim());
-							person.verantwortlicher.setUserID(lblusername.getText().trim());
-							person.verantwortlicher.setName(ShibbolethECP.getResponse().lastName);
-							person.verantwortlicher.setVorname(ShibbolethECP.getResponse().firstName);
-							person.verantwortlicher.setEMail(ShibbolethECP.getResponse().mail);
-							person.verantwortlicher.setHochschule(((OrganizationData) idpChoice
-									.getSelectedItem()).getOrganizationId());
-							person.verantwortlicher.setRole("Dozent");
-							ThriftManager.setSatellite(ShibbolethECP.getResponse().satellites.get("default"));
-							SessionData.serverAdress = ShibbolethECP.getResponse().satellites.get("default");
-							SessionData.authToken = ShibbolethECP.getResponse().token;
-							SessionData.sessionID = ShibbolethECP.getResponse().sessionId;
-
-							/*
-							 * Now postprocess successful login
-							 */
-							postLogin();
-							break;
-						case ERROR_IDP:
-							setStatus(Color.red, "Fehler: bwIDM-Anmeldung fehlgeschlagen!", null);
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Anmeldung fehlgeschlagen. Überprüfen Sie den Benutzername und Passwort.",
-											"Fehler", JOptionPane.ERROR_MESSAGE);
-							break;
-						case ERROR_UNREG:
-							setStatus(Color.red, "Fehler: Nicht bei bwLehrpool registriert!", null);
-							JOptionPane.showMessageDialog(null,
-									"Sie sind nicht bei bwLehrpool registriert.\nGehen Sie dazu auf folgende Seite:\n"
-											+ ShibbolethECP.getRegistrationUrl(), "Fehler",
-									JOptionPane.ERROR_MESSAGE);
-							break;
-						case ERROR_SP:
-							setStatus(Color.red, "Fehler: bwIDM-Anmeldung fehlgeschlagen!", null);
-							JOptionPane
-									.showMessageDialog(
-											null,
-											"Anmeldung erfolgreich aber die Antwort des Service Providers ist ungültig.",
-											"Fehler", JOptionPane.ERROR_MESSAGE);
-							break;
-						case ERROR_OTHER:
-							setStatus(Color.red, "Fehler: bwIDM-Anmeldung fehlgeschlagen!", null);
-							JOptionPane.showMessageDialog(null,
-									"Fataler Fehler. Schicken Sie die Log-Datei einem Administrator zu!",
-									"Fehler", JOptionPane.ERROR_MESSAGE);
-							break;
-						default:
-							setStatus(Color.red, "Fehler: bwIDM-Login fehlgeschlagen!", null);
-						}
-					} catch (InterruptedException e) {
-						LOGGER.error("SwingWorker for ShibbolethECP got interrupted, see trace: ", e);
-					} catch (ExecutionException e) {
-						LOGGER.error("Execution of SwingWorker for ShibbolethECP failed, see trace: ", e);
-					}
-				}
-
-				@Override
-				protected void process(List<String> msgs) {
-					String currentMessage = msgs.get(msgs.size() - 1);
-					setStatus(Color.black, currentMessage, null);
-				}
-			};
-			worker.execute();
-		}
-
-		// always save to user's config file.
-		if (chckbxBenutzernameSpeichern.isSelected()) 
-		{
-			Config.setUsername(lblusername.getText());
-			Config.setSaveUsername(true);
-			Config.setIdP(String.valueOf(idpChoice.getSelectedIndex()));
-			Config.setAuthenticationMethod(getSelectedRadioButton());
-		} else 
-		{
-			Config.setUsername("");
-			Config.setSaveUsername(false);
-		}
-		// save it to local disk
-		Config.store();
-
-	}// end performLogin
-
-	private String getSelectedRadioButton() 
-	{
-        for (Enumeration<AbstractButton> buttons = bgLoginType.getElements(); buttons.hasMoreElements();) {
-            AbstractButton button = buttons.nextElement();
-
-            if (button.isSelected()) {
-                return button.getText();
-            }
-        }
-
-        return null;
-	}
-	
-	private void setSelectedRadioButton() 
-	{
-		String authMethodByConfig = Config.getAuthenticationMethod();
-
-		if(authMethodByConfig.equals("Test-Zugang mit festem Benutzer")) 
-		{
-			rdbtnMasterserver.setSelected(true);
-		}
-		else if(authMethodByConfig.equals("Direkte Verbindung zum Satelliten")) 
-		{
-			rdbtnMasterserver.setSelected(true);
-			
-		}
-		else
-		{
-			rdbtnBwIDM.setSelected(true);
-			toggleLoginType(LOGIN_TYPE_BWIDM);
-		}
-    }
-
-
-
-	/**
-	 * Common function for either authentication method
-	 */
-	private void postLogin() {
-		// Version check
-		long remoteVersion;
-		try {
-			remoteVersion = ThriftManager.getSatClient().getVersion();
-			LOGGER.info("Satellite RPC version: " + remoteVersion);
-		} catch (Exception e) {
-			LOGGER.error(
-					"Could not query sat server version after successful connect! Assuming untagged version 1",
-					e);
-			remoteVersion = 1;
-		}
-		String text = null;
-		if (remoteVersion > Version.VERSION) {
-			text = "Das von Ihnen verwendete Dozentenmodul ist zu alt, um mit dem Satelliten-Server zu verbinden.\n"
-					+ "Sie verwenden Version "
-					+ Version.VERSION
-					+ ", der Satellit "
-					+ remoteVersion
-					+ "\n"
-					+ "Aktuelle Version unter http://bwlehrpool.hs-offenburg.de/";
-		} else if (remoteVersion < Version.VERSION) {
-			text = "Das von Ihnen verwendete Dozentenmodul ist zu neu, um mit dem Satelliten-Server zu verbinden.\n"
-					+ "Sie verwenden Version " + Version.VERSION + ", der Satellit " + remoteVersion;
-		}
-		if (text != null) {
-			JOptionPane.showMessageDialog(null, text, "Fehler", JOptionPane.ERROR_MESSAGE);
-		}
-
-		LOGGER.debug("Post-processing login ...");
-		// TODO here do all the session data stuff
-		// TODO and the telling the sat Server who we are
-		LOGGER.debug("Checking token: " + SessionData.authToken);
-		try {
-			boolean authenticated = ThriftManager.getSatClient().authenticated(SessionData.authToken);
-			if (!authenticated) {
-				JOptionPane.showMessageDialog(null, "Sessionübergabe an den Satelliten fehlgeschlagen.",
-						"Fehler", JOptionPane.ERROR_MESSAGE);
-				return;
-			}
-			String pk_institution = ThriftManager.getSatClient().setInstitution(
-					person.verantwortlicher.getHochschule(), SessionData.authToken);
-			ThriftManager.getSatClient().setPerson(person.verantwortlicher.getUserID(),
-					SessionData.authToken, pk_institution);
-		} catch (TException e) {
-			JOptionPane.showMessageDialog(null, "Unerwarteter Fehler.\n\n" + e.toString(), "Fehler",
-					JOptionPane.ERROR_MESSAGE);
-			LOGGER.error("Unexpected exception", e);
-			return;
-		}
-
-		// at the end
-		showMainMenu();
-	}
-
-	/**
-	 * Shows the next GUI's til the main menu. It checks if the user has already
-	 * seen the bill of rights and/or the vmware license windows and shows them
-	 * before continuing to the main menu.
-	 * 
-	 * This function should be called on a successful login.
-	 */
-	private void showMainMenu() {
-		/**
-		 * 
-		 * DISPLAY LICENSES / MAIN MENU
-		 * 
-		 */
-		if (!Config.getBillOfRights()) {
-			// display bill of rights?
-			GuiManager.show(new BillOfRights_GUI(), true);
-		} else {
-			// display vmware license?
-			if (!Config.getVmwareLicense()) {
-				GuiManager.show(new VmWareLink_GUI(), true);
-			} else {
-				// main menu
-				GuiManager.show(new MainMenue_GUI(), true);
-			}
-		}
-	}
-
-	/**
-	 * Set connection status message, optionally show message box.
-	 * 
-	 * @param color
-	 *            Color to display status message in.
-	 * @param shortMessage
-	 *            The message to display.
-	 * @param longMessage
-	 *            Optional message to show in a message box. null means don't
-	 *            show.
-	 */
-	private void setStatus(Color color, String shortMessage, String longMessage) {
-		LOGGER.info(shortMessage);
-		lblConnectionInfo.setForeground(color);
-		lblConnectionInfo.setText(shortMessage);
-		if (longMessage != null)
-			JOptionPane.showMessageDialog(null, longMessage, "Anmeldung fehlgeschlagen",
-					JOptionPane.ERROR_MESSAGE);
-	}
-
-	/**
-	 * Toggle the elements needed for the different login types.
-	 * 
-	 * @param type
-	 *            Type of the login to toggle. Valid are: - LOGIN_TYPE_BWIDM -
-	 *            LOGIN_TYPE_BWLEHRPOOL - LOGIN_TYPE_SATELLITE
-	 */
-	private void toggleLoginType(String type) {
-		LOGGER.info("Toggling to login method to: " + type);
-		panel.setVisible(false);
-		switch (type) {
-		case LOGIN_TYPE_BWIDM:
-			initIdpList();
-			panel.remove(lblSatIP);
-			panel.remove(lblSatellitenIp);
-			panel.add(idpChoice);
-			panel.add(lblIdp);
-			panel.add(LabelPass);
-			lblpass.setText("");
-			lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein.");
-			panel.add(lblpass);
-			lblusername.setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein.");
-			panel.revalidate();
-			panel.repaint();
-			panel.setVisible(true);
-			break;
-		case LOGIN_TYPE_BWLEHRPOOL:
-			panel.remove(idpChoice);
-			panel.remove(lblIdp);
-			panel.remove(lblSatIP);
-			panel.remove(lblSatellitenIp);
-			panel.add(LabelPass);
-			lblpass.setToolTipText("Bitte geben Sie Ihr bwLehrpool-Passwort ein.");
-			panel.add(lblpass);
-			lblusername.setToolTipText("Bitte geben Sie Ihr bwLehrpool-Benutzername ein.");
-			panel.revalidate();
-			panel.repaint();
-			panel.setVisible(true);
-			break;
-		case LOGIN_TYPE_SATELLITE:
-			panel.remove(idpChoice);
-			panel.remove(lblIdp);
-			panel.remove(LabelPass);
-			panel.remove(lblpass);
-			lblSatIP.setBounds(135, 85, 237, 20);
-			lblSatIP.setText("");
-			panel.add(lblSatIP);
-			lblSatellitenIp.setBounds(25, 85, 82, 20);
-			panel.add(lblSatellitenIp);
-			panel.revalidate();
-			panel.repaint();
-			panel.setVisible(true);
-			setStatus(Color.black, "Info: Bereit für bwIDM-Login", null);
-			break;
-		default:
-			panel.setVisible(true);
-			return;
-		}
-	}
-
-	/**
-	 * Request the list of identity providers from the masterserver and display
-	 * them in a combobox.
-	 */
-	private void initIdpList() {
-		// abort if we fetched the list already.
-		if (organizations != null) {
-			return;
-		} else {
-			organizations = new ArrayList<OrganizationData>();
-		}
-		LOGGER.info("Fetching list of identity providers from masterserver...");
-		SwingWorker<Boolean, String> worker = new SwingWorker<Boolean, String>() {
-			@Override
-			protected Boolean doInBackground() throws Exception {
-				publish("Info: Hole Liste von IdPs");
-				// if not then request it from the masterserver
-				List<OrganizationData> tempOrgs = null;
-				try {
-					tempOrgs = ThriftManager.getMasterClient().getOrganizations();
-				} catch (TException e) {
-					LOGGER.error(
-							"Could not fetch list of identity providers from the masterserver, see trace: ",
-							e);
-					return false;
-				}
-				// safety check to see if we got any organizations at all
-				if (tempOrgs != null) {
-					// now add those with an Ecp URL to the result list.
-					for (OrganizationData org : tempOrgs) {
-						if (org.getEcpUrl() != null && !org.getEcpUrl().isEmpty()) {
-							organizations.add(org);
-							LOGGER.debug("Valid IdP: " + org.toString());
-						} else {
-							LOGGER.debug("Skipped bad organization (no ECPUrl): " + org.toString());
-						}
-					}
-					// now we build the list, lets sort it
-					Collections.sort(organizations, new Comparator<OrganizationData>() {
-						@Override
-						public int compare(OrganizationData o1, OrganizationData o2) {
-							return o1.displayName.compareTo(o2.displayName);
-						}
-					});
-				} else {
-					LOGGER.error("Thrift call of 'getOrganizations()' seems to have worked, but 'organizations' is still null.");
-					LOGGER.error("Is the API of the masterserver working correctly?");
-					return false;
-				}
-				publish("Info: Liste von IdPs empfangen.");
-				
-				return true;
-			}
-
-			protected void done() {
-				try {
-					if (get()) {
-						// fill the combobox with the IdPs returned from the
-						// masterserver
-						OrganizationData[] orgs = organizations.toArray(new OrganizationData[] {});
-						idpChoice.setModel(new DefaultComboBoxModel<OrganizationData>(orgs));
-						// now override the renderer, to show the display names
-						// of the organizations.
-						idpChoice.setRenderer(new DefaultListCellRenderer() 
-						{
-							@Override
-							public Component getListCellRendererComponent(JList<?> list, Object value,
-									int index, boolean isSelected, boolean cellHasFocus) {
-								super.getListCellRendererComponent(list, value, index, isSelected,
-										cellHasFocus);
-								if (value instanceof OrganizationData) {
-									OrganizationData org = (OrganizationData) value;
-									setText(org.getDisplayName());
-								}
-								return this;
-							}
-						});
-						
-						setStatus(Color.black, "Info: Bereit für Login", null);
-					} else {
-						setStatus(Color.red, "Fehler: Vorbereitung für bwIDM-Login fehlgeschlagen!", null);
-					}
-				} catch (InterruptedException e) {
-					LOGGER.error("SwingWorker for 'getOrganizationsList' got interrupted, see trace: ", e);
-				} catch (ExecutionException e) {
-					LOGGER.error("Execution of SwingWorker for 'getOrganizationsList' failed, see trace: ", e);
-				}
-				
-				if(Config.getIdP() != -1)
-				{
-					idpChoice.setSelectedIndex(Config.getIdP()); //set IdP preselction to saved value, if stored. 0 is default
-				}
-			}
-
-			@Override
-			protected void process(List<String> msgs) {
-				String currentMessage = msgs.get(msgs.size() - 1);
-				setStatus(Color.black, currentMessage, null);
-			}
-		};
-		worker.execute();
-	}
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
deleted file mode 100644
index 2c1a939f..00000000
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ /dev/null
@@ -1,489 +0,0 @@
-package gui.intro;
-
-import gui.image.CreateImageAllgemein_GUI;
-import gui.image.DeleteImage_GUI;
-import gui.image.SearchEditImage_GUI;
-import gui.image.SearchImage_GUI;
-import gui.lecture.CreateLectureAllgemein_GUI;
-import gui.lecture.DeleteLecture_GUI;
-import gui.lecture.EditLectureSearch_GUI;
-import gui.lecture.SearchLecture_GUI;
-
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.ScrollPane;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
-import javax.swing.SwingConstants;
-import javax.swing.ToolTipManager;
-import javax.swing.UIManager;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.GUIRights;
-import models.Image;
-import models.ImageRights;
-import models.ItemOwner;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-
-import util.GuiManager;
-import util.News;
-import util.ResourceLoader;
-
-@SuppressWarnings("serial")
-public class MainMenue_GUI extends JInternalFrame {
-
-	private final static Logger LOGGER = Logger.getLogger(MainMenue_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private String descNewImage, descEditImage, descDeleteImage, descSearchImage, descNewLecture,
-			descEditLecture, descDeleteLecture, descSearchLecture = "";
-	private JRadioButton rdbtnImageNew;
-	private JRadioButton rdbtnImageEdit;
-	private JRadioButton rdbtnImageSearchDownload;
-	private JRadioButton rdbtnLectureNew;
-	private JRadioButton rdbtnImageDelete;
-	private JRadioButton rdbtnLectureEdit;
-	private JRadioButton rdbtnLectureDelete;
-	private JRadioButton rdbtnLectureSearch;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
-
-	// for testing
-	ImageRights imageRights = new ImageRights();
-
-	boolean tokenDeleted;
-
-	public MainMenue_GUI() {
-		setTitle("bwLehrpool Suite - Connected Server: " + SessionData.serverAdress + " - "
-				+ person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 603, 722);
-
-		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ü");
-				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ählen Sie ihre gewünschte Aktion.");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 22);
-			panel.add(txtpnBitteWhlenSie);
-		}
-
-		//reset the list of permissions and models
-		//every time the user goes back to the main menu
-		RightsManagement.rightsManagement.getPermittedUserList().clear();
-		Image.reset();
-		ItemOwner.itemOwner.reset();
-
-		setResizable(false); // window is not resizable
-
-		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, "Image", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panelImage.setBounds(10, 221, 270, 133);
-		contentPanel.add(panelImage);
-		panelImage.setLayout(null);
-
-		rdbtnImageNew = new JRadioButton("Neu");
-		rdbtnImageNew
-				.setToolTipText("Hier können Sie ein neues Image anlegen und im Anschluss eine Veranstaltung darauf verlinken");
-		rdbtnImageNew.setBounds(20, 22, 244, 23);
-		panelImage.add(rdbtnImageNew);
-		buttonGroup.add(rdbtnImageNew);
-		rdbtnImageNew.setBackground(SystemColor.menu);
-
-		rdbtnImageEdit = new JRadioButton("Bearbeiten");
-		rdbtnImageEdit.setToolTipText("Hier können Sie ein bereits angelegtes Image bearbeiten");
-		rdbtnImageEdit.setBounds(20, 48, 244, 23);
-		panelImage.add(rdbtnImageEdit);
-		buttonGroup.add(rdbtnImageEdit);
-		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageEdit.setBackground(SystemColor.menu);
-
-		rdbtnImageDelete = new JRadioButton("Löschen");
-		rdbtnImageDelete.setEnabled(true);
-		buttonGroup.add(rdbtnImageDelete);
-		rdbtnImageDelete.setToolTipText("Löschen Sie hier Images, die Sie nicht mehr benötigen");
-		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageDelete.setBackground(SystemColor.menu);
-		rdbtnImageDelete.setBounds(20, 74, 244, 23);
-		panelImage.add(rdbtnImageDelete);
-
-		rdbtnImageSearchDownload = new JRadioButton("Suche und Download (inkl. Vorlagen)");
-		buttonGroup.add(rdbtnImageSearchDownload);
-		rdbtnImageSearchDownload
-				.setToolTipText("Hier können Sie ein bestehendes Labor zum verändern downloaden");
-		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageSearchDownload.setBackground(SystemColor.menu);
-		rdbtnImageSearchDownload.setBounds(20, 100, 244, 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(10, 364, 270, 133);
-		contentPanel.add(panelDesc);
-
-		ScrollPane scrollPaneDesc = new ScrollPane();
-		scrollPaneDesc.setBounds(10, 15, 250, 110);
-		final JTextArea txtDesc = new JTextArea();
-		txtDesc.setEditable(false);
-		txtDesc.setBounds(280, 211, 10, 10);
-		txtDesc.setLineWrap(true);
-		txtDesc.setWrapStyleWord(true);
-		txtDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtDesc.setBackground(SystemColor.menu);
-		scrollPaneDesc.add(txtDesc);
-		// Pro AUswahl
-		txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung.");
-		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(290, 221, 270, 133);
-		contentPanel.add(panelVeranstaltung);
-
-		rdbtnLectureNew = new JRadioButton("Neu");
-		buttonGroup.add(rdbtnLectureNew);
-		rdbtnLectureNew
-				.setToolTipText("Erzeugen Sie Veranstaltungen, die dann im VMChooser erscheinen und mit denen Ihre Studierenden arbeiten können - hierzu benötigen Sie ein Image");
-		rdbtnLectureNew.setBounds(20, 24, 230, 23);
-		panelVeranstaltung.add(rdbtnLectureNew);
-		rdbtnLectureNew.setBackground(SystemColor.menu);
-
-		rdbtnLectureEdit = new JRadioButton("Bearbeiten");
-		rdbtnLectureEdit
-				.setToolTipText("Bearbeiten Sie Ihre Veranstaltungsdaten, wie beispielsweise den Anzeigenamen und die Details");
-		rdbtnLectureEdit.setBounds(20, 50, 230, 23);
-		panelVeranstaltung.add(rdbtnLectureEdit);
-		buttonGroup.add(rdbtnLectureEdit);
-		rdbtnLectureEdit.setBackground(SystemColor.menu);
-
-		rdbtnLectureDelete = new JRadioButton("Löschen");
-		rdbtnLectureDelete.setToolTipText("Löschen Sie nicht mehr benötigte Veranstaltungen");
-		rdbtnLectureDelete.setBounds(20, 76, 230, 23);
-		panelVeranstaltung.add(rdbtnLectureDelete);
-		buttonGroup.add(rdbtnLectureDelete);
-		rdbtnLectureDelete.setBackground(SystemColor.menu);
-
-		rdbtnLectureSearch = new JRadioButton("Suche");
-		buttonGroup.add(rdbtnLectureSearch);
-		rdbtnLectureSearch
-				.setToolTipText("Hier können Sie wahlweise nach Ihren eigenen, aber auch nach allen verfügbaren Veranstaltungen suchen");
-		rdbtnLectureSearch.setBackground(SystemColor.menu);
-		rdbtnLectureSearch.setBounds(20, 102, 230, 23);
-		panelVeranstaltung.add(rdbtnLectureSearch);
-
-		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, 364, 270, 133);
-		contentPanel.add(panelNews);
-
-		ScrollPane scrollPaneNews = new ScrollPane();
-		scrollPaneNews.setBounds(10, 15, 250, 110);
-		JTextArea txtNews = new JTextArea();
-		txtNews.setEditable(false);
-		txtNews.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		txtNews.setBackground(SystemColor.menu);
-		txtNews.setWrapStyleWord(true);
-		txtNews.setLineWrap(true);
-		if (News.getContent() != null)
-			txtNews.setText(News.getContent());
-		scrollPaneNews.add(txtNews);
-		panelNews.add(scrollPaneNews);
-
-		/*
-		 * Berücksichtigen der Rechte für GUI
-		 */
-		// set the rights for this user
-		setRoleRights();
-		processRights();
-		setCorrectRadioButton();
-
-		/*
-		 * Funktion Texte für das Klicken der RadioButtons
-		 */
-		rdbtnImageNew.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung.";
-				txtDesc.setText(descNewImage);
-			}
-		});
-		rdbtnImageEdit.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descEditImage = "Bearbeiten Sie die hinterlegten Informationen zu einem Image oder laden Sie eine neue .vmdk-Datei hoch.";
-				txtDesc.setText(descEditImage);
-			}
-		});
-		rdbtnImageDelete.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese.";
-				txtDesc.setText(descDeleteImage);
-			}
-		});
-		rdbtnImageSearchDownload.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen.";
-				txtDesc.setText(descSearchImage);
-			}
-		});
-		rdbtnLectureNew.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen.";
-				txtDesc.setText(descNewLecture);
-			}
-		});
-		rdbtnLectureEdit.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descEditLecture = "Bearbeiten Sie die hinterlegten Informationen zu einer Veranstaltung.";
-				txtDesc.setText(descEditLecture);
-			}
-		});
-		rdbtnLectureDelete.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten.";
-				txtDesc.setText(descDeleteLecture);
-			}
-		});
-		rdbtnLectureSearch.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung.";
-				txtDesc.setText(descSearchLecture);
-			}
-		});
-		/*
-		 * Ende der Radiobuttons
-		 */
-
-		JLabel lblGrafik = new JLabel("");
-		// ToolTipp fuer Grafik
-		lblGrafik.setToolTipText("<html>"
-				+ "Ein virtuelles Labor besteht immer aus den beiden Komponenten <br>"
-				+ "Image und Veranstaltung. Ein Image ist dabei  die Grundlage für <br>"
-				+ "mehrere Veranstaltungen. Somit kann eine neue Veranstaltung  <br>"
-				+ "erstellt werden, ohne ein neues Image hochladen zu müssen. <br> <br> <br>"
-				+ "<b>Image:</b> Das Image enthält die benötigte Software, die im  <br>"
-				+ "virtuellen Labor benötigt wird. Es wird von genau einem Dozenten  <br>"
-				+ "angelegt und besitzt einen allgemeinen Namen, z.B. \"Programmieren\".  <br>"
-				+ "Bei einem Image handelt es sich um eine Datei vom Typ VMDK. <br> <br> <br>"
-				+ "<b>Veranstaltung:</b> Es können nun, basierend auf einem Image,<br>"
-				+ " beliebig viele Veranstaltungen von unterschiedlichen Dozenten erstellt  <br>"
-				+ "werden. Diese könnten z.B. konkret \"Web-Entwicklung\" oder \"Künstliche <br>"
-				+ "Intelligenz\" lauten und referenzieren dabei auf das allgemeine Image <br>"
-				+ "\"Programmieren\".</html>");
-		lblGrafik.setIcon(ResourceLoader.getIcon("/img/e4_n_imgs2_bwl_vmc_v2.png"));
-
-		// ToolTipp lange anzeigen - 60sec
-		ToolTipManager.sharedInstance().setDismissDelay(60000);
-		ToolTipManager.sharedInstance().registerComponent(lblGrafik);
-		lblGrafik.setBounds(10, -12, 547, 189);
-		contentPanel.add(lblGrafik);
-
-		JTextPane txtpnUmDetaillierteInformationen = new JTextPane();
-		txtpnUmDetaillierteInformationen
-				.setText("Um detaillierte Informationen zu erhalten, fahren Sie bitte mit der Maus über die Grafik.");
-		txtpnUmDetaillierteInformationen.setEditable(false);
-		txtpnUmDetaillierteInformationen.setBackground(SystemColor.menu);
-		txtpnUmDetaillierteInformationen.setBounds(10, 177, 509, 36);
-		contentPanel.add(txtpnUmDetaillierteInformationen);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 630, 587, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton continueButton = new JButton("Weiter");
-
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// Images
-						if (rdbtnImageNew.isSelected() == true) {
-							GuiManager.show(new CreateImageAllgemein_GUI());
-						} else if (rdbtnImageEdit.isSelected() == true) {
-							GuiManager.show(new SearchEditImage_GUI());
-						} else if (rdbtnImageDelete.isSelected() == true) {
-							GuiManager.show(new DeleteImage_GUI());
-						} else if (rdbtnImageSearchDownload.isSelected() == true) {
-							GuiManager.show(new SearchImage_GUI());
-							// Lectures
-						} else if (rdbtnLectureNew.isSelected() == true) {
-							GuiManager.show(new CreateLectureAllgemein_GUI());
-						} else if (rdbtnLectureEdit.isSelected() == true) {
-							GuiManager.show(new EditLectureSearch_GUI());
-						} else if (rdbtnLectureDelete.isSelected() == true) {
-							GuiManager.show(new DeleteLecture_GUI());
-						} else if (rdbtnLectureSearch.isSelected() == true) {
-							GuiManager.show(new SearchLecture_GUI());
-						} else
-							JOptionPane.showMessageDialog(null, "Keine Auswahl getroffen.", "Auswahl fehlt",
-									JOptionPane.ERROR_MESSAGE);
-					}
-				});
-				continueButton.setActionCommand("OK");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-		{
-			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);
-		}
-	}// end main
-
-	/**
-	 * Enables/disables radio button given the user's rights
-	 */
-	private void processRights() {
-		// Image
-		if (person.verantwortlicher.getRole().equals("Student")) {
-			rdbtnImageNew.setEnabled(false);
-			rdbtnImageEdit.setEnabled(false);
-			rdbtnImageDelete.setEnabled(false);
-			rdbtnImageSearchDownload.setEnabled(true);
-		} else if (person.verantwortlicher.getRole().equals("Dozent")
-				|| person.verantwortlicher.getRole().equals("Admin")) {
-			rdbtnImageNew.setEnabled(true);
-			rdbtnImageEdit.setEnabled(true);
-			rdbtnImageDelete.setEnabled(true);
-			rdbtnImageSearchDownload.setEnabled(true);
-		} else {
-			rdbtnImageNew.setEnabled(false);
-			rdbtnImageEdit.setEnabled(false);
-			rdbtnImageDelete.setEnabled(false);
-			rdbtnImageSearchDownload.setEnabled(false);
-		}
-
-		// Veranstaltung
-		if (person.verantwortlicher.getRole().equals("Student")) {
-			rdbtnLectureNew.setEnabled(false);
-			rdbtnLectureEdit.setEnabled(false);
-			rdbtnLectureDelete.setEnabled(false);
-			rdbtnLectureSearch.setEnabled(true);
-		} else if (person.verantwortlicher.getRole().equals("Dozent")
-				|| person.verantwortlicher.getRole().equals("Admin")) {
-			rdbtnLectureNew.setEnabled(true);
-			rdbtnLectureEdit.setEnabled(true);
-			rdbtnLectureDelete.setEnabled(true);
-			rdbtnLectureSearch.setEnabled(true);
-		} else {
-			rdbtnLectureNew.setEnabled(false);
-			rdbtnLectureEdit.setEnabled(false);
-			rdbtnLectureDelete.setEnabled(false);
-			rdbtnLectureSearch.setEnabled(false);
-		}
-
-	}// end processRights()
-
-	/**
-	 * Sets rights for the user depending on its role
-	 * returned by the masterserver
-	 */
-	public void setRoleRights() {
-		LOGGER.info("Role: " + person.verantwortlicher.getRole());
-
-		// role==Student
-		if (person.verantwortlicher.getRole().equals("Student")) {
-			GUIRights.rights.setRead(1);
-			GUIRights.rights.setWrite(0);
-			GUIRights.rights.setChangePermission(0);
-			GUIRights.rights.setAdmin(0);
-			GUIRights.rights.setLinkAllowed(0);
-
-		} else if (person.verantwortlicher.getRole().equals("Dozent")) { // role==Dozent
-			GUIRights.rights.setRead(1);
-			GUIRights.rights.setWrite(1);
-			GUIRights.rights.setChangePermission(0);
-			GUIRights.rights.setAdmin(0);
-			GUIRights.rights.setLinkAllowed(1);
-		} else if (person.verantwortlicher.getRole().equals("Admin")) { // role==Admin
-			GUIRights.rights.setRead(1);
-			GUIRights.rights.setWrite(1);
-			GUIRights.rights.setChangePermission(1);
-			GUIRights.rights.setAdmin(1);
-			GUIRights.rights.setLinkAllowed(1);
-		} else { // role==Nothing
-			GUIRights.rights.setRead(0);
-			GUIRights.rights.setWrite(0);
-			GUIRights.rights.setChangePermission(0);
-			GUIRights.rights.setAdmin(0);
-			GUIRights.rights.setLinkAllowed(0);
-		}// end if else
-
-	}// end setRoleRights
-
-	public void setCorrectRadioButton() {
-		// get the first enabled RadioButton depending on role an rights. Start
-		// at top
-
-		if (rdbtnImageNew.isEnabled() == true) {
-			rdbtnImageNew.setSelected(true);
-		} else if (rdbtnImageEdit.isEnabled() == true) {
-			rdbtnImageEdit.setSelected(true);
-		} else if (rdbtnImageDelete.isEnabled() == true) {
-			rdbtnImageDelete.setSelected(true);
-		} else if (rdbtnImageSearchDownload.isEnabled() == true) {
-			rdbtnImageSearchDownload.setSelected(true);
-		} else if (rdbtnLectureNew.isEnabled() == true) {
-			rdbtnLectureNew.setSelected(true);
-		} else if (rdbtnLectureEdit.isEnabled() == true) {
-			rdbtnLectureEdit.setSelected(true);
-		} else if (rdbtnLectureDelete.isEnabled() == true) {
-			rdbtnLectureDelete.setSelected(true);
-		} else if (rdbtnLectureSearch.isEnabled() == true) {
-			rdbtnLectureSearch.setSelected(true);
-		}
-
-	}// end setCorrectRadioButton()
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java b/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
deleted file mode 100644
index 20eb0a09..00000000
--- a/dozentenmodul/src/main/java/gui/intro/VmWareLink_GUI.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package gui.intro;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JSeparator;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
-import util.GuiManager;
-import util.OpenLinks;
-import config.Config;
-
-@SuppressWarnings("serial")
-public class VmWareLink_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JCheckBox chckbxNewCheckBox;
-	private JButton btnWindows;
-
-	/**
-	 * Create the dialog.
-	 */
-	public VmWareLink_GUI() {
-		setTitle("bwLehrpool Suite");
-		setBounds(0, 0, 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ür die Arbeit mit der bwLehrpool Suite wird zwingend ein VMWare Player benötigt. Diesen können Sie sich unter folgendem Link kostenfrei downloaden. Wenn Sie bereits den VMWare Player oder die VMWare Workstation installiert haben, können Sie diesen Hinweis ignorieren.");
-		txtpnUmIhreVmdk.setBounds(10, 16, 499, 66);
-		contentPanel.add(txtpnUmIhreVmdk);
-
-		JLabel lblNewLabel_1 = new JLabel("<html><b>Windows: </b></html>");
-		lblNewLabel_1.setBounds(10, 93, 499, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		chckbxNewCheckBox = new JCheckBox("Diese Benachrichtigung nicht mehr anzeigen.");
-		chckbxNewCheckBox.addChangeListener(new ChangeListener() {
-			public void stateChanged(ChangeEvent arg0) {
-				if (chckbxNewCheckBox.isSelected()) {
-					Config.setVmwareLicense(true);
-					Config.store();
-				}
-			}
-		});
-		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);
-
-		btnWindows = new JButton("VMware Player herunterladen");
-		btnWindows.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				OpenLinks.openWebpage("vmware");
-
-			}
-		});
-		btnWindows.setBounds(10, 119, 186, 23);
-		contentPanel.add(btnWindows);
-
-		JButton btnLinux = new JButton("VMware Player herunterladen");
-		btnLinux.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				OpenLinks.openWebpage("vmware");
-			}
-		});
-		btnLinux.setBounds(10, 203, 186, 23);
-		contentPanel.add(btnLinux);
-
-		JLabel label = new JLabel(
-				"<HTML><U>Anleitung zum Erstellen einer virtuellen Maschine herunterladen</U></HTML>");
-		label.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				OpenLinks.openWebpage("intro");
-			}
-
-		});
-		label.setForeground(Color.BLUE);
-		label.setBounds(10, 283, 311, 14);
-		contentPanel.add(label);
-		{
-			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) {
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				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);
-		}
-
-	}//end constructor
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
deleted file mode 100644
index f7f84466..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ /dev/null
@@ -1,483 +0,0 @@
-package gui.lecture;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.ScrollPane;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-
-import models.Lecture;
-import models.person;
-import util.GuiManager;
-
-import com.toedter.calendar.JDateChooser;
-
-@SuppressWarnings("serial")
-public class CreateLectureAllgemein_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField txtFldVeranstaltungsname;
-	private JTextArea description;
-	private JRadioButton radioButtonyes;
-	private JRadioButton radioButtonno;
-	private JDateChooser dateChooserend;
-	private JDateChooser dateChooserstart;
-	private Date startDate = new Date();
-	private Date endDate;
-	private boolean descriptionLengthOK = false; // description may not be
-													// longer than
-													// MAX_DESCRIPTION_LENGTH
-	private final int MAX_DESCRIPTION_LENGTH = 254;
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">Geben Sie hier die Daten zu Ihrer Veranstaltung an.<br />"
-			+ "Der Anzeigename ist nachher der Titel im VMChooser, also dort, wo die Studenten das Labor auswählen.<br />"
-			+ "Eine Angabe des Namens des Dozenten kann daher hilfreich sein, wenn mehrere ähnliche Veranstaltungen vorliegen.<br />"
-			+ "Geben Sie in der Beschreibung kurz an, was in dieser Veranstaltung behandelt wird, evtl. auch mit welcher Software"
-			+ "</div></html>";
-
-	private int maxLifeTime = 240; // Anzahl Tage, die eine Veranstaltung in der Zukunft
-	// aktiv sein darf
-	private boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false;
-
-	/**
-	 * Create the dialog.
-	 */
-	public CreateLectureAllgemein_GUI() {
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				txtFldVeranstaltungsname.requestFocusInWindow();
-			}
-		});
-
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Veranstaltung erzeugen - " + person.verantwortlicher.getUserID());
-		setBounds(0, 0, 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 Imagenamen sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 21);
-			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 Besitzer", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 331, 557, 162);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 33, 125, 20);
-		panel_1.add(label);
-
-		Vorname = new JTextField();
-		Vorname.setEditable(false);
-		Vorname.setEnabled(false);
-		Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 33, 350, 20);
-		panel_1.add(Vorname);
-
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 64, 125, 20);
-		panel_1.add(label_7);
-
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 64, 350, 20);
-		panel_1.add(Nachname);
-
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 95, 125, 20);
-		panel_1.add(label_8);
-
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 95, 350, 20);
-		panel_1.add(Hochschule);
-
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 126, 125, 20);
-		panel_1.add(label_9);
-
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setBackground(Color.WHITE);
-		EMail.setColumns(10);
-		EMail.setBounds(145, 126, 350, 20);
-		panel_1.add(EMail);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 70, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(161, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(174, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 36, 557, 284);
-		contentPanel.add(panel_2);
-
-		JLabel lblAnzeigename = new JLabel("Anzeigename: *");
-		lblAnzeigename.setBounds(10, 25, 180, 14);
-		panel_2.add(lblAnzeigename);
-
-		txtFldVeranstaltungsname = new JTextField();
-		txtFldVeranstaltungsname.setColumns(10);
-		txtFldVeranstaltungsname.setBounds(200, 22, 347, 20);
-		txtFldVeranstaltungsname.setText(Lecture.lecture.getName());
-		panel_2.add(txtFldVeranstaltungsname);
-
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setEditable(false);
-		txtrGebenSieBitte.setWrapStyleWord(true);
-		txtrGebenSieBitte
-				.setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Grundlagen Programmieren Sommersemester...\", nicht \"Programmieren\"");
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setBounds(10, 49, 537, 49);
-		panel_2.add(txtrGebenSieBitte);
-
-		JLabel lblDesc = new JLabel("Beschreibung: *");
-		lblDesc.setBounds(10, 111, 180, 14);
-		panel_2.add(lblDesc);
-
-		ScrollPane scrollPane = new ScrollPane();
-		scrollPane.setBounds(200, 104, 347, 78);
-		panel_2.add(scrollPane);
-		description = new JTextArea();
-		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		description.setLineWrap(true);
-		description.setText(Lecture.lecture.getDesc());
-		scrollPane.add(description);
-		description.setBounds(0, 0, 4, 22);
-		scrollPane.add(description);
-		dateChooserstart = new JDateChooser();
-		dateChooserstart.addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent arg0) {
-				endDate = addDays(dateChooserstart.getDate(), maxLifeTime); // Datum darf weiter als 8
-				// Monate in der Zukunft
-				// liegen
-			}
-		});
-		if (Lecture.lecture.getStartdate() == null) {
-			// is not defined yet
-			dateChooserstart.setDate(startDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserstart.setDate(Lecture.lecture.getStartdate());
-		}
-		dateChooserstart.setDateFormatString("yyyy-MM-dd HH:mm:ss");
-		dateChooserstart.setBounds(226, 188, 143, 20);
-		panel_2.add(dateChooserstart);
-
-		dateChooserend = new JDateChooser();
-		endDate = addDays(dateChooserstart.getDate(), maxLifeTime); // Datum
-																	// darf
-																	// weiter
-																	// als 8
-		// Monate in der Zukunft
-		// liegen
-		dateChooserend.setDate(endDate);
-		if (Lecture.lecture.getEnddate() == null) {
-			// is not defined yet
-			dateChooserend.setDate(endDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserend.setDate(Lecture.lecture.getEnddate());
-		}
-		dateChooserend.setDateFormatString("yyyy-MM-dd HH:mm:ss");
-		dateChooserend.setBounds(404, 188, 143, 20);
-		panel_2.add(dateChooserend);
-
-		JLabel lblBis = new JLabel("bis:");
-		lblBis.setBounds(378, 188, 21, 20);
-		panel_2.add(lblBis);
-
-		JLabel label_6 = new JLabel("von:");
-		label_6.setBounds(200, 188, 30, 20);
-		panel_2.add(label_6);
-
-		JLabel label_10 = new JLabel("Gültigkeitsdatum: *");
-		label_10.setBounds(10, 194, 127, 14);
-		panel_2.add(label_10);
-
-		JLabel label_11 = new JLabel("Aktiv:");
-		label_11.setBounds(10, 229, 127, 14);
-		panel_2.add(label_11);
-
-		radioButtonyes = new JRadioButton("Ja");
-		radioButtonyes.setSelected(true);
-		radioButtonyes.setBounds(200, 225, 73, 23);
-		panel_2.add(radioButtonyes);
-
-		radioButtonno = new JRadioButton("Nein");
-		radioButtonyes.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				radioButtonyes.setSelected(true);
-				radioButtonno.setSelected(false);
-			}
-		});
-		radioButtonno.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				radioButtonno.setSelected(true);
-				radioButtonyes.setSelected(false);
-			}
-		});
-		radioButtonno.setBounds(296, 225, 73, 23);
-		panel_2.add(radioButtonno);
-
-		JLabel lblimVmchooserSichtbar = new JLabel("(im VMChooser sichtbar)");
-		lblimVmchooserSichtbar.setBounds(10, 245, 127, 14);
-		panel_2.add(lblimVmchooserSichtbar);
-
-		JLabel lblmaxMonate = new JLabel("(max. 6 Monate)");
-		lblmaxMonate.setBounds(10, 208, 127, 14);
-		panel_2.add(lblmaxMonate);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton backButton = new JButton("Zurück");
-				backButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-
-						Lecture.lecture.setName(txtFldVeranstaltungsname.getText().trim());
-						Lecture.lecture.setDesc(description.getText().trim());
-						Lecture.lecture.setEnddate(dateChooserend.getDate());
-						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				backButton.setActionCommand("Cancel");
-				buttonPane.add(backButton);
-				getRootPane().setDefaultButton(backButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() 
-				{
-					public void actionPerformed(ActionEvent e) 
-					{
-						// liegt das End-Datum vor dem Start-Datum?
-						if (dateChooserend.getDate().before(dateChooserstart.getDate())) 
-						{
-							// datum ist falsch rum
-							isDateOrderCorrect = false;
-							JOptionPane.showMessageDialog(null,
-									"Das End-Datum liegt vor dem Start-Datum. Bitte ändern.",
-									"Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-						} 
-						else {
-							// bereit
-							isDateOrderCorrect = true;
-						}
-						// liegt das eingegebene Datum nach dem erlaubten
-						// End-Datum?
-						/*
-						if (dateChooserend.getDate().after(endDate)) {
-							// Datum zu weit weg
-							isDateMaxLifeTimeCorrect = false;
-							
-							/*
-							JOptionPane.showMessageDialog(null,
-									"Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n"
-											+ endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-
-							dateChooserend.setDate(endDate); // setze Datum auf
-																// maximum
-																
-						} else {
-							// bereit
-							isDateMaxLifeTimeCorrect = true;
-						}
-						*/
-						// Pruefen ob alles eingegeben wurde
-						if (txtFldVeranstaltungsname.getText().trim().isEmpty() == true
-								|| description.getText().trim().isEmpty() == true) {
-							// mind 1 Textfeld ist leer
-							isAllInformationReady = false;
-							JOptionPane.showMessageDialog(null,
-									"Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
-									"Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-						} else {
-							// Textfelder bereit
-							isAllInformationReady = true;
-						}
-
-						// welcher Radiobutton ist geklickt?
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-						// Pruefe ob alle Eingaben korrekt sind, dann mache
-						// weiter
-						//if (isAllInformationReady == true && isDateMaxLifeTimeCorrect == true
-						if (isAllInformationReady && descriptionLenghtOK() && isDateOrderCorrect) 
-						{
-							// everything is ok, proceed
-							Lecture.lecture.setName(txtFldVeranstaltungsname.getText().trim());
-							Lecture.lecture.setDesc(description.getText().trim());
-							Lecture.lecture.setEnddate(dateChooserend.getDate());
-							Lecture.lecture.setStartdate(dateChooserstart.getDate());
-
-							GuiManager.show(new PermissionCreateLecture_GUI());
-						}
-
-					}
-				});
-				continueButton.setActionCommand("OK");
-				buttonPane.add(continueButton);
-			}
-		}
-
-		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);
-
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(32, 602, 136, 14);
-		getContentPane().add(lblPflichtfelder);
-
-	}
-
-	public Date addDays(Date date, int days) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		cal.add(Calendar.DATE, days); // minus number would decrement the days
-		return cal.getTime();
-	}// end addDays()
-
-	public boolean descriptionLenghtOK() {
-		descriptionLengthOK = false;
-
-		// max length is 254 chars
-		if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
-			descriptionLengthOK = false;
-			JOptionPane.showMessageDialog(null,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ description.getText().trim().length() + ".", "Beschreibung zu umfangreich",
-					JOptionPane.INFORMATION_MESSAGE);
-		} else {
-			descriptionLengthOK = true;
-
-		}
-
-		return descriptionLengthOK;
-	}// enddescriptionLenghtOK()
-
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
deleted file mode 100644
index 7cfc1181..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ /dev/null
@@ -1,678 +0,0 @@
-package gui.lecture;
-
-import gui.image.FTPCreateUploader_GUI;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.Lecture;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Image;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class CreateLectureLink_GUI extends JInternalFrame {
-
-	private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JComboBox<String> comboBox;
-	private JLabel labelName;
-	private JLabel labelUpdate;
-	private JLabel labelVerantwortlicher;
-	private JLabel labelWeitereVerantwortliche;
-	private JLabel labelVorlage;
-	private JLabel labelLizenzSoftware;
-	private JLabel labelInternet;
-	private JLabel labelRam;
-	private JLabel labelCPU;
-	private JLabel labelID;
-	private JLabel labelVersion;
-	private JTextArea textAreadesc;
-	private JLabel labelOS;
-	private JTable tablemyImages = new JTable();
-	private JTextField textFieldName;
-	private JLabel lblTotalResults;
-	private String lectureUuid = null;
-	private String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",
-			"Letztes Update", "ID", "Version", "Template", "Beschreibung" };
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Damit Ihre Veranstaltung geladen werden kann, muss sie mit einem Image verbunden werden.<br />"
-			+ "Das Image liegt entweder schon vor, oder Sie haben es im Vorfeld hochgeladen.<br />"
-			+ "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung erzeugen\"."
-			+ "</div></html>";
-
-	private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages);
-
-	private RowFilter<Object, Object> rf = null;
-	private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
-
-	/**
-	 * Create the dialog.
-	 */
-	public CreateLectureLink_GUI() {
-
-		filters.add(RowFilter.regexFilter(".", 0));
-		rf = RowFilter.orFilter(filters);
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				try {
-					initTableModel(modelMyImages);
-
-				} catch (TException e) {
-
-					e.printStackTrace();
-				} catch (ParseException e) {
-					e.printStackTrace();
-				}
-
-				// auszublendende Angaben
-				// 1=Lizenzpflichtig
-				// 3=Veranstaltung
-				// 6=ID
-				// 7=Version
-				// 8=Template
-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tablemyImages.getTableHeader().setReorderingAllowed(false);
-
-				tablemyImages.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tablemyImages.clearSelection(); //just one row is selectablemyImages
-						tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()),
-								tablemyImages.rowAtPoint(e.getPoint()));
-					}
-				});
-
-				textFieldName.requestFocusInWindow();
-			}
-		});
-
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Veranstaltung erzeugen - " + person.verantwortlicher.getUserID());
-		setBounds(0, 0, 918, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 892, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Veranstaltung auf ein Image verlinken");
-				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("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert.");
-			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, 92);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		textFieldName = new JTextField();
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				String stext = textFieldName.getText().trim();
-				// Wenn Textfield nicht leer
-				if (stext != "") {
-					// Filtere nach der Eingabe
-					filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyImages.setRowFilter(rf);
-
-				} else {
-					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyImages.setRowFilter(rf);
-				}
-				tablemyImages.clearSelection();
-
-				resetLectureInfo();
-
-			}
-
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		comboBox = new JComboBox<String>();
-		try {
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			comboBox.addItem("");
-			for (int i = 0; i < list.size(); i++) {
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e) {
-
-			e.printStackTrace();
-			JOptionPane.showMessageDialog(null, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message",
-					JOptionPane.ERROR_MESSAGE);
-		}
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString() != "") {
-					// rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(),
-					// 2));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()
-							.toString(), 2));
-					// rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(),
-					// 2));
-				} else {
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
-					// rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true",
-					// 8));
-					// rowSorterAll.setRowFilter(null);
-				}
-			}
-		});
-		comboBox.setBounds(133, 58, 191, 20);
-		panel_1.add(comboBox);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 76, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(151, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(164, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(10, 158, 557, 339);
-		contentPanel.add(scrollPaneMyImage);
-		tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tablemyImages.getSelectedRow() != -1) {
-					String imageid = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 6)
-							.toString();
-					String version = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-							.toString();
-					try {
-						//write the image data to the information fields on the right
-						writeImageData(imageid, version);
-					} catch (TException e1) {
-
-						e1.printStackTrace();
-					} catch (ParseException e1) {
-
-						e1.printStackTrace();
-					}
-				}
-			}
-
-		});
-		tablemyImages.setModel(modelMyImages);
-		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();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-
-		scrollPaneMyImage.setViewportView(tablemyImages);
-
-		lblTotalResults = new JLabel("Anzahl:");
-		lblTotalResults.setBounds(10, 512, 131, 20);
-		contentPanel.add(lblTotalResults);
-
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 902, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new PermissionCreateLecture_GUI());
-					}
-				});
-				cancelButton.setActionCommand("CANCEL");
-				buttonPane.add(cancelButton);
-				getRootPane().setDefaultButton(cancelButton);
-			}
-			{
-				JButton doLinkButton = new JButton("Veranstaltung erzeugen und abschließen");
-				doLinkButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// check if a row is selected
-						if (tablemyImages.getSelectedRow() != -1) {
-
-							// a row is selected, do operations
-							String imageID = tablemyImages.getValueAt(tablemyImages.getSelectedRow(), 6)
-									.toString();
-							try {
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-								//create new lecture
-								ThriftManager.getSatClient().writeLecturedata(Lecture.lecture.getName(),
-										Lecture.lecture.getShortDesc(), Lecture.lecture.getDesc(),
-										formatter.format(Lecture.lecture.getStartdate()).toString(),
-										formatter.format(Lecture.lecture.getEnddate()).toString(),
-										Lecture.lecture.isActive(), imageID, SessionData.authToken,
-										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet(), lectureUuid,
-										person.verantwortlicher.getHochschule());
-								System.out.println("imageID" + " " + imageID);
-								System.out.println("lectureID" + " " + lectureUuid);
-								//set rights for this user
-
-								ThriftManager.getSatClient().writeLectureRights(lectureUuid,
-										person.verantwortlicher.getRole(), SessionData.authToken,
-										person.verantwortlicher.getHochschule(),
-										person.verantwortlicher.getUserID());
-
-								//set rights for additional users
-								for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList()
-										.size(); i++) {
-									//System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size());
-									ThriftManager.getSatClient().writeAdditionalLectureRights(
-											lectureUuid,
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.getUserID(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_read(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_write(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_admin(), SessionData.authToken);
-
-								}//end for
-
-								LOGGER.info("Veranstaltung '" + Lecture.lecture.getName()
-										+ "' wurde erfolgreich angelegt.");
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.",
-												"Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE);
-								// zurueck zum Menue
-								GuiManager.show(new MainMenue_GUI());
-							} catch (TException e1) {
-								LOGGER.error("Veranstaltung '" + Lecture.lecture.getName()
-										+ "' konnte nicht angelegt werden.");
-
-								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-										"Error", JOptionPane.ERROR_MESSAGE);
-								JOptionPane.showMessageDialog(null, e1.getCause() + "\n" + e1.getStackTrace(),
-										"Debug-Message", JOptionPane.ERROR_MESSAGE);
-							}
-
-							dispose();
-
-						} else {
-							// nothing selected
-							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image aus.",
-									"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
-						}
-
-					}
-				});
-				doLinkButton.setActionCommand("OK");
-				buttonPane.add(doLinkButton);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 912, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 912, 2);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(586, 85, 316, 531);
-		getContentPane().add(panel);
-
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 87, 130, 14);
-		panel.add(lblName);
-
-		labelName = new JLabel("");
-		labelName.setBounds(10, 102, 296, 14);
-		panel.add(labelName);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 259, 130, 14);
-		panel.add(lblVerantwortlicher);
-
-		labelOS = new JLabel("");
-		labelOS.setBounds(10, 216, 296, 14);
-		panel.add(labelOS);
-
-		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
-		panel.add(lblWeitereVerantwortliche);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 272, 296, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel label = new JLabel("Weitere Verantwortliche:");
-		label.setBounds(10, 284, 130, 14);
-		panel.add(label);
-
-		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
-		panel.add(labelWeitereVerantwortliche);
-
-		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(10, 245, 296, 14);
-		panel.add(labelUpdate);
-
-		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 231, 130, 14);
-		panel.add(lblLetztesUpdate);
-
-		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 336, 130, 14);
-		panel.add(lblImageIstVorlage);
-
-		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 350, 296, 14);
-		panel.add(labelVorlage);
-
-		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(10, 383, 296, 14);
-		panel.add(labelLizenzSoftware);
-
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
-		panel.add(lblLizenzpflichtigeSoftware);
-
-		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
-		lblInternet.setBounds(10, 400, 130, 14);
-		panel.add(lblInternet);
-
-		labelInternet = new JLabel("");
-		labelInternet.setBounds(10, 417, 296, 14);
-		panel.add(labelInternet);
-
-		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
-		panel.add(lblEmpfehlungRam);
-
-		labelRam = new JLabel("");
-		labelRam.setBounds(10, 455, 296, 14);
-		panel.add(labelRam);
-
-		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
-		panel.add(lblEmpfehlungCpu);
-
-		labelCPU = new JLabel("");
-		labelCPU.setBounds(10, 487, 296, 14);
-		panel.add(labelCPU);
-
-		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 322, 296, 14);
-		panel.add(lblTechnischeDaten);
-
-		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 296, 14);
-		panel.add(lblId);
-
-		labelID = new JLabel("");
-		labelID.setBounds(10, 37, 296, 14);
-		panel.add(labelID);
-
-		labelVersion = new JLabel("");
-		labelVersion.setBounds(10, 73, 296, 14);
-		panel.add(labelVersion);
-
-		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 57, 296, 14);
-		panel.add(lblVersion);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 119, 130, 14);
-		panel.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 135, 296, 65);
-		panel.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setBackground(SystemColor.menu);
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		scrollPane.setViewportView(textAreadesc);
-
-		lectureUuid = UUID.randomUUID().toString();
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) throws TException, ParseException {
-		List<Image> images;
-
-		// Hole eine Liste der Images
-		if (person.verantwortlicher.getRole() == "Admin") {
-			//get complete list
-			images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),
-					SessionData.authToken);
-		} else {
-			images = ThriftManager.getSatClient().getImageListPermissionLink(
-					person.verantwortlicher.getUserID(), SessionData.authToken);
-		}
-
-		Iterator<Image> i = images.iterator();
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		int x = 0;
-
-		while (i.hasNext()) {
-			// erzeuge Objekte fuer die Tabelle
-			Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(),
-					images.get(x).getOsName(), images.get(x).getLectureName(), images.get(x).getUserData(),
-					out.format(in.parse(images.get(x).updateTime)), images.get(x).id,
-					images.get(x).getVersion(), images.get(x).getIsTemplate(), images.get(x).getDescription() };
-			// Fuege diese Objekte der Tabelle hinzu
-
-			model.addRow(obj);
-			x++;
-			i.next();
-
-		}
-		//show number if rows in GUI
-		lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
-
-		return model;
-
-	}
-
-	private void resetLectureInfo() {
-		//reset the detailed information on the right hand side when changing search string
-		labelID.setText("");
-		labelVersion.setText("");
-		labelName.setText("");
-		textAreadesc.setText("");
-		labelOS.setText("");
-		labelUpdate.setText("");
-		labelVerantwortlicher.setText("");
-		labelWeitereVerantwortliche.setText("");
-		labelVorlage.setText("");
-		labelLizenzSoftware.setText("");
-		labelInternet.setText("");
-		labelRam.setText("");
-		labelCPU.setText("");
-	}
-
-	public void writeImageData(String id, String version) throws TException, ParseException {
-
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
-				SessionData.authToken);
-		labelName.setText(res.get("name"));
-		labelOS.setText(res.get("os"));
-		labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
-		labelVerantwortlicher.setText(res.get("owner"));
-		labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
-		if (res.get("template").equals("true")) {
-			labelVorlage.setText("Ja");
-		} else {
-			labelVorlage.setText("Nein");
-		}
-		if (res.get("license").equals("1")) {
-			labelLizenzSoftware.setText("Ja");
-		} else {
-			labelLizenzSoftware.setText("Nein");
-		}
-		if (res.get("internet").equals("1")) {
-			labelInternet.setText("Ja");
-		} else {
-			labelInternet.setText("Nein");
-		}
-		labelRam.setText(res.get("ram"));
-		labelCPU.setText(res.get("cpu"));
-		labelID.setText(res.get("id"));
-		labelVersion.setText(res.get("version"));
-		textAreadesc.setText(res.get("desc"));
-
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
deleted file mode 100644
index e3523d3c..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ /dev/null
@@ -1,542 +0,0 @@
-package gui.lecture;
-
-import gui.helper.TableFiller;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Lecture;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class DeleteLecture_GUI extends JInternalFrame {
-
-	private final static Logger LOGGER = Logger.getLogger(DeleteLecture_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnInternetJa;
-	JRadioButton rdbtnInternetNein;
-	JLabel labelAktiv;
-	JLabel labelstartdate;
-	JLabel labelenddate;
-	JLabel labelimageversion;
-	JTextArea labelName;
-	JTextArea labelimage;
-	JTextArea labeldesc;
-	JLabel labelVerantwortlicher;
-	JTable tablemyLectures;
-	private JTextField textFieldName;
-	private JLabel lblTotalResults;
-	boolean activeSearch = false;
-	String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv",
-			"Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" };
-
-	final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(modelMyLectures);
-	private JButton button;
-
-	Component c = null;
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "In der Übersicht sehen Sie primär alle Veranstaltungen, die Sie erzeugt haben.<br />"
-			+ "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.<br />"
-			+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
-			+ "</div></html>";
-
-	RowFilter<Object, Object> rf = null;
-	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
-
-	/**
-	 * Create the dialog.
-	 */
-	public DeleteLecture_GUI() {
-
-		filters.add(RowFilter.regexFilter(".", 0));
-		rf = RowFilter.orFilter(filters);
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				textFieldName.requestFocusInWindow();
-				initTableModel(modelMyLectures);
-
-				// auszublendende Angaben
-				// 1=Beschreibung
-				// 2=Gültigkeitsdatum
-				// 3=Aktiv
-				// 6=Image
-				// 7=Schlagwort
-				// 8=ID
-
-				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
-
-				tablemyLectures.getTableHeader().setReorderingAllowed(false);
-				tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				tablemyLectures.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tablemyLectures.clearSelection(); //just one row is selectablemyLectures
-						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()),
-								tablemyLectures.rowAtPoint(e.getPoint()));
-						System.out.println(tablemyLectures.getSelectedRow());
-					}
-				});
-
-			}
-		});
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Veranstaltung löschen - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 842, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 816, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Zu löschende Veranstaltung wählen");
-				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("Wählen Sie bitte aus der unten stehenden Liste die zu löschende Veranstaltung aus.");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 85, 570, 518);
-		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, 64);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		textFieldName = new JTextField();
-		// Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-				String stext = textFieldName.getText().trim();
-				// Wenn Textfield nicht leer
-				if (stext != "") {
-					activeSearch = true;
-					// Filtere nach der Eingabe
-
-					filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case
-																			// insensitive
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case
-																			// insensitive
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyLectures.setRowFilter(rf);
-
-				} else {
-					activeSearch = false;
-					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0)); // case
-																// insensitive,
-																// filter for
-																// anything
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyLectures.setRowFilter(rf);
-				}
-
-				tablemyLectures.clearSelection();
-
-				resetLectureInfo();
-			}
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 75, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(152, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		lblTotalResults = new JLabel("Anzahl:");
-		lblTotalResults.setBounds(10, 500, 131, 20);
-		contentPanel.add(lblTotalResults);
-
-		JLabel lblNewLabel_1 = new JLabel("Löschen");
-		lblNewLabel_1.setBounds(166, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(10, 120, 552, 369);
-		contentPanel.add(scrollPaneMyImage);
-		tablemyLectures = new JTable();
-		tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tablemyLectures.getSelectedRow() != -1) {
-					String imageid = modelMyLectures.getValueAt(
-							tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)
-							.toString();
-
-					try {
-						writeLectureData(imageid);
-					} catch (TException e1) {
-
-						e1.printStackTrace();
-					} catch (ParseException e1) {
-
-						e1.printStackTrace();
-					}
-				}
-			}
-
-		});
-		tablemyLectures.setModel(modelMyLectures);
-
-		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyLectures.setRowSorter(rowSorterMyLectures);
-
-		scrollPaneMyImage.setViewportView(tablemyLectures);
-
-		button = new JButton("Löschen");
-		button.setBounds(442, 495, 118, 23);
-		contentPanel.add(button);
-		button.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				String lectureID = "";
-				int eingabe;
-				// check if a row is selected
-				if (tablemyLectures.getSelectedRowCount() != 0) {
-					// a row is selected
-					// ask for confirmation
-					eingabe = JOptionPane.showConfirmDialog(c, "Wollen Sie diese Daten löschen?", "Löschen?",
-							JOptionPane.YES_NO_OPTION);
-
-					if (eingabe == JOptionPane.YES_OPTION) {
-						// user has confirmed deletion, now get the ID of the
-						// selected lecture
-						lectureID = modelMyLectures.getValueAt(
-								tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)
-								.toString();
-
-						//int test = tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow());
-
-						// LOGGER.info("Lösche Veranstaltung: " + lectureID);
-						try {
-							if (ThriftManager.getSatClient().deleteLecture(lectureID, SessionData.authToken)) {
-
-								// delete successful
-								LOGGER.info("Veranstaltung erfolgreich '" + lectureID + "' gelöscht.");
-								GuiManager.show(new DeleteLecture_GUI());
-							} else {
-								// delete not successful
-								LOGGER.error("Konnte Veranstaltung '" + lectureID
-										+ "' nicht aus der Datenbank löschen!");
-								JOptionPane.showMessageDialog(c,
-										"Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.",
-										"Fehler", JOptionPane.INFORMATION_MESSAGE);
-							}
-						} catch (TException e1) {
-
-							e1.printStackTrace();
-						}// end delete
-					}// end ask for confirmation
-
-				}// end check if a row is selected
-			}
-		});
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 826, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton btnBack = new JButton("Zurück");
-				btnBack.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// oeffnet das Hauptmenue
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				btnBack.setActionCommand("OK");
-				buttonPane.add(btnBack);
-				getRootPane().setDefaultButton(btnBack);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 836, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 628, 836, 1);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(591, 85, 235, 518);
-		getContentPane().add(panel);
-
-		JLabel lblNewLabel_3 = new JLabel("Name:");
-		lblNewLabel_3.setBounds(10, 27, 104, 14);
-		panel.add(lblNewLabel_3);
-
-		JLabel lblAktiv = new JLabel("Aktiv:");
-		lblAktiv.setBounds(10, 98, 104, 14);
-		panel.add(lblAktiv);
-
-		labelAktiv = new JLabel("");
-		labelAktiv.setBounds(10, 114, 218, 14);
-		panel.add(labelAktiv);
-
-		labelstartdate = new JLabel("");
-		labelstartdate.setBounds(10, 147, 218, 14);
-		panel.add(labelstartdate);
-
-		JLabel lblStartdatum = new JLabel("Startdatum:");
-		lblStartdatum.setBounds(10, 129, 104, 14);
-		panel.add(lblStartdatum);
-
-		labelenddate = new JLabel("");
-		labelenddate.setBounds(10, 175, 218, 14);
-		panel.add(labelenddate);
-
-		JLabel lblEnddatum = new JLabel("Enddatum:");
-		lblEnddatum.setBounds(10, 161, 104, 14);
-		panel.add(lblEnddatum);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 189, 104, 14);
-		panel.add(lblBeschreibung);
-
-		JLabel lblImage = new JLabel("Image:");
-		lblImage.setBounds(10, 293, 104, 14);
-		panel.add(lblImage);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 426, 218, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 411, 104, 14);
-		panel.add(lblVerantwortlicher);
-
-		JLabel lblImageversion = new JLabel("Imageversion:");
-		lblImageversion.setBounds(10, 381, 104, 14);
-		panel.add(lblImageversion);
-
-		labelimageversion = new JLabel("");
-		labelimageversion.setBounds(10, 399, 218, 14);
-		panel.add(labelimageversion);
-
-		labeldesc = new JTextArea();
-		labeldesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labeldesc.setEditable(false);
-		labeldesc.setLineWrap(true);
-		labeldesc.setBackground(SystemColor.menu);
-		labeldesc.setBounds(124, 127, 104, 110);
-		JScrollPane scrollPane = new JScrollPane(labeldesc);
-		scrollPane.setBounds(10, 209, 218, 81);
-		panel.add(scrollPane);
-		// panel.add(labeldesc);
-
-		labelimage = new JTextArea();
-		labelimage.setLineWrap(true);
-		labelimage.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labelimage.setEditable(false);
-		labelimage.setBackground(SystemColor.menu);
-		labelimage.setBounds(124, 248, 101, 81);
-		JScrollPane scrollPaneImage = new JScrollPane(labelimage);
-		scrollPaneImage.setBounds(10, 309, 215, 69);
-		panel.add(scrollPaneImage);
-
-		labelName = new JTextArea();
-		labelName.setEditable(false);
-		labelName.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labelName.setBackground(SystemColor.menu);
-		labelName.setBounds(124, 22, 101, 55);
-		JScrollPane scrollPaneName = new JScrollPane(labelName);
-		scrollPaneName.setBounds(10, 40, 218, 55);
-		panel.add(scrollPaneName);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<Lecture> lectures;
-		try {
-
-			// Hole eine Liste der erlaubten Images für die diese Person
-			if (person.verantwortlicher.getRole() == "Admin") {
-				//get complete list
-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
-			} else {
-				//get permitted list
-				lectures = ThriftManager.getSatClient().getLectureListPermissionAdmin(SessionData.authToken);
-			}
-
-			TableFiller.fillModelWithLectureList(model, lectures);
-
-			//show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
-
-			return model;
-		} catch (TException e1) {
-
-			e1.printStackTrace();
-		}
-
-		return model;
-	}
-
-	private void resetLectureInfo() {
-		// reset the detailed information on the right hand side when changing
-		// search string
-
-		labelName.setText("");
-		labelVerantwortlicher.setText("");
-		labelAktiv.setText("");
-		labeldesc.setText("");
-		labelenddate.setText("");
-		labelimage.setText("");
-		labelimageversion.setText("");
-		labelstartdate.setText("");
-		labelVerantwortlicher.setText("");
-
-	}
-
-	public void writeLectureData(String id) throws TException, ParseException {
-
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken);
-		labelName.setText(res.get("name"));
-		labelAktiv.setText(res.get("isActive"));
-		labeldesc.setText(res.get("desc"));
-		labelVerantwortlicher.setText(res.get("owner"));
-		labelstartdate.setText(out.format(in.parse(res.get("startTime"))));
-		labelenddate.setText(out.format(in.parse(res.get("endTime"))));
-		labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1));
-		labelimageversion.setText(res.get("imageversion"));
-
-	}
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
deleted file mode 100644
index e06611db..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ /dev/null
@@ -1,521 +0,0 @@
-package gui.lecture;
-
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.ScrollPane;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.Calendar;
-import java.util.Date;
-
-import javax.swing.ButtonGroup;
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JSeparator;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-
-import models.Image;
-import models.ItemOwner;
-import models.Lecture;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-import com.toedter.calendar.JDateChooser;
-
-@SuppressWarnings("serial")
-public class EditLectureAllgemein_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTextField Vorname;
-	private JTextField Nachname;
-	private JTextField Hochschule;
-	private JTextField EMail;
-	private JTextField textFieldLaborname;
-	private JTextArea description;
-	private JRadioButton radioButtonyes;
-	private JDateChooser dateChooserend;
-	private JDateChooser dateChooserstart;
-	private JRadioButton radioButtonno;
-	private Date startDate = new Date();
-	private Date endDate;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
-
-	private boolean descriptionLengthOK = false; // description may not be
-													// longer than
-													// MAX_DESCRIPTION_LENGTH
-	private final int MAX_DESCRIPTION_LENGTH = 254;
-
-	private int maxLifeTime = 240; // Anzahl Tage, die eine Veranstaltung in der Zukunft
-	// aktiv sein darf
-	private boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect, isAllInformationReady = false;
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Bearbeiten Sie hier Ihre allgemeinen Informationen zu einer Veranstaltung.<br />"
-			+ "Sie können auch den Zeitraum neu wählen und die Beschreibung ändern.<br />"
-			+ "Klicken Sie anschließend auf \"Witer\" um die Daten im nächsten Schritt zu übernehmen."
-			+ "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditLectureAllgemein_GUI() {
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID());
-		setBounds(0, 0, 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 Veranstaltungsnamen sowie Ihre Kontaktdaten an");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 21);
-			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 Besitzer", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 331, 557, 162);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel label = new JLabel("Vorname: *");
-		label.setBackground(SystemColor.menu);
-		label.setBounds(10, 33, 125, 20);
-		panel_1.add(label);
-
-		Vorname = new JTextField();
-		Vorname.setEditable(false);
-		Vorname.setEnabled(false);
-		//Vorname.setText(person.verantwortlicher.getVorname());
-		Vorname.setText(ItemOwner.itemOwner.getVorname());
-		Vorname.setBackground(Color.WHITE);
-		Vorname.setColumns(10);
-		Vorname.setBounds(145, 33, 350, 20);
-		panel_1.add(Vorname);
-
-		JLabel label_7 = new JLabel("Nachname: *");
-		label_7.setBackground(SystemColor.menu);
-		label_7.setBounds(10, 64, 125, 20);
-		panel_1.add(label_7);
-
-		Nachname = new JTextField();
-		Nachname.setEnabled(false);
-		Nachname.setEditable(false);
-		//Nachname.setText(person.verantwortlicher.getName());
-		Nachname.setText(ItemOwner.itemOwner.getNachname());
-		Nachname.setBackground(Color.WHITE);
-		Nachname.setColumns(10);
-		Nachname.setBounds(145, 64, 350, 20);
-		panel_1.add(Nachname);
-
-		JLabel label_8 = new JLabel("Hochschule: *");
-		label_8.setBackground(SystemColor.menu);
-		label_8.setBounds(10, 95, 125, 20);
-		panel_1.add(label_8);
-
-		Hochschule = new JTextField();
-		Hochschule.setEnabled(false);
-		Hochschule.setEditable(false);
-		//Hochschule.setText(person.verantwortlicher.getHochschule());
-		Hochschule.setText(ItemOwner.itemOwner.getHochschule());
-		Hochschule.setBackground(Color.WHITE);
-		Hochschule.setColumns(10);
-		Hochschule.setBounds(145, 95, 350, 20);
-		panel_1.add(Hochschule);
-
-		JLabel label_9 = new JLabel("E-Mail: *");
-		label_9.setBackground(SystemColor.menu);
-		label_9.setBounds(10, 126, 125, 20);
-		panel_1.add(label_9);
-
-		EMail = new JTextField();
-		EMail.setEnabled(false);
-		EMail.setEditable(false);
-		//EMail.setText(person.verantwortlicher.getEMail());
-		EMail.setText(ItemOwner.itemOwner.getEmail());
-		EMail.setBackground(Color.WHITE);
-		EMail.setColumns(10);
-		EMail.setBounds(145, 126, 350, 20);
-		panel_1.add(EMail);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 402, 577, 33);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 84, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(175, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(188, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Veranstaltungsdaten", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(10, 36, 557, 284);
-		contentPanel.add(panel_2);
-
-		JLabel label_3 = new JLabel("Laborname (Anzeigename): *");
-		label_3.setBounds(10, 25, 180, 14);
-		panel_2.add(label_3);
-
-		textFieldLaborname = new JTextField();
-		textFieldLaborname.setText(Lecture.lecture.getName());
-		textFieldLaborname.setColumns(10);
-		textFieldLaborname.setBounds(200, 22, 347, 20);
-		panel_2.add(textFieldLaborname);
-
-		JTextArea txtrGebenSieBitte = new JTextArea();
-		txtrGebenSieBitte.setEditable(false);
-		txtrGebenSieBitte.setWrapStyleWord(true);
-		txtrGebenSieBitte
-				.setText("Geben Sie bitte einen sprechenden Namen für die Veranstaltung an. Dieser soll jedoch recht spezifisch sein.\r\nBeispiel: \"Programmieren 1\", nicht \"Programmieren\"");
-		txtrGebenSieBitte.setLineWrap(true);
-		txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12));
-		txtrGebenSieBitte.setBackground(SystemColor.menu);
-		txtrGebenSieBitte.setBounds(10, 49, 537, 49);
-		panel_2.add(txtrGebenSieBitte);
-
-		JLabel label_4 = new JLabel("Beschreibung: *");
-		label_4.setBounds(10, 111, 180, 14);
-		panel_2.add(label_4);
-
-		ScrollPane scrollPane = new ScrollPane();
-		scrollPane.setBounds(200, 104, 347, 78);
-		panel_2.add(scrollPane);
-		description = new JTextArea();
-		description.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		description.setText(Lecture.lecture.getDesc());
-		description.setLineWrap(true);
-		scrollPane.add(description);
-		description.setBounds(0, 0, 4, 22);
-		scrollPane.add(description);
-
-		dateChooserend = new JDateChooser();
-		dateChooserend.setDateFormatString("dd-MM-yyyy HH:mm:ss");
-		dateChooserend.setDate(Lecture.lecture.getEnddate());
-		dateChooserend.setBounds(404, 188, 143, 20);
-		panel_2.add(dateChooserend);
-
-		JLabel label_5 = new JLabel("bis");
-		label_5.setBounds(378, 188, 21, 20);
-		panel_2.add(label_5);
-
-		dateChooserstart = new JDateChooser();
-		dateChooserstart.addPropertyChangeListener(new PropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent arg0) {
-				endDate = addDays(dateChooserstart.getDate(), maxLifeTime); // Datum darf weiter als 8
-				// Monate in der Zukunft
-				// liegen
-			}
-		});
-
-		// initialize
-		if (Lecture.lecture.getStartdate() == null) {
-			// is not defined yet
-			dateChooserstart.setDate(startDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserstart.setDate(Lecture.lecture.getStartdate());
-		}
-
-		if (Lecture.lecture.getEnddate() == null) {
-			// is not defined yet
-			dateChooserend.setDate(endDate);
-		} else {
-			// already defined from last visit on this page
-			dateChooserend.setDate(Lecture.lecture.getEnddate());
-		}
-
-		dateChooserstart.setDateFormatString("yyyy-MM-dd HH:mm:ss");
-		dateChooserstart.setDate(Lecture.lecture.getStartdate());
-		dateChooserstart.setBounds(226, 188, 143, 20);
-		panel_2.add(dateChooserstart);
-
-		JLabel label_6 = new JLabel("von:");
-		label_6.setBounds(200, 188, 30, 20);
-		panel_2.add(label_6);
-
-		JLabel label_10 = new JLabel("Gültigkeitsdatum: *");
-		label_10.setBounds(10, 188, 250, 14);
-		panel_2.add(label_10);
-
-		JLabel label_11 = new JLabel("Aktiv:");
-		label_11.setBounds(10, 229, 250, 14);
-		panel_2.add(label_11);
-
-		radioButtonyes = new JRadioButton("Ja");
-		buttonGroup.add(radioButtonyes);
-		radioButtonyes.setBounds(240, 225, 109, 23);
-		panel_2.add(radioButtonyes);
-
-		radioButtonno = new JRadioButton("Nein");
-		buttonGroup.add(radioButtonno);
-		radioButtonno.setBounds(385, 225, 109, 23);
-		panel_2.add(radioButtonno);
-
-		//set button value
-		if (Lecture.lecture.isActive() == true) {
-			radioButtonyes.setSelected(true);
-			radioButtonno.setSelected(false);
-		} else {
-			radioButtonyes.setSelected(false);
-			radioButtonno.setSelected(true);
-		}
-
-		radioButtonyes.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				radioButtonyes.setSelected(true);
-				radioButtonno.setSelected(false);
-			}
-		});
-		radioButtonno.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				radioButtonno.setSelected(true);
-				radioButtonyes.setSelected(false);
-			}
-		});
-
-		JLabel label_12 = new JLabel("(Im VMChooser sichtbar)");
-		label_12.setBounds(10, 254, 250, 14);
-		panel_2.add(label_12);
-
-		JLabel lblmaxMonate = new JLabel("(max. 6 Monate)");
-		lblmaxMonate.setBounds(10, 208, 127, 14);
-		panel_2.add(lblmaxMonate);
-
-		{
-			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ück");
-				okButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-
-						Lecture.lecture.setName(textFieldLaborname.getText().trim());
-						Lecture.lecture.setDesc(description.getText().trim());
-						Lecture.lecture.setEnddate(dateChooserend.getDate());
-						Lecture.lecture.setStartdate(dateChooserstart.getDate());
-						Image.Imagename = textFieldLaborname.getText().trim();
-
-						GuiManager.show(new EditLectureSearch_GUI());
-					}
-				});
-				okButton.setActionCommand("OK");
-				buttonPane.add(okButton);
-				getRootPane().setDefaultButton(okButton);
-			}
-			{
-				JButton cancelButton = new JButton("Weiter");
-				cancelButton.addActionListener(new ActionListener() {
-
-					public void actionPerformed(ActionEvent e) {
-						// liegt das End-Datum vor dem Start-Datum?
-						if (dateChooserend.getDate().before(dateChooserstart.getDate())) 
-						{
-							// datum ist falsch rum
-							isDateOrderCorrect = false;
-							JOptionPane.showMessageDialog(null,
-									"Das End-Datum liegt vor dem Start-Datum. Bitte ändern.",
-									"Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-						} else 
-						{
-							// bereit
-							isDateOrderCorrect = true;
-						}
-						// liegt das eingegebene Datum nach dem erlaubten
-						// End-Datum?
-						
-						/*
-						if (dateChooserend.getDate().after(endDate)) 
-						{
-							// Datum zu weit weg
-							isDateMaxLifeTimeCorrect = false;
-							JOptionPane.showMessageDialog(null,
-									"Das End-Datum liegt zu weit in der Zukunft. Erlaubt ist maximal:\n"
-											+ endDate, "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-
-							dateChooserend.setDate(endDate); // setze Datum auf
-																// maximum
-						} else 
-						{
-							// bereit
-							isDateMaxLifeTimeCorrect = true;
-						}
-						*/
-						// Pruefen ob alles eingegeben wurde
-						if (textFieldLaborname.getText().trim().isEmpty() == true
-								|| description.getText().trim().isEmpty() == true) {
-							// mind 1 Textfeld ist leer
-							isAllInformationReady = false;
-							JOptionPane.showMessageDialog(null,
-									"Bitte geben Sie einen Veranstaltungsnamen und eine Beschreibung ein.",
-									"Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE);
-						} else {
-							// Textfelder bereit
-							isAllInformationReady = true;
-						}
-
-						// welcher Radiobutton ist geklickt?
-						if (radioButtonyes.isSelected() == true) {
-							Lecture.lecture.setActive(true);
-						} else {
-							Lecture.lecture.setActive(false);
-						}
-						// Pruefe ob alle Eingaben korrekt sind, dann mache
-						// weiter
-						if (isAllInformationReady && isDateOrderCorrect && descriptionLenghtOK() == true) {
-							// everything is ok, proceed
-							Lecture.lecture.setNewName(textFieldLaborname.getText().trim());
-							Lecture.lecture.setDesc(description.getText().trim());
-							Lecture.lecture.setEnddate(dateChooserend.getDate());
-							Lecture.lecture.setStartdate(dateChooserstart.getDate());
-
-							Image.Imagename = textFieldLaborname.getText().trim();
-
-							//check which GUI to open
-							try {
-
-								if ((ThriftManager.getSatClient().userIsLectureAdmin(
-										person.verantwortlicher.getUserID(), Lecture.lecture.getid(),
-										SessionData.authToken) || (person.verantwortlicher.getRole()
-										.equals("Admin")))) {
-									//user is admin of the lecture
-									GuiManager.show(new PermissionEditLecture_GUI());
-								} else {
-									//user is not admin of the lecture
-									GuiManager.show(new EditLectureLink_GUI());
-								}
-							} catch (TException e1) {
-								// TODO Auto-generated catch block
-								e1.printStackTrace();
-							}
-
-						}
-
-					}
-
-				});
-				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);
-
-		JLabel lblPflichtfelder = new JLabel("* Pflichtfelder");
-		lblPflichtfelder.setBounds(32, 602, 136, 14);
-		getContentPane().add(lblPflichtfelder);
-
-	}
-
-	public Date addDays(Date date, int days) {
-		Calendar cal = Calendar.getInstance();
-		cal.setTime(date);
-		cal.add(Calendar.DATE, days); // minus number would decrement the days
-		return cal.getTime();
-	}// end addDays()
-
-	public boolean descriptionLenghtOK() {
-		descriptionLengthOK = false;
-
-		// max length is 254 chars
-		if (description.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) {
-			descriptionLengthOK = false;
-			JOptionPane.showMessageDialog(null,
-					"Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "
-							+ description.getText().trim().length() + ".", "Beschreibung zu umfangreich",
-					JOptionPane.INFORMATION_MESSAGE);
-		} else {
-			descriptionLengthOK = true;
-
-		}
-
-		return descriptionLengthOK;
-	}// enddescriptionLenghtOK()
-
-}// end class
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
deleted file mode 100644
index 0ceb4891..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ /dev/null
@@ -1,1058 +0,0 @@
-package gui.lecture;
-
-import gui.helper.TableFiller;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JComboBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.Lecture;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Image;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class EditLectureLink_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JComboBox<String> comboBox;
-	private JLabel labelName;
-	private JLabel labelUpdate;
-	private JLabel labelVerantwortlicher;
-	private JLabel labelWeitereVerantwortliche;
-	private JLabel labelVorlage;
-	private JLabel labelLizenzSoftware;
-	private JLabel labelInternet;
-	private JLabel labelRam;
-	private JLabel labelID;
-	private JLabel labelVersion;
-	private JTextArea textAreadesc;
-	private JLabel labelCPU;
-	private JLabel labelOS;
-	private JTable tableAllImages = new JTable();
-	private JTable tablemyImages = new JTable();
-	private JTable tableCoopImages = new JTable();
-	private JTable tablePublicVorlagen = new JTable();
-	private JTextField textFieldName;
-	private JTabbedPane tabbedPane;
-	private String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher",
-			"Letztes Update", "ID", "Version", "Template", "Beschreibung" };
-
-	private final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	private final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	private final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-	private final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelAll);
-	private final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(modelMyImages);
-	private final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
-			modelPublicVorlagen);
-
-	private RowFilter<Object, Object> orFilter = null;
-	private List<RowFilter<Object, Object>> orFilters = new ArrayList<RowFilter<Object, Object>>();
-
-	//needed for templates, filter for name OR desc AND temp_flag --> (name || desc) && (temp_flag)
-	private RowFilter<Object, Object> andFilter = null;
-	private List<RowFilter<Object, Object>> andFilters = new ArrayList<RowFilter<Object, Object>>();
-
-	//the final filter which handles the search in the templates
-	private RowFilter<Object, Object> templateFilter = null;
-	private ArrayList<RowFilter<Object, Object>> finalFilters = new ArrayList<RowFilter<Object, Object>>();
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Ändern Sie hier das Image, zu dem Ihre Veranstaltung gehört.<br />"
-			+ "Wählen Sie das Image aus, das zu Ihrer Veranstaltung passt und klicken Sie anschließend auf \"Veranstaltung ändern und abschließen\"."
-			+ "</div></html>";
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditLectureLink_GUI() {
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				initTableModelAll(modelAll);
-				initTableModel(modelMyImages);
-				initTableModelTemplates(modelPublicVorlagen);
-
-				// auszublendende Angaben
-				// 1=Lizenzpflichtig
-				// 3=Veranstaltung
-				// 6=ID
-				// 7=Version
-				// 8=Template
-				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tablemyImages.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tablemyImages.getTableHeader().setReorderingAllowed(false);
-
-				tablemyImages.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tablemyImages.clearSelection(); //just one row is selectablemyImages
-						tablemyImages.setRowSelectionInterval(tablemyImages.rowAtPoint(e.getPoint()),
-								tablemyImages.rowAtPoint(e.getPoint()));
-					}
-				});
-
-				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(9).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(9).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tablePublicVorlagen.getTableHeader().setReorderingAllowed(false);
-
-				tablePublicVorlagen.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tablePublicVorlagen.clearSelection(); //just one row is selectablePublicVorlagen
-						tablePublicVorlagen.setRowSelectionInterval(
-								tablePublicVorlagen.rowAtPoint(e.getPoint()),
-								tablePublicVorlagen.rowAtPoint(e.getPoint()));
-					}
-				});
-
-				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(3).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(8).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(6).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				tableAllImages.getColumnModel().getColumn(9).setWidth(0);
-				tableAllImages.getColumnModel().getColumn(9).setMinWidth(0);
-				tableAllImages.getColumnModel().getColumn(9).setMaxWidth(0);
-
-				tableAllImages.getTableHeader().setReorderingAllowed(false);
-
-				tableAllImages.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tableAllImages.clearSelection(); //just one row is selectableAllImages
-						tableAllImages.setRowSelectionInterval(tableAllImages.rowAtPoint(e.getPoint()),
-								tableAllImages.rowAtPoint(e.getPoint()));
-					}
-				});
-
-				textFieldName.requestFocusInWindow();
-			}
-		});
-
-		setResizable(false);
-
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 918, 722);
-
-		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("Veranstaltung auf ein Image verlinken");
-				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("Wählen Sie bitte ein Image aus, auf dem Ihre Veranstaltung basiert.");
-			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, 91);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
-		lblInternetIstInnerhalb.setBounds(30, 58, 80, 20);
-		panel_1.add(lblInternetIstInnerhalb);
-
-		textFieldName = new JTextField();
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				String stext = textFieldName.getText().trim();
-				// Wenn Textfield nicht leer
-				if (stext != "") {
-					// Filtere nach der Eingabe
-
-					orFilters.clear();
-					andFilters.clear();
-					finalFilters.clear();
-
-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive
-					//preparation for search via lecture description. "9" has to be corrected as the index of titles
-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive
-
-					orFilter = RowFilter.orFilter(orFilters);
-
-					rowSorterAll.setRowFilter(orFilter);
-					rowSorterMyImages.setRowFilter(orFilter);
-
-					andFilters.add(RowFilter.regexFilter("1", 8));
-					andFilter = RowFilter.andFilter(andFilters);
-
-					finalFilters.add(andFilter);
-					finalFilters.add(orFilter);
-					templateFilter = RowFilter.andFilter(finalFilters);
-					rowSorterPublicVorlagen.setRowFilter(templateFilter);
-				} else {
-
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-
-					orFilters.clear();
-					andFilters.clear();
-					orFilters.add(RowFilter.regexFilter(username, 4)); //case insensitive, filter for anything
-					orFilter = RowFilter.andFilter(orFilters);
-
-					rowSorterMyImages.setRowFilter(orFilter);
-					rowSorterAll.setRowFilter(orFilter);
-
-					//in addition, templates can only be shown when they really are templates!
-					orFilters.clear();
-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive
-					orFilters.add(RowFilter.regexFilter("(?i)" + stext, 9)); //case insensitive
-					orFilters.add(RowFilter.regexFilter("1", 8));
-					orFilter = RowFilter.orFilter(orFilters);
-					rowSorterPublicVorlagen.setRowFilter(orFilter);
-
-				}
-
-				tablemyImages.clearSelection();
-				tableAllImages.clearSelection();
-				tablePublicVorlagen.clearSelection();
-
-				resetLectureInfo();
-
-			}
-
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		comboBox = new JComboBox<String>();
-		try {
-			List<String> list = ThriftManager.getSatClient().getAllOS(SessionData.authToken);
-			comboBox.addItem("");
-			for (int i = 0; i < list.size(); i++) {
-				comboBox.addItem(list.get(i));
-			}
-		} catch (TException e2) {
-
-			e2.printStackTrace();
-		}
-		comboBox.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString() != "") {
-					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()
-							.toString(), 2));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem()
-							.toString(), 2));
-				} else {
-					String username = person.verantwortlicher.getName() + " "
-							+ person.verantwortlicher.getVorname();
-					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8));
-					rowSorterAll.setRowFilter(null);
-				}
-			}
-		});
-		comboBox.setBounds(133, 58, 191, 20);
-		panel_1.add(comboBox);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 76, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(151, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(164, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
-
-		tabbedPane.setBounds(10, 158, 557, 339);
-		contentPanel.add(tabbedPane);
-
-		JScrollPane scrollPaneAllImages = new JScrollPane();
-		tableAllImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tableAllImages.getSelectedRow() != -1) {
-
-					String imageid = modelAll.getValueAt(
-							tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 6)
-							.toString();
-					String version = modelAll.getValueAt(
-							tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 7)
-							.toString();
-					writeImageData(imageid, version);
-				}
-			}
-		});
-		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();
-		tableAllImages.setRowSorter(rowSorterAll);
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		tablemyImages.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tablemyImages.getSelectedRow() != -1) {
-					String imageid = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages //selber fehler wie bei image
-									.getSelectedRow()), 6).toString();
-					String version = modelMyImages.getValueAt(
-							tablemyImages.convertRowIndexToModel(tablemyImages.getSelectedRow()), 7)
-							.toString();
-					writeImageData(imageid, version);
-				}
-			}
-		});
-		tablemyImages.setModel(modelMyImages);
-		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();
-		tablemyImages.setRowSorter(rowSorterMyImages);
-		scrollPaneMyImage.setViewportView(tablemyImages);
-		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-
-		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-		scrollPanePublicVorlagen.setEnabled(false);
-		tablePublicVorlagen.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-				if (tablePublicVorlagen.getSelectedRow() != -1) {
-					String imageid = modelPublicVorlagen.getValueAt(
-							tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()),
-							6).toString();
-					String version = modelPublicVorlagen.getValueAt(
-							tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()),
-							7).toString();
-					writeImageData(imageid, version);
-				}
-			}
-		});
-		tablePublicVorlagen.setModel(modelPublicVorlagen);
-		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();
-		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);
-
-		scrollPaneAllImages.setViewportView(tableAllImages);
-		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-
-		JScrollPane scrollPaneCoopImages = new JScrollPane();
-
-		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("bwLehrpool", null, scrollPaneCoopImages, null);
-		tabbedPane.setEnabledAt(3, false);
-
-		JButton btnLinkLschen = new JButton("Link löschen");
-		btnLinkLschen.setEnabled(false);
-		btnLinkLschen.setBounds(478, 508, 89, 23);
-		contentPanel.add(btnLinkLschen);
-
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 902, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton btnBack = new JButton("Zurück");
-				btnBack.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						//check which GUI to open
-						try {
-
-							if (ThriftManager.getSatClient().userIsLectureAdmin(
-									person.verantwortlicher.getUserID(), Lecture.lecture.getid(),
-									SessionData.authToken)
-									|| (person.verantwortlicher.getRole().equals("Admin"))) {
-
-								//user is admin of the lecture
-								GuiManager.show(new PermissionEditLecture_GUI());
-							} else {
-								//user is not admin of the lecture
-								GuiManager.show(new EditLectureAllgemein_GUI());
-							}
-						} catch (TException e1) {
-							// TODO Auto-generated catch block
-							e1.printStackTrace();
-						}
-
-					}
-				});
-				btnBack.setActionCommand("OK");
-				buttonPane.add(btnBack);
-				getRootPane().setDefaultButton(btnBack);
-			}
-			{
-				JButton btnFinish = new JButton("Veranstaltung ändern und abschließen");
-				btnFinish.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						String username = person.verantwortlicher.getName() + " "
-								+ person.verantwortlicher.getVorname();
-						// check if a row is selected
-						if (tablemyImages.getSelectedRow() != -1) {
-
-							// a row is selected, do operations
-							try {
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-								// update the lecture
-								ThriftManager.getSatClient().updateLecturedata(
-										Lecture.lecture.getid(),
-										Lecture.lecture.getNewName(),
-										Lecture.lecture.getShortDesc(),
-										Lecture.lecture.getDesc(),
-										formatter.format(Lecture.lecture.getStartdate()).toString(),
-										formatter.format(Lecture.lecture.getEnddate()).toString(),
-										Lecture.lecture.isActive(),
-										modelMyImages.getValueAt(
-												tablemyImages.convertRowIndexToModel(tablemyImages
-														.getSelectedRow()), 6).toString(),
-										modelMyImages.getValueAt(
-												tablemyImages.convertRowIndexToModel(tablemyImages
-														.getSelectedRow()), 7).toString(),
-										SessionData.authToken, person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(),
-										person.verantwortlicher.getHochschule());
-
-								// remove all additional user permissions on
-								// first stage
-								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
-										Lecture.lecture.getid(), SessionData.authToken,
-										person.verantwortlicher.getUserID());
-
-								// then, add user permissions as they have been
-								// set new
-								for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList()
-										.size(); i++) {
-
-									ThriftManager.getSatClient().writeAdditionalLectureRights(
-											Lecture.lecture.getid(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.getUserID(), // userID
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_read(),// read
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_write(),// write
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isLecture_admin(),// admin
-											SessionData.authToken);
-
-								}// end for
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.",
-												"Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE);
-								// zurueck zum Menue
-								GuiManager.show(new MainMenue_GUI());
-							} catch (TException e1) {
-
-								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-										"Error", JOptionPane.ERROR_MESSAGE);
-								JOptionPane.showMessageDialog(null,
-										e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
-										JOptionPane.ERROR_MESSAGE);
-							}
-
-							dispose();
-
-						} else if (tablePublicVorlagen.getSelectedRow() != -1
-								&& tablePublicVorlagen.getValueAt(tablePublicVorlagen.getSelectedRow(), 4)
-										.toString().equals(username)) {
-
-							// a row is selected, do operations
-							try {
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-								ThriftManager.getSatClient().updateLecturedata(
-										Lecture.lecture.getName(),
-										Lecture.lecture.getNewName(),
-										Lecture.lecture.getShortDesc(),
-										Lecture.lecture.getDesc(),
-										formatter.format(Lecture.lecture.getStartdate()).toString(),
-										formatter.format(Lecture.lecture.getEnddate()).toString(),
-										Lecture.lecture.isActive(),
-										modelPublicVorlagen.getValueAt(
-												tablePublicVorlagen
-														.convertRowIndexToModel(tablePublicVorlagen
-																.getSelectedRow()), 6).toString(),
-										modelPublicVorlagen.getValueAt(
-												tablePublicVorlagen
-														.convertRowIndexToModel(tablePublicVorlagen
-																.getSelectedRow()), 7).toString(),
-										SessionData.authToken, person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(),
-										person.verantwortlicher.getHochschule());
-
-								// remove all additional user permissions on
-								// first stage
-								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
-										Lecture.lecture.getid(), SessionData.authToken,
-										person.verantwortlicher.getUserID());
-
-								// then, add user permissions as they have been
-								// set new
-								for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList()
-										.size(); i++) {
-									System.out
-											.println("Writing additional rights for user "
-													+ RightsManagement.rightsManagement
-															.getPermittedUserList().get(i).getUserID()
-													+ ", User "
-													+ i
-													+ "/"
-													+ RightsManagement.rightsManagement
-															.getPermittedUserList().size());
-									ThriftManager.getSatClient().writeAdditionalLectureRights(
-											Lecture.lecture.getName(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.getUserID(), // userID
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageRead(),// read
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageWrite(),// write
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageAdmin(),// admin
-											SessionData.authToken);
-								}
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.",
-												"Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE);
-								// zurueck zum Menue
-								GuiManager.show(new MainMenue_GUI());
-							} catch (TException e1) {
-
-								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-										"Error", JOptionPane.ERROR_MESSAGE);
-								JOptionPane.showMessageDialog(null,
-										e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
-										JOptionPane.ERROR_MESSAGE);
-							}
-
-							dispose();
-
-						} else if (tableAllImages.getSelectedRow() != -1
-								&& tableAllImages.getValueAt(tableAllImages.getSelectedRow(), 4).toString()
-										.equals(username)) {
-
-							// a row is selected, do operations
-							try {
-								DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-								ThriftManager.getSatClient().updateLecturedata(
-										Lecture.lecture.getName(),
-										Lecture.lecture.getNewName(),
-										Lecture.lecture.getShortDesc(),
-										Lecture.lecture.getDesc(),
-										formatter.format(Lecture.lecture.getStartdate()).toString(),
-										formatter.format(Lecture.lecture.getEnddate()).toString(),
-										Lecture.lecture.isActive(),
-										modelAll.getValueAt(
-												tableAllImages.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()), 6).toString(),
-										modelAll.getValueAt(
-												tableAllImages.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()), 7).toString(),
-										SessionData.authToken, person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultaet(), Lecture.lecture.getid(),
-										person.verantwortlicher.getHochschule());
-
-								// remove all additional user permissions on
-								// first stage
-								ThriftManager.getSatClient().deleteAllAdditionalLecturePermissions(
-										Lecture.lecture.getid(), SessionData.authToken,
-										person.verantwortlicher.getUserID());
-
-								// then, add user permissions as they have been
-								// set new
-								for (int i = 0; i < RightsManagement.rightsManagement.getPermittedUserList()
-										.size(); i++) {
-									System.out
-											.println("Writing additional rights for user "
-													+ RightsManagement.rightsManagement
-															.getPermittedUserList().get(i).getUserID()
-													+ ", User "
-													+ i
-													+ "/"
-													+ RightsManagement.rightsManagement
-															.getPermittedUserList().size());
-									ThriftManager.getSatClient().writeAdditionalLectureRights(
-											Lecture.lecture.getName(),
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.getUserID(), // userID
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageRead(),// read
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageWrite(),// write
-											RightsManagement.rightsManagement.getPermittedUserList().get(i)
-													.isImageAdmin(),// admin
-											SessionData.authToken);
-								}
-
-								JOptionPane
-										.showMessageDialog(
-												null,
-												"Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmenü zurück.",
-												"Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE);
-								// zurueck zum Menue
-								GuiManager.show(new MainMenue_GUI());
-							} catch (TException e1) {
-
-								e1.printStackTrace();
-								JOptionPane.showMessageDialog(null,
-										"Beim Anlegen Ihrer Veranstaltung ist ein Fehler aufgetreten.",
-										"Error", JOptionPane.ERROR_MESSAGE);
-								JOptionPane.showMessageDialog(null,
-										e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
-										JOptionPane.ERROR_MESSAGE);
-							}
-
-							dispose();
-
-						} else {
-							// nothing selected
-							JOptionPane.showMessageDialog(null, "Bitte wählen Sie ein Image aus.",
-									"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
-						}
-
-					}
-				});
-				btnFinish.setActionCommand("Cancel");
-				buttonPane.add(btnFinish);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 912, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 627, 912, 2);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(586, 85, 316, 531);
-		getContentPane().add(panel);
-
-		JLabel lblName = new JLabel("Name:");
-		lblName.setBounds(10, 87, 130, 14);
-		panel.add(lblName);
-
-		labelName = new JLabel("");
-		labelName.setBounds(10, 102, 296, 14);
-		panel.add(labelName);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 259, 130, 14);
-		panel.add(lblVerantwortlicher);
-
-		labelOS = new JLabel("");
-		labelOS.setBounds(10, 216, 296, 14);
-		panel.add(labelOS);
-
-		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
-		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
-		panel.add(lblWeitereVerantwortliche);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 272, 296, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel lblWeitereAnsprechpartner = new JLabel("Weitere Ansprechpartner:");
-		lblWeitereAnsprechpartner.setBounds(10, 284, 130, 14);
-		panel.add(lblWeitereAnsprechpartner);
-
-		labelWeitereVerantwortliche = new JLabel("");
-		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
-		panel.add(labelWeitereVerantwortliche);
-
-		labelUpdate = new JLabel("");
-		labelUpdate.setBounds(10, 245, 296, 14);
-		panel.add(labelUpdate);
-
-		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
-		lblLetztesUpdate.setBounds(10, 231, 130, 14);
-		panel.add(lblLetztesUpdate);
-
-		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
-		lblImageIstVorlage.setBounds(10, 336, 130, 14);
-		panel.add(lblImageIstVorlage);
-
-		labelVorlage = new JLabel("");
-		labelVorlage.setBounds(10, 350, 296, 14);
-		panel.add(labelVorlage);
-
-		labelLizenzSoftware = new JLabel("");
-		labelLizenzSoftware.setBounds(10, 383, 296, 14);
-		panel.add(labelLizenzSoftware);
-
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
-		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
-		panel.add(lblLizenzpflichtigeSoftware);
-
-		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
-		lblInternet.setBounds(10, 400, 130, 14);
-		panel.add(lblInternet);
-
-		labelInternet = new JLabel("");
-		labelInternet.setBounds(10, 417, 296, 14);
-		panel.add(labelInternet);
-
-		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
-		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
-		panel.add(lblEmpfehlungRam);
-
-		labelRam = new JLabel("");
-		labelRam.setBounds(10, 455, 296, 14);
-		panel.add(labelRam);
-
-		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
-		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
-		panel.add(lblEmpfehlungCpu);
-
-		labelCPU = new JLabel("");
-		labelCPU.setBounds(10, 487, 296, 14);
-		panel.add(labelCPU);
-
-		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
-		lblTechnischeDaten.setBounds(10, 322, 296, 14);
-		panel.add(lblTechnischeDaten);
-
-		JLabel lblId = new JLabel("ID:");
-		lblId.setBounds(10, 23, 296, 14);
-		panel.add(lblId);
-
-		labelID = new JLabel("");
-		labelID.setBounds(10, 37, 296, 14);
-		panel.add(labelID);
-
-		labelVersion = new JLabel("");
-		labelVersion.setBounds(10, 73, 296, 14);
-		panel.add(labelVersion);
-
-		JLabel lblVersion = new JLabel("Version:");
-		lblVersion.setBounds(10, 57, 296, 14);
-		panel.add(lblVersion);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 119, 130, 14);
-		panel.add(lblBeschreibung);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setBounds(10, 135, 296, 65);
-		panel.add(scrollPane);
-
-		textAreadesc = new JTextArea();
-		textAreadesc.setLineWrap(true);
-		textAreadesc.setBackground(SystemColor.menu);
-		textAreadesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		scrollPane.setViewportView(textAreadesc);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<Image> images;
-
-		// Hole eine Liste der Images
-		try {
-			if (person.verantwortlicher.getRole().equals("Admin")) {
-				//get complete list
-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),
-						SessionData.authToken);
-			} else {
-				//get permitted list
-				images = ThriftManager.getSatClient().getImageListPermissionLink(
-						person.verantwortlicher.getUserID(), SessionData.authToken);
-			}
-		} catch (Exception e) {
-			return model;
-		}
-
-		TableFiller.fillModelWithImageList(model, images);
-
-		//show number of rows in GUI
-		tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0) + " (" + model.getRowCount() + ") ");
-
-		return model;
-
-	}
-
-	public DefaultTableModel initTableModelAll(DefaultTableModel model) {
-		List<Image> images;
-
-		// Hole eine Liste der Images
-		try {
-			if (person.verantwortlicher.getRole().equals("Admin")) {
-				//get complete list
-				images = ThriftManager.getSatClient().getImageList(person.verantwortlicher.getUserID(),
-						SessionData.authToken);
-			} else {
-				//get permitted list
-				images = ThriftManager.getSatClient().getImageListPermissionLink(
-						person.verantwortlicher.getUserID(), SessionData.authToken);
-			}
-		} catch (Exception e) {
-			return model;
-		}
-
-		TableFiller.fillModelWithImageList(model, images);
-
-		//show number of rows in GUI
-		tabbedPane.setTitleAt(2, tabbedPane.getTitleAt(2) + " (" + model.getRowCount() + ") ");
-
-		return model;
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModelTemplates(DefaultTableModel model) {
-		List<Image> images;
-
-		// Hole eine Liste der Images
-		try {
-			images = ThriftManager.getSatClient().getImageListAllTemplates(SessionData.authToken);
-		} catch (Exception e) {
-			return model;
-		}
-
-		TableFiller.fillModelWithImageList(model, images);
-		//show number of rows in GUI
-		tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1) + " (" + model.getRowCount() + ") ");
-
-		return model;
-
-	}
-
-	private void resetLectureInfo() {
-		//reset the detailed information on the right hand side when changing search string
-		labelID.setText("");
-		labelVersion.setText("");
-		labelName.setText("");
-		textAreadesc.setText("");
-		labelOS.setText("");
-		labelUpdate.setText("");
-		labelVerantwortlicher.setText("");
-		labelWeitereVerantwortliche.setText("");
-		labelVorlage.setText("");
-		labelLizenzSoftware.setText("");
-		labelInternet.setText("");
-		labelRam.setText("");
-		labelCPU.setText("");
-	}
-
-	public void writeImageData(String id, String version) {
-		try {
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-			Map<String, String> res = ThriftManager.getSatClient().getImageData(id, version,
-					SessionData.authToken);
-			labelName.setText(res.get("name"));
-			labelOS.setText(res.get("os"));
-			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
-			labelVerantwortlicher.setText(res.get("owner"));
-			labelWeitereVerantwortliche.setText("Noch nicht Verfügbar");
-			if (res.get("template").equals("true")) {
-				labelVorlage.setText("Ja");
-			} else {
-				labelVorlage.setText("Nein");
-			}
-			if (res.get("license").equals("1")) {
-				labelLizenzSoftware.setText("Ja");
-			} else {
-				labelLizenzSoftware.setText("Nein");
-			}
-			if (res.get("internet").equals("1")) {
-				labelInternet.setText("Ja");
-			} else {
-				labelInternet.setText("Nein");
-			}
-			labelRam.setText(res.get("ram"));
-			labelCPU.setText(res.get("cpu"));
-			labelID.setText(res.get("id"));
-			labelVersion.setText(res.get("version"));
-			textAreadesc.setText(res.get("desc"));
-		} catch (TException | ParseException e1) {
-
-			e1.printStackTrace();
-		}
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
deleted file mode 100644
index bc5be1d9..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ /dev/null
@@ -1,596 +0,0 @@
-package gui.lecture;
-
-import gui.helper.TableFiller;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextArea;
-import javax.swing.JTextField;
-import javax.swing.JTextPane;
-import javax.swing.ListSelectionModel;
-import javax.swing.RowFilter;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.event.InternalFrameAdapter;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.ItemOwner;
-import models.Lecture;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.GuiManager;
-
-@SuppressWarnings("serial")
-public class EditLectureSearch_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JLabel labelAktiv;
-	private JLabel labelstartdate;
-	private JLabel labelenddate;
-	private JLabel labelimageversion;
-	private JTextArea labelName;
-	private JTextArea labelimage;
-	private JTextArea labeldesc;
-	private JLabel labelVerantwortlicher;
-	private JTable tablemyLectures;
-	private JTextField textFieldName;
-	private JLabel lblTotalResults;
-	private String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv",
-			"Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" };
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.<br />"
-			+ "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern."
-			+ "</div></html>";
-
-	private final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	private final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
-			modelMyLectures);
-
-	private RowFilter<Object, Object> rf = null;
-	private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);
-
-	/**
-	 * Create the dialog.
-	 */
-	public EditLectureSearch_GUI() {
-
-		filters.add(RowFilter.regexFilter(".", 0));
-		rf = RowFilter.orFilter(filters);
-
-		addInternalFrameListener(new InternalFrameAdapter() {
-			@Override
-			public void internalFrameActivated(InternalFrameEvent arg0) {
-				textFieldName.requestFocusInWindow();
-				initTableModel(modelMyLectures);
-
-				// auszublendende Angaben
-				// 1=Beschreibung
-				// 2=Gültigkeitsdatum
-				// 3=Aktiv
-				// 6=Image
-				// 7=Schlagwort
-				// 8=ID
-				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(2).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(3).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(6).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(7).setMaxWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);
-				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);
-
-				tablemyLectures.getTableHeader().setReorderingAllowed(false);
-				tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				tablemyLectures.addMouseListener(new MouseAdapter() {
-
-					@Override
-					public void mouseReleased(MouseEvent e) {
-
-						tablemyLectures.clearSelection(); //just one row is selectablemyLectures
-						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()),
-								tablemyLectures.rowAtPoint(e.getPoint()));
-					}
-				});
-			}
-		});
-
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Veranstaltung bearbeiten - " + person.verantwortlicher.getUserID());
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 842, 722);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 816, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Suche nach Veranstaltung");
-				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önnen Sie nach Ihrem gewünschten Vorlesungsimage suchen und dieses für weitere Schritte auswählen");
-			txtpnBitteWhlenSie.setBounds(10, 36, 536, 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, 66);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");
-		lblNewLabel_2.setBounds(30, 30, 80, 20);
-		panel_1.add(lblNewLabel_2);
-
-		textFieldName = new JTextField();
-		// Key Listener der Tastatureingabe registriert
-		textFieldName.addKeyListener(new KeyAdapter() {
-			@Override
-			public void keyReleased(KeyEvent e) {
-				// Textfield eingabe auslesen
-				String stext = textFieldName.getText().trim();
-				// Wenn Textfield nicht leer
-				if (!stext.isEmpty()) {
-					// Filtere nach der Eingabe
-
-					filters.clear();
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0));
-					filters.add(RowFilter.regexFilter("(?i)" + stext, 1));
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyLectures.setRowFilter(rf);
-
-				} else {
-					filters.clear();
-					filters.add(RowFilter.regexFilter(".", 0));
-					rf = RowFilter.orFilter(filters);
-					rowSorterMyLectures.setRowFilter(rf);
-
-				}
-				tablemyLectures.clearSelection();
-
-				resetLectureInfo();
-			}
-		});
-
-		textFieldName.setBounds(133, 30, 400, 20);
-		panel_1.add(textFieldName);
-		textFieldName.setColumns(10);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				// oeffnet das Hauptmenue
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 75, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(152, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(166, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(10, 120, 552, 369);
-		contentPanel.add(scrollPaneMyImage);
-		tablemyLectures = new JTable();
-		tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
-			public void valueChanged(ListSelectionEvent e) {
-
-				if (tablemyLectures.getSelectedRow() != -1) {
-					String lectureid = modelMyLectures.getValueAt(
-							tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)
-							.toString();
-
-					try {
-
-						// write the values into the information pane on
-						// the right hand side
-						writeLectureData(lectureid);
-
-						// fill the itemOwnder model with information
-						// from selected item
-						setItemOwnerInformation(lectureid);
-
-					} catch (TException e1) {
-
-						e1.printStackTrace();
-					} catch (ParseException e1) {
-
-						e1.printStackTrace();
-					}
-				}
-			}
-
-		});
-		tablemyLectures.setModel(modelMyLectures);
-
-		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();
-		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();
-		tablemyLectures.setRowSorter(rowSorterMyLectures);
-
-		scrollPaneMyImage.setViewportView(tablemyLectures);
-
-		lblTotalResults = new JLabel("Anzahl:");
-		lblTotalResults.setBounds(10, 512, 131, 20);
-		contentPanel.add(lblTotalResults);
-
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 826, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton btnBack = new JButton("Zurück");
-				btnBack.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// oeffnet das Hauptmenue
-						GuiManager.show(new MainMenue_GUI());
-					}
-				});
-				btnBack.setActionCommand("OK");
-				buttonPane.add(btnBack);
-				// getRootPane().setDefaultButton(btnBack);
-			}
-			{
-				JButton btnContinue = new JButton("Weiter");
-				btnContinue.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// check if a row is selected
-						if (tablemyLectures.getSelectedRow() != -1) {
-
-							// a row is selected, do operations
-
-							Lecture.lecture.setid(modelMyLectures.getValueAt(
-									tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
-									8).toString());
-							Lecture.lecture.setName(modelMyLectures.getValueAt(
-									tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
-									0).toString());
-							Lecture.lecture.setDesc(modelMyLectures.getValueAt(
-									tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
-									1).toString());
-							String date = modelMyLectures.getValueAt(
-									tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
-									2).toString();
-
-							Lecture.lecture.setLinkedImagename(modelMyLectures.getValueAt(
-									tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()),
-									6).toString());
-
-							
-							
-							int zweitesLeerzeichen = date.indexOf(" ", date.indexOf(" ") + 1);
-							System.out.println("date: "+date.toString());
-
-							
-							String startdate = date.substring(0, zweitesLeerzeichen);
-							String enddate = date.substring(zweitesLeerzeichen);
-							
-							SimpleDateFormat out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-							//SimpleDateFormat out = new SimpleDateFormat("yy-MM-dd HH:mm");
-							
-							SimpleDateFormat in = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-							//SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-							//SimpleDateFormat in = new SimpleDateFormat("yy-MM-dd HH:mm:ss");
-							
-							/*
-							String startdate = date.substring(0, zweitesLeerzeichen);
-							String enddate = date.substring(zweitesLeerzeichen);
-							SimpleDateFormat out = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-							//SimpleDateFormat in = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-							SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-							*/
-							try {
-								
-								startdate = out.format(in.parse(startdate));
-								enddate = out.format(in.parse(enddate));
-								
-								System.out.println("startdate: "+startdate);
-								System.out.println("enddate: "+enddate);
-								
-								//in.parse("2014-12-12 15:50:00");
-								//out.parse("");
-								
-							} catch (ParseException e2) {
-
-								e2.printStackTrace();
-							}
-
-							DateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
-							try {
-								// Format has to be "yyyy-MM-dd HH:mm:ss"
-								Lecture.lecture.setEnddate(df.parse(enddate));
-								Lecture.lecture.setStartdate(df.parse(startdate));
-							} catch (ParseException e1) {
-
-								e1.printStackTrace();
-							}
-							if (modelMyLectures
-									.getValueAt(
-											tablemyLectures.convertRowIndexToModel(tablemyLectures
-													.getSelectedRow()), 3).toString().equals("1")) {
-								Lecture.lecture.setActive(true);
-							} else {
-								Lecture.lecture.setActive(false);
-							}
-
-							GuiManager.show(new EditLectureAllgemein_GUI());
-						}
-
-					} // end action
-
-				});
-				btnContinue.setActionCommand("Cancel");
-				buttonPane.add(btnContinue);
-			}
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 836, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 628, 836, 1);
-		getContentPane().add(separator_1);
-
-		JPanel panel = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Detailinformationen",
-
-		TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(591, 85, 235, 518);
-		getContentPane().add(panel);
-
-		JLabel lblNewLabel_3 = new JLabel("Name:");
-		lblNewLabel_3.setBounds(10, 27, 104, 14);
-		panel.add(lblNewLabel_3);
-
-		JLabel lblAktiv = new JLabel("Aktiv:");
-		lblAktiv.setBounds(10, 98, 104, 14);
-		panel.add(lblAktiv);
-
-		labelAktiv = new JLabel("");
-		labelAktiv.setBounds(10, 114, 218, 14);
-		panel.add(labelAktiv);
-
-		labelstartdate = new JLabel("");
-		labelstartdate.setBounds(10, 147, 218, 14);
-		panel.add(labelstartdate);
-
-		JLabel lblStartdatum = new JLabel("Startdatum:");
-		lblStartdatum.setBounds(10, 129, 104, 14);
-		panel.add(lblStartdatum);
-
-		labelenddate = new JLabel("");
-		labelenddate.setBounds(10, 175, 218, 14);
-		panel.add(labelenddate);
-
-		JLabel lblEnddatum = new JLabel("Enddatum:");
-		lblEnddatum.setBounds(10, 161, 104, 14);
-		panel.add(lblEnddatum);
-
-		JLabel lblBeschreibung = new JLabel("Beschreibung:");
-		lblBeschreibung.setBounds(10, 189, 104, 14);
-		panel.add(lblBeschreibung);
-
-		JLabel lblImage = new JLabel("Image:");
-		lblImage.setBounds(10, 293, 104, 14);
-		panel.add(lblImage);
-
-		labelVerantwortlicher = new JLabel("");
-		labelVerantwortlicher.setBounds(10, 426, 218, 14);
-		panel.add(labelVerantwortlicher);
-
-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
-		lblVerantwortlicher.setBounds(10, 411, 104, 14);
-		panel.add(lblVerantwortlicher);
-
-		JLabel lblImageversion = new JLabel("Imageversion:");
-		lblImageversion.setBounds(10, 381, 104, 14);
-		panel.add(lblImageversion);
-
-		labelimageversion = new JLabel("");
-		labelimageversion.setBounds(10, 399, 218, 14);
-		panel.add(labelimageversion);
-
-		labeldesc = new JTextArea();
-		labeldesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labeldesc.setEditable(false);
-		labeldesc.setLineWrap(true);
-		labeldesc.setBackground(SystemColor.menu);
-		labeldesc.setBounds(124, 127, 104, 110);
-		JScrollPane scrollPane = new JScrollPane(labeldesc);
-		scrollPane.setBounds(10, 209, 218, 81);
-		panel.add(scrollPane);
-		// panel.add(labeldesc);
-
-		labelimage = new JTextArea();
-		labelimage.setLineWrap(true);
-		labelimage.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labelimage.setEditable(false);
-		labelimage.setBackground(SystemColor.menu);
-		labelimage.setBounds(124, 248, 101, 81);
-		JScrollPane scrollPaneImage = new JScrollPane(labelimage);
-		scrollPaneImage.setBounds(10, 309, 215, 69);
-		panel.add(scrollPaneImage);
-
-		labelName = new JTextArea();
-		labelName.setEditable(false);
-		labelName.setFont(new Font("Tahoma", Font.PLAIN, 11));
-		labelName.setBackground(SystemColor.menu);
-		labelName.setBounds(124, 22, 101, 55);
-		JScrollPane scrollPaneName = new JScrollPane(labelName);
-		scrollPaneName.setBounds(10, 40, 218, 55);
-		panel.add(scrollPaneName);
-
-	}
-
-	// Initiale Beffuelung eines Table models
-	public DefaultTableModel initTableModel(DefaultTableModel model) {
-		List<org.openslx.sat.thrift.iface.Lecture> lectures;
-		try {
-
-			// Hole eine Liste der erlaubten Images für die diese Person
-			if (person.verantwortlicher.getRole().equals("Admin")) {
-				//get complete list
-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);
-			} else {
-				//get permitted list
-				lectures = ThriftManager.getSatClient().getLectureListPermissionWrite(SessionData.authToken);
-			}
-
-			TableFiller.fillModelWithLectureList(model, lectures);
-
-			//show number if rows in GUI
-			lblTotalResults.setText(lblTotalResults.getText() + " " + model.getRowCount());
-
-			return model;
-		} catch (TException e1) {
-
-		}
-		return model;
-	}
-
-	private void resetLectureInfo() {
-		// reset the detailed information on the right hand side when changing
-		// search string
-
-		labelName.setText("");
-		labelVerantwortlicher.setText("");
-		labelAktiv.setText("");
-		labeldesc.setText("");
-		labelenddate.setText("");
-		labelimage.setText("");
-		labelimageversion.setText("");
-		labelstartdate.setText("");
-		labelVerantwortlicher.setText("");
-
-	}
-
-	public void writeLectureData(String id) throws TException, ParseException {
-
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
-		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken);
-		labelName.setText(res.get("name"));
-		labelAktiv.setText(res.get("isActive"));
-		labeldesc.setText(res.get("desc"));
-		labelVerantwortlicher.setText(res.get("owner"));
-		labelstartdate.setText(out.format(in.parse(res.get("startTime"))));
-		labelenddate.setText(out.format(in.parse(res.get("endTime"))));
-		labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1));
-		labelimageversion.setText(res.get("imageversion"));
-
-	}// end writeLectureData
-
-	public void setItemOwnerInformation(String lectureid) {
-		Map<String, String> map = new HashMap<String, String>();
-
-		try {
-			// get values from server and set them in model
-			map = ThriftManager.getSatClient().getItemOwner(lectureid, SessionData.authToken);
-
-			ItemOwner.itemOwner.setUserID(map.get("userID"));
-			ItemOwner.itemOwner.setUsername(map.get("loginName"));
-			ItemOwner.itemOwner.setNachname(map.get("Nachname"));
-			ItemOwner.itemOwner.setVorname(map.get("Vorname"));
-			ItemOwner.itemOwner.setEmail(map.get("mail"));
-			ItemOwner.itemOwner.setHochschule(map.get("institution"));
-
-		} catch (TException e) {
-			e.printStackTrace();
-		}
-
-	}// end setItemInformation
-
-}// end class
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
deleted file mode 100644
index d612df55..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package gui.lecture;
-
-import gui.helper.ColumnSelector;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.ItemListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JCheckBox;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.JTableHeader;
-import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableColumnModel;
-
-import models.RightsManagement;
-import models.person;
-import util.CheckIntegrity;
-import util.GuiManager;
-import util.ListAllOtherUsers_GUI;
-
-@SuppressWarnings("serial")
-public class PermissionCreateLecture_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-
-	private JTable tablePermittedUsers = null;
-	private static final String[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Hier können Sie die Berechtigungen für Ihre Veranstaltung ändern.<br />"
-			+ "Es wird unterschieden, ob innerhalb der Suite (dieses Programm) Änderungen vorgenommen werden dürfen, <br />"
-			+ "und/oder ob die Veranstaltung auch im VMChooser angezeigt wird." + "</div></html>";
-
-	private final DefaultTableModel model = new DefaultTableModel(titles, 0) {
-
-		@Override
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			if (mColIndex >= 1) {
-				return true;
-			}
-			return false;
-		}
-
-		@Override
-		public Class<?> getColumnClass(int c) {
-			switch (c) {
-			case 0:
-				return String.class;
-			default:
-				return Boolean.class;
-			}
-		}
-
-	};
-
-	// private JTable tablePermittedUsers;
-
-	public PermissionCreateLecture_GUI() {
-
-		setResizable(false);
-		setTitle("bwLehrpool Suite - Berechtigungen - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 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("Veranstaltung - Berechtigungen");
-				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("Definieren Sie hier bitte die gewünschten Berechtigungen für Ihre Veranstaltung");
-			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);
-
-		// tablePermittedUsers = new JTable();
-		tablePermittedUsers = new JTable();
-		tablePermittedUsers.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				checkIntegrity(-1);
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
-
-				tablePermittedUsers.clearSelection(); //just one row is selectable
-				tablePermittedUsers.setRowSelectionInterval(tablePermittedUsers.rowAtPoint(e.getPoint()),
-						tablePermittedUsers.rowAtPoint(e.getPoint()));
-			}
-		});
-
-		tablePermittedUsers.setModel(model);
-		tablePermittedUsers.setSelectionForeground(Color.WHITE);
-		tablePermittedUsers.getTableHeader().setReorderingAllowed(false);
-		// invisible attribute userID for identifying selected user
-		tablePermittedUsers.getColumnModel().getColumn(4).setWidth(0);
-		tablePermittedUsers.getColumnModel().getColumn(4).setMinWidth(0);
-		tablePermittedUsers.getColumnModel().getColumn(4).setMaxWidth(0);
-
-		// if new session, get values for table from database
-		if (RightsManagement.rightsManagement.getPermittedUserList().size() > 0) {
-			List<person> listt = RightsManagement.rightsManagement.getPermittedUserList();
-			Iterator<person> i = listt.iterator();
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				person temp = i.next();
-
-				Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
-						temp.isLecture_read(), // Read
-						temp.isLecture_write(), // Write
-						// temp.isImageLinkAllowed(), // Link
-						temp.isLecture_admin(), // Admin
-						temp.getUserID() // userID
-				};
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-			}
-		}// end set list of permitted users
-
-		TableColumn tc1 = tablePermittedUsers.getColumnModel().getColumn(1);
-		tc1.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class));
-		tc1.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class));
-		tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1), titles[1]));
-
-		TableColumn tc2 = tablePermittedUsers.getColumnModel().getColumn(2);
-		tc2.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class));
-		tc2.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class));
-		tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1, 2), titles[2]));
-
-		TableColumn tc3 = tablePermittedUsers.getColumnModel().getColumn(3);
-		tc3.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class));
-		tc3.setCellRenderer(tablePermittedUsers.getDefaultRenderer(Boolean.class));
-		tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1, 2, 3), titles[3]));
-
-		tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1), titles[1]));
-		tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1, 2), titles[2]));
-		tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(tablePermittedUsers, 1, 2, 3), titles[3]));
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 90, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(181, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Neu");
-		lblNewLabel_1.setBounds(194, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel = new JPanel();
-		panel.setBounds(10, 35, 557, 148);
-		contentPanel.add(panel);
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panel.setBackground(SystemColor.menu);
-
-		JLabel label = new JLabel("Lesen");
-		label.setBounds(28, 18, 90, 20);
-		panel.add(label);
-
-		JLabel label_3 = new JLabel("Schreiben");
-		label_3.setBounds(28, 38, 90, 20);
-		panel.add(label_3);
-
-		JLabel label_5 = new JLabel("Admin");
-		label_5.setBounds(28, 58, 90, 20);
-		panel.add(label_5);
-
-		JLabel label_7 = new JLabel("Veranstaltung ist in bwLehrpool Suite und VMchooser sichtbar.");
-		label_7.setBounds(128, 18, 419, 20);
-		panel.add(label_7);
-
-		JLabel lblimageDarfAngepasst = new JLabel(
-				"Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
-		lblimageDarfAngepasst.setBounds(128, 38, 419, 20);
-		panel.add(lblimageDarfAngepasst);
-
-		JLabel lblvolleRechteRead = new JLabel(
-				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblvolleRechteRead.setBounds(128, 58, 419, 35);
-		panel.add(lblvolleRechteRead);
-
-		JPanel panel_1 = new JPanel();
-		panel_1.setLayout(null);
-		panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBounds(10, 194, 311, 326);
-		contentPanel.add(panel_1);
-
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPaneMyImage.setBounds(10, 28, 291, 251);
-		panel_1.add(scrollPaneMyImage);
-
-		tablePermittedUsers.setBounds(0, 0, 555, 1);
-		// panel_1.add(tablePermittedUsers);
-
-		scrollPaneMyImage.setViewportView(tablePermittedUsers);
-
-		JButton btnAddUser = new JButton("Hinzufügen...");
-		btnAddUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				// show list of all other relevant users
-				GuiManager.openPopup(new ListAllOtherUsers_GUI(tablePermittedUsers, 4));
-				// give access to the table model and inform that the
-				// userID is position 5 in the model
-			}
-		});
-		btnAddUser.setBounds(10, 290, 113, 23);
-		panel_1.add(btnAddUser);
-
-		JButton btnDeleteUser = new JButton("Löschen");
-		btnDeleteUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// delete selected users from table
-				int[] deletableRows = tablePermittedUsers.getSelectedRows();
-				int pointerCorrection = 0;
-				// after deleting a row, the length of selected rows is reduced by 1.
-				// This pointer counts the already deleted rows and correct the offset of i
-				for (int i = 0; i < deletableRows.length; i++) {
-					model.removeRow(deletableRows[i - pointerCorrection]);
-					pointerCorrection++;
-				}
-			}
-		});
-		btnDeleteUser.setBounds(133, 290, 113, 23);
-		panel_1.add(btnDeleteUser);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(331, 194, 236, 326);
-		contentPanel.add(panel_2);
-
-		JScrollPane scrollPane_1 = new JScrollPane();
-		scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane_1.setEnabled(false);
-		scrollPane_1.setBounds(16, 88, 210, 191);
-		panel_2.add(scrollPane_1);
-
-		JRadioButton radioButton = new JRadioButton("Sichtbar für alle");
-		radioButton.setSelected(true);
-		radioButton.setEnabled(false);
-		radioButton.setBounds(6, 32, 109, 23);
-		panel_2.add(radioButton);
-
-		JRadioButton radioButton_1 = new JRadioButton("Individuell");
-		radioButton_1.setEnabled(false);
-		radioButton_1.setBounds(6, 58, 109, 23);
-		panel_2.add(radioButton_1);
-
-		JButton button_2 = new JButton("Hinzufügen");
-		button_2.setEnabled(false);
-		button_2.setBounds(23, 290, 89, 23);
-		panel_2.add(button_2);
-
-		JButton button_3 = new JButton("Löschen");
-		button_3.setEnabled(false);
-		button_3.setBounds(122, 290, 89, 23);
-		panel_2.add(button_3);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new CreateLectureAllgemein_GUI());
-					}
-				});
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-				// getRootPane().setDefaultButton(cancelButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// before save, check integrity to avoid dblClick errors
-						// of rights
-						for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) {
-							checkIntegrity(i); // check integrity of each line
-												// again
-							//System.out.println("in auto-correct");
-						}
-
-						saveTableToList();
-						GuiManager.show(new CreateLectureLink_GUI());
-					}
-				});
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		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);
-
-	}// end constructor
-
-	private void checkIntegrity(int row) {
-
-		int selectedRow;
-
-		if (row == -1) {
-			selectedRow = tablePermittedUsers.getSelectedRow();
-		} else {
-			selectedRow = row;
-		}
-
-		boolean isRead, isWrite, isAdmin;
-
-		// collect all row data
-		isRead = (boolean) tablePermittedUsers.getValueAt(selectedRow, 1);
-		isWrite = (boolean) tablePermittedUsers.getValueAt(selectedRow, 2);
-		isAdmin = (boolean) tablePermittedUsers.getValueAt(selectedRow, 3);
-
-		boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite, isAdmin);
-
-		tablePermittedUsers.setValueAt(checkedVals[0], selectedRow, 1);
-		tablePermittedUsers.setValueAt(checkedVals[1], selectedRow, 2);
-		tablePermittedUsers.setValueAt(checkedVals[2], selectedRow, 3);
-	}// end checkIntegrity()
-
-	// Column 0 == Concat user name
-
-	// save the entered rights into the model and prepare them to be written to
-	// the database
-	private void saveTableToList() {
-		//System.out.println("Saving Table to List");
-
-		List<person> list = new ArrayList<person>();
-
-		int seperatorIndex = 0;
-
-		// get values from table and save the checkbox values
-
-		for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) {
-			person temp = new person();
-
-			seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0).toString().indexOf(",");
-
-			temp.setUserID(tablePermittedUsers.getModel().getValueAt(i, 4).toString()); // get
-			// userID
-			temp.setLecture_admin(Boolean.parseBoolean(tablePermittedUsers.getModel().getValueAt(i, 3)
-					.toString())); // get Admin
-			temp.setLecture_write(Boolean.parseBoolean(tablePermittedUsers.getModel().getValueAt(i, 2)
-					.toString()));// get Write
-			temp.setLecture_read(Boolean.parseBoolean(tablePermittedUsers.getModel().getValueAt(i, 1)
-					.toString()));// get Read
-			seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0).toString().indexOf(",");
-			temp.setName(tablePermittedUsers.getModel().getValueAt(i, 0).toString()
-					.substring(0, seperatorIndex));
-			temp.setVorname(tablePermittedUsers.getModel().getValueAt(i, 0).toString()
-					.substring(seperatorIndex + 2));
-
-			// check if at least one checkbox is checked. If yes, save this
-			// entry into list, if not ignore this entry
-			if (temp.isLecture_admin() || temp.isLecture_write() || temp.isLecture_read()) {
-				// save entry
-				list.add(temp);
-			} else {
-				// do nothing
-			}
-		}
-
-		RightsManagement.rightsManagement.setPermittedUserList(list);
-	}// end saveTableToList()
-
-}// end class
-
-class CheckBoxHeader extends JCheckBox implements TableCellRenderer, MouseListener {
-	private static final long serialVersionUID = -132401386877928691L;
-	protected CheckBoxHeader rendererComponent;
-	protected int column;
-	protected boolean mousePressed = false;
-
-	public CheckBoxHeader(ItemListener itemListener, String text) {
-		rendererComponent = this;
-		rendererComponent.addItemListener(itemListener);
-		rendererComponent.setText(text);
-	}
-
-	public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
-			boolean hasFocus, int row, int column) {
-		if (table != null) {
-			JTableHeader header = table.getTableHeader();
-			if (header != null) {
-				rendererComponent.setForeground(header.getForeground());
-				rendererComponent.setBackground(header.getBackground());
-				rendererComponent.setFont(header.getFont());
-				rendererComponent.setBorder(header.getBorder());
-				header.addMouseListener(rendererComponent);
-			}
-		}
-		setColumn(column);
-
-		return rendererComponent;
-	}
-
-	protected void setColumn(int column) {
-		this.column = column;
-	}
-
-	public int getColumn() {
-		return column;
-	}
-
-	protected void handleClickEvent(MouseEvent e) {
-		if (mousePressed) {
-			mousePressed = false;
-			JTableHeader header = (JTableHeader) (e.getSource());
-			JTable tableView = header.getTable();
-			TableColumnModel columnModel = tableView.getColumnModel();
-			int viewColumn = columnModel.getColumnIndexAtX(e.getX());
-			int column = tableView.convertColumnIndexToModel(viewColumn);
-
-			if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) {
-				doClick();
-			}
-		}
-	}
-
-	public void mouseClicked(MouseEvent e) {
-		handleClickEvent(e);
-		((JTableHeader) e.getSource()).repaint();
-	}
-
-	public void mousePressed(MouseEvent e) {
-		mousePressed = true;
-	}
-
-	public void mouseReleased(MouseEvent e) {
-	}
-
-	public void mouseEntered(MouseEvent e) {
-	}
-
-	public void mouseExited(MouseEvent e) {
-	}
-}
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
deleted file mode 100644
index 037de54c..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ /dev/null
@@ -1,470 +0,0 @@
-package gui.lecture;
-
-import gui.helper.ColumnSelector;
-import gui.intro.MainMenue_GUI;
-
-import java.awt.Color;
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.swing.JButton;
-import javax.swing.JInternalFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.ScrollPaneConstants;
-import javax.swing.border.EmptyBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableColumn;
-
-import models.Lecture;
-import models.RightsManagement;
-import models.SessionData;
-import models.person;
-
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Person;
-import org.openslx.thrifthelper.ThriftManager;
-
-import util.CheckIntegrity;
-import util.GuiManager;
-import util.ListAllOtherUsers_GUI;
-
-@SuppressWarnings("serial")
-public class PermissionEditLecture_GUI extends JInternalFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	private JTable table;
-	private String[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
-	private List<Person> map = null; // List of people who have rights
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "Hier können Sie die Berechtigungen für Ihre Veranstaltung festlegen.<br />"
-			+ "Es wird unterschieden, ob innerhalb der Suite (dieses Programm) Änderungen vorgenommen werden dürfen, <br />"
-			+ "und/oder ob die Veranstaltung auch im VMChooser angezeigt wird." + "</div></html>";
-
-	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
-
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			if (mColIndex >= 1) {
-				return true;
-			}
-			return false;
-		}
-
-		public Class<?> getColumnClass(int c) {
-			switch (c) {
-			case 0:
-				return String.class;
-			default:
-				return Boolean.class;
-			}
-		}
-
-	};
-
-	public PermissionEditLecture_GUI() {
-		setResizable(false);
-		setTitle("bwLehrpool Suite - Berechtigungen - " + person.verantwortlicher.getUserID());
-
-		setBounds(0, 0, 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("Veranstaltung - Berechtigungen");
-				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("Definieren Sie hier bitte die gewünschten Berechtigungen für Ihre Veranstaltung");
-			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 = new JPanel();
-		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null,
-				null));
-		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 35, 557, 130);
-		contentPanel.add(panel);
-
-		JLabel lblLesen = new JLabel("Lesen");
-		lblLesen.setBounds(28, 18, 90, 20);
-		panel.add(lblLesen);
-
-		JLabel lblVeranstaltungIstIn = new JLabel(
-				"Veranstaltung ist in bwLehrpool Suite und VMchooser für sichtbar.");
-		lblVeranstaltungIstIn.setBounds(128, 18, 419, 20);
-		panel.add(lblVeranstaltungIstIn);
-
-		JLabel lblSchreiben = new JLabel("Schreiben");
-		lblSchreiben.setBounds(28, 38, 90, 20);
-		panel.add(lblSchreiben);
-
-		JLabel label_5 = new JLabel(
-				"Veranstaltung darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
-		label_5.setBounds(128, 38, 419, 20);
-		panel.add(label_5);
-
-		JLabel label_6 = new JLabel("Admin");
-		label_6.setBounds(28, 58, 90, 20);
-		panel.add(label_6);
-
-		JLabel lblvolleRechteLesen = new JLabel(
-				"<HTML>Volle Rechte: Lesen, Schreiben, Löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
-		lblvolleRechteLesen.setBounds(128, 58, 419, 35);
-		panel.add(lblvolleRechteLesen);
-
-		JPanel panel_1 = new JPanel();
-		panel_1.setBackground(SystemColor.menu);
-		panel_1.setBorder(new TitledBorder(null, "Suite-Berechtigungen", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_1.setBounds(10, 194, 311, 326);
-		contentPanel.add(panel_1);
-		panel_1.setLayout(null);
-
-		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane.setBounds(10, 28, 291, 251);
-		panel_1.add(scrollPane);
-
-		table = new JTable();
-		table.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				checkIntegrity(-1);
-			}
-
-			@Override
-			public void mouseReleased(MouseEvent e) {
-
-				table.clearSelection(); //just one row is selectable
-				table.setRowSelectionInterval(table.rowAtPoint(e.getPoint()), table.rowAtPoint(e.getPoint()));
-			}
-		});
-
-		table.setModel(model);
-		table.setSelectionForeground(Color.WHITE);
-		table.getTableHeader().setReorderingAllowed(false);
-		// invisible attribute userID for identifying selected user
-		table.getColumnModel().getColumn(4).setWidth(0);
-		table.getColumnModel().getColumn(4).setMinWidth(0);
-		table.getColumnModel().getColumn(4).setMaxWidth(0);
-
-		// if new session, get values for table from database
-		if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) {
-			//System.out.println("Loading data from db");
-			try {
-
-				map = ThriftManager.getSatClient().getPermissionForUserAndLecture(SessionData.authToken,
-						Lecture.lecture.getid(), person.verantwortlicher.getUserID());
-				Iterator<Person> i = map.iterator();
-
-				int x = 0;
-
-				while (i.hasNext()) {
-					// erzeuge Objekte fuer die Tabelle
-					Object[] obj = { map.get(x).getNachname() + ", " + map.get(x).getVorname(), // Name
-							(boolean) map.get(x).isLecture_read(), // Read
-							(boolean) map.get(x).isLecture_write(), // Write
-							(boolean) map.get(x).isLecture_admin(), // Admin
-							map.get(x).getUserID() // userID
-					};
-					// Fuege diese Objekte der Tabelle hinzu
-					model.addRow(obj);
-
-					i.next();
-					x++;
-
-				}
-
-			} catch (TException e1) {
-
-				e1.printStackTrace();
-			}
-		} else // read from model
-		{
-
-			List<person> listt = RightsManagement.rightsManagement.getPermittedUserList();
-			Iterator<person> i = listt.iterator();
-
-			while (i.hasNext()) {
-				// erzeuge Objekte fuer die Tabelle
-				person temp = i.next();
-
-				Object[] obj = { temp.getName() + ", " + temp.getVorname(), // Name
-						temp.isLecture_read(), // Read
-						temp.isLecture_write(), // Write
-						temp.isLecture_admin(), // Admin
-						temp.getUserID() // userID
-				};
-				// Fuege diese Objekte der Tabelle hinzu
-				model.addRow(obj);
-			}
-		}// end set list of permitted users
-
-		TableColumn tc1 = table.getColumnModel().getColumn(1);
-		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc1.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1), titles[1]));
-
-		TableColumn tc2 = table.getColumnModel().getColumn(2);
-		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc2.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2), titles[2]));
-
-		TableColumn tc3 = table.getColumnModel().getColumn(3);
-		tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
-		tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
-		tc3.setHeaderRenderer(new CheckBoxHeader(new ColumnSelector(table, 1, 2, 3), titles[3]));
-
-		scrollPane.setViewportView(table);
-
-		JButton btnAddUser = new JButton("Hinzufügen");
-		btnAddUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				// show list of all other relevant users
-				GuiManager.openPopup(new ListAllOtherUsers_GUI(table, 4));
-				// give access to the table model and inform that
-				// the userID is position 5 in the model
-			}
-		});
-		btnAddUser.setBounds(10, 290, 113, 23);
-		panel_1.add(btnAddUser);
-
-		JButton btnDeleteUser = new JButton("Löschen");
-		btnDeleteUser.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-
-				// delete selected users from table
-				int[] deletableRows = table.getSelectedRows();
-				int pointerCorrection = 0; // after deleting a row, the length
-											// of selected rows is reduced by 1.
-											// This pointer counts the already
-											// deleted rows and correct the
-											// offset of i
-
-				for (int i = 0; i < deletableRows.length; i++) {
-					model.removeRow(deletableRows[i - pointerCorrection]);
-					pointerCorrection++;
-				}
-			}
-		});
-		btnDeleteUser.setBounds(133, 290, 113, 23);
-		panel_1.add(btnDeleteUser);
-
-		JLabel lblHauptmen = new JLabel("Hauptmenü");
-		lblHauptmen.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				GuiManager.show(new MainMenue_GUI());
-			}
-		});
-		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("Veranstaltung");
-		lblVlimage.setForeground(Color.BLUE);
-		lblVlimage.setBounds(81, 11, 90, 14);
-		contentPanel.add(lblVlimage);
-
-		JLabel label_2 = new JLabel(">");
-		label_2.setBounds(181, 11, 13, 14);
-		contentPanel.add(label_2);
-
-		JLabel lblNewLabel_1 = new JLabel("Bearbeiten");
-		lblNewLabel_1.setBounds(194, 11, 155, 14);
-		contentPanel.add(lblNewLabel_1);
-
-		JPanel panel_2 = new JPanel();
-		panel_2.setLayout(null);
-		panel_2.setBorder(new TitledBorder(null, "Sichtbarkeit im VMChooser", TitledBorder.LEADING,
-				TitledBorder.TOP, null, null));
-		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBounds(331, 194, 236, 326);
-		contentPanel.add(panel_2);
-
-		final JScrollPane scrollPane_1 = new JScrollPane();
-		scrollPane_1.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
-		scrollPane_1.setEnabled(false);
-		scrollPane_1.setBounds(16, 88, 210, 191);
-		panel_2.add(scrollPane_1);
-
-		JRadioButton rdbtnAlle = new JRadioButton("Sichtbar für alle");
-		rdbtnAlle.setSelected(true);
-		rdbtnAlle.setEnabled(false);
-		rdbtnAlle.setBounds(6, 32, 109, 23);
-		panel_2.add(rdbtnAlle);
-
-		JRadioButton rdbtnIndividuell = new JRadioButton("Individuell");
-		rdbtnIndividuell.setEnabled(false);
-		rdbtnIndividuell.setBounds(6, 58, 109, 23);
-		panel_2.add(rdbtnIndividuell);
-
-		final JButton btnAddVmUser = new JButton("Hinzufügen");
-		btnAddVmUser.setEnabled(false);
-		btnAddVmUser.setBounds(23, 290, 89, 23);
-		panel_2.add(btnAddVmUser);
-
-		final JButton btnDelVmUser = new JButton("Löschen");
-		btnDelVmUser.setEnabled(false);
-		btnDelVmUser.setBounds(122, 290, 89, 23);
-		panel_2.add(btnDelVmUser);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 640, 597, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-			{
-				JButton cancelButton = new JButton("Zurück");
-				cancelButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						GuiManager.show(new EditLectureAllgemein_GUI());
-					}
-				});
-				cancelButton.setActionCommand("OK");
-				buttonPane.add(cancelButton);
-			}
-			{
-				JButton continueButton = new JButton("Weiter");
-				continueButton.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-
-						// before save, check integrity to avoid dblClick errors
-						// of rights
-						for (int i = 0; i < table.getRowCount(); i++) {
-							checkIntegrity(i); // check integrity of each line again
-						}
-
-						saveTableToList();
-						GuiManager.show(new EditLectureLink_GUI());
-					}
-				});
-				continueButton.setActionCommand("Cancel");
-				buttonPane.add(continueButton);
-				getRootPane().setDefaultButton(continueButton);
-			}
-		}
-
-		rdbtnAlle.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				scrollPane_1.setEnabled(false);
-				btnAddVmUser.setEnabled(false);
-				btnDelVmUser.setEnabled(false);
-			}
-		});
-
-		rdbtnIndividuell.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent e) {
-				scrollPane_1.setEnabled(true);
-				btnAddVmUser.setEnabled(true);
-				btnDelVmUser.setEnabled(true);
-			}
-		});
-
-		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);
-
-	}// end constructor
-
-	private void checkIntegrity(int row) {
-
-		int selectedRow;
-
-		if (row == -1) {
-			selectedRow = table.getSelectedRow();
-		} else {
-			selectedRow = row;
-		}
-
-		boolean isRead, isWrite, isAdmin;
-
-		// collect all row data
-		isRead = (boolean) table.getValueAt(selectedRow, 1);
-		isWrite = (boolean) table.getValueAt(selectedRow, 2);
-		isAdmin = (boolean) table.getValueAt(selectedRow, 3);
-
-		boolean[] checkedVals = CheckIntegrity.isIntegreForLecture(isRead, isWrite, isAdmin);
-
-		table.setValueAt(checkedVals[0], selectedRow, 1);
-		table.setValueAt(checkedVals[1], selectedRow, 2);
-		table.setValueAt(checkedVals[2], selectedRow, 3);
-	}// end checkIntegrity()
-
-	// save the entered rights into the model and prepare them to be written to
-	// the database
-	private void saveTableToList() {
-		List<person> list = new ArrayList<person>();
-
-		int seperatorIndex = 0;
-
-		// get values from table and save the checkbox values
-
-		for (int i = 0; i < table.getRowCount(); i++) {
-			person temp = new person();
-
-			seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(",");
-
-			temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get
-			// userID
-			temp.setLecture_admin(Boolean.parseBoolean(table.getModel().getValueAt(i, 3).toString())); // get Admin
-			temp.setLecture_write(Boolean.parseBoolean(table.getModel().getValueAt(i, 2).toString()));// get Write
-			temp.setLecture_read(Boolean.parseBoolean(table.getModel().getValueAt(i, 1).toString()));// get Read
-			seperatorIndex = table.getModel().getValueAt(i, 0).toString().indexOf(",");
-			temp.setName(table.getModel().getValueAt(i, 0).toString().substring(0, seperatorIndex));
-			temp.setVorname(table.getModel().getValueAt(i, 0).toString().substring(seperatorIndex + 2));
-
-			// check if at least one checkbox is checked. If yes, save this
-			// entry into list, if not ignore this entry
-			if (temp.isLecture_admin() || temp.isLecture_write() || temp.isLecture_read()) {
-				// save entry
-				list.add(temp);
-			} else {
-				// do nothing
-			}
-		}
-
-		RightsManagement.rightsManagement.setPermittedUserList(list);
-	}// end saveTableToList()
-
-}
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
deleted file mode 100644
index 9f55ee83..00000000
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ /dev/null
@@ -1,549 +0,0 @@
-package gui.lecture;

-

-import gui.helper.TableFiller;

-import gui.intro.MainMenue_GUI;

-

-import java.awt.Color;

-import java.awt.FlowLayout;

-import java.awt.Font;

-import java.awt.SystemColor;

-import java.awt.event.ActionEvent;

-import java.awt.event.ActionListener;

-import java.awt.event.KeyAdapter;

-import java.awt.event.KeyEvent;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import java.text.ParseException;

-import java.text.SimpleDateFormat;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.Map;

-

-import javax.swing.JButton;

-import javax.swing.JInternalFrame;

-import javax.swing.JLabel;

-import javax.swing.JPanel;

-import javax.swing.JScrollPane;

-import javax.swing.JSeparator;

-import javax.swing.JTabbedPane;

-import javax.swing.JTable;

-import javax.swing.JTextArea;

-import javax.swing.JTextField;

-import javax.swing.JTextPane;

-import javax.swing.ListSelectionModel;

-import javax.swing.RowFilter;

-import javax.swing.border.EmptyBorder;

-import javax.swing.border.TitledBorder;

-import javax.swing.event.InternalFrameAdapter;

-import javax.swing.event.InternalFrameEvent;

-import javax.swing.event.ListSelectionEvent;

-import javax.swing.event.ListSelectionListener;

-import javax.swing.table.DefaultTableModel;

-import javax.swing.table.TableModel;

-import javax.swing.table.TableRowSorter;

-

-import models.SessionData;

-import models.person;

-

-import org.apache.thrift.TException;

-import org.openslx.sat.thrift.iface.Lecture;

-import org.openslx.thrifthelper.ThriftManager;

-

-import util.GuiManager;

-

-@SuppressWarnings("serial")

-public class SearchLecture_GUI extends JInternalFrame {

-

-	private final JPanel contentPanel = new JPanel();

-	private JLabel labelAktiv;

-	private JLabel labelstartdate;

-	private JLabel labelenddate;

-	private JLabel labelimageversion;

-	private JTextArea labelName;

-	private JTextArea labelimage;

-	private JTextArea labeldesc;

-	private JLabel labelVerantwortlicher;

-	private JTable tableAllLectures;

-	private JTable tablemyLectures;

-	private JTextField textFieldName;

-	private JTabbedPane tabbedPane;

-	private String[] titles = { "Veranstaltungsname", "Beschreibung", "Gültigkeitsdatum", "Aktiv",

-			"Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" };

-

-	private final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {

-		public boolean isCellEditable(int rowIndex, int mColIndex) {

-			return false;

-		}

-	};

-

-	private final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) {

-		public boolean isCellEditable(int rowIndex, int mColIndex) {

-			return false;

-		}

-	};

-

-	private final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelAll);

-

-	private final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

-			modelMyLectures);

-

-	private RowFilter<Object, Object> rf = null;

-	private List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(2);

-

-	/**

-	 * Create the dialog.

-	 */

-	public SearchLecture_GUI() {

-

-		filters.add(RowFilter.regexFilter(".", 0));

-		rf = RowFilter.orFilter(filters);

-

-		addInternalFrameListener(new InternalFrameAdapter() {

-			@Override

-			public void internalFrameActivated(InternalFrameEvent arg0) {

-				initTableModel(modelMyLectures);

-				initTableModelAll(modelAll);

-				tablemyLectures.getColumnModel().getColumn(1).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(1).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(1).setMaxWidth(0);

-				tablemyLectures.getColumnModel().getColumn(2).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(2).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(2).setMaxWidth(0);

-				tablemyLectures.getColumnModel().getColumn(3).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(3).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(3).setMaxWidth(0);

-				tablemyLectures.getColumnModel().getColumn(6).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(6).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(6).setMaxWidth(0);

-				tablemyLectures.getColumnModel().getColumn(7).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(7).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(7).setMaxWidth(0);

-				tablemyLectures.getColumnModel().getColumn(8).setWidth(0);

-				tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0);

-				tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0);

-

-				tablemyLectures.getTableHeader().setReorderingAllowed(false);

-				tablemyLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

-				tablemyLectures.addMouseListener(new MouseAdapter() {

-

-					@Override

-					public void mouseReleased(MouseEvent e) {

-

-						tablemyLectures.clearSelection(); //just one row is selectablemyLectures

-						tablemyLectures.setRowSelectionInterval(tablemyLectures.rowAtPoint(e.getPoint()),

-								tablemyLectures.rowAtPoint(e.getPoint()));

-					}

-				});

-

-				tableAllLectures.getColumnModel().getColumn(1).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(1).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(1).setMaxWidth(0);

-				tableAllLectures.getColumnModel().getColumn(2).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(2).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(2).setMaxWidth(0);

-				tableAllLectures.getColumnModel().getColumn(3).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(3).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(3).setMaxWidth(0);

-				tableAllLectures.getColumnModel().getColumn(6).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(6).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(6).setMaxWidth(0);

-				tableAllLectures.getColumnModel().getColumn(7).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(7).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(7).setMaxWidth(0);

-				tableAllLectures.getColumnModel().getColumn(8).setWidth(0);

-				tableAllLectures.getColumnModel().getColumn(8).setMinWidth(0);

-				tableAllLectures.getColumnModel().getColumn(8).setMaxWidth(0);

-

-				tableAllLectures.getTableHeader().setReorderingAllowed(false);

-				tableAllLectures.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

-				tableAllLectures.addMouseListener(new MouseAdapter() {

-

-					@Override

-					public void mouseReleased(MouseEvent e) {

-

-						tableAllLectures.clearSelection(); //just one row is selectableAllLectures

-						tableAllLectures.setRowSelectionInterval(tableAllLectures.rowAtPoint(e.getPoint()),

-								tableAllLectures.rowAtPoint(e.getPoint()));

-					}

-				});

-			}

-		});

-

-		// Verhindert das Vergroessern Des Fensters

-		setResizable(false);

-

-		// Setzt den Fenstertitel

-		setTitle("bwLehrpool Suite - Veranstaltung suchen - " + person.verantwortlicher.getUserID());

-		// Zentriert das Fenster in die Bildmitte 2;

-		setBounds(0, 0, 842, 722);

-

-		getContentPane().setLayout(null);

-		{

-			JPanel panel = new JPanel();

-			panel.setBackground(SystemColor.menu);

-			panel.setBounds(10, 11, 816, 57);

-			getContentPane().add(panel);

-			panel.setLayout(null);

-			{

-				JLabel lblNewLabel = new JLabel("Suche nach Veranstaltung");

-				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önnen Sie nach Ihrer gewünschten Veranstaltung suchen und diese für weitere Schritte auswählen.");

-			txtpnBitteWhlenSie.setBounds(10, 36, 538, 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, 63);

-		contentPanel.add(panel_1);

-		panel_1.setLayout(null);

-

-		JLabel lblNewLabel_2 = new JLabel("Volltextsuche:");

-		lblNewLabel_2.setBounds(30, 30, 80, 20);

-		panel_1.add(lblNewLabel_2);

-

-		textFieldName = new JTextField();

-		// Key Listener der Tastatureingabe registriert

-		textFieldName.addKeyListener(new KeyAdapter() {

-			@Override

-			public void keyReleased(KeyEvent e) {

-				// Textfield eingabe auslesen

-				String stext = textFieldName.getText().trim();

-				// Wenn Textfield nicht leer

-				if (stext != "") {

-					// Filtere nach der Eingabe

-					filters.clear();

-					filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); //case insensitive

-					filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); //case insensitive

-					rf = RowFilter.orFilter(filters);

-					rowSorterMyLectures.setRowFilter(rf);

-					rowSorterAll.setRowFilter(rf);

-

-				} else {

-					filters.clear();

-					filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything

-					rf = RowFilter.orFilter(filters);

-					rowSorterMyLectures.setRowFilter(rf);

-					rowSorterAll.setRowFilter(rf);

-				}

-				tablemyLectures.clearSelection();

-				tableAllLectures.clearSelection();

-

-				resetLectureInfo();

-			}

-		});

-

-		textFieldName.setBounds(133, 30, 400, 20);

-		panel_1.add(textFieldName);

-		textFieldName.setColumns(10);

-

-		JLabel lblHauptmen = new JLabel("Hauptmenü");

-		lblHauptmen.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent arg0) {

-				// oeffnet das Hauptmenue

-				GuiManager.show(new MainMenue_GUI());

-			}

-		});

-		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("Veranstaltung");

-		lblVlimage.setForeground(Color.BLUE);

-		lblVlimage.setBounds(81, 11, 75, 14);

-		contentPanel.add(lblVlimage);

-

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

-		label_2.setBounds(152, 11, 13, 14);

-		contentPanel.add(label_2);

-

-		JLabel lblNewLabel_1 = new JLabel("Suche");

-		lblNewLabel_1.setBounds(166, 11, 155, 14);

-		contentPanel.add(lblNewLabel_1);

-

-		tabbedPane = new JTabbedPane(JTabbedPane.TOP);

-

-		tabbedPane.setBounds(10, 123, 557, 397);

-		contentPanel.add(tabbedPane);

-

-		JScrollPane scrollPaneAllImages = new JScrollPane();

-		tableAllLectures = new JTable();

-		tableAllLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

-			public void valueChanged(ListSelectionEvent e) {

-				if (tableAllLectures.getSelectedRow() != -1) {

-					String imageid = modelAll.getValueAt(

-							tableAllLectures.convertRowIndexToModel(tableAllLectures.getSelectedRow()), 8)

-							.toString();

-

-					try {

-						writeLectureData(imageid);

-					} catch (TException e1) {

-

-						e1.printStackTrace();

-					} catch (ParseException e1) {

-

-						e1.printStackTrace();

-					}

-				}

-			}

-		});

-		tableAllLectures.setModel(modelAll);

-		tableAllLectures.getColumnModel().getColumn(1).sizeWidthToFit();

-		tableAllLectures.getColumnModel().getColumn(2).sizeWidthToFit();

-		tableAllLectures.getColumnModel().getColumn(3).sizeWidthToFit();

-		tableAllLectures.getColumnModel().getColumn(4).sizeWidthToFit();

-		tableAllLectures.getColumnModel().getColumn(5).sizeWidthToFit();

-

-		JScrollPane scrollPaneMyImage = new JScrollPane();

-		tablemyLectures = new JTable();

-		tablemyLectures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {

-			public void valueChanged(ListSelectionEvent e) {

-				if (tablemyLectures.getSelectedRow() != -1) {

-					String imageid = modelMyLectures.getValueAt(

-							tablemyLectures.convertRowIndexToModel(tablemyLectures.getSelectedRow()), 8)

-							.toString();

-

-					try {

-						writeLectureData(imageid);

-					} catch (TException e1) {

-

-						e1.printStackTrace();

-					} catch (ParseException e1) {

-

-						e1.printStackTrace();

-					}

-				}

-			}

-

-		});

-		tablemyLectures.setModel(modelMyLectures);

-

-		tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit();

-		tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit();

-		tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit();

-		tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit();

-		tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit();

-		tablemyLectures.setRowSorter(rowSorterMyLectures);

-

-		scrollPaneMyImage.setViewportView(tablemyLectures);

-		tabbedPane.addTab("Meine Veranstaltungen", null, scrollPaneMyImage, null);

-		tableAllLectures.setRowSorter(rowSorterAll);

-

-		scrollPaneAllImages.setViewportView(tableAllLectures);

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

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBounds(0, 640, 826, 33);

-			buttonPane.setBackground(SystemColor.menu);

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

-			getContentPane().add(buttonPane);

-			{

-				JButton btnBack = new JButton("Zurück");

-				btnBack.addActionListener(new ActionListener() {

-					public void actionPerformed(ActionEvent e) {

-						// oeffnet das Hauptmenue

-						GuiManager.show(new MainMenue_GUI());

-					}

-				});

-				btnBack.setActionCommand("OK");

-				buttonPane.add(btnBack);

-			}

-		}

-

-		JSeparator separator = new JSeparator();

-		separator.setBounds(0, 79, 836, 1);

-		getContentPane().add(separator);

-

-		JSeparator separator_1 = new JSeparator();

-		separator_1.setBounds(0, 628, 836, 1);

-		getContentPane().add(separator_1);

-

-		JPanel panel = new JPanel();

-		panel.setLayout(null);

-		panel.setBorder(new TitledBorder(null, "Detailinformationen",

-

-		TitledBorder.LEADING, TitledBorder.TOP, null, null));

-		panel.setBackground(SystemColor.menu);

-		panel.setBounds(591, 85, 235, 518);

-		getContentPane().add(panel);

-

-		JLabel lblNewLabel_3 = new JLabel("Name:");

-		lblNewLabel_3.setBounds(10, 27, 104, 14);

-		panel.add(lblNewLabel_3);

-

-		JLabel lblAktiv = new JLabel("Aktiv:");

-		lblAktiv.setBounds(10, 98, 104, 14);

-		panel.add(lblAktiv);

-

-		labelAktiv = new JLabel("");

-		labelAktiv.setBounds(10, 114, 218, 14);

-		panel.add(labelAktiv);

-

-		labelstartdate = new JLabel("");

-		labelstartdate.setBounds(10, 147, 218, 14);

-		panel.add(labelstartdate);

-

-		JLabel lblStartdatum = new JLabel("Startdatum:");

-		lblStartdatum.setBounds(10, 129, 104, 14);

-		panel.add(lblStartdatum);

-

-		labelenddate = new JLabel("");

-		labelenddate.setBounds(10, 175, 218, 14);

-		panel.add(labelenddate);

-

-		JLabel lblEnddatum = new JLabel("Enddatum:");

-		lblEnddatum.setBounds(10, 161, 104, 14);

-		panel.add(lblEnddatum);

-

-		JLabel lblBeschreibung = new JLabel("Beschreibung:");

-		lblBeschreibung.setBounds(10, 189, 104, 14);

-		panel.add(lblBeschreibung);

-

-		JLabel lblImage = new JLabel("Image:");

-		lblImage.setBounds(10, 293, 104, 14);

-		panel.add(lblImage);

-

-		labelVerantwortlicher = new JLabel("");

-		labelVerantwortlicher.setBounds(10, 426, 218, 14);

-		panel.add(labelVerantwortlicher);

-

-		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");

-		lblVerantwortlicher.setBounds(10, 411, 104, 14);

-		panel.add(lblVerantwortlicher);

-

-		JLabel lblImageversion = new JLabel("Imageversion:");

-		lblImageversion.setBounds(10, 381, 104, 14);

-		panel.add(lblImageversion);

-

-		labelimageversion = new JLabel("");

-		labelimageversion.setBounds(10, 399, 218, 14);

-		panel.add(labelimageversion);

-

-		labeldesc = new JTextArea();

-		labeldesc.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		labeldesc.setEditable(false);

-		labeldesc.setLineWrap(true);

-		labeldesc.setBackground(SystemColor.menu);

-		labeldesc.setBounds(124, 127, 104, 110);

-		JScrollPane scrollPane = new JScrollPane(labeldesc);

-		scrollPane.setBounds(10, 209, 218, 81);

-		panel.add(scrollPane);

-		//panel.add(labeldesc);

-

-		labelimage = new JTextArea();

-		labelimage.setLineWrap(true);

-		labelimage.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		labelimage.setEditable(false);

-		labelimage.setBackground(SystemColor.menu);

-		labelimage.setBounds(124, 248, 101, 81);

-		JScrollPane scrollPaneImage = new JScrollPane(labelimage);

-		scrollPaneImage.setBounds(10, 309, 215, 69);

-		panel.add(scrollPaneImage);

-

-		labelName = new JTextArea();

-		labelName.setEditable(false);

-		labelName.setFont(new Font("Tahoma", Font.PLAIN, 11));

-		labelName.setBackground(SystemColor.menu);

-		labelName.setBounds(124, 22, 101, 55);

-		JScrollPane scrollPaneName = new JScrollPane(labelName);

-		scrollPaneName.setBounds(10, 40, 218, 55);

-		panel.add(scrollPaneName);

-

-	}

-

-	// Initiale Beffuelung eines Table models

-	public DefaultTableModel initTableModel(DefaultTableModel model) {

-		List<Lecture> lectures;

-		try {

-

-			// Hole eine Liste der erlaubten Images für die diese Person

-			if (person.verantwortlicher.getRole() == "Admin") {

-				//get complete list

-				lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);

-			} else {

-				//get permitted list			

-				lectures = ThriftManager.getSatClient().getLectureListPermissionRead(SessionData.authToken);

-			}

-

-			TableFiller.fillModelWithLectureList(model, lectures);

-			//show number of rows in GUI

-			tabbedPane.setTitleAt(0, tabbedPane.getTitleAt(0) + " (" + model.getRowCount() + ") ");

-

-			return model;

-		} catch (TException e1) {

-

-			e1.printStackTrace();

-		}

-		return model;

-	}

-

-	// Initiale Beffuelung eines Table models

-	public DefaultTableModel initTableModelAll(DefaultTableModel model) {

-		List<Lecture> lectures;

-		try {

-			// Hole eine Liste der erlaubten Images für die diese Person

-			lectures = ThriftManager.getSatClient().getLectureList(SessionData.authToken);

-

-			TableFiller.fillModelWithLectureList(model, lectures);

-			//show number of rows in GUI

-			tabbedPane.setTitleAt(1, tabbedPane.getTitleAt(1) + " (" + model.getRowCount() + ") ");

-

-			return model;

-		} catch (TException e1) {

-

-			e1.printStackTrace();

-		}

-		return model;

-	}

-

-	private void resetLectureInfo() {

-		//reset the detailed information on the right hand side when changing search string

-

-		labelName.setText("");

-		labelVerantwortlicher.setText("");

-		labelAktiv.setText("");

-		labeldesc.setText("");

-		labelenddate.setText("");

-		labelimage.setText("");

-		labelimageversion.setText("");

-		labelstartdate.setText("");

-		labelVerantwortlicher.setText("");

-

-	}

-

-	public void writeLectureData(String id) throws TException, ParseException {

-

-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");

-		Map<String, String> res = ThriftManager.getSatClient().getLectureData(id, SessionData.authToken);

-		labelName.setText(res.get("name"));

-		labelAktiv.setText(res.get("isActive"));

-		labeldesc.setText(res.get("desc"));

-		labelVerantwortlicher.setText(res.get("owner"));

-		labelstartdate.setText(out.format(in.parse(res.get("startTime"))));

-		labelenddate.setText(out.format(in.parse(res.get("endTime"))));

-		labelimage.setText(res.get("imagepath").substring(res.get("imagepath").indexOf("/") + 1));

-		labelimageversion.setText(res.get("imageversion"));

-

-	}

-}

diff --git a/dozentenmodul/src/main/java/models/Client.java b/dozentenmodul/src/main/java/models/Client.java
deleted file mode 100644
index 1faa8620..00000000
--- a/dozentenmodul/src/main/java/models/Client.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package models;
-
-import org.openslx.sat.thrift.iface.Server;
-
-public class Client {
-
-	private Server.Client client;
-	public static Client clientcon=new Client();
-
-	public Server.Client getClient() {
-		return client;
-	}
-
-	public void setClient(Server.Client client) {
-		this.client = client;
-	}
-	
-	
-	
-}
diff --git a/dozentenmodul/src/main/java/models/GUIRights.java b/dozentenmodul/src/main/java/models/GUIRights.java
deleted file mode 100644
index a1937b78..00000000
--- a/dozentenmodul/src/main/java/models/GUIRights.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package models;
-
-public class GUIRights {
-
-	private int read;
-	private int write;
-	private int changePermission;
-	private int admin;
-	private int linkAllowed;
-	private String userID;
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public static GUIRights rights = new GUIRights();
-
-	public int getRead() {
-		return read;
-	}
-
-	public void setRead(int read) {
-		this.read = read;
-	}
-
-	public int getWrite() {
-		return write;
-	}
-
-	public void setWrite(int write) {
-		this.write = write;
-	}
-
-	public int getChangePermission() {
-		return changePermission;
-	}
-
-	public void setChangePermission(int changePermission) {
-		this.changePermission = changePermission;
-	}
-
-	public int getAdmin() {
-		return admin;
-	}
-
-	public void setAdmin(int admin) {
-		this.admin = admin;
-	}
-
-	public int getLinkAllowed() {
-		return linkAllowed;
-	}
-
-	public void setLinkAllowed(int linkAllowed) {
-		this.linkAllowed = linkAllowed;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/Image.java b/dozentenmodul/src/main/java/models/Image.java
deleted file mode 100644
index 4bb1338d..00000000
--- a/dozentenmodul/src/main/java/models/Image.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package models;
-
-public class Image {
-	public static String ImageId;
-	public static String Version;
-	public static String Imagename;
-	public static String Imagepath;
-	public static String OS;
-	public static int ShareMode;
-	public static boolean Licensed;
-	public static boolean Internet;
-	public static boolean Vorlage;
-	public static int Ram;
-	public static int Cpu;
-	public static long Filesize;
-	public static String Desc;
-
-	private Image() {
-		// Prevent instantiation
-	}
-
-	public static void reset() {
-		ImageId = null;
-		Version = null;
-		Imagename = null;
-		Imagepath = null;
-		OS = null;
-		ShareMode = 0;
-		Licensed = false;
-		Internet = false;
-		Vorlage = false;
-		Ram = 0;
-		Cpu = 0;
-		Filesize = 0;
-		Desc = null;
-	}
-}
diff --git a/dozentenmodul/src/main/java/models/ImageRights.java b/dozentenmodul/src/main/java/models/ImageRights.java
deleted file mode 100644
index 71148359..00000000
--- a/dozentenmodul/src/main/java/models/ImageRights.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package models;
-
-public class ImageRights {
-	
-	
-	private String userID;
-	private boolean read;
-	private boolean write;
-	private boolean changePermission;
-	private boolean admin;
-	private boolean linkAllowed;
-	
-	
-	public String getUserID() {
-		return userID;
-	}
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-	public static ImageRights rights =new ImageRights();
-	public boolean getRead() {
-		return read;
-	}
-	public void setRead(boolean read) {
-		this.read = read;
-	}
-	public boolean getWrite() {
-		return write;
-	}
-	public void setWrite(boolean write) {
-		this.write = write;
-	}
-	public boolean getChangePermission() {
-		return changePermission;
-	}
-	public void setChangePermission(boolean changePermission) {
-		this.changePermission = changePermission;
-	}
-	public boolean getAdmin() {
-		return admin;
-	}
-	public void setAdmin(boolean admin) {
-		this.admin = admin;
-	}
-	public boolean getLinkAllowed() {
-		return linkAllowed;
-	}
-	public void setLinkAllowed(boolean linkAllowed) {
-		this.linkAllowed = linkAllowed;
-	}
-	
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/ItemOwner.java b/dozentenmodul/src/main/java/models/ItemOwner.java
deleted file mode 100644
index 3afb20d2..00000000
--- a/dozentenmodul/src/main/java/models/ItemOwner.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package models;
-
-public class ItemOwner {
-
-	private String userID;
-	private String username;
-	private String nachname;
-	private String vorname;
-	private String hochschule;
-	private String email;
-
-
-	public static ItemOwner itemOwner = new ItemOwner();
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getNachname() {
-		return nachname;
-	}
-
-	public void setNachname(String nachname) {
-		this.nachname = nachname;
-	}
-
-	public String getVorname() {
-		return vorname;
-	}
-
-	public void setVorname(String vorname) {
-		this.vorname = vorname;
-	}
-
-	public String getHochschule() {
-		return hochschule;
-	}
-
-	public void setHochschule(String hochschule) {
-		this.hochschule = hochschule;
-	}
-
-	public String getEmail() {
-		return email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	
-	public void reset(){
-		userID=null;
-		username=null;
-		nachname=null;
-		vorname=null;
-		hochschule=null;
-		email=null;
-	}
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/Lecture.java b/dozentenmodul/src/main/java/models/Lecture.java
deleted file mode 100644
index 0b55172b..00000000
--- a/dozentenmodul/src/main/java/models/Lecture.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package models;
-
-import java.util.Date;
-
-public class Lecture {
-
-	private String name;
-
-	private String newName;
-
-	private String shortDesc;
-
-	private String desc;
-
-	private Date startdate;
-
-	private Date enddate;
-
-	private boolean active;
-
-	private String id;
-
-	private String linkedImagename;
-
-	public static Lecture lecture =new Lecture();
-
-	
-
-	public String getNewName() {
-
-		return newName;
-
-	}
-
-	public void setNewName(String newName) {
-
-		this.newName = newName;
-
-	}
-
-	public String getLinkedImagename() {
-
-		return linkedImagename;
-
-	}
-
-	public void setLinkedImagename(String linkedImagename) {
-
-		this.linkedImagename = linkedImagename;
-
-	}
-
-	public String getid() {
-
-		return id;
-
-	}
-
-	public void setid(String id) {
-
-		this.id = id;
-
-	}
-
-	public String getName() {
-
-		return name;
-
-	}
-
-	public void setName(String name) {
-
-		this.name = name;
-
-	}
-
-	public String getShortDesc() {
-
-		return shortDesc;
-
-	}
-
-	public void setShortDesc(String shortDesc) {
-
-		this.shortDesc = shortDesc;
-
-	}
-
-	public String getDesc() {
-
-		return desc;
-
-	}
-
-	public void setDesc(String desc) {
-
-		this.desc = desc;
-
-	}
-
-	public Date getStartdate() {
-
-		return startdate;
-
-	}
-
-	public void setStartdate(Date startdate) {
-
-		this.startdate = startdate;
-
-	}
-
-	public Date getEnddate() {
-
-		return enddate;
-
-	}
-
-	public void setEnddate(Date enddate) {
-
-		this.enddate = enddate;
-
-	}
-
-	public boolean isActive() {
-
-		return active;
-
-	}
-
-	public void setActive(boolean active) {
-
-		this.active = active;
-
-	}
-	
-	public void reset()
-	{
-		  name = null;
-
-		  newName = null;
-
-		  shortDesc = null;
-
-		  desc = null;
-
-		  startdate = null;
-
-		  enddate = null;
-
-		  active = false;
-
-		  id = null;
-
-		  linkedImagename = null;
-	}
-
-	
-
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/LectureRights.java b/dozentenmodul/src/main/java/models/LectureRights.java
deleted file mode 100644
index d5b3b163..00000000
--- a/dozentenmodul/src/main/java/models/LectureRights.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package models;
-
-public class LectureRights {
-	
-	private String userID;
-	private int recRead;
-	private int recWrite;
-	private int recChangePermission;
-	private int recAdmin;
-	
-	
-	public static LectureRights rights =new LectureRights();
-	
-	public String getUserID() {
-		return userID;
-	}
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-		
-	public int getRecRead() {
-		return recRead;
-	}
-	public void setRecRead(int recRead) {
-		this.recRead = recRead;
-	}
-	public int getRecWrite() {
-		return recWrite;
-	}
-	public void setRecWrite(int recWrite) {
-		this.recWrite = recWrite;
-	}
-	public int getRecChangePermission() {
-		return recChangePermission;
-	}
-	public void setRecChangePermission(int recChangePermission) {
-		this.recChangePermission = recChangePermission;
-	}
-	public int getRecAdmin() {
-		return recAdmin;
-	}
-	public void setRecAdmin(int recAdmin) {
-		this.recAdmin = recAdmin;
-	}
-	
-	
-}
diff --git a/dozentenmodul/src/main/java/models/RightsManagement.java b/dozentenmodul/src/main/java/models/RightsManagement.java
deleted file mode 100644
index d93ade10..00000000
--- a/dozentenmodul/src/main/java/models/RightsManagement.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package models;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class RightsManagement {
-	
-	
-	public RightsManagement(){
-		//
-	}
-	
-	//list which holds all selected users and permissions for this session and type (either for image or lecture, depending on mode)
-	private List<person> permittedUserList = new ArrayList<person>(); 
-
-	public static RightsManagement rightsManagement = new RightsManagement();
-
-	public List<person> getPermittedUserList() {
-		return permittedUserList;
-	}
-
-	public void setPermittedUserList(List<person> list) {
-		this.permittedUserList = list;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/Search.java b/dozentenmodul/src/main/java/models/Search.java
deleted file mode 100644
index 59a28b21..00000000
--- a/dozentenmodul/src/main/java/models/Search.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package models;
-
-public class Search {
-	
-	
-	private String Software;
-	private String Hochschule;
-	private String Creator;
-	private boolean ExistingImage;
-	private boolean Rohling;
-	public static Search search =new Search();
-
-	public String getSoftware() {
-		return Software;
-	}
-	public void setSoftware(String software) {
-		Software = software;
-	}
-	public String getHochschule() {
-		return Hochschule;
-	}
-	public void setHochschule(String hochschule) {
-		Hochschule = hochschule;
-	}
-	public String getCreator() {
-		return Creator;
-	}
-	public void setCreator(String creator) {
-		Creator = creator;
-	}
-	public boolean isExistingImage() {
-		return ExistingImage;
-	}
-	public void setExistingImage(boolean existingImage) {
-		ExistingImage = existingImage;
-	}
-	public boolean isRohling() {
-		return Rohling;
-	}
-	public void setRohling(boolean rohling) {
-		Rohling = rohling;
-	}
-	
-	
-
-}
diff --git a/dozentenmodul/src/main/java/models/SessionData.java b/dozentenmodul/src/main/java/models/SessionData.java
deleted file mode 100644
index 4d3fc153..00000000
--- a/dozentenmodul/src/main/java/models/SessionData.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package models;
-
-public class SessionData {
-
-	private SessionData() {
-		// Prevent instantiation
-	}
-	
-	public static String sessionID;
-	public static String authToken;
-	public static String serverAdress;
-
-}
diff --git a/dozentenmodul/src/main/java/models/Version.java b/dozentenmodul/src/main/java/models/Version.java
deleted file mode 100644
index b63e5e6e..00000000
--- a/dozentenmodul/src/main/java/models/Version.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package models;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Properties;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-
-public class Version {
-
-	private static String version = null;
-
-	public static String getVersion() {
-		// Maven writes a version number derived from the current timestamp
-		// to MANIFEST.MF - read it
-		if (version == null) {
-			JarFile jf = null;
-			try {
-		        String classPath = Version.class.getName().replace('.', '/') + ".class";
-		        ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-		        URL classPathUrl = classLoader.getResource(classPath);
-		        String jarPath = classPathUrl.getPath().replaceAll("![^!]*$", "").replaceAll("^(file:|jar:)*", "");
-		        jf = new JarFile(jarPath);
-		        JarEntry je = jf.getJarEntry("META-INF/MANIFEST.MF");
-		        InputStream is = jf.getInputStream(je);
-				Properties p = new Properties();
-				p.load(is);
-				version = p.getProperty("Version-Timestamp");
-			} catch (Exception e) {
-				e.printStackTrace();
-				version = "unknown";
-			} finally {
-				if (jf != null)
-					try {
-						jf.close();
-					} catch (IOException e) {
-
-					}
-			}
-		}
-		return version;
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/models/person.java b/dozentenmodul/src/main/java/models/person.java
deleted file mode 100644
index ea6a38c4..00000000
--- a/dozentenmodul/src/main/java/models/person.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package models;
-
-public class person {
-
-	private String username;
-	private String userID;
-	private String Name;
-	private String Vorname;
-	private String Hochschule;
-	private String EMail;
-	private String Tel;
-	private String Fakultaet;
-	private String role;
-	private boolean ischecked;
-	private boolean image_read;
-	private boolean image_write;
-	private boolean image_admin;
-	private boolean image_linkAllowed;
-	private boolean lecture_read;
-	private boolean lecture_write;
-	private boolean lecture_admin;
-
-		
-	public static person verantwortlicher = new person();
-	
-	
-	public boolean isLecture_read() {
-		return lecture_read;
-	}
-
-	public void setLecture_read(boolean lecture_read) {
-		this.lecture_read = lecture_read;
-	}
-
-	public boolean isLecture_write() {
-		return lecture_write;
-	}
-
-	public void setLecture_write(boolean lecture_write) {
-		this.lecture_write = lecture_write;
-	}
-
-	public boolean isLecture_admin() {
-		return lecture_admin;
-	}
-
-	public void setLecture_admin(boolean lecture_admin) {
-		this.lecture_admin = lecture_admin;
-	}
-	
-	public boolean isImageRead() {
-		return image_read;
-	}
-
-	public void setImageRead(boolean image_read) {
-		this.image_read = image_read;
-	}
-
-	public boolean isImageWrite() {
-		return image_write;
-	}
-
-	public void setImageWrite(boolean image_write) {
-		this.image_write = image_write;
-	}
-
-	public boolean isImageAdmin() {
-		return image_admin;
-	}
-
-	public void setImageAdmin(boolean image_admin) {
-		this.image_admin = image_admin;
-	}
-
-	public boolean isImageLinkAllowed() {
-		return image_linkAllowed;
-	}
-
-	public void setImageLinkAllowed(boolean image_linkAllowed) {
-		this.image_linkAllowed = image_linkAllowed;
-	}
-
-	public String getUserID() {
-		return userID;
-	}
-
-	public void setUserID(String userID) {
-		this.userID = userID;
-	}
-
-	public String getRole() {
-		return role;
-	}
-
-	public void setRole(String role) {
-		this.role = role;
-	}
-
-	public String getUsername() {
-
-		return username;
-
-	}
-
-	public void setUsername(String username) {
-
-		this.username = username;
-
-	}
-
-	public String getName() {
-
-		return Name;
-
-	}
-
-	public void setName(String name) {
-
-		Name = name;
-
-	}
-
-	public String getVorname() {
-
-		return Vorname;
-
-	}
-
-	public void setVorname(String vorname) {
-
-		Vorname = vorname;
-
-	}
-
-	public String getHochschule() {
-
-		return Hochschule;
-
-	}
-
-	public void setHochschule(String hochschule) {
-
-		Hochschule = hochschule;
-
-	}
-
-	public String getEMail() {
-
-		return EMail;
-
-	}
-
-	public void setEMail(String eMail) {
-
-		EMail = eMail;
-
-	}
-
-	public String getTel() {
-
-		return Tel;
-
-	}
-
-	public void setTel(String tel) {
-
-		Tel = tel;
-
-	}
-
-	public String getFakultaet() {
-
-		return Fakultaet;
-
-	}
-
-	public void setFakultaet(String fakultaet) {
-
-		Fakultaet = fakultaet;
-
-	}
-
-	public boolean isIschecked() {
-
-		return ischecked;
-
-	}
-
-	public void setIschecked(boolean ischecked) {
-
-		this.ischecked = ischecked;
-
-	}
-
-
-}
diff --git a/dozentenmodul/src/main/java/util/GuiManager.java b/dozentenmodul/src/main/java/util/GuiManager.java
deleted file mode 100644
index 67671fcb..00000000
--- a/dozentenmodul/src/main/java/util/GuiManager.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package util;
-
-import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
-
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.HeadlessException;
-import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-
-import javax.swing.JFrame;
-import javax.swing.JInternalFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-import javax.swing.plaf.basic.BasicInternalFrameUI;
-
-import org.apache.log4j.Logger;
-
-/**
- * An abstract class to organize the GUI. Currently only provide a method for
- * centering Window-objects.
- */
-public abstract class GuiManager {
-
-	private final static Logger LOGGER = Logger.getLogger(GuiManager.class);
-
-	/**
-	 * Our main window object as a JFrame
-	 */
-	private static JFrame mainWindow = null;
-
-	/**
-	 * Currently displayed internal frame (inside the main window)
-	 */
-	private static JInternalFrame currentFrame = null;
-
-	/**
-	 * Previously displayed frame TODO: use this when going back in the GUI
-	 */
-	private static JInternalFrame formerFrame = null;
-
-	/**
-	 * The rectangle representing the bounds of the primary display
-	 */
-	private static Rectangle rect = null;
-
-	/**
-	 * Initializes the GUI by creating the main window and showing the Login_GUI
-	 * as the first frame.
-	 */
-	public static void initGui() {
-		// get the screen size
-		getDisplayBounds();
-		if (rect == null) {
-			LOGGER.error("Could not get display size. Contact developper.");
-			System.exit(1);
-		}
-
-		// create main window
-		mainWindow = new JFrame("DozMod");
-		mainWindow.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		mainWindow.setResizable(false);
-
-		// create login frame
-		currentFrame = new Login_GUI();
-		mainWindow.getContentPane().add(currentFrame, BorderLayout.CENTER);
-		((BasicInternalFrameUI) currentFrame.getUI()).setNorthPane(null);
-		mainWindow.pack();
-
-		// size management
-		mainWindow.setBounds(0, 0, 785, 430);
-		mainWindow.setLocation((int) (rect.getWidth() / 2 - mainWindow.getWidth() / 2),
-				(int) (rect.getHeight() / 2 - mainWindow.getHeight() / 2));
-
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (Exception e) {
-			// Non-critical - applying the look failed, but app will still work
-		}
-
-		// finally let's see the frames
-		currentFrame.setVisible(true);
-		mainWindow.setVisible(true);
-	}
-
-	/**
-	 * Public function to show the given frame, replacing the current frame
-	 * 
-	 * @param newFrame
-	 *            the new frame to show
-	 */
-	public static void show(JInternalFrame newFrame) {
-		// first remove the current component
-		currentFrame.setVisible(false);
-		mainWindow.getContentPane().remove(currentFrame);
-		// save it as formerFrame in case we need it
-		formerFrame = currentFrame;
-		// from now on currentFrame is newFrame !!!
-		currentFrame = newFrame;
-		currentFrame.setBorder(null);
-
-		// show the menu bar for everything but the Login_GUI
-		if (!(currentFrame instanceof Login_GUI)) {
-			if (mainWindow.getMenuBar() == null) {
-				if (!addMenuBar()) {
-					LOGGER.error("Failed to add menu to main window. See logs.");
-				}
-			}
-			// add help if needed
-			if (!addHelp()) {
-				LOGGER.error("Failed to add help to main window's menu. See logs.");
-			}
-		}
-		// prepare the switch
-		if (currentFrame.getUI() instanceof BasicInternalFrameUI) {
-			BasicInternalFrameUI bar = ((BasicInternalFrameUI) currentFrame.getUI());
-			if (bar.getNorthPane() != null)
-				bar.setNorthPane(null);
-		}
-		// TODO else case
-
-		mainWindow.setTitle(newFrame.getTitle() != null ? newFrame.getTitle() : "bwLehrpool Suite");
-		mainWindow.getContentPane().add(currentFrame, BorderLayout.CENTER);
-		mainWindow.setBounds((int) mainWindow.getLocationOnScreen().getX(),
-				(int) mainWindow.getLocationOnScreen().getY(), currentFrame.getWidth(),
-				currentFrame.getHeight());
-		currentFrame.setVisible(true);
-
-	}
-
-	/**
-	 * Public function to show the given frame, replacing the current frame
-	 * 
-	 * @param newFrame
-	 *            the new frame to show
-	 * @param center
-	 *            true if the main window is to be centered, false otherwise
-	 */
-	public static void show(JInternalFrame newFrame, boolean center) {
-		show(newFrame);
-		if (center) {
-			double xCenter = (rect.getWidth() / 2 - newFrame.getWidth() / 2);
-			double yCenter = (rect.getHeight() / 2 - newFrame.getHeight() / 2);
-			mainWindow.setBounds((int) xCenter, (int) yCenter, newFrame.getWidth(), newFrame.getHeight());
-		}
-	}
-
-	/**
-	 * Public function to open the given JFrame as a popup and center it on the
-	 * main window
-	 * 
-	 * @param popup
-	 *            The component to open as popup. Note this must be a JFrame.
-	 */
-	public static void openPopup(Component popup) {
-		if (!(popup instanceof JFrame)) {
-			LOGGER.error("Popup classes need to be JFrame, given a: " + popup.getClass().getName());
-			return;
-		}
-		int xPopup = (int) (mainWindow.getX() + (mainWindow.getWidth() / 2) - (popup.getWidth() / 2));
-		int yPopup = (int) (mainWindow.getY() + (mainWindow.getHeight() / 2) - (popup.getHeight() / 2));
-		((JFrame) popup).setLocation(xPopup, yPopup);
-		((JFrame) popup).setVisible(true);
-	}
-
-	/**
-	 * Private function to add the menu bar to the main window.
-	 * 
-	 * @return true if adding the menu bar worked, false otherwise
-	 */
-	private static boolean addMenuBar() {
-		JMenuBar menuBar = new JMenuBar();
-		mainWindow.setJMenuBar(menuBar);
-
-		JMenu helpMenu = new JMenu("Hilfe");
-		menuBar.add(helpMenu);
-
-		// FAQ Field
-		JMenuItem mntmFaq = new JMenuItem("FAQ");
-		mntmFaq.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mousePressed(MouseEvent arg0) {
-				OpenLinks.openWebpage("faq");
-			}
-		});
-		helpMenu.add(mntmFaq);
-		// About Field
-		JMenuItem mntmAbout = new JMenuItem("About");
-		mntmAbout.addActionListener(new ActionListener() {
-			public void actionPerformed(ActionEvent arg0) {
-				GuiManager.openPopup(new About_GUI());
-			}
-		});
-		helpMenu.add(mntmAbout);
-		return true;
-	}
-
-	/**
-	 * Private function to determine whether the currentFrame has a
-	 * 'HELP_MESSAGE'
-	 * defined and to add it to the menu bar if found one.
-	 * 
-	 * @return true if setting the help button to the menu bar worked, false
-	 *         otherwise
-	 */
-	private static boolean addHelp() {
-		// let's see if we have a HELP_MESSAGE variable defined in
-		// the class of the currentFrame, if so we need to show it by pressing
-		// "Hilfe"
-		final String helpMessage;
-		try {
-			helpMessage = (String) (currentFrame.getClass().getDeclaredField("HELP_MESSAGE").get(currentFrame));
-		} catch (NoSuchFieldException e) {
-			// only this case if interesting for us,
-			// since we now we don't have a help message to show
-			return false;
-		} catch (IllegalArgumentException | IllegalAccessException | SecurityException e) {
-			LOGGER.error("Failed to check for 'HELP_MESSAGE' variable in '" + currentFrame.getClass()
-					+ "' class, see trace: " + e);
-			return false;
-		}
-		// print it for debugging purposes
-		// still here? means we have a HELP_MESSAGE to display
-		JMenu mnNewMenu_Info = new JMenu("Info");
-		mnNewMenu_Info.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mousePressed(MouseEvent arg0) {
-				JOptionPane.showMessageDialog(currentFrame, helpMessage != null ? helpMessage
-						: "No help message.", "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE);
-			}
-		});
-		mainWindow.getJMenuBar().add(mnNewMenu_Info);
-		return true;
-	}
-
-	/**
-	 * Gets the bounds of the primary display using AWT's GraphicsEnvironment
-	 * class.
-	 */
-	private static boolean getDisplayBounds() {
-		GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
-		GraphicsDevice gd = null;
-		try {
-			gd = ge.getDefaultScreenDevice();
-		} catch (HeadlessException he) {
-			he.printStackTrace();
-			JOptionPane.showMessageDialog(null, "Konnte kein Display ermittelt werden.", "Fehler",
-					JOptionPane.ERROR_MESSAGE);
-			return false;
-		}
-
-		GraphicsConfiguration gc = gd.getDefaultConfiguration();
-		rect = gc.getBounds();
-
-		if (rect == null) {
-			JOptionPane.showMessageDialog(null, "Konnte die Resolution des Bildschirms nicht ermitteln!",
-					"Fehler", JOptionPane.ERROR_MESSAGE);
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	 * Generic helper to show a message box to the user, and optionally log the message to the log file.
-	 *
-	 * @param message Message to display. Can be multi line.
-	 * @param messageType Type of message (warning, information)
-	 * @param logger Logger instance to log to. Can be null.
-	 * @param exception Exception related to this message. Can be null.
-	 */
-	public static void showMessageBox(String message, MessageType messageType, Logger logger,
-			Throwable exception) {
-		if (logger != null)
-			logger.log(messageType.logPriority, message, exception);
-		if (exception != null)
-			message += "\n\n" + exception.getClass().getSimpleName();
-		JOptionPane.showMessageDialog(mainWindow, message, messageType.title, messageType.optionPaneId);
-	}
-}
diff --git a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
deleted file mode 100644
index 412fdd5d..00000000
--- a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package util;
-
-import java.awt.FlowLayout;
-import java.awt.Font;
-import java.awt.SystemColor;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.DefaultListSelectionModel;
-import javax.swing.JButton;
-import javax.swing.JFrame;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JScrollPane;
-import javax.swing.JSeparator;
-import javax.swing.JTable;
-import javax.swing.JTextPane;
-import javax.swing.border.EmptyBorder;
-import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableRowSorter;
-
-import models.SessionData;
-import models.person;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
-import org.openslx.sat.thrift.iface.Person;
-import org.openslx.thrifthelper.ThriftManager;
-
-@SuppressWarnings("serial")
-public class ListAllOtherUsers_GUI extends JFrame {
-
-	private final static Logger LOGGER = Logger.getLogger(ListAllOtherUsers_GUI.class);
-
-	private final JPanel contentPanel = new JPanel();
-	private JTable tableUsers;
-	private String[] titles = { "userID", "Nachname", "Vorname", "Mail" };
-
-	private JButton btnAdd;
-	private JTable table;
-	private int userIDPos;
-
-	List<String> user = new ArrayList<String>();
-
-	public static final String HELP_MESSAGE = "<html><div align=\"center\">"
-			+ "In der Übersicht sehen Sie primär alle Veranstaltungen, die Sie erzeugt haben.<br />"
-			+ "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.<br />"
-			+ "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden."
-			+ "</div></html>";
-
-	//prevent table cells being clickable
-	final DefaultTableModel modelUsers = new DefaultTableModel(titles, 0) {
-		public boolean isCellEditable(int rowIndex, int mColIndex) {
-			return false;
-		}
-	};
-
-	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(modelUsers);
-
-	public ListAllOtherUsers_GUI(final JTable table, final int userIDPos) {
-
-		// get table model to work with
-		final DefaultTableModel model = (DefaultTableModel) table.getModel();
-
-		//set incoming table
-		this.table = table;
-		this.userIDPos = userIDPos;
-
-		addWindowListener(new WindowAdapter() {
-
-			@Override
-			public void windowOpened(WindowEvent arg0) {
-
-				// auszublendende Angaben
-				// 0=userID
-
-				tableUsers.getColumnModel().getColumn(0).setWidth(0);
-				tableUsers.getColumnModel().getColumn(0).setMinWidth(0);
-				tableUsers.getColumnModel().getColumn(0).setMaxWidth(0);
-			}
-		});
-		// Verhindert das Vergroessern Des Fensters
-		setResizable(false);
-
-		// Setzt den Fenstertitel
-		setTitle("bwLehrpool Suite - Benutzer hinzufügen");
-		// Zentriert das Fenster in die Bildmitte
-		setBounds(0, 0, 531, 673);
-
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 570, 57);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Benutzer hinzufügen");
-				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("Wählen Sie bitte aus der unten stehenden Liste Benutzer aus, denen Sie Rechte vergeben möchten.");
-			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 176, 498, 359);
-		contentPanel.setBackground(SystemColor.menu);
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		JScrollPane scrollPaneMyImage = new JScrollPane();
-		scrollPaneMyImage.setBounds(0, 0, 498, 359);
-		contentPanel.add(scrollPaneMyImage);
-		tableUsers = new JTable();
-		tableUsers.setSelectionModel(new MyDefaultListSelectionModel());
-
-		tableUsers.setModel(modelUsers);
-
-		tableUsers.getColumnModel().getColumn(1).sizeWidthToFit();// Nachname
-		tableUsers.getColumnModel().getColumn(2).sizeWidthToFit();// Vorname
-		tableUsers.getColumnModel().getColumn(3).sizeWidthToFit();// email
-
-		// initialize content
-		initTableContent();
-
-		tableUsers.setRowSorter(rowSorterAll);
-
-		scrollPaneMyImage.setViewportView(tableUsers);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 568, 508, 33);
-			buttonPane.setBackground(SystemColor.menu);
-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
-			getContentPane().add(buttonPane);
-
-			btnAdd = new JButton("Übernehmen und schließen");
-			buttonPane.add(btnAdd);
-			{
-				JButton btnCancel = new JButton("Abbrechen");
-				buttonPane.add(btnCancel);
-				btnCancel.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						// only close window
-						dispose();
-					}
-				});
-				btnCancel.setActionCommand("OK");
-				getRootPane().setDefaultButton(btnCancel);
-			}
-			btnAdd.addActionListener(new ActionListener() {
-				public void actionPerformed(ActionEvent e) {
-					// save the user list and go back to last GUI
-					int pos = 0; // pointer for array
-					int[] selectedRows = tableUsers.getSelectedRows(); // list
-
-					// check if a row is selected
-					if (selectedRows.length > 0) {
-						// step through entries
-						for (int i = 0; i < selectedRows.length; i++) {
-							// get userID and write it to the table in former
-							// GUI
-
-							if (table.getColumnCount() == 6) { // is it an image
-																// GUI?
-
-								Object[] obj = {
-										tableUsers.getValueAt(selectedRows[pos], 1) + ", "
-												+ tableUsers.getValueAt(selectedRows[pos], 2), // Nachname
-																								// und
-																								// Vorname
-										false, // Read image
-										false, // Write image
-										false, // Link image
-										false, // Admin image
-										tableUsers.getValueAt(selectedRows[pos], 0) // userID
-								};
-								model.addRow(obj);
-
-							} else if (table.getColumnCount() == 5) { // is it a
-																		// lecture
-																		// GUI?
-								Object[] obj = {
-										tableUsers.getValueAt(selectedRows[pos], 1) + ", "
-												+ tableUsers.getValueAt(selectedRows[pos], 2), // Nachname
-																								// und
-																								// Vorname
-										false, // Read image
-										false, // Write image
-										false, // Admin image
-										tableUsers.getValueAt(selectedRows[pos], 0) // userID
-								};
-								model.addRow(obj);
-							}
-
-							pos++;// next selected row
-						}
-					}// end if
-
-					dispose();
-				}// end actionPerformed
-			});
-		}
-
-		JSeparator separator = new JSeparator();
-		separator.setBounds(0, 79, 836, 1);
-		getContentPane().add(separator);
-
-		JSeparator separator_1 = new JSeparator();
-		separator_1.setBounds(0, 552, 836, 1);
-		getContentPane().add(separator_1);
-	}
-
-	// get users from db which are not in listed in the permission yet
-	public void initTableContent() {
-
-		try {
-
-			//set users which are NOT to be listed in table
-			//logged on user
-			user.add(0, person.verantwortlicher.getUserID());
-
-			//users already in table
-			for (int y = 0; y < table.getRowCount(); y++) {
-				user.add("" + table.getValueAt(y, userIDPos));
-			}
-
-			//get the info
-			List<Person> users = ThriftManager.getSatClient().getAllOtherSatelliteUsers(user,
-					SessionData.authToken);
-			for (Person p : users) {
-				// erzeuge Objekte fuer die Tabelle
-				Object[] obj = { p.getUserID(), // userID
-						p.getNachname(), // Nachname
-						p.getVorname(),// Vorname
-						p.getMail() // EMail
-				};
-				// Fuege diese Objekte der Tabelle hinzu
-				modelUsers.addRow(obj);
-			}
-
-		} catch (TException e2) {
-			LOGGER.info("Failed to get List of users from server");
-			e2.printStackTrace();
-		}
-	}// end initTableContent
-}// end class ListAllOtherUsers
-
-@SuppressWarnings("serial")
-class MyDefaultListSelectionModel extends DefaultListSelectionModel {
-
-	public MyDefaultListSelectionModel() {
-		super();
-	}
-
-	public void setSelectionInterval(int index0, int index1) {
-		if (isSelectedIndex(index0)) {
-			super.removeSelectionInterval(index0, index1);
-		} else {
-			super.addSelectionInterval(index0, index1);
-		}
-	}
-}// end class MyDefaultListSelectionModel
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/util/News.java b/dozentenmodul/src/main/java/util/News.java
index 1c32209a..5f3ea776 100644
--- a/dozentenmodul/src/main/java/util/News.java
+++ b/dozentenmodul/src/main/java/util/News.java
@@ -12,7 +12,7 @@ import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
-import models.SessionData;
+import org.openslx.bwlp.thrift.iface.SessionData;
 
 import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
@@ -113,7 +113,7 @@ public class News {
 	private static void init(){
 		// Document representing the XML
 		Document doc = null;
-		String satIp = SessionData.serverAdress;
+		String satIp = SessionData._Fields.SERVER_ADDRESS.toString();
 		// sanity check to see if we have the satellite IP
 		if (satIp == null || satIp.isEmpty()) {
 			LOGGER.error("No satellite IP adress is set in SessionData, aborting news fetching...");
@@ -123,7 +123,7 @@ public class News {
 		// URL to news API
 		URL url = null;
 		try {
-			url = new URL("http://" + SessionData.serverAdress + "/slx-admin/api.php?do=news");
+			url = new URL("http://" + SessionData._Fields.SERVER_ADDRESS.toString() + "/slx-admin/api.php?do=news");
 		} catch (MalformedURLException e) {
 			LOGGER.error("Malformated URL to News-API, see trace: ", e);
 		}