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

Conflicts:
	Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class
fsad

9 files changed, 696 insertions, 583 deletions

diff --git a/Dozentenmodul/src/ftp/DownloadTask.java b/Dozentenmodul/src/ftp/DownloadTask.java
index a71556e7..5592adba 100644
--- a/Dozentenmodul/src/ftp/DownloadTask.java
+++ b/Dozentenmodul/src/ftp/DownloadTask.java
@@ -110,7 +110,7 @@ public class DownloadTask extends SwingWorker<Void, Void> {
 		} else if(!isCancelled() && percentCompleted != 100){
 			System.out.println("Datein wurde unvollständig heruntergeladen");
 			JOptionPane.showMessageDialog(null,
-					"Datein wurde unvollständig heruntergeladen. Bitte wiederholen.", "Message",
+					"Datei wurde unvollständig heruntergeladen. Bitte wiederholen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
 		}
 	}
diff --git a/Dozentenmodul/src/ftp/UploadTask.java b/Dozentenmodul/src/ftp/UploadTask.java
index 2196a80e..e7ebe43b 100644
--- a/Dozentenmodul/src/ftp/UploadTask.java
+++ b/Dozentenmodul/src/ftp/UploadTask.java
@@ -101,7 +101,7 @@ public class UploadTask extends SwingWorker<Void, Void> {
 		} else if(!isCancelled() && percentCompleted != 100){
 			System.out.println("Datein wurde unvollständig hochgeladen");
 			JOptionPane.showMessageDialog(null,
-					"Datein wurde unvollständig hochgeladen. Bitte wiederholen.", "Message",
+					"Datei wurde unvollständig hochgeladen. Bitte wiederholen.", "Message",
 					JOptionPane.INFORMATION_MESSAGE);
 		}
 	}
diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
index e17a79d2..9e69dbd4 100644
--- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java
@@ -91,25 +91,26 @@ public class DeleteImage_GUI extends JFrame {
 	JTable tablePublicVorlagen;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
-	boolean activeSearch=false;
+	boolean activeSearch = false;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "ID", "Version","Template" };
+			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
-	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
+			0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
@@ -129,13 +130,14 @@ public class DeleteImage_GUI extends JFrame {
 				con.closeThriftConnection();
 				System.exit(0);
 			}
+
 			@Override
 			public void windowOpened(WindowEvent arg0) {
 				initTableModel(modelAll);
 				initTableModel(modelMyImages);
 				initTableModel(modelPublicVorlagen);
-				
-				//�bernehmen in aandere
+
+				// �bernehmen in aandere
 				tablemyImages.getColumnModel().getColumn(1).setWidth(0);
 				tablemyImages.getColumnModel().getColumn(1).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -149,17 +151,25 @@ public class DeleteImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7)
+						.setMaxWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -172,13 +182,13 @@ public class DeleteImage_GUI extends JFrame {
 				tableAllImages.getColumnModel().getColumn(7).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tableAllImages.getColumnModel().getColumn(7).setMaxWidth(0);
-				//bis hier
+				// bis hier
 				textFieldName.requestFocusInWindow();
 			}
 		});
 		// Verhindert das Vergroessern Des Fensters
 		setResizable(false);
-		
+
 		try {
 			// Setzt das Look & Feel auf System
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -250,7 +260,7 @@ public class DeleteImage_GUI extends JFrame {
 
 				// Wenn Textfield nicht leer
 				if (stext != "") {
-					activeSearch=true;
+					activeSearch = true;
 					// Filtere nach der Eingabe
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
@@ -259,8 +269,8 @@ public class DeleteImage_GUI extends JFrame {
 					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
 
-				}else{
-					activeSearch=false;
+				} else {
+					activeSearch = false;
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
@@ -278,7 +288,8 @@ public class DeleteImage_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			// Holt sich eine Liste aller verf\u00FCgbaren Betriebssysteme vom Server
+			// Holt sich eine Liste aller verf\u00FCgbaren Betriebssysteme vom
+			// Server
 			List<String> list = client.getAllOS();
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
@@ -290,23 +301,23 @@ public class DeleteImage_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e2.getCause()+"\n"+e2.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		// Registriert Auswahlaenderungen der Box
 		comboBox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				// Prueft das die Auswahl nicht leer ist
 				if (comboBox.getSelectedItem().toString() != "") {
-					activeSearch=true;
+					activeSearch = true;
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
 							.getSelectedItem().toString(), 2));
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
 					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
-				}else{
-					activeSearch=false;
+				} else {
+					activeSearch = false;
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
@@ -330,7 +341,7 @@ public class DeleteImage_GUI extends JFrame {
 				con.closeThriftConnection();
 
 				// oeffnet das Hauuetmenue
-				
+
 				DeleteImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -361,50 +372,49 @@ public class DeleteImage_GUI extends JFrame {
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
 				System.out.println(tabbedPane.getSelectedIndex());
-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) {
-					
+				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
+
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					// String username="Spitzer Tobias";
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							username, 4));
-				}else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){
-					//System.out.println("Yeah");
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8));
-				} else if(tabbedPane.getSelectedIndex()==2 && activeSearch==false){
+				} else if (tabbedPane.getSelectedIndex() == 1
+						&& activeSearch == false) {
+					// System.out.println("Yeah");
+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
+							"true", 8));
+				} else if (tabbedPane.getSelectedIndex() == 2
+						&& activeSearch == false) {
 					rowSorterAll.setRowFilter(null);
-				} 
+				}
 
 			}
 		});
 
 		tabbedPane.setBounds(10, 158, 557, 339);
 		contentPanel.add(tabbedPane);
-		
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
-	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-	    {
-	        public void valueChanged(ListSelectionEvent e)
-	        {
-	        	String imageid = modelMyImages
-						.getValueAt(
+		tablemyImages.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+						String imageid = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
-						.toString();
-	        	System.out.println(imageid);
-	        	String version = modelMyImages
-						.getValueAt(
+								.toString();
+						System.out.println(imageid);
+						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
-						.toString();
-	        	System.out.println(version);
-	        	writeImageData(imageid, version);
-	        }
-	    });
+								.toString();
+						System.out.println(version);
+						writeImageData(imageid, version);
+					}
+				});
 		tablemyImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
@@ -416,8 +426,6 @@ public class DeleteImage_GUI extends JFrame {
 
 		scrollPaneMyImage.setViewportView(tablemyImages);
 		tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null);
-		
-
 
 		JScrollPane scrollPaneCoopImages = new JScrollPane();
 		JTable tableCoopImages = new JTable();
@@ -428,93 +436,86 @@ public class DeleteImage_GUI extends JFrame {
 		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		
-				JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-				tablePublicVorlagen = new JTable();
-			    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-			    {
-			        public void valueChanged(ListSelectionEvent e)
-			        {
-			        	String imageid = modelPublicVorlagen
+
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+		tablePublicVorlagen = new JTable();
+		tablePublicVorlagen.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+						String imageid = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-			        	System.out.println(imageid);
-			        	String version = modelPublicVorlagen
+						System.out.println(imageid);
+						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-			        	System.out.println(version);
-			        	writeImageData(imageid, version);
-			        }
-			    });
-				tablePublicVorlagen.setModel(modelPublicVorlagen);
-				tablePublicVorlagen
-						.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				
-				tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-				tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-				scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-				tabbedPane.addTab("Vorlagen", null,
-						scrollPanePublicVorlagen, null);
-		
-				JScrollPane scrollPaneAllImages = new JScrollPane();
-				tableAllImages = new JTable();
-			    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-			    {
-			        public void valueChanged(ListSelectionEvent e)
-			        {
-
-			        	String imageid = modelAll
-								.getValueAt(
-										tableAllImages
-												.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()), 6)
+						System.out.println(version);
+						writeImageData(imageid, version);
+					}
+				});
+		tablePublicVorlagen.setModel(modelPublicVorlagen);
+		tablePublicVorlagen
+				.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+
+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
+		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);
+
+		JScrollPane scrollPaneAllImages = new JScrollPane();
+		tableAllImages = new JTable();
+		tableAllImages.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+
+						String imageid = modelAll.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 6)
 								.toString();
