new commit

37 files changed, 476 insertions, 7 deletions

diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
index 55635a3d..9dd8d00c 100644
--- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
index 29f2a80d..5cc49090 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
index eefe174e..9bb444b5 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
index 6801b996..e2caddfd 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
index b6a1e26e..59a0ff9e 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/GUI/MainMenue_GUI.class b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
index 6faa718f..c52b2e1a 100644
--- a/Dozentenmodul/bin/GUI/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/GUI/MainMenue_GUI.class
diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class
index dfcc1d27..fcd1a276 100644
--- a/Dozentenmodul/bin/Models/Image.class
+++ b/Dozentenmodul/bin/Models/Image.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class
new file mode 100644
index 00000000..6139b7dc
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class
new file mode 100644
index 00000000..214998fb
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class
new file mode 100644
index 00000000..1ab047a4
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class
new file mode 100644
index 00000000..9382863b
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class
new file mode 100644
index 00000000..0e845cc7
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$5.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class
new file mode 100644
index 00000000..63b957b6
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$6.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
new file mode 100644
index 00000000..a943d210
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$7.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class b/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class
new file mode 100644
index 00000000..a1eb0a54
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI$8.class
diff --git a/Dozentenmodul/bin/gui/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/DeleteImage_GUI.class
new file mode 100644
index 00000000..ad9c8803
--- /dev/null
+++ b/Dozentenmodul/bin/gui/DeleteImage_GUI.class
diff --git a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
index 55635a3d..9dd8d00c 100644
--- a/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
+++ b/Dozentenmodul/bin/gui/FTPDownloader_GUI.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
index 29f2a80d..5cc49090 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$1.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class
index eefe174e..9bb444b5 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$2.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$2.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class
index 6801b996..e2caddfd 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$3.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$3.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
index b6a1e26e..59a0ff9e 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI$4.class
diff --git a/Dozentenmodul/bin/gui/MainMenue_GUI.class b/Dozentenmodul/bin/gui/MainMenue_GUI.class
index 6faa718f..c52b2e1a 100644
--- a/Dozentenmodul/bin/gui/MainMenue_GUI.class
+++ b/Dozentenmodul/bin/gui/MainMenue_GUI.class
diff --git a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
index 94e1e05d..702b7f67 100644
--- a/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/GUI/FTPDownloader_GUI.java
@@ -47,7 +47,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	JLabel downspeed;
 	User user;
 	JProgressBar progressBar;
-	String host="141.79.128.121";
+	String host="141.79.1+ü28.121";
 	int port=21;
 	String username="openslx";
 	String password="openslx-ng";
diff --git a/Dozentenmodul/src/GUI/MainMenue_GUI.java b/Dozentenmodul/src/GUI/MainMenue_GUI.java
index ddf89269..17b94397 100644
--- a/Dozentenmodul/src/GUI/MainMenue_GUI.java
+++ b/Dozentenmodul/src/GUI/MainMenue_GUI.java
@@ -41,6 +41,7 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnImageEdit;

 	JRadioButton rdbtnImageSearchDownload;

 	JRadioButton rdbtnVeranstaltungNew;

