Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

24 files changed, 15 insertions, 230 deletions

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index 0b3c936e..e08ed5a2 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -1,9 +1,9 @@
 package models;
 
 public class Image {
+	
 	private String ImageId;
 	private String version;
-
 	private String imagename;
 	private String newName;
 	private String imagepath;
@@ -12,7 +12,6 @@ public class Image {
 	private int ram;
 	private int cpu;
 	private long filesize;
-	
 	public static Image image =new Image();
 	
 	
diff --git a/Dozentenmodul/src/Models/Lecture.java b/Dozentenmodul/src/Models/Lecture.java
index 6b7e6fa1..eae05ec5 100644
--- a/Dozentenmodul/src/Models/Lecture.java
+++ b/Dozentenmodul/src/Models/Lecture.java
@@ -4,7 +4,6 @@ import java.util.Date;
 
 public class Lecture {
 
-	
 	private String name;
 	private String newName;
 	private String shortDesc;
@@ -14,8 +13,6 @@ public class Lecture {
 	private boolean active;
 	private String id;
 	private String linkedImagename;
-	
-	
 	public static Lecture lecture =new Lecture();
 	
 
diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/Models/person.java
+++ b/Dozentenmodul/src/Models/person.java
@@ -3,9 +3,7 @@ package models;
 
 public class person{
 
-
 	private String username;
-
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
 	private String Tel;
 	private String Fakultaet;
 	private boolean ischecked;
-
-	//public static person verantowrtlicher=new person();
 	public static person verantwortlicher=new person();
 	
-	
 	public String getUsername() {
 		return username;
 	}
diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
index 308ff3b7..45331b21 100644
--- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
+++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java
@@ -8,7 +8,6 @@ import java.awt.FlowLayout;
 import java.awt.Toolkit;
 import javax.swing.JFrame;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
@@ -53,18 +52,7 @@ public class CreateImageTechnisch_GUI extends JFrame {
 	JRadioButton rdbtnInternetNein;
 	private final ButtonGroup buttonGrouplicense = new ButtonGroup();
 	private final ButtonGroup buttonGroupInternet = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateImageTechnisch_GUI dialog = new CreateImageTechnisch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index 72ee98fa..ca5408ae 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -50,11 +49,9 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 import javax.swing.ListSelectionModel;
@@ -91,19 +88,6 @@ public class DeleteImage_GUI extends JFrame {
 			modelMyImages);
 
 	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			DeleteImage_GUI dialog = new DeleteImage_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
 	 * Create the dialog.
 	 */
 	public DeleteImage_GUI() {
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 3adb426a..b1394c0e 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
@@ -41,7 +40,6 @@ import models.person;
 import org.apache.thrift.TException;
 import server.Server.Client;
 import thrift.ThriftConnection;
-//import util.XMLCreator;
 import ftp.UploadTask;
 import gui.intro.MainMenue_GUI;
 import javax.swing.JMenuItem;
@@ -80,22 +78,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JButton btnZurck = new JButton("Zur\u00FCck");
 	int progress = 0; // progress of upload
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPCreateUploader_GUI frame = new FTPCreateUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
+	
 	/**
 	 * Create the frame.
 	 */
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index 99fc034b..05846e25 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -3,7 +3,6 @@ package gui.image;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.FlowLayout;
 import java.awt.Font;
 import java.awt.SystemColor;
@@ -80,22 +79,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		EventQueue.invokeLater(new Runnable() {
-			public void run() {
-				try {
-					FTPEditUploader_GUI frame = new FTPEditUploader_GUI();
-					frame.setVisible(true);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		});
-	}
-
+	
 	/**
 	 * Create the frame.
 	 */
diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
index f9c3811b..80274087 100644
--- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java
@@ -48,10 +48,7 @@ import javax.swing.table.TableRowSorter;
 import models.Image;
 import models.Links;
 import models.person;
-//import models.person;
-
 import org.apache.thrift.TException;
-
 import server.Server.Client;
 import thrift.ThriftConnection;
 
diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
index 67472c17..ac9fb96f 100644
--- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java
@@ -15,10 +15,8 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.IOException;
-
 import javax.swing.ButtonGroup;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -33,7 +31,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Links;
 
 @SuppressWarnings("serial")
@@ -45,18 +42,7 @@ public class SearchMethodLecture_GUI extends JFrame {
 	JRadioButton rdbtnSearchByLecture;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			SearchMethodLecture_GUI dialog = new SearchMethodLecture_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
index 4d610587..7e8f2ffd 100644
--- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
+++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java
@@ -28,7 +28,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.JCheckBox;
@@ -44,8 +43,6 @@ public class VmWareLink_GUI extends JFrame {
 
 	private final JPanel contentPanel = new JPanel();
 	String[] result;
-	//String uriWindows="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
-	//String uriLinux="https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	JCheckBox chckbxNewCheckBox;
 	private JButton btnWindows;
 	
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
index 21d84e2a..8c937204 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -15,7 +14,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -39,7 +37,6 @@ import java.awt.ScrollPane;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
-
 import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 
@@ -65,18 +62,6 @@ public class CreateLectureAllgemein_GUI extends JFrame {
 	boolean isDateOrderCorrect, isDateMaxLifeTimeCorrect,
 			isAllInformationReady = false;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateLectureAllgemein_GUI dialog = new CreateLectureAllgemein_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index ff19ed13..af5a75ea 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -1,7 +1,6 @@
 package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
-
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -24,7 +23,6 @@ import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -70,19 +68,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			CreateLectureLink_GUI dialog = new CreateLectureLink_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
index ae228c1e..dd58ec60 100644
--- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -44,7 +43,6 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
@@ -78,19 +76,7 @@ public class DeleteLecture_GUI extends JFrame {
 			modelMyLectures);
 	private JButton button;
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index 67f86a13..27355602 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -15,9 +15,7 @@ import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -31,7 +29,6 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Image;
 import models.Lecture;
 import models.Links;
@@ -39,7 +36,6 @@ import models.person;
 import javax.swing.JTextArea;
 import java.awt.ScrollPane;
 import java.io.IOException;
-
 import com.toedter.calendar.JDateChooser;
 import javax.swing.JRadioButton;
 import javax.swing.ButtonGroup;
@@ -61,18 +57,7 @@ public class EditLectureAllgemein_GUI extends JFrame {
 	JDateChooser dateChooserstart;
 	JRadioButton radioButtonno;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureAllgemein_GUI dialog = new EditLectureAllgemein_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
index f995d70d..4e5641f1 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java
@@ -2,7 +2,6 @@ package gui.lecture;
 
 import gui.intro.MainMenue_GUI;
 import java.awt.Color;
-import java.awt.Desktop;
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -24,7 +23,6 @@ import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -70,19 +68,7 @@ public class EditLectureLink_GUI extends JFrame {
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureLink_GUI dialog = new EditLectureLink_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
index 7bd42034..68b0ad13 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java
@@ -22,7 +22,6 @@ import java.text.SimpleDateFormat;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -88,19 +87,7 @@ public class EditLectureSearch_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
+	
 	/**
 	 * Create the dialog.
 	 */
diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
index 8d605ef3..45413401 100644
--- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java
@@ -3,7 +3,6 @@ package gui.lecture;
 
 import gui.image.CreateImageAllgemein_GUI;
 import gui.image.FTPCreateUploader_GUI;
-
 import java.awt.Dimension;
 import java.awt.FlowLayout;
 import java.awt.Font;
@@ -11,13 +10,9 @@ import java.awt.SystemColor;
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -31,9 +26,7 @@ import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.border.EmptyBorder;
 import javax.swing.border.TitledBorder;
-
 import models.Links;
-
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
@@ -45,19 +38,7 @@ public class ExtendedSearchForImages_GUI extends JFrame {
 	String[] result;
 	private JTextField textField;
 	private JTextField textField_1;
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			ExtendedSearchForImages_GUI dialog = new ExtendedSearchForImages_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-			
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
+	
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
index 18eb411a..19497a65 100644
--- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java
@@ -19,7 +19,6 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
 import javax.swing.JButton;
-import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JMenu;
@@ -43,7 +42,6 @@ import javax.swing.event.ChangeListener;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
 import javax.swing.table.TableRowSorter;
-
 import models.Links;
 import models.person;
 import org.apache.thrift.TException;
@@ -84,18 +82,6 @@ public class SearchLecture_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterMyLectures = new TableRowSorter<TableModel>(
 			modelMyLectures);
 
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			EditLectureSearch_GUI dialog = new EditLectureSearch_GUI();
-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
 
 	/**
 	 * Create the dialog.
diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java
index 6dc587f1..42eccdec 100644
--- a/Dozentenmodul/src/models/Client.java
+++ b/Dozentenmodul/src/models/Client.java
@@ -3,7 +3,6 @@ package models;
 public class Client {
 
 	private server.Server.Client client;
-	
 	public static Client clientcon=new Client();
 
 	public server.Server.Client getClient() {
diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
index 0b3c936e..e08ed5a2 100644
--- a/Dozentenmodul/src/models/Image.java
+++ b/Dozentenmodul/src/models/Image.java
@@ -1,9 +1,9 @@
 package models;
 
 public class Image {
+	
 	private String ImageId;
 	private String version;
-
 	private String imagename;
 	private String newName;
 	private String imagepath;
@@ -12,7 +12,6 @@ public class Image {
 	private int ram;
 	private int cpu;
 	private long filesize;
-	
 	public static Image image =new Image();
 	
 	
diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java
index 6b7e6fa1..eae05ec5 100644
--- a/Dozentenmodul/src/models/Lecture.java
+++ b/Dozentenmodul/src/models/Lecture.java
@@ -4,7 +4,6 @@ import java.util.Date;
 
 public class Lecture {
 
-	
 	private String name;
 	private String newName;
 	private String shortDesc;
@@ -14,8 +13,6 @@ public class Lecture {
 	private boolean active;
 	private String id;
 	private String linkedImagename;
-	
-	
 	public static Lecture lecture =new Lecture();
 	
 
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
index 67b6b84e..0f14af51 100644
--- a/Dozentenmodul/src/models/person.java
+++ b/Dozentenmodul/src/models/person.java
@@ -3,9 +3,7 @@ package models;
 
 public class person{
 
-
 	private String username;
-
 	private String Name;
 	private String Vorname;
 	private String Hochschule;
@@ -13,11 +11,8 @@ public class person{
 	private String Tel;
 	private String Fakultaet;
 	private boolean ischecked;
-
-	//public static person verantowrtlicher=new person();
 	public static person verantwortlicher=new person();
 	
-	
 	public String getUsername() {
 		return username;
 	}
diff --git a/Dozentenmodul/src/models/user.java b/Dozentenmodul/src/models/user.java
index be64937f..9aa958a4 100644
--- a/Dozentenmodul/src/models/user.java
+++ b/Dozentenmodul/src/models/user.java
@@ -4,6 +4,7 @@ public class user {
 	
 	private String userName;
 	private String Password;
+	
 	public String getUserName() {
 		return userName;
 	}
diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java
index 760b8bd0..11a27368 100644
--- a/Dozentenmodul/src/thrift/MasterThriftConnection.java
+++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java
@@ -15,6 +15,8 @@ import thrift.ImageServer.Client;
 public class MasterThriftConnection {
 	
 	public static final String MASTERSERVERIP="132.230.4.16"; 
+	//public static final String MASTERSERVERIP="127.0.0.1"; 
+	
 	final TTransport transport = new TSocket(MASTERSERVERIP, 9090);
 	
 	public Client getMasterThriftConnection()