-			        	System.out.println(imageid);
-			        	String version = modelAll
-								.getValueAt(
-										tableAllImages
-												.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()), 7)
+						System.out.println(imageid);
+						String version = modelAll.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 7)
 								.toString();
-			        	System.out.println(version);
-			        	writeImageData(imageid, version);
-
-			        }
-			    });
-				tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
-				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);
+						System.out.println(version);
+						writeImageData(imageid, version);
+
+					}
+				});
+		tableAllImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		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("bwLehrpool", null, scrollPaneCoopImages,
-				null);
+		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null);
 		tabbedPane.setEnabledAt(3, false);
-		
 
 		JButton btnDelete = new JButton("L\u00F6schen");
 		btnDelete.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 
-				String imageid="";
-				String imageversion="";
+				String imageid = "";
+				String imageversion = "";
 				int eingabe;
 				String username = person.verantwortlicher.getName() + " "
 						+ person.verantwortlicher.getVorname();
@@ -522,8 +523,8 @@ public class DeleteImage_GUI extends JFrame {
 
 					// frage, soll das selektierte Daten geloescht werden?
 					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?",
-							JOptionPane.YES_NO_OPTION);
+							"Wollen Sie diese Daten l\u00f6schen?",
+							"L\u00f6schen?", JOptionPane.YES_NO_OPTION);
 
 					if (eingabe == JOptionPane.YES_OPTION) {
 
@@ -550,20 +551,17 @@ public class DeleteImage_GUI extends JFrame {
 								System.out.println(imageid);
 								System.out.println(imageversion);
 								try {
-									client.deleteImageServer(imageid, imageversion);
+									client.deleteImageServer(imageid,
+											imageversion);
 									if (client.deleteImageData(imageid,
 											imageversion)) {
 										// if (client.deleteImageServer(imageid
 										// ,imageversion)) {
-										
-										
-										
-										
+
 										DeleteImage_GUI di = new DeleteImage_GUI();
 										di.setVisible(true);
 										dispose();
-										
-										
+
 										/*
 										 * } else {
 										 * 
@@ -585,52 +583,68 @@ public class DeleteImage_GUI extends JFrame {
 								} catch (HeadlessException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								} catch (TException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								}
 
 							} else {
-								
-								JOptionPane.showMessageDialog(null,
-										"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
-										"Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE);
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
+												"Verlinkung vorhanden",
+												JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-							JOptionPane.showMessageDialog(null,
-									e.getCause()+"\n"+e.getStackTrace(),
+							JOptionPane.showMessageDialog(null, e.getCause()
+									+ "\n" + e.getStackTrace(),
 									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 					}
 
-				}else if (tablePublicVorlagen.getSelectedRowCount() != 0 && modelPublicVorlagen.getValueAt(tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen
-												.getSelectedRow()), 4).equals(username)) {
+				} else if (tablePublicVorlagen.getSelectedRowCount() != 0
+						&& modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 4)
+								.equals(username)) {
 
 					// frage, soll das selektierte Daten geloescht werden?
 					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?",
-							JOptionPane.YES_NO_OPTION);
+							"Wollen Sie diese Daten l\u00f6schen?",
+							"L\u00f6schen?", JOptionPane.YES_NO_OPTION);
 
 					if (eingabe == JOptionPane.YES_OPTION) {
 
-						imageid = modelPublicVorlagen.getValueAt(
-								tablePublicVorlagen
-										.convertRowIndexToModel(tablePublicVorlagen
-												.getSelectedRow()), 6)
+						imageid = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 6)
 								.toString();
 
-						imageversion = modelPublicVorlagen.getValueAt(
-								tablePublicVorlagen
-										.convertRowIndexToModel(tablePublicVorlagen
-												.getSelectedRow()), 7)
+						imageversion = modelPublicVorlagen
+								.getValueAt(
+										tablePublicVorlagen
+												.convertRowIndexToModel(tablePublicVorlagen
+														.getSelectedRow()), 7)
 								.toString();
 
 						// TODO
@@ -644,20 +658,17 @@ public class DeleteImage_GUI extends JFrame {
 								System.out.println(imageid);
 								System.out.println(imageversion);
 								try {
-									client.deleteImageServer(imageid, imageversion);
+									client.deleteImageServer(imageid,
+											imageversion);
 									if (client.deleteImageData(imageid,
 											imageversion)) {
 										// if (client.deleteImageServer(imageid
 										// ,imageversion)) {
-										
-										
-										
-										
+
 										DeleteImage_GUI di = new DeleteImage_GUI();
 										di.setVisible(true);
 										dispose();
-										
-										
+
 										/*
 										 * } else {
 										 * 
@@ -679,39 +690,52 @@ public class DeleteImage_GUI extends JFrame {
 								} catch (HeadlessException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								} catch (TException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								}
 
 							} else {
-								
-								JOptionPane.showMessageDialog(null,
-										"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
-										"Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE);
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
+												"Verlinkung vorhanden",
+												JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-							JOptionPane.showMessageDialog(null,
-									e.getCause()+"\n"+e.getStackTrace(),
+							JOptionPane.showMessageDialog(null, e.getCause()
+									+ "\n" + e.getStackTrace(),
 									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 					}
 
-				}else if (tableAllImages.getSelectedRowCount() != 0&&modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages
-						.getSelectedRow()), 4).equals(username)) {
+				} else if (tableAllImages.getSelectedRowCount() != 0
+						&& modelAll.getValueAt(
+								tableAllImages
+										.convertRowIndexToModel(tableAllImages
+												.getSelectedRow()), 4).equals(
+								username)) {
 
 					// frage, soll das selektierte Daten geloescht werden?
 					eingabe = JOptionPane.showConfirmDialog(null,
-							"Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?",
-							JOptionPane.YES_NO_OPTION);
+							"Wollen Sie diese Daten l\u00f6schen?",
+							"L\u00f6schen?", JOptionPane.YES_NO_OPTION);
 
 					if (eingabe == JOptionPane.YES_OPTION) {
 
@@ -738,20 +762,17 @@ public class DeleteImage_GUI extends JFrame {
 								System.out.println(imageid);
 								System.out.println(imageversion);
 								try {
-									client.deleteImageServer(imageid, imageversion);
+									client.deleteImageServer(imageid,
+											imageversion);
 									if (client.deleteImageData(imageid,
 											imageversion)) {
 										// if (client.deleteImageServer(imageid
 										// ,imageversion)) {
-										
-										
-										
-										
+
 										DeleteImage_GUI di = new DeleteImage_GUI();
 										di.setVisible(true);
 										dispose();
-										
-										
+
 										/*
 										 * } else {
 										 * 
@@ -773,34 +794,42 @@ public class DeleteImage_GUI extends JFrame {
 								} catch (HeadlessException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								} catch (TException e) {
 									// TODO Auto-generated catch block
 									e.printStackTrace();
-									JOptionPane.showMessageDialog(null,
-											e.getCause()+"\n"+e.getStackTrace(),
-											"Debug-Message", JOptionPane.ERROR_MESSAGE);
+									JOptionPane.showMessageDialog(
+											null,
+											e.getCause() + "\n"
+													+ e.getStackTrace(),
+											"Debug-Message",
+											JOptionPane.ERROR_MESSAGE);
 								}
 
 							} else {
-								
-								JOptionPane.showMessageDialog(null,
-										"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
-										"Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE);
+
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.",
+												"Verlinkung vorhanden",
+												JOptionPane.INFORMATION_MESSAGE);
 							}
 						} catch (TException e) {
 							// TODO Auto-generated catch block
 							e.printStackTrace();
-							JOptionPane.showMessageDialog(null,
-									e.getCause()+"\n"+e.getStackTrace(),
+							JOptionPane.showMessageDialog(null, e.getCause()
+									+ "\n" + e.getStackTrace(),
 									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 					}
 
-				}  
-				else {
+				} else {
 
 					JOptionPane.showMessageDialog(null,
 							"Bitte w\u00e4hlen Sie ein eigenes Image aus",
@@ -826,7 +855,6 @@ public class DeleteImage_GUI extends JFrame {
 						con.closeThriftConnection();
 
 						// oeffnet das Hauptmenue
-						
 
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
@@ -851,124 +879,125 @@ public class DeleteImage_GUI extends JFrame {
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Detailinformationen",
 
-						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
 		panel.setBounds(586, 85, 316, 531);
 		getContentPane().add(panel);
-		
+
 		JLabel lblName = new JLabel("Name:");
 		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
-		
+
 		labelName = new JLabel("");
 		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
-		
+
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
 		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
-		
+
 		labelOS = new JLabel("");
 		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
-		
+
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
 		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
-		
+
 		labelVerantwortlicher = new JLabel("");
 		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
-		
+
 		JLabel label = new JLabel("Weitere Verantwortliche:");
 		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
-		
+
 		labelWeitereVerantwortliche = new JLabel("");
 		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
-		
+
 		labelUpdate = new JLabel("");
 		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
-		
+
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
 		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
-		
+
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
 		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
-		
+
 		labelVorlage = new JLabel("");
 		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
-		
+
 		labelLizenzSoftware = new JLabel("");
 		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
-		
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
+
+		JLabel lblLizenzpflichtigeSoftware = new JLabel(
+				"Lizenzpflichtige Software:");
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
-		
+
 		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
-		
+
 		labelInternet = new JLabel("");
 		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
-		
+
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
 		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
-		
+
 		labelRam = new JLabel("");
 		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
-		
+
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
 		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
-		
+
 		labelCPU = new JLabel("");
 		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
-		
+
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
 		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
-		
+
 		JLabel lblId = new JLabel("ID:");
 		lblId.setBounds(10, 23, 296, 14);
 		panel.add(lblId);
-		
+
 		labelID = new JLabel("");
 		labelID.setBounds(10, 37, 296, 14);
 		panel.add(labelID);
-		
+
 		labelVersion = new JLabel("");
 		labelVersion.setBounds(10, 73, 296, 14);
 		panel.add(labelVersion);
-		
+
 		JLabel lblVersion = new JLabel("Version:");
 		lblVersion.setBounds(10, 57, 296, 14);
 		panel.add(lblVersion);
-		
+
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
 		lblBeschreibung.setBounds(10, 119, 130, 14);
 		panel.add(lblBeschreibung);
-		
+
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setBounds(10, 135, 296, 65);
 		panel.add(scrollPane);
-		
+
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
 		scrollPane.setViewportView(textAreadesc);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
 
@@ -979,15 +1008,15 @@ 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);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -995,7 +1024,6 @@ public class DeleteImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmFaq);
-		
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
@@ -1003,22 +1031,22 @@ public class DeleteImage_GUI extends JFrame {
 			public void mousePressed(MouseEvent arg0) {
 
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
+
 			}
 		});
 		mnNewMenu_1.add(mntmOtrs);
-		
+
 		JMenuItem menuItem = new JMenuItem("About");
 		menuItem.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -1038,14 +1066,14 @@ public class DeleteImage_GUI extends JFrame {
 			images = client.getImageList();
 
 			Iterator<server.Image> i = images.iterator();
-			
+
 			int x = 0;
-			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			while (i.hasNext()) {
-				
-				//System.out.println(out.format(in.parse(images.get(x).updateTime)));
-				
+
+				// System.out.println(out.format(in.parse(images.get(x).updateTime)));
+
 				// erzeuge Objekte fuer die Tabelle
 				Object[] obj = { images.get(x).getImageName(),
 						images.get(x).getLicenseRestriction(),
@@ -1053,9 +1081,8 @@ public class DeleteImage_GUI extends JFrame {
 						images.get(x).getLectureName(),
 						images.get(x).getUserData(),
 						out.format(in.parse(images.get(x).updateTime)),
-						images.get(x).id,
-						images.get(x).getVersion(),
-						images.get(x).getIsTemplate()};
+						images.get(x).id, images.get(x).getVersion(),
+						images.get(x).getIsTemplate() };
 				// Fuege diese Objekte der Tabelle hinzu
 				model.addRow(obj);
 				x++;
@@ -1068,38 +1095,35 @@ public class DeleteImage_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e1.getCause()+"\n"+e1.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		return model;
 	}
-	public void writeImageData(String id, String version){
-    	try {
-			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
-			Map<String,String> res=client.getImageData(id,version);
+
+	public void writeImageData(String id, String version) {
+		try {
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			Map<String, String> res = client.getImageData(id, version);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
 			labelVerantwortlicher.setText(res.get("owner"));
 			labelWeitereVerantwortliche.setText("Noch nicht Verf�gbar");
-			if(res.get("template").equals("true")){
+			if (res.get("template").equals("true")) {
 				labelVorlage.setText("Ja");
-			}else{
+			} else {
 				labelVorlage.setText("Nein");
 			}
-			if(res.get("license").equals("1")){
+			if (res.get("license").equals("1")) {
 				labelLizenzSoftware.setText("Ja");
-			}
-			else
-			{
+			} else {
 				labelLizenzSoftware.setText("Nein");
 			}
-			if(res.get("internet").equals("1")){
+			if (res.get("internet").equals("1")) {
 				labelInternet.setText("Ja");
-			}
-			else
-			{
+			} else {
 				labelInternet.setText("Nein");
 			}
 			labelRam.setText(res.get("ram"));
diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
index 62ea2a0c..a0d679fb 100644
--- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java
@@ -87,6 +87,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 	JButton btnUploadStarten = new JButton("Upload auf Server starten");
 	JButton btnZurck = new JButton("Zur\u00FCck");
 	int progress = 0; // progress of upload
+	private boolean isCurrentlyLoading = false; // currently up or downloading file
 
 	/**
 	 * Create the frame.
@@ -99,7 +100,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 			@Override
 			public void windowClosing(WindowEvent arg0) {
-				
+
 				if (taskrun == true) {
 					// check if user wants to quit.
 					int choice = JOptionPane
@@ -117,18 +118,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
-							JOptionPane.showMessageDialog(null, e1.getCause()
-									+ "\n" + e1.getStackTrace(),
-									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 						task.cancel(true);
 						con.closeThriftConnection();
 						System.exit(0);
-					}//end if choice
+					}// end if choice
 				} else {
-					//no upload running, close window
+					// no upload running, close window
 					System.exit(0);
-				}//end if taskrun
+				}// end if taskrun
 			}// end window closing
 		});
 		setResizable(false);
@@ -200,12 +198,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		}
 		lblPath = new JLabel("");
 		try {
-			Wini ini = new Wini(
-					new File(
-							"C:\\Users\\"
-									+ System.getProperty("user.name")
-									+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-			lblPath.setText(ini.get("main", "Letzter Uploadpfad",String.class));
+			Wini ini = new Wini(new File("C:\\Users\\"
+					+ System.getProperty("user.name")
+					+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
+			lblPath.setText(ini.get("main", "Letzter Uploadpfad", String.class));
 		} catch (InvalidFileFormatException e2) {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
@@ -213,10 +209,10 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
 		}
-		
+
 		lblPath.addPropertyChangeListener(new PropertyChangeListener() {
 			public void propertyChange(PropertyChangeEvent arg0) {
-				if (lblPath.getText()==null) {
+				if (lblPath.getText() == null) {
 					// wenn leer, dann upload button nicht freigeben
 					btnUploadStarten.setEnabled(false);
 					btnUploadStarten.setText("Bitte warten");
@@ -374,7 +370,13 @@ public class FTPCreateUploader_GUI extends JFrame implements
 											"C:\\Users\\"
 													+ System.getProperty("user.name")
 													+ "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini"));
-							ini.put("main", "Letzter Uploadpfad", lblPath.getText().substring(0, lblPath.getText().lastIndexOf("\\")));
+							ini.put("main",
+									"Letzter Uploadpfad",
+									lblPath.getText()
+											.substring(
+													0,
+													lblPath.getText()
+															.lastIndexOf("\\")));
 							ini.store();
 						} catch (InvalidFileFormatException e2) {
 							// TODO Auto-generated catch block
@@ -408,10 +410,38 @@ public class FTPCreateUploader_GUI extends JFrame implements
 
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						dispose();
+						// check if loading file or not
+						if (isCurrentlyLoading() == true) {
+							int choice = JOptionPane
+									.showOptionDialog(
+											null,
+											"Nicht abgeschlossene Uploads werden beendet. Trotzdem zurück gehen?",
+											"Warnung",
+											JOptionPane.YES_NO_CANCEL_OPTION,
+											JOptionPane.QUESTION_MESSAGE, null,
+											options, options[1]);
+							// 0=beenden, 1=abbrechen
+							if (choice == 0) {
+								try {
+									client.DeleteFtpUser(user.userName);
+								} catch (TException e1) {
+									// TODO Auto-generated catch block
+									e1.printStackTrace();
+								}
+								task.cancel(true);
+								// not loading files, go back one page
+								dispose();
+
+								PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
+								m.setVisible(true);
 
-						PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
-						m.setVisible(true);
+							}
+						} else {
+							dispose();
+
+							PermissionCreateImage_GUI m = new PermissionCreateImage_GUI();
+							m.setVisible(true);
+						}
 					}
 				});
 				btnZurck.setActionCommand("Cancel");
@@ -533,14 +563,15 @@ public class FTPCreateUploader_GUI extends JFrame implements
 			// Button zum Fertigstellen freischalten, wenn 100% erreicht sind
 			if (progress == 0 || progress == 100) {
 				// not uploading currently
-				btnZurck.setEnabled(true);
+				// btnZurck.setEnabled(true);
 			} else {
 				// currently uploading, don't let user interact
-				btnZurck.setEnabled(false);
+				// btnZurck.setEnabled(false);
 			}
 
 			// Fertigstellen erlauben wenn upload abgeschlossen
 			if (progress == 100) {
+				isCurrentlyLoading();
 				finishButton.setEnabled(true);
 
 			} else {
@@ -625,5 +656,18 @@ public class FTPCreateUploader_GUI extends JFrame implements
 		}
 		return true;
 
-	}
-}
\ No newline at end of file
+	}// end writeData()
+
+	public boolean isCurrentlyLoading() {
+		isCurrentlyLoading = false;
+
+		if (labelverbleibend.getText().equals("0")) {
+			isCurrentlyLoading = false;
+		} else {
+			isCurrentlyLoading = true;
+		}
+		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
+		return isCurrentlyLoading;
+	}// end isCurrentlyLoading()
+
+}// end class
diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
index 7a439934..aae76861 100644
--- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java
@@ -84,6 +84,7 @@ public class FTPEditDownloader_GUI extends JFrame implements
 	JButton btnZurck = new JButton("Zur\u00FCck");
 	JButton btnDownloadStarten = new JButton("Download starten");
 	private JLabel lblAnleitung;
+	private boolean isCurrentlyLoading = false; // currently up or downloading file
 
 	/**
 	 * Create the frame.
@@ -114,9 +115,6 @@ public class FTPEditDownloader_GUI extends JFrame implements
 						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
-							JOptionPane.showMessageDialog(null, e1.getCause()
-									+ "\n" + e1.getStackTrace(),
-									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 						task.cancel(true);
 						System.exit(0);
@@ -563,5 +561,17 @@ public class FTPEditDownloader_GUI extends JFrame implements
 
 		}
 
-	}
-}
\ No newline at end of file
+	}//end PropertyChange()
+	
+	public boolean isCurrentlyLoading() {
+		isCurrentlyLoading = false;
+
+		if (labelVerbleibend.getText().equals("0")) {
+			isCurrentlyLoading = false;
+		} else {
+			isCurrentlyLoading = true;
+		}
+		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
+		return isCurrentlyLoading;
+	}// end isCurrentlyLoading()
+}// end class
diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
index b73e0723..12a5d6bb 100644
--- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java
@@ -88,6 +88,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 	JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
 	JButton finishButton = new JButton("Fertigstellen");
 	JButton btnZurck = new JButton("Zur\u00FCck");
+	private boolean isCurrentlyLoading = false; // currently up or downloading file
 
 	/**
 	 * Create the frame.
@@ -398,6 +399,8 @@ public class FTPEditUploader_GUI extends JFrame implements
 				});
 				btnZurck.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent arg0) {
+						
+						//
 						dispose();
 						PermissionEditImage_GUI ei = new PermissionEditImage_GUI();
 						ei.setVisible(true);
@@ -608,4 +611,16 @@ public class FTPEditUploader_GUI extends JFrame implements
 		return true;
 
 	}
+	
+	public boolean isCurrentlyLoading() {
+		isCurrentlyLoading = false;
+
+		if (labelverbleibend.getText().equals("0")) {
+			isCurrentlyLoading = false;
+		} else {
+			isCurrentlyLoading = true;
+		}
+		System.out.println("isCurrentlyLoading"+isCurrentlyLoading);
+		return isCurrentlyLoading;
+	}// end isCurrentlyLoading()
 }
\ No newline at end of file
diff --git a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
index 555dd9f6..ad178085 100644
--- a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
+++ b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java
@@ -114,9 +114,6 @@ public class FTPSearchDownloader_GUI extends JFrame implements
 						} catch (TException e1) {
 							// TODO Auto-generated catch block
 							e1.printStackTrace();
-							JOptionPane.showMessageDialog(null, e1.getCause()
-									+ "\n" + e1.getStackTrace(),
-									"Debug-Message", JOptionPane.ERROR_MESSAGE);
 						}
 						task.cancel(true);
 
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 9ebeb791..c8fe5d38 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -89,27 +89,28 @@ public class SearchEditImage_GUI extends JFrame {
 	JTable tableAllImages;
 	JTable tablemyImages;
 	JTable tablePublicVorlagen;
-	boolean activeSearch=false;
+	boolean activeSearch = false;
 	private JTextField textFieldName;
 	JTabbedPane tabbedPane;
 	String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
-			"Verantwortlicher", "Letztes Update", "ID", "Version","Template" };
+			"Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
 	ThriftConnection con = new ThriftConnection();
 	Client client = models.Client.clientcon.getClient();
-	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
-	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
-	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles, 0){
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-		        return false;
-		      }
+	final DefaultTableModel modelPublicVorlagen = new DefaultTableModel(titles,
+			0) {
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			return false;
+		}
 	};
 	final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>(
 			modelAll);
@@ -118,7 +119,6 @@ public class SearchEditImage_GUI extends JFrame {
 	final TableRowSorter<TableModel> rowSorterPublicVorlagen = new TableRowSorter<TableModel>(
 			modelPublicVorlagen);
 
-
 	/**
 	 * Create the dialog.
 	 */
@@ -149,17 +149,25 @@ public class SearchEditImage_GUI extends JFrame {
 				tablemyImages.getColumnModel().getColumn(7).setMinWidth(0);
 				tablemyImages.getColumnModel().getColumn(7).setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(1).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(1).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(1)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(8).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(8).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(8)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(6).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(6).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(6)
+						.setMaxWidth(0);
 				tablePublicVorlagen.getColumnModel().getColumn(7).setWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMinWidth(0);
-				tablePublicVorlagen.getColumnModel().getColumn(7).setMaxWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7)
+						.setMinWidth(0);
+				tablePublicVorlagen.getColumnModel().getColumn(7)
+						.setMaxWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setMinWidth(0);
 				tableAllImages.getColumnModel().getColumn(1).setMaxWidth(0);
@@ -247,8 +255,8 @@ public class SearchEditImage_GUI extends JFrame {
 				String stext = textFieldName.getText();
 
 				// Wenn Textfield nicht leer
-				if (stext.isEmpty()==false) {
-					activeSearch=true;
+				if (stext.isEmpty() == false) {
+					activeSearch = true;
 					// Filtere nach der Eingabe
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
@@ -256,17 +264,16 @@ public class SearchEditImage_GUI extends JFrame {
 							textFieldName.getText(), 0));
 					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
 							textFieldName.getText(), 0));
-					}
-				else{
-						activeSearch=false;
-						String username = person.verantwortlicher.getName() + " "
-								+ person.verantwortlicher.getVorname();
-						rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
-								username, 4));
-						rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
-								"true", 8));
-						rowSorterAll.setRowFilter(null);
-						}
+				} else {
+					activeSearch = false;
+					String username = person.verantwortlicher.getName() + " "
+							+ person.verantwortlicher.getVorname();
+					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
+							username, 4));
+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
+							"true", 8));
+					rowSorterAll.setRowFilter(null);
+				}
 			}
 		});
 
