Remove client -> server dependency, move thrift classes to master-sync-shared

27 files changed, 263 insertions, 401 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index 325fe62f..60f608a0 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -25,6 +25,7 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
@@ -38,23 +39,15 @@ import models.Image;
 import models.Links;
 import models.SessionData;
 import models.person;
-import server.generated.Server.Client;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-import javax.swing.JScrollPane;
 
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+
+import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class CreateImageAllgemein_GUI extends JFrame {
 
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(CreateImageAllgemein_GUI.class);
-	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
index e80c3a68..42e98c4f 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java
@@ -2,7 +2,6 @@ package gui.image;
 
 
 import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -20,9 +19,9 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
 
-import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -30,7 +29,6 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JRadioButton;
 import javax.swing.JSeparator;
 import javax.swing.JSpinner;
 import javax.swing.JTextArea;
@@ -43,20 +41,15 @@ import javax.swing.border.TitledBorder;
 
 import models.Image;
 import models.Links;
-
 import models.SessionData;
-
 import models.person;
 
-import server.generated.Server.Client;
-import thrift.ThriftConnection;
-import util.GuiOrganizer;
-import util.OpenLinks;
-
-import javax.swing.JComboBox;
-
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+
+import thrift.ThriftConnection;
+import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class CreateImageTechnisch_GUI extends JFrame {
@@ -73,9 +66,6 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	private JCheckBox chckbxIsLicensed;
 	private JCheckBox chckbxIsInternetBlocked;
 	JComboBox<String> comboBox;
-	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
-	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	private final ButtonGroup buttonGroupVorlage = new ButtonGroup();
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 	Component c = null;
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index b1fde196..44e86aae 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -38,8 +38,8 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 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;
@@ -48,8 +48,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
@@ -62,12 +60,11 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
-import javax.swing.JTextArea;
 
 @SuppressWarnings("serial")
 public class DeleteImage_GUI extends JFrame {
@@ -132,7 +129,7 @@ public class DeleteImage_GUI extends JFrame {
 			modelMyImages);
 
 
-	RowFilter rf = null;
+	RowFilter<Object, Object> rf = null;
 	List<RowFilter<Object, Object>> filters = new ArrayList<RowFilter<Object, Object>>(
 			2);
 
@@ -212,8 +209,6 @@ public class DeleteImage_GUI extends JFrame {
 		setBounds(0, 0, 918, 722);
 		setLocationRelativeTo(formerGUI);
 
-		final DefaultTableModel model = new DefaultTableModel(titles, 0);
-
 		getContentPane().setLayout(null);
 		{
 			JPanel panel = new JPanel();
@@ -731,14 +726,11 @@ public class DeleteImage_GUI extends JFrame {
 		mntmFaq.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 
@@ -752,14 +744,11 @@ public class DeleteImage_GUI extends JFrame {
 		mntmOtrs.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 
@@ -796,7 +785,7 @@ public class DeleteImage_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 
-		List<server.generated.Image> images;
+		List<Image> images;
 		try {
 
 			// Hole eine Liste der Images
@@ -811,7 +800,7 @@ public class DeleteImage_GUI extends JFrame {
 						SessionData.session.getAuthToken());
 			}
 
-			Iterator<server.generated.Image> i = images.iterator();
+			Iterator<Image> i = images.iterator();
 
 			System.out.println("Size of image list=" + images.size());
 
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
index 686fcccb..1dfd8191 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java
@@ -1,7 +1,6 @@
 package gui.image;
 
 import gui.intro.About_GUI;
-import gui.intro.Login_GUI;
 import gui.intro.MainMenue_GUI;
 
 import java.awt.Color;
@@ -27,6 +26,7 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
@@ -42,24 +42,15 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
 
-import javax.swing.JScrollPane;
-
 @SuppressWarnings("serial")
 public class EditImageAllgemein_GUI extends JFrame {
 
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger.getLogger(EditImageAllgemein_GUI.class);
-	
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTextField Vorname;
@@ -390,12 +381,10 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 				
-				OpenLinks open = new OpenLinks();
-				
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
 				}
@@ -409,12 +398,10 @@ public class EditImageAllgemein_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-				
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
 				}
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
index 10be7d2b..6895f6c1 100644
--- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java
@@ -19,6 +19,8 @@ import java.net.URISyntaxException;
 import java.util.List;
 
 import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -36,26 +38,17 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import server.generated.Server.Client;
-import thrift.ThriftConnection;
-import util.OpenLinks;
 import models.Image;
 import models.Links;
 import models.SessionData;
 import models.person;
 
-import javax.swing.JComboBox;
-
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import javax.swing.JCheckBox;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.ItemEvent;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
+import thrift.ThriftConnection;
+import util.OpenLinks;
 
 @SuppressWarnings("serial")
 public class EditImageTechnisch_GUI extends JFrame {
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index d5ab0330..a2247b97 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -47,8 +47,9 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+import org.openslx.sat.thrift.iface.User;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.OpenLinks;
 import config.Config;
@@ -75,7 +76,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
 	int port = 21;
-	server.generated.User user;
+	User user;
 	String filename = "";
 	File uploadFile;
 	static String arg = "";
@@ -116,11 +117,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	public FTPCreateUploader_GUI(Component formerGUI) {
 
 		final Object[] options = { "Beenden", "Abbrechen" };
-		
-		try 
-		{
-	
-			uuid = client.createRandomUUID(SessionData.session.getAuthToken()); 
+
+		try {
+
+			uuid = client.createRandomUUID(SessionData.session.getAuthToken());
 
 		} catch (TException e1) {
 
@@ -145,7 +145,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					// 0=beenden, 1=abbrechen
 					if (choice == 0) {
 						try {
-							client.DeleteFtpUser(user.userName, SessionData.session.getAuthToken());
+							client.DeleteFtpUser(user.userName,
+									SessionData.session.getAuthToken());
 						} catch (TException e1) {
 
 							e1.printStackTrace();
@@ -153,7 +154,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						task.cancel(true);
 						con.closeThriftConnection();
 						try {
-							client.setSessionInvalid(SessionData.session.getAuthToken());
+							client.setSessionInvalid(SessionData.session
+									.getAuthToken());
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
@@ -162,9 +164,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					}// end if choice
 				} else {
 					// no upload running, close window
-					
+
 					try {
-						client.setSessionInvalid(SessionData.session.getAuthToken());
+						client.setSessionInvalid(SessionData.session
+								.getAuthToken());
 					} catch (TException e) {
 						// TODO Auto-generated catch block
 						e.printStackTrace();
@@ -188,7 +191,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		// filename=name;
 		setBackground(Color.WHITE);
-		setTitle("Dozentenmodul - Image erzeugen - "+person.verantwortlicher.getUserID());
+		setTitle("Dozentenmodul - Image erzeugen - "
+				+ person.verantwortlicher.getUserID());
 		// Aktion die beim Schliessen durchgefuehrt werden soll
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
@@ -397,7 +401,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 				isAborted = true; // set flag
 				try {
-					client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+					client.DeleteFtpUser(user.userName,
+							SessionData.session.getAuthToken());
 					LOGGER.info("Deleted FTP user.");
 				} catch (TException e1) {
 
@@ -465,7 +470,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 						if (taskrun == true) {
 							try {
-								client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+								client.DeleteFtpUser(user.userName,
+										SessionData.session.getAuthToken());
 
 							} catch (TException e1) {
 
@@ -478,17 +484,19 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							task.cancel(true);
 						}
 
-
 						// Erstellung Array vom Datentyp Object, Hinzufügen der
 						// Optionen
 						Object[] options = { "Neue Veranstaltung erstellen",
 								"Zum Hauptmenü zurückkehren" };
 
-						int choice = JOptionPane.showOptionDialog(c,
-								"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]);
+						int choice = JOptionPane
+								.showOptionDialog(
+										c,
+										"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) {
@@ -520,7 +528,8 @@ public class FTPCreateUploader_GUI extends JFrame implements
 							// 0=beenden, 1=abbrechen
 							if (choice == 0) {
 								try {
-									client.DeleteFtpUser(user.userName,SessionData.session.getAuthToken());
+									client.DeleteFtpUser(user.userName,
+											SessionData.session.getAuthToken());
 								} catch (TException e1) {
 
 									e1.printStackTrace();
@@ -528,10 +537,6 @@ public class FTPCreateUploader_GUI extends JFrame implements
 								task.cancel(true);
 								// not loading files, go back one page
 								dispose();
-								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI(
-										c);
-								// m.setVisible(true);
-
 							}// end if choice
 						} else {
 
@@ -592,11 +597,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		menuItem_1.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 
 					e.printStackTrace();
@@ -733,43 +737,43 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 		try {
 
-			client.writeVLdata(
-					Image.image.getImagename(),
-					Image.image.getDesc(),
-					person.verantwortlicher.getTel(),
+			client.writeVLdata(Image.image.getImagename(),
+					Image.image.getDesc(), person.verantwortlicher.getTel(),
 					person.verantwortlicher.getFakultaet(),
-					Image.image.isLicensed(), 
-					Image.image.isInternet(),
-					Image.image.getRam(), 
-					Image.image.getCpu(), 
-					"temp/"+ Image.image.getNewName(),
-					Image.image.isVorlage(), 
-					Image.image.getFilesize(),
-					Image.image.getShareMode(), 
-					Image.image.getOS(),
-					uuid,
+					Image.image.isLicensed(), Image.image.isInternet(),
+					Image.image.getRam(), Image.image.getCpu(), "temp/"
+							+ Image.image.getNewName(),
+					Image.image.isVorlage(), Image.image.getFilesize(),
+					Image.image.getShareMode(), Image.image.getOS(), uuid,
 					SessionData.session.getAuthToken(),
-					person.verantwortlicher.getUserID()
-					);
-			
-			//System.out.println("userID is: "+person.verantwortlicher.getUserID());
-			System.out.println("starting file copy...");
-			client.startFileCopy(Image.image.getNewName(),SessionData.session.getAuthToken());
+					person.verantwortlicher.getUserID());
 
-			client.writeImageRights(uuid,SessionData.session.getAuthToken(),person.verantwortlicher.getRole(),person.verantwortlicher.getHochschule(), person.verantwortlicher.getUserID());
-			
-			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());
-				client.writeAdditionalImageRights(
-						uuid,
-						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.session.getAuthToken()
-						);
+			// System.out.println("userID is: "+person.verantwortlicher.getUserID());
+			System.out.println("starting file copy...");
+			client.startFileCopy(Image.image.getNewName(),
+					SessionData.session.getAuthToken());
+
+			client.writeImageRights(uuid, SessionData.session.getAuthToken(),
+					person.verantwortlicher.getRole(),
+					person.verantwortlicher.getHochschule(),
+					person.verantwortlicher.getUserID());
+
+			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());
+				client.writeAdditionalImageRights(uuid,
+						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.session.getAuthToken());
 
 			}// end for
 
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
index 437f6c77..d190c50f 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.Cursor;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
@@ -16,7 +15,6 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -44,19 +42,15 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
+import org.openslx.sat.thrift.iface.Server.Client;
+import org.openslx.sat.thrift.iface.User;
 
-import server.generated.Server.Client;
-import server.generated.User;
 import thrift.ThriftConnection;
 import util.OpenLinks;
-
-
+import config.Config;
 import ftp.DownloadTask;
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
-import config.Config;
 
 @SuppressWarnings("serial")
 public class FTPEditDownloader_GUI extends JFrame implements
@@ -370,11 +364,10 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		menuItem.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					
 					e.printStackTrace();
@@ -388,11 +381,10 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		menuItem_1.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					
 					e.printStackTrace();
@@ -417,12 +409,10 @@ public class FTPEditDownloader_GUI extends JFrame implements
 		lblAnleitung.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
-
 				URI anleitung;
 				try {
 					anleitung = new URI(Links.getAnleitungVMDK());
-					open.openWebpage(anleitung);
+					OpenLinks.openWebpage(anleitung);
 				} catch (URISyntaxException e) {
 					
 					e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index f918d0f4..a8c2424c 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -47,8 +47,9 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+import org.openslx.sat.thrift.iface.User;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.OpenLinks;
 import config.Config;
@@ -73,7 +74,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JProgressBar progressBar;
 	String host = SessionData.session.getServerAdress();
 	int port = 21;
-	server.generated.User user;
+	User user;
 	String filename = "";
 	File uploadFile;
 	static String arg = "";
diff --git a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
index f7238b03..823d8894 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPSearchDownloader_GUI.java
@@ -15,7 +15,6 @@ import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
-import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 
@@ -43,18 +42,15 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
-import org.ini4j.InvalidFileFormatException;
-import org.ini4j.Wini;
+import org.openslx.sat.thrift.iface.Server.Client;
+import org.openslx.sat.thrift.iface.User;
 
-import server.generated.Server.Client;
-import server.generated.User;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
+import config.Config;
 import ftp.DownloadTask;
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
-import config.Config;
 
 @SuppressWarnings("serial")
 public class FTPSearchDownloader_GUI extends JFrame implements
@@ -367,13 +363,11 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
@@ -390,13 +384,11 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
@@ -423,12 +415,10 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 		lblAnleitung.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				OpenLinks open = new OpenLinks();
-
 				URI anleitung;
 				try {
 					anleitung = new URI(Links.getAnleitungVMDK());
-					open.openWebpage(anleitung);
+					OpenLinks.openWebpage(anleitung);
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
index 53c30efc..2b590b0b 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java
@@ -57,11 +57,10 @@ 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.Person;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Person;
-import server.generated.Server.Client;
 import util.CheckIntegrity;
 import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
@@ -69,13 +68,10 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class PermissionCreateImage_GUI extends JFrame {
 
-	private final static Logger LOGGER = Logger
-			.getLogger(PermissionCreateImage_GUI.class);
 	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table = null;
-	private Class[] classes;
 	Object[] titles = { "Name", "Lesen", "Schreiben", "Link", "Admin", "userID" };
 	private List<Person> map = null; // List of people who have rights
 	Component c = null;
@@ -90,7 +86,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 			return false;
 		}
 
-		public Class getColumnClass(int c) {
+		public Class<?> getColumnClass(int c) {
 			switch (c) {
 			case 0:
 				return String.class;
@@ -266,7 +262,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 					.getPermittedUserList();
 			Iterator<person> i = listt.iterator();
 
-			int x = 0;
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				person temp = i.next();
@@ -285,7 +280,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
-				x++;
 			}
 		}// end set list of permitted users
 		
@@ -334,9 +328,9 @@ public class PermissionCreateImage_GUI extends JFrame {
 		label.setBounds(10, 30, 250, 20);
 		panel.add(label);
 
-		final JComboBox comboBox_1 = new JComboBox();
+		final JComboBox<String> comboBox_1 = new JComboBox<>();
 		comboBox_1
-				.setModel(new DefaultComboBoxModel(new String[] {
+				.setModel(new DefaultComboBoxModel<String>(new String[] {
 						"Lokal (Eigene Hochschule)",
 						"Öffentlich (Alle Hochschulen)" }));
 		comboBox_1.setSelectedIndex(0);
@@ -516,13 +510,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
@@ -537,13 +529,11 @@ public class PermissionCreateImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
@@ -663,11 +653,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 				//TODO
 				//also set table header (un-)selected
 			}
-			JTableHeader header = table.getTableHeader();
-			//header.getColumnModel().getColumn(1).setHeaderValue(Status.);
-			//header.getColumnModel().getColumn(2).setHeaderValue(new Boolean(checked));
-			//model.setValueAt(new Boolean(checked), 0, 1);
-			//table.setValueAt(new Boolean(checked), 0, 1);
 			
 		}
 	}
@@ -750,7 +735,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 
 class CheckBoxHeader extends JCheckBox implements TableCellRenderer,MouseListener 
 {
-	
+	private static final long serialVersionUID = 6189969287264710386L;
 	protected CheckBoxHeader rendererComponent;
 	protected int column;
 	protected boolean mousePressed = false;
diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
index 6853f6d7..053d279a 100644
--- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java
@@ -43,7 +43,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
-import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
 import models.Image;
@@ -52,11 +51,10 @@ 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.Person;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Person;
-import server.generated.Server.Client;
 import util.CheckIntegrity;
 import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
@@ -64,13 +62,10 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class PermissionEditImage_GUI extends JFrame {
 	
-	private final static Logger LOGGER = Logger
-			.getLogger(PermissionCreateImage_GUI.class);
 	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table;
-	private Class[] classes;
 	Object[] titles = { "Name", "Lesen", "Schreiben", "Link", "Admin", "userID" };
 	private List<Person> map = null; // List of people who have rights
 	Component c = null;
@@ -85,7 +80,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			return false;
 		}
 
-		public Class getColumnClass(int c) {
+		public Class<?> getColumnClass(int c) {
 			switch (c) {
 			case 0:
 				return String.class;
@@ -203,7 +198,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			try {
 								
 				map = client.getPermissionForUserAndImage(SessionData.session.getAuthToken(),Image.image.getImageId(),person.verantwortlicher.getUserID());
-				Iterator<server.generated.Person> i = map.iterator();
+				Iterator<Person> i = map.iterator();
 
 				int x = 0;
 				
@@ -244,7 +239,6 @@ public class PermissionEditImage_GUI extends JFrame {
 					.getPermittedUserList();
 			Iterator<person> i = listt.iterator();
 
-			int x = 0;
 			while (i.hasNext()) {
 				// System.out.println("current pos=" + x);
 				// erzeuge Objekte fuer die Tabelle
@@ -264,7 +258,6 @@ public class PermissionEditImage_GUI extends JFrame {
 				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
-				x++;
 			}
 		}// end set list of permitted users
 
@@ -274,8 +267,6 @@ public class PermissionEditImage_GUI extends JFrame {
 		 * model.addRow(rowdata);
 		 */
 
-		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
-
 		TableColumn tc1 = table.getColumnModel().getColumn(1);
 		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
 		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
@@ -320,9 +311,9 @@ public class PermissionEditImage_GUI extends JFrame {
 		label_7.setBounds(10, 30, 250, 20);
 		panel_2.add(label_7);
 
-		final JComboBox comboBox_1 = new JComboBox();
+		final JComboBox<String> comboBox_1 = new JComboBox<>();
 		comboBox_1
-				.setModel(new DefaultComboBoxModel(new String[] {
+				.setModel(new DefaultComboBoxModel<String>(new String[] {
 						"Lokal (Eigene Hochschule)",
 						"Öffentlich (Alle Hochschulen)" }));
 		comboBox_1.setSelectedIndex(Image.image.getShareMode());
@@ -506,13 +497,11 @@ public class PermissionEditImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
@@ -527,13 +516,11 @@ public class PermissionEditImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
index 5e1607a8..7ebd604d 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java
@@ -60,10 +60,9 @@ import models.Links;
 import models.SessionData;
 import models.person;
 
-import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.OpenLinks;
 //import models.person;
@@ -71,12 +70,6 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class SearchEditImage_GUI extends JFrame {
 
-	/**
-	 * Logger instance for this class.
-	 */
-	private final static Logger LOGGER = Logger
-			.getLogger(SearchEditImage_GUI.class);
-
 	private final JPanel contentPanel = new JPanel();
 	JLabel labelName;
 	JLabel labelUpdate;
@@ -138,7 +131,7 @@ public class SearchEditImage_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>(
 		modelMyImages);
 
-	RowFilter rf = null;
+	RowFilter<Object, Object> rf = null;
 	List<RowFilter<Object,Object>> filters = new ArrayList<RowFilter<Object,Object>>(2);
 	private JLabel lblTotalResults;
 
@@ -401,8 +394,6 @@ public class SearchEditImage_GUI extends JFrame {
 			public void actionPerformed(ActionEvent arg0) {
 				// oeffnet den Downloader
 
-				String username = person.verantwortlicher.getName() + " "
-						+ person.verantwortlicher.getVorname();
 				// check if user is in correct tab
 				/* if (tabbedPane.getSelectedIndex() == 0) { */
 				// check if a row is selected
@@ -514,8 +505,6 @@ public class SearchEditImage_GUI extends JFrame {
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 
-						String username = person.verantwortlicher.getName()
-								+ " " + person.verantwortlicher.getVorname();
 						// check if user is in correct tab
 						// if (tabbedPane.getSelectedIndex() == 0) {
 						// check if a row is selected
@@ -694,13 +683,11 @@ public class SearchEditImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
@@ -714,13 +701,11 @@ public class SearchEditImage_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
 
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
@@ -759,7 +744,7 @@ public class SearchEditImage_GUI extends JFrame {
 
 		//LOGGER.debug("trying to init table first time... in: searcheditimage_gui");
 		
-		List<server.generated.Image> images;
+		List<org.openslx.sat.thrift.iface.Image> images;
 		try {
 			
 			// Hole eine Liste der passenden Images,
@@ -771,7 +756,7 @@ public class SearchEditImage_GUI extends JFrame {
 				images = client.getImageListPermissionWrite(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 			}
 
-			Iterator<server.generated.Image> i = images.iterator();
+			Iterator<org.openslx.sat.thrift.iface.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;
diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
index 9aff1648..18f4a1e7 100644
--- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java
@@ -59,21 +59,15 @@ import models.Links;
 import models.SessionData;

 import models.person;

 

-import org.apache.log4j.Logger;

 import org.apache.thrift.TException;

+import org.openslx.sat.thrift.iface.Server.Client;

 

-import server.generated.Server.Client;

 import thrift.ThriftConnection;

 import util.OpenLinks;

 

 @SuppressWarnings("serial")

 public class SearchImage_GUI extends JFrame {

 

-	/**

-	 * Logger instance for this class.

-	 */

-	private final static Logger LOGGER = Logger.getLogger(SearchImage_GUI.class);

-	

 	private final JPanel contentPanel = new JPanel();

 	JLabel labelName;

 	JLabel labelUpdate;

@@ -149,16 +143,16 @@ public class SearchImage_GUI extends JFrame {
 	

 	

 	

-	RowFilter orFilter = null;

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

+	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 andFilter = null; 

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

+	RowFilter<Object,Object> andFilter = null; 

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

 

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

-	RowFilter templateFilter = null;

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

+	RowFilter<Object,Object> templateFilter = null;

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

 	

 	

 	

@@ -929,13 +923,11 @@ public class SearchImage_GUI extends JFrame {
 			@Override

 			public void mousePressed(MouseEvent arg0) {

 

-				OpenLinks open = new OpenLinks();

-

 				URI windows;

 				try {

 					windows = new URI(Links.getFAQ());

 

-					open.openWebpage(windows);

+					OpenLinks.openWebpage(windows);

 

 				} catch (URISyntaxException e) {

 					 

@@ -950,13 +942,11 @@ public class SearchImage_GUI extends JFrame {
 			@Override

 			public void mousePressed(MouseEvent arg0) {

 

-				OpenLinks open = new OpenLinks();

-

 				URI windows;

 				try {

 					windows = new URI(Links.getOTRS());

 

-					open.openWebpage(windows);

+					OpenLinks.openWebpage(windows);

 

 				} catch (URISyntaxException e) {

 					 

@@ -991,7 +981,7 @@ public class SearchImage_GUI extends JFrame {
 

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModel(DefaultTableModel model) {

-		List<server.generated.Image> images;

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

 		try {

 			

 			// Hole eine Liste der Images

@@ -1002,7 +992,7 @@ public class SearchImage_GUI extends JFrame {
 				images = client.getImageListPermissionRead(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 			}

 

-			Iterator<server.generated.Image> i = images.iterator();

+			Iterator<org.openslx.sat.thrift.iface.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;

@@ -1044,12 +1034,12 @@ public class SearchImage_GUI extends JFrame {
 	}

 	

 	public DefaultTableModel initTableModelAll(DefaultTableModel model) {

-		List<server.generated.Image> images;

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

 		try {

 			// Hole eine Liste der Images

 			images = client.getImageList(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());

 

-			Iterator<server.generated.Image> i = images.iterator();

+			Iterator<org.openslx.sat.thrift.iface.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;

@@ -1094,12 +1084,12 @@ public class SearchImage_GUI extends JFrame {
 	

 	// Initiale Beffuelung eines Table models

 		public DefaultTableModel initTableModelTemplates(DefaultTableModel model) {

-			List<server.generated.Image> images;

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

 			try {

 				// Hole eine Liste der Images

 				images = client.getImageListAllTemplates(SessionData.session.getAuthToken());

 

-				Iterator<server.generated.Image> i = images.iterator();

+				Iterator<org.openslx.sat.thrift.iface.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;

diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
index 0b22792d..0af27fee 100644
--- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java
@@ -44,6 +44,7 @@ import org.apache.thrift.TException;
 import org.openslx.imagemaster.thrift.iface.ImageServer.Client;
 import org.openslx.imagemaster.thrift.iface.OrganizationData;
 import org.openslx.imagemaster.thrift.iface.UserInfo;
+import org.openslx.sat.thrift.iface.Server;
 
 import thrift.MasterThriftConnection;
 import thrift.ThriftConnection;
@@ -72,7 +73,6 @@ public class Login_GUI extends JFrame {
 	JLabel lblConnectionInfo = new JLabel("");
 	boolean isClientReturnedCorrectly = false;
 	JCheckBox chckbxBenutzernameSpeichern;
-	private static final String HELP_MESSAGE = "";
 	Component c = null;
 	String[] args = null;
 
@@ -361,7 +361,7 @@ public class Login_GUI extends JFrame {
 			setStatus(Color.black, "Hole Verbindungsdaten von Server...", null);
 			// set connection to bwLehrpoolSuiteServer
 			ThriftConnection bwthrift = new ThriftConnection();
-			server.generated.Server.Client bwClient = bwthrift.getThriftConnection();
+			Server.Client bwClient = bwthrift.getThriftConnection();
 			models.Client.clientcon.setClient(bwClient);
 
 			// User-Info
@@ -487,7 +487,7 @@ public class Login_GUI extends JFrame {
 		 * 
 		 */
 		//import server.generated.Server.Client;
-		server.generated.Server.Client client_2 = models.Client.clientcon.getClient();
+		Server.Client client_2 = models.Client.clientcon.getClient();
 		try 
 		{
 			boolean authenticated = client_2.authenticated(authToken);
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index a171cd57..504203fe 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -12,7 +12,6 @@ import gui.lecture.SearchLecture_GUI;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Font;
-import java.awt.Rectangle;
 import java.awt.ScrollPane;
 import java.awt.SystemColor;
 import java.awt.event.ActionEvent;
@@ -48,18 +47,15 @@ import models.GUIRights;
 import models.Image;
 import models.ImageRights;
 import models.ItemOwner;
-import models.Lecture;
 import models.Links;
 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.Server.Client;
 
-import server.generated.Server.Client;
-import util.GuiOrganizer;
 import util.News;
 import util.OpenLinks;
 import util.ResourceLoader;
@@ -89,11 +85,6 @@ public class MainMenue_GUI extends JFrame {
 	Client client = models.Client.clientcon.getClient();
 
 	
-	
-	private static final String HELP_MESSAGE = "<html><div align=\"center\">" +
-											   " " +	
-											   "</div></html>";
-
 	// for testing
 	ImageRights imageRights = new ImageRights();
 	
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
index 8bdf566a..54a22d9f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -15,9 +15,10 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -39,20 +40,17 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import org.apache.thrift.TException;
-
-import models.Image;
 import models.Lecture;
 import models.Links;
 import models.SessionData;
 import models.person;
-import server.generated.Server.Client;
-import util.GuiOrganizer;
+
+import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
+
 import util.OpenLinks;
 
 import com.toedter.calendar.JDateChooser;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 
 @SuppressWarnings("serial")
 public class CreateLectureAllgemein_GUI extends JFrame {
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index ea1c7b88..14b050a9 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -39,7 +39,6 @@ import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
-import javax.swing.JTabbedPane;
 import javax.swing.JTable;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
@@ -49,11 +48,12 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
+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.Lecture;
 import models.Links;
 import models.RightsManagement;
@@ -62,15 +62,11 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 @SuppressWarnings("serial")
 public class CreateLectureLink_GUI extends JFrame {
@@ -762,7 +758,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model)
 			throws TException, ParseException {
-		List<server.generated.Image> images;
+		List<Image> images;
 
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
@@ -772,7 +768,7 @@ public class CreateLectureLink_GUI extends JFrame {
 			images = client.getImageListPermissionLink(person.verantwortlicher.getUserID(),SessionData.session.getAuthToken());
 		}
 
-		Iterator<server.generated.Image> i = images.iterator();
+		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;
diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
index 3e010696..438e817f 100644
--- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java
@@ -58,8 +58,9 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Lecture;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 import util.OpenLinks;
 
@@ -633,7 +634,7 @@ public class DeleteLecture_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model)
 			throws ParseException {
-		List<server.generated.Lecture> lectures;
+		List<Lecture> lectures;
 		try {
 		
 			// Hole eine Liste der erlaubten Images für die diese Person
@@ -648,7 +649,7 @@ public class DeleteLecture_GUI extends JFrame {
 				lectures = client.getLectureListPermissionAdmin(SessionData.session.getAuthToken());
 			}
 			
-			Iterator<server.generated.Lecture> i = lectures.iterator();
+			Iterator<Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
index f9fdd8fb..88a79fb6 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureAllgemein_GUI.java
@@ -15,6 +15,8 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Calendar;
@@ -39,10 +41,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
 
-import org.apache.thrift.TException;
-
-//import server.generated.Server.Client;
-import models.Client;
 import models.Image;
 import models.ItemOwner;
 import models.Lecture;
@@ -51,11 +49,13 @@ import models.SessionData;
 //import models.person;
 import models.person;
 
+import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server;
+
 import util.OpenLinks;
 
 import com.toedter.calendar.JDateChooser;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
+//import server.generated.Server.Client;
 
 @SuppressWarnings("serial")
 public class EditLectureAllgemein_GUI extends JFrame {
@@ -76,7 +76,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 	Date endDate;
 	Component c = null;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
-	server.generated.Server.Client client = models.Client.clientcon.getClient();
+	Server.Client client = models.Client.clientcon.getClient();
 	private boolean descriptionLengthOK = false; // description may not be
 													// longer than
 													// MAX_DESCRIPTION_LENGTH
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index 001f1b44..9ae612f6 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -48,11 +48,12 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
+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.Lecture;
 import models.Links;
 import models.RightsManagement;
@@ -60,15 +61,11 @@ import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Image;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
 
 @SuppressWarnings("serial")
 public class EditLectureLink_GUI extends JFrame {
@@ -1214,7 +1211,7 @@ public class EditLectureLink_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model)
 			throws TException, ParseException {
-		List<server.generated.Image> images;
+		List<Image> images;
 
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
@@ -1226,7 +1223,7 @@ public class EditLectureLink_GUI extends JFrame {
 				.getUserID(),SessionData.session.getAuthToken());
 		}
 
-		Iterator<server.generated.Image> i = images.iterator();
+		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;
@@ -1257,7 +1254,7 @@ public class EditLectureLink_GUI extends JFrame {
 	
 	public DefaultTableModel initTableModelAll(DefaultTableModel model)
 			throws TException, ParseException {
-		List<server.generated.Image> images;
+		List<Image> images;
 
 		// Hole eine Liste der Images
 		if(person.verantwortlicher.getRole()=="Admin"){
@@ -1269,7 +1266,7 @@ public class EditLectureLink_GUI extends JFrame {
 				.getUserID(),SessionData.session.getAuthToken());
 		}
 
-		Iterator<server.generated.Image> i = images.iterator();
+		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;
@@ -1301,13 +1298,13 @@ public class EditLectureLink_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 		public DefaultTableModel initTableModelTemplates(DefaultTableModel model)
 				throws TException, ParseException {
-			List<server.generated.Image> images;
+			List<Image> images;
 
 			// Hole eine Liste der Images
 			//images = client.getImageListPermissionLink(person.verantwortlicher.getUserID());
 			images = client.getImageListAllTemplates(SessionData.session.getAuthToken());
 
-			Iterator<server.generated.Image> i = images.iterator();
+			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;
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
index 064ad5af..a3119b79 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java
@@ -61,10 +61,9 @@ import models.SessionData;
 import models.person;
 
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
-import util.GuiOrganizer;
 import util.OpenLinks;
 
 @SuppressWarnings("serial")
@@ -665,7 +664,7 @@ public class EditLectureSearch_GUI extends JFrame {
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model)
 			throws ParseException {
-		List<server.generated.Lecture> lectures;
+		List<org.openslx.sat.thrift.iface.Lecture> lectures;
 		try {
 			
 			// Hole eine Liste der erlaubten Images für die diese Person
@@ -677,7 +676,7 @@ public class EditLectureSearch_GUI extends JFrame {
 				lectures = client.getLectureListPermissionWrite(SessionData.session.getAuthToken());
 			}
 			
-			Iterator<server.generated.Lecture> i = lectures.iterator();
+			Iterator<org.openslx.sat.thrift.iface.Lecture> i = lectures.iterator();
 			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			int x = 0;
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
index b9886c73..3c4e74b1 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java
@@ -24,7 +24,6 @@ import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.AbstractButton;
-import javax.swing.ButtonGroup;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JFrame;
@@ -57,11 +56,9 @@ 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.Server.Client;
 
-import server.generated.Person;
-import server.generated.Server.Client;
 import util.CheckIntegrity;
 import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
@@ -69,17 +66,11 @@ import util.OpenLinks;
 @SuppressWarnings("serial")
 public class PermissionCreateLecture_GUI extends JFrame {
 
-	// Logger for this class
-	private final static Logger LOGGER = Logger
-			.getLogger(PermissionCreateLecture_GUI.class);
-
 	private final JPanel contentPanel = new JPanel();
 	Client client = models.Client.clientcon.getClient();
 	String[] result;
-	private Class[] classes;
 	// private JTable table = null;
 	private JTable tablePermittedUsers = null;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
 	Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
 	// Object[] titles = { "Name", "Read", "Write", "Link", "Admin", "userID" };
 	Component c = null;
@@ -88,7 +79,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			+ "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 List<Person> map = null; // List of people who have rights
  
 	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
@@ -101,6 +91,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
 
+		@Override
 		public boolean isCellEditable(int rowIndex, int mColIndex) {
 			if (mColIndex >= 1) {
 				return true;
@@ -108,7 +99,8 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			return false;
 		}
 
-		public Class getColumnClass(int c) {
+		@Override
+		public Class<?> getColumnClass(int c) {
 			switch (c) {
 			case 0:
 				return String.class;
@@ -217,7 +209,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
 					.getPermittedUserList();
 			Iterator<person> i = listt.iterator();
 
-			int x = 0;
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
 				person temp = i.next();
@@ -236,7 +227,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
 				
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
-				x++;
 			}
 		}// end set list of permitted users
 
@@ -500,12 +490,10 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getFAQ());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
 				}
@@ -518,12 +506,10 @@ public class PermissionCreateLecture_GUI extends JFrame {
 			@Override
 			public void mousePressed(MouseEvent arg0) {
 
-				OpenLinks open = new OpenLinks();
-
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					open.openWebpage(windows);
+					OpenLinks.openWebpage(windows);
 				} catch (URISyntaxException e) {
 					e.printStackTrace();
 				}
@@ -701,6 +687,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 
 class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
 		MouseListener {
+	private static final long serialVersionUID = -132401386877928691L;
 	protected CheckBoxHeader rendererComponent;
 	protected int column;
 	protected boolean mousePressed = false;
diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
index 40956d88..ab53c43d 100644
--- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java
@@ -1,6 +1,5 @@
 package gui.lecture;
 
-import gui.image.PermissionCreateImage_GUI;
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
@@ -24,9 +23,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import javax.swing.AbstractButton;
-import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
-import javax.swing.JComboBox;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -38,7 +35,6 @@ import javax.swing.JRadioButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
 import javax.swing.JTable;
-import javax.swing.JTextField;
 import javax.swing.JTextPane;
 import javax.swing.ScrollPaneConstants;
 import javax.swing.UIManager;
@@ -49,32 +45,27 @@ import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 
-import models.Image;
 import models.Lecture;
 import models.Links;
 import models.RightsManagement;
 import models.SessionData;
 import models.person;
-import server.generated.Person;
-import server.generated.Server.Client;
+
+import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Person;
+import org.openslx.sat.thrift.iface.Server.Client;
+
 import util.CheckIntegrity;
 import util.ListAllOtherUsers_GUI;
 import util.OpenLinks;
-import javax.swing.JCheckBox;
-
-import org.apache.log4j.Logger;
-import org.apache.thrift.TException;
 
 @SuppressWarnings("serial")
 public class PermissionEditLecture_GUI extends JFrame {
 
-	private final static Logger LOGGER = Logger
-			.getLogger(PermissionCreateImage_GUI.class);
 	Client client = models.Client.clientcon.getClient();
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
 	private JTable table;
-	private Class[] classes;
 	Object[] titles = { "Name", "Lesen", "Schreiben", "Admin", "userID" };
 	private List<Person> map = null; // List of people who have rights
 	Component c = null;
@@ -93,7 +84,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 			return false;
 		}
  
-		public Class getColumnClass(int c) {
+		public Class<?> getColumnClass(int c) {
 			switch (c) {
 			case 0:
 				return String.class;
@@ -241,7 +232,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 				map = client.getPermissionForUserAndLecture(
 						SessionData.session.getAuthToken(),Lecture.lecture.getid(),person.verantwortlicher.getUserID()
 						);
-				Iterator<server.generated.Person> i = map.iterator();
+				Iterator<Person> i = map.iterator();
 
 				int x = 0;
 
diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
index cb783a59..bd387fab 100644
--- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java
@@ -7,7 +7,6 @@ import java.awt.Color;
 import java.awt.Component;

 import java.awt.FlowLayout;

 import java.awt.Font;

-import java.awt.Point;

 import java.awt.SystemColor;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

@@ -38,6 +37,7 @@ 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;

@@ -59,13 +59,11 @@ import models.SessionData;
 import models.person;

 

 import org.apache.thrift.TException;

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

+import org.openslx.sat.thrift.iface.Server.Client;

 

-import server.generated.Server.Client;

 import thrift.ThriftConnection;

-import util.GuiOrganizer;

 import util.OpenLinks;

-import javax.swing.JTextArea;

-import javax.swing.ScrollPaneConstants;

 

 @SuppressWarnings("serial")

 public class SearchLecture_GUI extends JFrame {

@@ -112,7 +110,7 @@ public class SearchLecture_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(

 			modelMyLectures);

 

-	RowFilter rf = null;

+	RowFilter<Object, Object> rf = null;

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

 

 	/**

@@ -342,9 +340,6 @@ public class SearchLecture_GUI extends JFrame {
 		tabbedPane.addChangeListener(new ChangeListener() {

 			public void stateChanged(ChangeEvent arg0) {

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

-

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

-							+ person.verantwortlicher.getVorname();

 					//rowSorterMyLectures.setRowFilter(RowFilter.regexFilter(username, 5));

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

 

@@ -627,7 +622,7 @@ public class SearchLecture_GUI extends JFrame {
 

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModel(DefaultTableModel model) throws ParseException {

-		List<server.generated.Lecture> lectures;

+		List<Lecture> lectures;

 		try {

 			

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

@@ -639,7 +634,7 @@ public class SearchLecture_GUI extends JFrame {
 				lectures = client.getLectureListPermissionRead(SessionData.session.getAuthToken());

 			}

 			

-			Iterator<server.generated.Lecture> i = lectures.iterator();

+			Iterator<Lecture> i = lectures.iterator();

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

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

 			int x = 0;

@@ -673,12 +668,12 @@ public class SearchLecture_GUI extends JFrame {
 	

 	// Initiale Beffuelung eines Table models

 	public DefaultTableModel initTableModelAll(DefaultTableModel model) throws ParseException {

-		List<server.generated.Lecture> lectures;

+		List<Lecture> lectures;

 		try {

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

 			//lectures = client.getLectureList();

 			lectures = client.getLectureList(SessionData.session.getAuthToken());

-			Iterator<server.generated.Lecture> i = lectures.iterator();

+			Iterator<Lecture> i = lectures.iterator();

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

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

 			int x = 0;

diff --git a/dozentenmodul/src/main/java/models/Client.java b/dozentenmodul/src/main/java/models/Client.java
index e249127a..1faa8620 100644
--- a/dozentenmodul/src/main/java/models/Client.java
+++ b/dozentenmodul/src/main/java/models/Client.java
@@ -1,15 +1,17 @@
 package models;
 
+import org.openslx.sat.thrift.iface.Server;
+
 public class Client {
 
-	private server.generated.Server.Client client;
+	private Server.Client client;
 	public static Client clientcon=new Client();
 
-	public server.generated.Server.Client getClient() {
+	public Server.Client getClient() {
 		return client;
 	}
 
-	public void setClient(server.generated.Server.Client client) {
+	public void setClient(Server.Client client) {
 		this.client = client;
 	}
 	
diff --git a/dozentenmodul/src/main/java/thrift/ThriftConnection.java b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
index 8b0221e8..a026ef03 100644
--- a/dozentenmodul/src/main/java/thrift/ThriftConnection.java
+++ b/dozentenmodul/src/main/java/thrift/ThriftConnection.java
@@ -9,47 +9,68 @@ import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
-import org.apache.thrift.transport.TTransportException;
-
-import server.generated.Server;
-import server.generated.Server.Client;
+import org.openslx.sat.thrift.iface.Server;
+import org.openslx.sat.thrift.iface.Server.Client;
+import org.openslx.sat.thrift.version.Version;
 
 public class ThriftConnection {
-	
-	private final static Logger LOGGER = Logger.getLogger(ThriftConnection.class);
-	
-	private String satAddress = ""+SessionData.session.getServerAdress();
-	final TTransport transport = new TSocket(satAddress, 9090);
-	
-	public ThriftConnection() {
-		// TODO Auto-generated constructor stub
-	}
-	
-	public Client getThriftConnection()
-	{
-		
+
+	private final static Logger LOGGER = Logger
+			.getLogger(ThriftConnection.class);
+
+	private String satAddress = SessionData.session.getServerAdress();
+	final TTransport transport = new TSocket(satAddress, 9090, 10000);
+
+	public Client getThriftConnection() {
+
 		try {
 			transport.open();
-		} catch (TTransportException e) {
-			LOGGER.error("Keine Verbindung möglich! Satellit: " + satAddress);
-			e.printStackTrace();
+		} catch (Exception e) {
+			LOGGER.error("Keine Verbindung möglich! Satellit: " + satAddress, e);
 			JOptionPane.showMessageDialog(null,
-					"Konnte keine Verbindung zum Satellit '" + satAddress + "' aufbauen!",
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					"Konnte keine Verbindung zum Satellit '" + satAddress
+							+ "' aufbauen!", "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 			return null;
 		}
 
 		final TProtocol protocol = new TBinaryProtocol(transport);
-		
 		final Server.Client client = new Server.Client(protocol);
-		LOGGER.info("Verbindung zu "+satAddress+" wurde aufgebaut.");
-		
+		LOGGER.info("Verbindung zu " + satAddress + " wurde aufgebaut.");
+
+		long remoteVersion;
+		try {
+			remoteVersion = client.getVersion();
+		} 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);
+		}
+
 		return client;
-	} 
+	}
 
-	public void closeThriftConnection()
-	{
-		//System.out.println("Ich funktioniere auch, wenn ich nicht geschlossen, sondern im TaskManager gekillt werde"); //works
+	public void closeThriftConnection() {
 		LOGGER.info("Verbindung wird geplant getrennt.");
 		transport.close();
 	}
diff --git a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
index ae097426..e09f0b08 100644
--- a/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
+++ b/dozentenmodul/src/main/java/util/ListAllOtherUsers_GUI.java
@@ -45,9 +45,9 @@ import models.person;
 
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
+import org.openslx.sat.thrift.iface.Person;
+import org.openslx.sat.thrift.iface.Server.Client;
 
-import server.generated.Person;
-import server.generated.Server.Client;
 import thrift.ThriftConnection;
 
 @SuppressWarnings("serial")
@@ -363,7 +363,7 @@ public class ListAllOtherUsers_GUI extends JFrame {
 			
 			//get the info
 			map = client.getAllOtherSatelliteUsers(user,SessionData.session.getAuthToken());
-			Iterator<server.generated.Person> i = map.iterator();
+			Iterator<Person> i = map.iterator();
 
 			int x = 0;
 			while (i.hasNext()) {