+	JRadioButton rdbtnImageDelete;

 	private final ButtonGroup buttonGroup = new ButtonGroup();

 	/**

 	 * Launch the application.

@@ -131,7 +132,8 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);

 		rdbtnImageEdit.setBackground(SystemColor.menu);

 		

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

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

+		rdbtnImageDelete.setEnabled(false);

 		buttonGroup.add(rdbtnImageDelete);

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

 		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);

@@ -140,6 +142,7 @@ public class MainMenue_GUI extends JFrame {
 		panelImage.add(rdbtnImageDelete);

 		

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

+		rdbtnImageSearchDownload.setEnabled(false);

 		buttonGroup.add(rdbtnImageSearchDownload);

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

 		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);

@@ -180,6 +183,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);

 		

 		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");

+		rdbtnVeranstaltungEdit.setEnabled(false);

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

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

 		panelVeranstaltung.add(rdbtnVeranstaltungEdit);

@@ -187,6 +191,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);

 		

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

+		rdbtnVeranstaltungDelete.setEnabled(false);

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

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

 		panelVeranstaltung.add(rdbtnVeranstaltungDelete);

@@ -194,6 +199,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);

 		

 		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");

+		rdbtnVeranstaltungSearch.setEnabled(false);

 		buttonGroup.add(rdbtnVeranstaltungSearch);

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

 		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);

@@ -285,7 +291,13 @@ public class MainMenue_GUI extends JFrame {
 							SearchMethod_GUI sm=new SearchMethod_GUI();

 							sm.setVisible(true);

 							dispose();

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

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

+						{

+							DeleteImage_GUI di=new DeleteImage_GUI();

+							di.setVisible(true);

+							dispose();

+						}

+						else if(rdbtnVeranstaltungNew.isSelected()==true)

 						{

 							EingabeVeranstaltungAllgemein_GUI av=new EingabeVeranstaltungAllgemein_GUI();

 							av.setVisible(true);

diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java
index f16a7594..2a8c4fcd 100644
--- a/Dozentenmodul/src/Models/Image.java
+++ b/Dozentenmodul/src/Models/Image.java
@@ -2,6 +2,7 @@ package models;
 
 public class Image {
 	private String imagename;
+	private String newName;
 	private boolean licensed;
 	private boolean internet;
 	private int ram;
@@ -39,5 +40,10 @@ public class Image {
 	public void setCpu(int cpu) {
 		this.cpu = cpu;
 	}
-	
+	public String getNewName() {
+		return newName;
+	}
+	public void setNewName(String newName) {
+		this.newName = newName;
+	}
 }
diff --git a/Dozentenmodul/src/gui/DeleteImage_GUI.java b/Dozentenmodul/src/gui/DeleteImage_GUI.java
new file mode 100644
index 00000000..de6d4123
--- /dev/null
+++ b/Dozentenmodul/src/gui/DeleteImage_GUI.java
@@ -0,0 +1,439 @@
+package gui;
+
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.SystemColor;
+import java.awt.Toolkit;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.KeyAdapter;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+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;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+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.JTextField;
+import javax.swing.JTextPane;
+import javax.swing.RowFilter;
+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.table.DefaultTableModel;
+import javax.swing.table.TableModel;
+import javax.swing.table.TableRowSorter;
+
+import org.apache.thrift.TException;
+
+import server.Server.Client;
+import thrift.ThriftConnection;
+
+@SuppressWarnings("serial")
+public class DeleteImage_GUI extends JFrame {
+
+	private final JPanel contentPanel = new JPanel();
+	String[] result;
+	JRadioButton rdbtnInternetJa;
+	JRadioButton rdbtnInternetNein;
+	JComboBox<String> comboBox;
+	JTable tableAllImages;
+	JTable tablemyImages;
+	private JTextField textFieldName;
+	JTabbedPane tabbedPane;
+	String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"};
+    ThriftConnection con=new ThriftConnection();
+    Client client=con.getThriftConnection();
+    final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 );
+    final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 );
+    final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll );
+    final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( 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() {
+		addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosing(WindowEvent arg0) {
+				//Beendet die Anwendung nach klick auf X
+				System.exit(0);
+			}
+		});
+		//Verhindert das Vergrößern Des Fensters
+		setResizable(false);
+		
+		try {
+			//Setzt das Look & Feel auf System
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+		} catch (ClassNotFoundException | InstantiationException
+				| IllegalAccessException | UnsupportedLookAndFeelException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		//Setzt den Fenstertitel
+		setTitle("bwLehrpool Suite *Prototyp*");
+		//Zentriert das Fenster in die Bildmitte
+		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+		int top=(screenSize.height - 722) / 2;
+		int left=(screenSize.width - 603) / 2;
+		setBounds(left, top, 603, 722);
+		
+
+		
+		final DefaultTableModel model = new DefaultTableModel( titles, 0 );
+		
+		
+		getContentPane().setLayout(null);
+		{
+			JPanel panel = new JPanel();
+			panel.setBackground(SystemColor.menu);
+			panel.setBounds(10, 11, 577, 57);
+			getContentPane().add(panel);
+			panel.setLayout(null);
+			{
+				JLabel lblNewLabel = new JLabel("Suche nach VL-Image");
+				lblNewLabel.setBounds(10, 11, 509, 22);
+				panel.add(lblNewLabel);
+				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
+			}
+			
+			JTextPane txtpnBitteWhlenSie = new JTextPane();
+			txtpnBitteWhlenSie.setEditable(false);
+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+			txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen");
+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
+			panel.add(txtpnBitteWhlenSie);
+		}
+		contentPanel.setBounds(10, 85, 577, 531);
+		contentPanel.setBackground(SystemColor.menu);
+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+		getContentPane().add(contentPanel);
+		contentPanel.setLayout(null);
+		
+		JPanel panel_1 = new JPanel();
+		panel_1.setBackground(SystemColor.menu);
+		panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBounds(10, 49, 557, 131);
+		contentPanel.add(panel_1);
+		panel_1.setLayout(null);
+		
+		JLabel lblNewLabel_2 = new JLabel("Anzeigename:");
+		lblNewLabel_2.setBounds(10, 30, 250, 20);
+		panel_1.add(lblNewLabel_2);
+		
+		JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:");
+		lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
+		panel_1.add(lblInternetIstInnerhalb);
+		
+		textFieldName = new JTextField();
+		//Key Listener der Tastatureingabe registriert
+		textFieldName.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				//Textfield eingabe auslesen
+				String stext=textFieldName.getText();
+
+				//Wenn Textfield nicht leer
+				if(stext!="")
+				{
+					//Filtere nach der Eingabe
+					rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0));
+					
+				}
+		}});
+
+
+		textFieldName.setBounds(270, 30, 250, 20);
+		panel_1.add(textFieldName);
+		textFieldName.setColumns(10);
+		
+		JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>");
+		lblErweiterteSuche.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				//Öffnet das Fenster Extended GUI
+				ExtendedSearch_GUI es=new ExtendedSearch_GUI();
+				es.setVisible(true);
+			}
+		});
+		lblErweiterteSuche.setForeground(Color.BLUE);
+		
+		lblErweiterteSuche.setBounds(431, 106, 89, 14);
+		panel_1.add(lblErweiterteSuche);
+		
+		comboBox = new JComboBox<String>();
+		try {
+			//Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server
+			List<String> list=client.getAllOS();
+			//Leeres Item hinzufügen
+			comboBox.addItem("");
+			for(int i=0;i<list.size();i++)
+			{
+				//Hinzufügen der verfügbaren Betriebssysteme
+				comboBox.addItem(list.get(i));
+			}
+		} catch (TException e2) {
+			// TODO Auto-generated catch block
+			e2.printStackTrace();
+		}
+		//Registriert Auswahländerungen der Box
+		comboBox.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				//Prüft das die Auswahl nicht leer ist
+				if(comboBox.getSelectedItem().toString()!="")
+				{
+					//Filtert nach dem ausgewählten Betriebssystem
+					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2));
+				}							
+			}
+			
+		});
+		comboBox.setBounds(270, 58, 250, 20);
+		panel_1.add(comboBox);
+		
+		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+		lblHauptmen.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseClicked(MouseEvent arg0) {
+				//Öffnet das Hauütmenü
+				DeleteImage_GUI.this.setVisible(false);
+				MainMenue_GUI main=new MainMenue_GUI();
+				main.setVisible(true);
+			}
+		});
+		lblHauptmen.setForeground(Color.BLUE);
+		lblHauptmen.setBounds(10, 11, 61, 14);
+		contentPanel.add(lblHauptmen);
+		
+		JLabel label_1 = new JLabel(">");
+		label_1.setBounds(69, 11, 13, 14);
+		contentPanel.add(label_1);
+		
+		JLabel lblVlimage = new JLabel("VL-Image");
+		lblVlimage.setForeground(Color.BLUE);
+		lblVlimage.setBounds(81, 11, 45, 14);
+		contentPanel.add(lblVlimage);
+		
+		JLabel label_2 = new JLabel(">");
+		label_2.setBounds(133, 11, 13, 14);
+		contentPanel.add(label_2);
+		
+		JLabel lblNewLabel_1 = new JLabel("Imageauswahl");
+		lblNewLabel_1.setBounds(146, 11, 85, 14);
+		contentPanel.add(lblNewLabel_1);
+		
+		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+		tabbedPane.addChangeListener(new ChangeListener() {
+			public void stateChanged(ChangeEvent arg0) {
+				System.out.println(tabbedPane.getSelectedIndex());
+				if(tabbedPane.getSelectedIndex()==0){
+					
+					
+					
+				}
+				else if(tabbedPane.getSelectedIndex()==1){
+					String username="Spitzer Tobias";
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4));
+					//rowSorterMyImages.toggleSortOrder(0);	
+				}
+				
+			}
+		});
+
+		tabbedPane.setBounds(10, 197, 557, 300);
+		contentPanel.add(tabbedPane);
+		
+		JScrollPane scrollPaneMyImage = new JScrollPane();
+		tablemyImages=new JTable();
+		tablemyImages.setModel(modelMyImages);
+		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		initTableModel(modelMyImages);
+		tablemyImages.setRowSorter(rowSorterMyImages);
+		initTableModel(modelAll);
+
+		scrollPaneMyImage.setViewportView(tablemyImages);
+		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
+		
+		JScrollPane scrollPaneCoopImages = new JScrollPane();
+		JTable tableCoopImages=new JTable();
+		tableCoopImages.setModel(model);
+		tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		tableAllImages=new JTable();
+		tableAllImages.setModel(modelAll);
+		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
+		tableAllImages.setRowSorter(rowSorterAll);
+		
+				scrollPaneAllImages.setViewportView(tableAllImages);
+				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
+
+		scrollPaneCoopImages.setViewportView(tableCoopImages);
+		tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null);
+		tabbedPane.setEnabledAt(2, false);
+		
+		JScrollPane scrollPanePublicImages = new JScrollPane();
+		JTable tablePublicImages=new JTable();
+		tablePublicImages.setModel(model);
+		tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPanePublicImages.setViewportView(tablePublicImages);
+		tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null);
+		tabbedPane.setEnabledAt(3, false);
+		
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+		JTable tablePublicVorlagen=new JTable();
+		tablePublicVorlagen.setModel(model);
+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
+
+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
+		tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null);
+		tabbedPane.setEnabledAt(4, false);
+		
+		
+		
+
+		JButton btnDelete = new JButton("L\u00F6schen");
+		btnDelete.addActionListener(new ActionListener() {
+			public void actionPerformed(ActionEvent arg0) {
+				//Öffnet den Downloader
+				FTPDownloader_GUI down=new FTPDownloader_GUI("Test");
+				down.setVisible(true);
+				DeleteImage_GUI.this.setVisible(false);
+			}
+		});
+		btnDelete.setBounds(449, 508, 118, 23);
+		contentPanel.add(btnDelete);
+		{
+			JPanel buttonPane = new JPanel();
+			buttonPane.setBounds(0, 640, 597, 33);
+			buttonPane.setBackground(SystemColor.menu);
+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+			getContentPane().add(buttonPane);
+			{
+				JButton mainButton = new JButton("Hauptmen\u00FC");
+				mainButton.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+
+						EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI();
+						ea.setVisible(true);
+						dispose();
+						
+					}
+				});
+				mainButton.setActionCommand("Cancel");
+				buttonPane.add(mainButton);
+			}
+		}
+		
+		JSeparator separator = new JSeparator();
+		separator.setBounds(0, 78, 597, 2);
+		getContentPane().add(separator);
+		
+		JSeparator separator_1 = new JSeparator();
+		separator_1.setBounds(0, 627, 597, 2);
+		getContentPane().add(separator_1);
+		
+		JMenuBar menuBar = new JMenuBar();
+		setJMenuBar(menuBar);
+		
+		JMenu mnNewMenu_1 = new JMenu("Hilfe");
+		menuBar.add(mnNewMenu_1);
+		
+		JMenuItem mntmFaq = new JMenuItem("FAQ");
+		mnNewMenu_1.add(mntmFaq);
+		
+		JMenuItem mntmOtrs = new JMenuItem("OTRS");
+		mnNewMenu_1.add(mntmOtrs);
+		
+	}
+	//Initiale Beffülung eines Table models
+	public DefaultTableModel initTableModel(DefaultTableModel model){
+		List<server.Image> images;
+		try {
+			//Hole eine Liste der Images
+			
+			images = client.getImageList();
+			Iterator<server.Image> i=images.iterator();
+			
+			int x=0;
+			
+			while(i.hasNext())
+			{
+				//erzeuge Objekte für die Tabelle
+				Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()};
+				//Füge diese Objekte der Tabelle hinzu
+				model.addRow(obj);
+				x++;
+				i.next();
+				
+			}
+			
+			return model;
+		} catch (TException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
+		return model;
+	}
+	
+	}
+
+
diff --git a/Dozentenmodul/src/gui/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
index 94e1e05d..702b7f67 100644
--- a/Dozentenmodul/src/gui/FTPDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/FTPDownloader_GUI.java
@@ -47,7 +47,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener
 	JLabel downspeed;
 	User user;
 	JProgressBar progressBar;
-	String host="141.79.128.121";
+	String host="141.79.1+ü28.121";
 	int port=21;
 	String username="openslx";
 	String password="openslx-ng";
diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java
index 4e45a030..b879ccf1 100644
--- a/Dozentenmodul/src/gui/MainMenue_GUI.java
+++ b/Dozentenmodul/src/gui/MainMenue_GUI.java
@@ -41,6 +41,7 @@ public class MainMenue_GUI extends JFrame {
 	JRadioButton rdbtnImageEdit;
 	JRadioButton rdbtnImageSearchDownload;
 	JRadioButton rdbtnVeranstaltungNew;
+	JRadioButton rdbtnImageDelete;
 	private final ButtonGroup buttonGroup = new ButtonGroup();
 	/**
 	 * Launch the application.
@@ -131,7 +132,8 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);
 		rdbtnImageEdit.setBackground(SystemColor.menu);
 		
-		JRadioButton rdbtnImageDelete = new JRadioButton("L\u00F6schen");
+		rdbtnImageDelete = new JRadioButton("L\u00F6schen");
+		rdbtnImageDelete.setEnabled(false);
 		buttonGroup.add(rdbtnImageDelete);
 		rdbtnImageDelete.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
 		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);
@@ -140,6 +142,7 @@ public class MainMenue_GUI extends JFrame {
 		panelImage.add(rdbtnImageDelete);
 		
 		rdbtnImageSearchDownload = new JRadioButton("Suche und Download");
+		rdbtnImageSearchDownload.setEnabled(false);
 		buttonGroup.add(rdbtnImageSearchDownload);
 		rdbtnImageSearchDownload.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
 		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);
@@ -180,6 +183,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);
 		
 		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");
+		rdbtnVeranstaltungEdit.setEnabled(false);
 		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");
 		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);
 		panelVeranstaltung.add(rdbtnVeranstaltungEdit);
@@ -187,6 +191,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);
 		
 		JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen");
+		rdbtnVeranstaltungDelete.setEnabled(false);
 		rdbtnVeranstaltungDelete.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
 		rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23);
 		panelVeranstaltung.add(rdbtnVeranstaltungDelete);
@@ -194,6 +199,7 @@ public class MainMenue_GUI extends JFrame {
 		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);
 		
 		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");
+		rdbtnVeranstaltungSearch.setEnabled(false);
 		buttonGroup.add(rdbtnVeranstaltungSearch);
 		rdbtnVeranstaltungSearch.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
 		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);
@@ -285,7 +291,13 @@ public class MainMenue_GUI extends JFrame {
 							SearchMethod_GUI sm=new SearchMethod_GUI();
 							sm.setVisible(true);
 							dispose();
-						}else if(rdbtnVeranstaltungNew.isSelected()==true)
+						}else if(rdbtnImageDelete.isSelected()==true)
+						{
+							DeleteImage_GUI di=new DeleteImage_GUI();
+							di.setVisible(true);
+							dispose();
+						}
+						else if(rdbtnVeranstaltungNew.isSelected()==true)
 						{
 							EingabeVeranstaltungAllgemein_GUI av=new EingabeVeranstaltungAllgemein_GUI();
 							av.setVisible(true);
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class
new file mode 100644
index 00000000..87cec09d
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class
new file mode 100644
index 00000000..5bc6fd96
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class
new file mode 100644
index 00000000..5e55a2a1
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class
new file mode 100644
index 00000000..948c4d4b
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImages$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImages$1.class
new file mode 100644
index 00000000..6a95dd5c
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImages$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class
new file mode 100644
index 00000000..6e937558
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class
new file mode 100644
index 00000000..69a9ccae
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class
new file mode 100644
index 00000000..bb98cab8
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata$1.class
diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class
new file mode 100644
index 00000000..38d88ec0
--- /dev/null
+++ b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata$1.class