@@ -276,7 +283,8 @@ public class SearchEditImage_GUI extends JFrame {
 
 		comboBox = new JComboBox<String>();
 		try {
-			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server
+			// Holt sich eine Liste aller verfuegbaren Betriebssysteme vom
+			// Server
 			List<String> list = client.getAllOS();
 			// Leeres Item hinzufuegen
 			comboBox.addItem("");
@@ -288,25 +296,24 @@ public class SearchEditImage_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e2.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e2.getCause()+"\n"+e2.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		// Registriert Auswahlaenderungen der Box
 		comboBox.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent arg0) {
 				// Prueft das die Auswahl nicht leer ist
-				if (comboBox.getSelectedItem().toString().isEmpty()==false) {
+				if (comboBox.getSelectedItem().toString().isEmpty() == false) {
 					// Filtert nach dem ausgewaehlten Betriebssystem
-					activeSearch=true;
+					activeSearch = true;
 					rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox
 							.getSelectedItem().toString(), 2));
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
 					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
 							comboBox.getSelectedItem().toString(), 2));
-				}
-				else{
-					activeSearch=false;
+				} else {
+					activeSearch = false;
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
@@ -326,7 +333,7 @@ public class SearchEditImage_GUI extends JFrame {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
 				// oeffnet das Hauuetmenue
-				
+
 				SearchEditImage_GUI.this.setVisible(false);
 				MainMenue_GUI main = new MainMenue_GUI();
 				main.setVisible(true);
@@ -356,50 +363,49 @@ public class SearchEditImage_GUI extends JFrame {
 		tabbedPane = new JTabbedPane(JTabbedPane.TOP);
 		tabbedPane.addChangeListener(new ChangeListener() {
 			public void stateChanged(ChangeEvent arg0) {
-				if (tabbedPane.getSelectedIndex() == 0 && activeSearch==false) {
+				if (tabbedPane.getSelectedIndex() == 0 && activeSearch == false) {
 
 					String username = person.verantwortlicher.getName() + " "
 							+ person.verantwortlicher.getVorname();
 					// String username="Spitzer Tobias";
 					rowSorterMyImages.setRowFilter(RowFilter.regexFilter(
 							username, 4));
-				}  else if(tabbedPane.getSelectedIndex()==1 && activeSearch==false){
-					//System.out.println("Yeah");
-					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter("true", 8));
-				}else if(tabbedPane.getSelectedIndex()==2 && activeSearch==false){
+				} else if (tabbedPane.getSelectedIndex() == 1
+						&& activeSearch == false) {
+					// System.out.println("Yeah");
+					rowSorterPublicVorlagen.setRowFilter(RowFilter.regexFilter(
+							"true", 8));
+				} else if (tabbedPane.getSelectedIndex() == 2
+						&& activeSearch == false) {
 					rowSorterAll.setRowFilter(null);
 				}
-				
+
 			}
 		});
 
 		tabbedPane.setBounds(10, 158, 557, 339);
 		contentPanel.add(tabbedPane);
-		
 
 		JScrollPane scrollPaneMyImage = new JScrollPane();
 		tablemyImages = new JTable();
-	    tablemyImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-	    {
-	        public void valueChanged(ListSelectionEvent e)
-	        {
-	        	String imageid = modelMyImages
-						.getValueAt(
+		tablemyImages.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+						String imageid = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 6)
-						.toString();
-	        	System.out.println(imageid);
-	        	String version = modelMyImages
-						.getValueAt(
+								.toString();
+						System.out.println(imageid);
+						String version = modelMyImages.getValueAt(
 								tablemyImages
 										.convertRowIndexToModel(tablemyImages
 												.getSelectedRow()), 7)
-						.toString();
-	        	System.out.println(version);
-	        	writeImageData(imageid, version);
-	        }
-	    });
+								.toString();
+						System.out.println(version);
+						writeImageData(imageid, version);
+					}
+				});
 		tablemyImages.setModel(modelMyImages);
 		tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -419,67 +425,61 @@ public class SearchEditImage_GUI extends JFrame {
 		tableCoopImages.getColumnModel().getColumn(3).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit();
-		
-				JScrollPane scrollPanePublicVorlagen = new JScrollPane();
-				tablePublicVorlagen = new JTable();
-			    tablePublicVorlagen.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-			    {
-			        public void valueChanged(ListSelectionEvent e)
-			        {
-			        	String imageid = modelPublicVorlagen
+
+		JScrollPane scrollPanePublicVorlagen = new JScrollPane();
+		tablePublicVorlagen = new JTable();
+		tablePublicVorlagen.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
+						String imageid = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 6)
 								.toString();
-			        	System.out.println(imageid);
-			        	String version = modelPublicVorlagen
+						System.out.println(imageid);
+						String version = modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
 														.getSelectedRow()), 7)
 								.toString();
-			        	System.out.println(version);
-			        	writeImageData(imageid, version);
-			        }
-			    });
-				tablePublicVorlagen.setModel(modelPublicVorlagen);
-				tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
-				tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
-				tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
-						scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
-						tabbedPane.addTab("Vorlagen", null,
-								scrollPanePublicVorlagen, null);
-		
+						System.out.println(version);
+						writeImageData(imageid, version);
+					}
+				});
+		tablePublicVorlagen.setModel(modelPublicVorlagen);
+		tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(3).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(4).sizeWidthToFit();
+		tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit();
+		tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen);
+		scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen);
+		tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null);
 
 		JScrollPane scrollPaneAllImages = new JScrollPane();
 		tableAllImages = new JTable();
-	    tableAllImages.getSelectionModel().addListSelectionListener( new ListSelectionListener()
-	    {
-	        public void valueChanged(ListSelectionEvent e)
-	        {
+		tableAllImages.getSelectionModel().addListSelectionListener(
+				new ListSelectionListener() {
+					public void valueChanged(ListSelectionEvent e) {
 
-	        	String imageid = modelAll
-						.getValueAt(
+						String imageid = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 6)
-						.toString();
-	        	System.out.println(imageid);
-	        	String version = modelAll
-						.getValueAt(
+								.toString();
+						System.out.println(imageid);
+						String version = modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 7)
-						.toString();
-	        	System.out.println(version);
-	        	writeImageData(imageid, version);
+								.toString();
+						System.out.println(version);
+						writeImageData(imageid, version);
 
-	        }
-	    });
+					}
+				});
 		tableAllImages.setModel(modelAll);
 		tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit();
@@ -487,14 +487,12 @@ public class SearchEditImage_GUI extends JFrame {
 		tableAllImages.getColumnModel().getColumn(4).sizeWidthToFit();
 		tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit();
 		tableAllImages.setRowSorter(rowSorterAll);
-		
-				scrollPaneAllImages.setViewportView(tableAllImages);
-				tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
-						
+
+		scrollPaneAllImages.setViewportView(tableAllImages);
+		tabbedPane.addTab("Alle", null, scrollPaneAllImages, null);
 
 		scrollPaneCoopImages.setViewportView(tableCoopImages);
-		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages,
-				null);
+		tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null);
 		tabbedPane.setEnabledAt(3, false);
 
 		JButton btnDownload = new JButton("Download");
@@ -506,107 +504,118 @@ public class SearchEditImage_GUI extends JFrame {
 						+ person.verantwortlicher.getVorname();
 				// check if user is in correct tab
 				if (tabbedPane.getSelectedIndex() == 0) {
-					//check if a row is selected
+					// check if a row is selected
 					if (tablemyImages.getSelectedRow() != -1) {
-						String imageid = modelMyImages
-								.getValueAt(
-										tablemyImages
-												.convertRowIndexToModel(tablemyImages
-														.getSelectedRow()),
-										6).toString();
+						String imageid = modelMyImages.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 6)
+								.toString();
 
 						Image.image.setImageId(imageid);
-						String imageversion = modelMyImages
-								.getValueAt(
-										tablemyImages
-												.convertRowIndexToModel(tablemyImages
-														.getSelectedRow()),
-										7).toString();
+						String imageversion = modelMyImages.getValueAt(
+								tablemyImages
+										.convertRowIndexToModel(tablemyImages
+												.getSelectedRow()), 7)
+								.toString();
 
 						Image.image.setVersion(imageversion);
-						
+
 						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
 						ea.setVisible(true);
 						dispose();
 					}
-				}else if(tabbedPane.getSelectedIndex()==1)
-				{
+				} else if (tabbedPane.getSelectedIndex() == 1) {
 					if (tablePublicVorlagen.getSelectedRow() != -1) {
-						if (modelPublicVorlagen.getValueAt(
-								tablePublicVorlagen
-										.convertRowIndexToModel(tablePublicVorlagen
-												.getSelectedRow()), 4).equals(
-								username) == true ||modelPublicVorlagen.getValueAt(tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen
-												.getSelectedRow()), 8).equals(
-								"true") == true  ) {
-						String imageid = modelPublicVorlagen
-								.getValueAt(
-										tablePublicVorlagen
-												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()),
-										6).toString();
-
-						Image.image.setImageId(imageid);
-						String imageversion = modelPublicVorlagen
+						if (modelPublicVorlagen
 								.getValueAt(
 										tablePublicVorlagen
 												.convertRowIndexToModel(tablePublicVorlagen
-														.getSelectedRow()),
-										7).toString();
-
-						Image.image.setVersion(imageversion);
-						
-						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
-						ea.setVisible(true);
-						dispose();
-						}else {
+														.getSelectedRow()), 4)
+								.equals(username) == true
+								|| modelPublicVorlagen
+										.getValueAt(
+												tablePublicVorlagen
+														.convertRowIndexToModel(tablePublicVorlagen
+																.getSelectedRow()),
+												8).equals("true") == true) {
+							String imageid = modelPublicVorlagen
+									.getValueAt(
+											tablePublicVorlagen
+													.convertRowIndexToModel(tablePublicVorlagen
+															.getSelectedRow()),
+											6).toString();
+
+							Image.image.setImageId(imageid);
+							String imageversion = modelPublicVorlagen
+									.getValueAt(
+											tablePublicVorlagen
+													.convertRowIndexToModel(tablePublicVorlagen
+															.getSelectedRow()),
+											7).toString();
+
+							Image.image.setVersion(imageversion);
+
+							FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
+							ea.setVisible(true);
+							dispose();
+						} else {
 							JOptionPane
-							.showMessageDialog(
-									null,
-									"Sie haben keine Berechtigung fremde Images herunterzuladen.",
-									"Message",
-									JOptionPane.INFORMATION_MESSAGE);
-				}}}else if(tabbedPane.getSelectedIndex()==2)
-				{
-					if (tableAllImages.getSelectedRow() != -1 ) {
+									.showMessageDialog(
+											null,
+											"Sie haben keine Berechtigung fremde Images herunterzuladen.",
+											"Message",
+											JOptionPane.INFORMATION_MESSAGE);
+						}
+					}
+				} else if (tabbedPane.getSelectedIndex() == 2) {
+					if (tableAllImages.getSelectedRow() != -1) {
 						if (modelAll.getValueAt(
 								tableAllImages
 										.convertRowIndexToModel(tableAllImages
 												.getSelectedRow()), 4).equals(
-								username) == true ||modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages
-												.getSelectedRow()), 8).equals(
-								"true") == true  ) {
-						String imageid = modelAll
-								.getValueAt(
-										tableAllImages
-												.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()),
-										6).toString();
-
-						Image.image.setImageId(imageid);
-						String imageversion = modelAll
-								.getValueAt(
-										tableAllImages
-												.convertRowIndexToModel(tableAllImages
-														.getSelectedRow()),
-										7).toString();
-
-						Image.image.setVersion(imageversion);
-						
-						FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
-						ea.setVisible(true);
-						dispose();
-						}else {
+								username) == true
+								|| modelAll
+										.getValueAt(
+												tableAllImages
+														.convertRowIndexToModel(tableAllImages
+																.getSelectedRow()),
+												8).equals("true") == true) {
+							String imageid = modelAll
+									.getValueAt(
+											tableAllImages
+													.convertRowIndexToModel(tableAllImages
+															.getSelectedRow()),
+											6).toString();
+
+							Image.image.setImageId(imageid);
+							String imageversion = modelAll
+									.getValueAt(
+											tableAllImages
+													.convertRowIndexToModel(tableAllImages
+															.getSelectedRow()),
+											7).toString();
+
+							Image.image.setVersion(imageversion);
+
+							FTPEditDownloader_GUI ea = new FTPEditDownloader_GUI();
+							ea.setVisible(true);
+							dispose();
+						} else {
 							JOptionPane
+									.showMessageDialog(
+											null,
+											"Sie haben keine Berechtigung fremde Images herunterzuladen.",
+											"Message",
+											JOptionPane.INFORMATION_MESSAGE);
+						}
+					}
+				} else {
+					JOptionPane
 							.showMessageDialog(
 									null,
-									"Sie haben keine Berechtigung fremde Images herunterzuladen.",
-									"Message",
-									JOptionPane.INFORMATION_MESSAGE);
-				}}} else {
-					JOptionPane.showMessageDialog(null,
-							"Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus",
-							"Message", JOptionPane.INFORMATION_MESSAGE);
+									"Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus",
+									"Message", JOptionPane.INFORMATION_MESSAGE);
 				}
 			}
 		});
@@ -623,7 +632,7 @@ public class SearchEditImage_GUI extends JFrame {
 				okButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						// oeffnet das Hauptmenue
-						
+
 						MainMenue_GUI main = new MainMenue_GUI();
 						main.setVisible(true);
 						dispose();
@@ -637,12 +646,12 @@ public class SearchEditImage_GUI extends JFrame {
 				JButton cancelButton = new JButton("Weiter");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						String username = person.verantwortlicher.getName() + " "
-								+ person.verantwortlicher.getVorname();
+
+						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
+							// check if a row is selected
 							if (tablemyImages.getSelectedRow() != -1) {
 								String imageid = modelMyImages
 										.getValueAt(
@@ -660,14 +669,19 @@ public class SearchEditImage_GUI extends JFrame {
 												7).toString();
 
 								Image.image.setVersion(imageversion);
-								
+
 								EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
 								ea.setVisible(true);
 								dispose();
 							}
-						}else if(tabbedPane.getSelectedIndex()==1)
-						{
-							if (tablePublicVorlagen.getSelectedRow() != -1 && modelPublicVorlagen.getValueAt(tablePublicVorlagen.convertRowIndexToModel(tablePublicVorlagen.getSelectedRow()), 4).equals(username)==true) {
+						} else if (tabbedPane.getSelectedIndex() == 1) {
+							if (tablePublicVorlagen.getSelectedRow() != -1
+									&& modelPublicVorlagen
+											.getValueAt(
+													tablePublicVorlagen
+															.convertRowIndexToModel(tablePublicVorlagen
+																	.getSelectedRow()),
+													4).equals(username) == true) {
 								String imageid = modelPublicVorlagen
 										.getValueAt(
 												tablePublicVorlagen
@@ -684,13 +698,19 @@ public class SearchEditImage_GUI extends JFrame {
 												7).toString();
 
 								Image.image.setVersion(imageversion);
-								
+
 								EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
 								ea.setVisible(true);
 								dispose();
-						}}else if(tabbedPane.getSelectedIndex()==2)
-						{
-							if (tableAllImages.getSelectedRow() != -1 && modelAll.getValueAt(tableAllImages.convertRowIndexToModel(tableAllImages.getSelectedRow()), 4).equals(username)==true) {
+							}
+						} else if (tabbedPane.getSelectedIndex() == 2) {
+							if (tableAllImages.getSelectedRow() != -1
+									&& modelAll
+											.getValueAt(
+													tableAllImages
+															.convertRowIndexToModel(tableAllImages
+																	.getSelectedRow()),
+													4).equals(username) == true) {
 								String imageid = modelAll
 										.getValueAt(
 												tableAllImages
@@ -707,15 +727,19 @@ public class SearchEditImage_GUI extends JFrame {
 												7).toString();
 
 								Image.image.setVersion(imageversion);
-								
+
 								EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI();
 								ea.setVisible(true);
 								dispose();
-						}} else {
-							JOptionPane.showMessageDialog(null,
-									"Bitte w\u00e4hlen Sie ein eigenes Image aus.",
-									"Image Auswahl", JOptionPane.INFORMATION_MESSAGE);
-						}//end check if correct tab is selected
+							} else {
+								JOptionPane
+										.showMessageDialog(
+												null,
+												"Bitte w\u00e4hlen Sie ein eigenes Image aus.",
+												"Image Auswahl",
+												JOptionPane.INFORMATION_MESSAGE);
+							}
+						}// end check if correct tab is selected
 					}
 				});
 				cancelButton.setActionCommand("Cancel");
@@ -735,119 +759,120 @@ public class SearchEditImage_GUI extends JFrame {
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Detailinformationen",
 
-						TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
 		panel.setBounds(586, 85, 316, 531);
 		getContentPane().add(panel);
-		
+
 		JLabel lblName = new JLabel("Name:");
 		lblName.setBounds(10, 87, 130, 14);
 		panel.add(lblName);
-		
+
 		labelName = new JLabel("");
 		labelName.setBounds(10, 102, 296, 14);
 		panel.add(labelName);
-		
+
 		JLabel lblVerantwortlicher = new JLabel("Verantwortlicher:");
 		lblVerantwortlicher.setBounds(10, 259, 130, 14);
 		panel.add(lblVerantwortlicher);
-		
+
 		labelOS = new JLabel("");
 		labelOS.setBounds(10, 216, 296, 14);
 		panel.add(labelOS);
-		
+
 		JLabel lblWeitereVerantwortliche = new JLabel("Betriebssystem:");
 		lblWeitereVerantwortliche.setBounds(10, 202, 130, 14);
 		panel.add(lblWeitereVerantwortliche);
-		
+
 		labelVerantwortlicher = new JLabel("");
 		labelVerantwortlicher.setBounds(10, 272, 296, 14);
 		panel.add(labelVerantwortlicher);
-		
+
 		JLabel label = new JLabel("Weitere Verantwortliche:");
 		label.setBounds(10, 284, 130, 14);
 		panel.add(label);
-		
+
 		labelWeitereVerantwortliche = new JLabel("");
 		labelWeitereVerantwortliche.setBounds(10, 297, 296, 14);
 		panel.add(labelWeitereVerantwortliche);
-		
+
 		labelUpdate = new JLabel("");
 		labelUpdate.setBounds(10, 245, 296, 14);
 		panel.add(labelUpdate);
-		
+
 		JLabel lblLetztesUpdate = new JLabel("Letztes Update:");
 		lblLetztesUpdate.setBounds(10, 231, 130, 14);
 		panel.add(lblLetztesUpdate);
-		
+
 		JLabel lblImageIstVorlage = new JLabel("Image ist Vorlage:");
 		lblImageIstVorlage.setBounds(10, 336, 130, 14);
 		panel.add(lblImageIstVorlage);
-		
+
 		labelVorlage = new JLabel("");
 		labelVorlage.setBounds(10, 350, 296, 14);
 		panel.add(labelVorlage);
-		
+
 		labelLizenzSoftware = new JLabel("");
 		labelLizenzSoftware.setBounds(10, 383, 296, 14);
 		panel.add(labelLizenzSoftware);
-		
-		JLabel lblLizenzpflichtigeSoftware = new JLabel("Lizenzpflichtige Software:");
+
+		JLabel lblLizenzpflichtigeSoftware = new JLabel(
+				"Lizenzpflichtige Software:");
 		lblLizenzpflichtigeSoftware.setBounds(10, 367, 130, 14);
 		panel.add(lblLizenzpflichtigeSoftware);
-		
+
 		JLabel lblInternet = new JLabel("Internetsperre vorhanden:");
 		lblInternet.setBounds(10, 400, 130, 14);
 		panel.add(lblInternet);
-		
+
 		labelInternet = new JLabel("");
 		labelInternet.setBounds(10, 417, 296, 14);
 		panel.add(labelInternet);
-		
+
 		JLabel lblEmpfehlungRam = new JLabel("Empfehlung RAM:");
 		lblEmpfehlungRam.setBounds(10, 432, 130, 14);
 		panel.add(lblEmpfehlungRam);
-		
+
 		labelRam = new JLabel("");
 		labelRam.setBounds(10, 455, 296, 14);
 		panel.add(labelRam);
-		
+
 		JLabel lblEmpfehlungCpu = new JLabel("Empfehlung CPU:");
 		lblEmpfehlungCpu.setBounds(10, 469, 130, 14);
 		panel.add(lblEmpfehlungCpu);
-		
+
 		labelCPU = new JLabel("");
 		labelCPU.setBounds(10, 487, 296, 14);
 		panel.add(labelCPU);
-		
+
 		JLabel lblTechnischeDaten = new JLabel("Technische Daten:");
 		lblTechnischeDaten.setBounds(10, 322, 296, 14);
 		panel.add(lblTechnischeDaten);
-		
+
 		JLabel lblId = new JLabel("ID:");
 		lblId.setBounds(10, 23, 296, 14);
 		panel.add(lblId);
-		
+
 		labelID = new JLabel("");
 		labelID.setBounds(10, 37, 296, 14);
 		panel.add(labelID);
-		
+
 		labelVersion = new JLabel("");
 		labelVersion.setBounds(10, 73, 296, 14);
 		panel.add(labelVersion);
-		
+
 		JLabel lblVersion = new JLabel("Version:");
 		lblVersion.setBounds(10, 57, 296, 14);
 		panel.add(lblVersion);
-		
+
 		JLabel lblBeschreibung = new JLabel("Beschreibung:");
 		lblBeschreibung.setBounds(10, 119, 130, 14);
 		panel.add(lblBeschreibung);
-		
+
 		JScrollPane scrollPane = new JScrollPane();
 		scrollPane.setBounds(10, 135, 296, 65);
 		panel.add(scrollPane);
-		
+
 		textAreadesc = new JTextArea();
 		textAreadesc.setLineWrap(true);
 		textAreadesc.setBackground(SystemColor.menu);
@@ -862,15 +887,15 @@ public class SearchEditImage_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);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -878,7 +903,6 @@ public class SearchEditImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmFaq);
-		
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
@@ -886,22 +910,22 @@ public class SearchEditImage_GUI extends JFrame {
 			public void mousePressed(MouseEvent arg0) {
 
 				OpenLinks open = new OpenLinks();
-				
+
 				URI windows;
 				try {
 					windows = new URI(Links.getOTRS());
-					
+
 					open.openWebpage(windows);
-					
+
 				} catch (URISyntaxException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-				
+
 			}
 		});
 		mnNewMenu_1.add(mntmOtrs);
-		
+
 		JMenuItem mntmAbout = new JMenuItem("About");
 		mntmAbout.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
@@ -912,7 +936,7 @@ public class SearchEditImage_GUI extends JFrame {
 		mnNewMenu_1.add(mntmAbout);
 
 	}
-	
+
 	// Initiale Beffuelung eines Table models
 	public DefaultTableModel initTableModel(DefaultTableModel model) {
 		List<server.Image> images;
@@ -921,8 +945,8 @@ public class SearchEditImage_GUI extends JFrame {
 			images = client.getImageList();
 
 			Iterator<server.Image> i = images.iterator();
-			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
 			int x = 0;
 
 			while (i.hasNext()) {
@@ -932,11 +956,11 @@ public class SearchEditImage_GUI extends JFrame {
 						images.get(x).getOsName(),
 						images.get(x).getLectureName(),
 						images.get(x).getUserData(),
-						out.format(in.parse(images.get(x).updateTime)), images.get(x).id,
-						images.get(x).getVersion(),
-						images.get(x).getIsTemplate()};
+						out.format(in.parse(images.get(x).updateTime)),
+						images.get(x).id, images.get(x).getVersion(),
+						images.get(x).getIsTemplate() };
 				// Fuege diese Objekte der Tabelle hinzu
-				
+
 				model.addRow(obj);
 				x++;
 				i.next();
@@ -948,38 +972,35 @@ public class SearchEditImage_GUI extends JFrame {
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			JOptionPane.showMessageDialog(null,
-					e1.getCause()+"\n"+e1.getStackTrace(),
-					"Debug-Message", JOptionPane.ERROR_MESSAGE);
+					e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message",
+					JOptionPane.ERROR_MESSAGE);
 		}
 		return model;
 	}
-	public void writeImageData(String id, String version){
-    	try {
-			SimpleDateFormat in=new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out=new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
-			Map<String,String> res=client.getImageData(id,version);
+
+	public void writeImageData(String id, String version) {
+		try {
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			Map<String, String> res = client.getImageData(id, version);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
 			labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
 			labelVerantwortlicher.setText(res.get("owner"));
 			labelWeitereVerantwortliche.setText("Noch nicht Verf�gbar");
-			if(res.get("template").equals("true")){
+			if (res.get("template").equals("true")) {
 				labelVorlage.setText("Ja");
-			}else{
+			} else {
 				labelVorlage.setText("Nein");
 			}
-			if(res.get("license").equals("1")){
+			if (res.get("license").equals("1")) {
 				labelLizenzSoftware.setText("Ja");
-			}
-			else
-			{
+			} else {
 				labelLizenzSoftware.setText("Nein");
 			}
-			if(res.get("internet").equals("1")){
+			if (res.get("internet").equals("1")) {
 				labelInternet.setText("Ja");
-			}
-			else
-			{
+			} else {
 				labelInternet.setText("Nein");
 			}
 			labelRam.setText(res.get("ram"));
diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java
index 03ca2d16..644e84dc 100644
--- a/Dozentenmodul/src/gui/intro/About_GUI.java
+++ b/Dozentenmodul/src/gui/intro/About_GUI.java
@@ -23,6 +23,8 @@ public class About_GUI extends JFrame {
 
 	private JPanel contentPane;
 	private JTextPane txtpnVersionVBuilddate;
+	private String buildDate ="25.08.2014";
+	private String version="1.01";
 
 	/**
 	 * Create the frame.
@@ -86,7 +88,7 @@ public class About_GUI extends JFrame {
 
 		txtpnVersionVBuilddate = new JTextPane();
 		txtpnVersionVBuilddate
-				.setText("Version: v1.0\r\nBuild-Date: 22.08.2014\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
+				.setText("Version: "+version+"\r\nBuild-Date: "+buildDate+"\r\n\r\nContact: michael.wilson@hs-offenburg.de\r\nWebsite: http://bwlehrpool.hs-offenburg.de/");
 		txtpnVersionVBuilddate.setEditable(false);
 		txtpnVersionVBuilddate.setBackground(SystemColor.menu);
 		txtpnVersionVBuilddate.setBounds(62, 95, 224, 90);