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

5 files changed, 510 insertions, 545 deletions

diff --git a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
index bb2e4b24..1230c228 100644
--- a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java
@@ -1,6 +1,5 @@
 package gui.image;
 
-
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
@@ -70,40 +69,34 @@ public class PermissionCreateImage_GUI extends JFrame {
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name","Read", "Write", "ChangePermission","Link Allowed",
-			"Admin"};
-	
-	final DefaultTableModel model = new DefaultTableModel(titles, 0){
-		
-		
-		
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-			 	if(mColIndex>=1){
-			 		return true;
-			 	}
-		        return false;
-		      }
-		    public Class getColumnClass(int c) {
-		    	switch(c){
-		    	case 0:
-		        return String.class;
-		        default:
-		        	return Boolean.class;
-		    	}
-		      }
-		    
-		    
+	Object[] titles = { "Name", "Read", "Write", "Link allowed","Admin"};
+
+	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
+
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			if (mColIndex >= 1) {
+				return true;
+			}
+			return false;
+		}
+
+		public Class getColumnClass(int c) {
+			switch (c) {
+			case 0:
+				return String.class;
+			default:
+				return Boolean.class;
+			}
+		}
 
 	};
 	private JTextField textField;
 	private JLabel lblRead;
 	private JLabel lblWrite;
-	private JLabel lblChangepermission;
 	private JLabel lblAdmin;
 	private JLabel lblLinkallowed;
 	private JLabel lblReadDesc;
 	private JLabel lblWriteDesc;
-	private JLabel lblBerechtigungenFrDas;
 	private JLabel lblAdminDesc;
 	private JLabel lblLinkallowedDesc;
 
@@ -115,7 +108,7 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		});
 		setResizable(false);
-		
+
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
@@ -136,16 +129,18 @@ public class PermissionCreateImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Image Berechtigungen (Nur zur Veranschaulichung)");
+				JLabel lblNewLabel = new JLabel(
+						"Image Berechtigungen (Nur zur Veranschaulichung)");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
 			}
-			
+
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Definieren Sie hier bitte die gew\u00FCnschten Berechtigungen f\u00FCr ihr Image");
+			txtpnBitteWhlenSie
+					.setText("Definieren Sie hier bitte die gew\u00FCnschten Berechtigungen f\u00FCr ihr Image");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -154,150 +149,157 @@ public class PermissionCreateImage_GUI extends JFrame {
 		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, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
+
 		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+		scrollPane
+				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
-		
+
 		table = new JTable();
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
-		Object[] rowdata={"Max Mustermann", new Boolean(false),new Boolean(false),new Boolean(false),new Boolean(false),new Boolean(false)};
+		Object[] rowdata = { "Max Mustermann", new Boolean(false),
+				new Boolean(false), new Boolean(false), new Boolean(false),
+				new Boolean(false) };
 		model.addRow(rowdata);
 
-		TableCellRenderer rend=table.getTableHeader().getDefaultRenderer();
-		
-		
-	    TableColumn tc1 = table.getColumnModel().getColumn(1);  
-	    tc1.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),(String) titles[1]));
-	    
-	    TableColumn tc2 = table.getColumnModel().getColumn(2);  
-	    tc2.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),(String) titles[2]));
-	    
-	    TableColumn tc3 = table.getColumnModel().getColumn(3);  
-	    tc3.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
-	    
-	    TableColumn tc4 = table.getColumnModel().getColumn(4);  
-	    tc4.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4]));
-	    
-	    TableColumn tc5 = table.getColumnModel().getColumn(5);  
-	    tc5.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),(String) titles[5]));
+		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
+
+		TableColumn tc1 = table.getColumnModel().getColumn(1);
+		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),
+				(String) titles[1]));
+
+		TableColumn tc2 = table.getColumnModel().getColumn(2);
+		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),
+				(String) titles[2]));
+
+		TableColumn tc3 = table.getColumnModel().getColumn(3);
+		tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),
+				(String) titles[3]));
+
+		TableColumn tc4 = table.getColumnModel().getColumn(4);
+		tc4.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),
+				(String) titles[4]));
+
+		/*
+		TableColumn tc5 = table.getColumnModel().getColumn(5);
+		tc5.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),
+				(String) titles[5]));
+		*/
 		scrollPane.setViewportView(table);
 		
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				
+
 				PermissionCreateImage_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
+				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("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("Berechtigung");
 		lblNewLabel_1.setBounds(146, 11, 80, 14);
 		contentPanel.add(lblNewLabel_1);
-		
+
 		JLabel lblName = new JLabel("Name:");
 		lblName.setBounds(10, 36, 46, 20);
 		contentPanel.add(lblName);
-		
+
 		textField = new JTextField();
 		textField.setBounds(69, 36, 171, 20);
 		contentPanel.add(textField);
 		textField.setColumns(10);
-		
+
 		JLabel lblHochschule = new JLabel("Hochschule:");
 		lblHochschule.setBounds(275, 36, 80, 20);
 		contentPanel.add(lblHochschule);
-		
+
 		JComboBox comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universit\u00E4t Freiburg"}));
+		comboBox.setModel(new DefaultComboBoxModel(new String[] {
+				"Hochschule Offenburg", "Hochschule Reutlingen",
+				"Universit\u00E4t Freiburg" }));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
-		
+
 		JPanel panel_2 = new JPanel();
 		panel_2.setBackground(SystemColor.menu);
-		panel_2.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_2.setBorder(new TitledBorder(null, "Beschreibung",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_2.setBounds(10, 67, 557, 129);
 		contentPanel.add(panel_2);
 		panel_2.setLayout(null);
-		
-		
-		
+
 		lblRead = new JLabel("Read");
 		lblRead.setBounds(20, 18, 90, 20);
 		panel_2.add(lblRead);
-		
+
 		lblWrite = new JLabel("Write");
 		lblWrite.setBounds(20, 38, 90, 20);
 		panel_2.add(lblWrite);
-		
-		lblChangepermission = new JLabel("ChangePermission");
-		lblChangepermission.setBounds(20, 58, 90, 20);
-		panel_2.add(lblChangepermission);
-		
+
 		lblAdmin = new JLabel("Admin");
 		lblAdmin.setBounds(20, 78, 90, 20);
 		panel_2.add(lblAdmin);
-		
-		lblLinkallowed = new JLabel("Link_allowed");
-		lblLinkallowed.setBounds(20, 98, 90, 20);
+
+		lblLinkallowed = new JLabel("Link allowed");
+		lblLinkallowed.setBounds(20, 58, 90, 20);
 		panel_2.add(lblLinkallowed);
-		
-		lblReadDesc = new JLabel("Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
+
+		lblReadDesc = new JLabel(
+				"Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
 		lblReadDesc.setBounds(120, 18, 427, 20);
 		panel_2.add(lblReadDesc);
-		
-		lblWriteDesc = new JLabel("Image anpassen und überschrieben, jedoch nicht löschen.");
+
+		lblWriteDesc = new JLabel(
+				"Image anpassen und überschrieben, jedoch nicht löschen.");
 		lblWriteDesc.setBounds(120, 38, 380, 20);
 		panel_2.add(lblWriteDesc);
-		
-		lblBerechtigungenFrDas = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
-		lblBerechtigungenFrDas.setBounds(120, 58, 380, 20);
-		panel_2.add(lblBerechtigungenFrDas);
-		
-		lblAdminDesc = new JLabel("Volle Rechte: write + changePermission + löschen.");
-		lblAdminDesc.setBounds(120, 78, 380, 20);
+
+		lblAdminDesc = new JLabel(
+				"<HTML>Volle Rechte: read, write, löschen, Link_allowed und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
+		lblAdminDesc.setBounds(120, 78, 380, 40);
 		panel_2.add(lblAdminDesc);
-		
-		lblLinkallowedDesc = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		lblLinkallowedDesc.setBounds(120, 98, 380, 20);
+
+		lblLinkallowedDesc = new JLabel(
+				"Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		lblLinkallowedDesc.setBounds(120, 58, 380, 20);
 		panel_2.add(lblLinkallowedDesc);
 		{
 			JPanel buttonPane = new JPanel();
@@ -309,26 +311,25 @@ public class PermissionCreateImage_GUI extends JFrame {
 				JButton cancelButton = new JButton("Zur\u00FCck");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						
-						CreateImageFreigabe_GUI sr=new CreateImageFreigabe_GUI();
+
+						CreateImageFreigabe_GUI sr = new CreateImageFreigabe_GUI();
 						sr.setVisible(true);
 						dispose();
 					}
 				});
 				cancelButton.setActionCommand("OK");
 				buttonPane.add(cancelButton);
-				//getRootPane().setDefaultButton(cancelButton);
+				// getRootPane().setDefaultButton(cancelButton);
 			}
 			{
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						FTPCreateUploader_GUI ea=new FTPCreateUploader_GUI();
+
+						FTPCreateUploader_GUI ea = new FTPCreateUploader_GUI();
 						ea.setVisible(true);
 						dispose();
-						
+
 					}
 				});
 				continueButton.setActionCommand("Cancel");
@@ -336,34 +337,34 @@ public class PermissionCreateImage_GUI extends JFrame {
 				getRootPane().setDefaultButton(continueButton);
 			}
 		}
-		
+
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
-		
+
 		JSeparator separator_1 = new JSeparator();
 		separator_1.setBounds(0, 627, 597, 2);
 		getContentPane().add(separator_1);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-				
+
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
-		
+
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		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();
@@ -371,7 +372,6 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmFaq);
-		
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
@@ -379,22 +379,22 @@ public class PermissionCreateImage_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) {
@@ -403,131 +403,140 @@ public class PermissionCreateImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
-		
+
+	}
+
+	class MyItemListener1 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 1);
+			}
+		}
+	}
+
+	class MyItemListener2 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 2);
+			}
+		}
+	}
+
+	class MyItemListener3 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 3);
+			}
+		}
+	}
+
+	class MyItemListener4 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 4);
+			}
+		}
+	}
+
+	class MyItemListener5 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 5);
+			}
+		}
+	}
+}
+
+class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
+		MouseListener {
+	protected CheckBoxHeader rendererComponent;
+	protected int column;
+	protected boolean mousePressed = false;
+
+	public CheckBoxHeader(ItemListener itemListener, String text) {
+		rendererComponent = this;
+		rendererComponent.addItemListener(itemListener);
+		rendererComponent.setText(text);
+	}
+
+	public Component getTableCellRendererComponent(JTable table, Object value,
+			boolean isSelected, boolean hasFocus, int row, int column) {
+		if (table != null) {
+			JTableHeader header = table.getTableHeader();
+			if (header != null) {
+				rendererComponent.setForeground(header.getForeground());
+				rendererComponent.setBackground(header.getBackground());
+				rendererComponent.setFont(header.getFont());
+				rendererComponent.setBorder(header.getBorder());
+				header.addMouseListener(rendererComponent);
+			}
+		}
+		setColumn(column);
+		// rendererComponent.setText("Check All");
+		// setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+
+		return rendererComponent;
+	}
+
+	protected void setColumn(int column) {
+		this.column = column;
+	}
+
+	public int getColumn() {
+		return column;
+	}
+
+	protected void handleClickEvent(MouseEvent e) {
+		if (mousePressed) {
+			mousePressed = false;
+			JTableHeader header = (JTableHeader) (e.getSource());
+			JTable tableView = header.getTable();
+			TableColumnModel columnModel = tableView.getColumnModel();
+			int viewColumn = columnModel.getColumnIndexAtX(e.getX());
+			int column = tableView.convertColumnIndexToModel(viewColumn);
+
+			if (viewColumn == this.column && e.getClickCount() == 1
+					&& column != -1) {
+				doClick();
+			}
+		}
+	}
+
+	public void mouseClicked(MouseEvent e) {
+		handleClickEvent(e);
+		((JTableHeader) e.getSource()).repaint();
+	}
+
+	public void mousePressed(MouseEvent e) {
+		mousePressed = true;
+	}
+
+	public void mouseReleased(MouseEvent e) {
+	}
+
+	public void mouseEntered(MouseEvent e) {
+	}
+
+	public void mouseExited(MouseEvent e) {
 	}
-	  class MyItemListener1 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,1);  
-	      }  
-	    }
-	   }
-	  class MyItemListener2 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,2);  
-	      }  
-	    }
-	   }
-	  class MyItemListener3 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,3);  
-	      }  
-	    }
-	   }
-	  class MyItemListener4 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,4);  
-	      }  
-	    }
-	   }
-	  class MyItemListener5 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,5);  
-	      }  
-	    }
-	   }
 }
-class CheckBoxHeader extends JCheckBox
-implements TableCellRenderer, MouseListener {  
-protected CheckBoxHeader rendererComponent;  
-protected int column;  
-protected boolean mousePressed = false;  
-
-public CheckBoxHeader(ItemListener itemListener ,String text) {  
-rendererComponent = this;  
-rendererComponent.addItemListener(itemListener);  
-rendererComponent.setText(text);
-}  
-
-public Component getTableCellRendererComponent(  
-  JTable table, Object value,  
-  boolean isSelected, boolean hasFocus, int row, int column) {  
-if (table != null) {  
-  JTableHeader header = table.getTableHeader();  
-  if (header != null) {  
-   rendererComponent.setForeground(header.getForeground());  
-   rendererComponent.setBackground(header.getBackground());  
-   rendererComponent.setFont(header.getFont());
-   rendererComponent.setBorder(header.getBorder());
-   header.addMouseListener(rendererComponent);  
-  }  
-}  
-setColumn(column);  
-//rendererComponent.setText("Check All");  
-//setBorder(UIManager.getBorder("TableHeader.cellBorder"));  
-
-return rendererComponent;  
-}  
-protected void setColumn(int column) {  
-this.column = column;  
-}  
-public int getColumn() {  
-return column;  
-}  
-protected void handleClickEvent(MouseEvent e) {  
-if (mousePressed) {  
-  mousePressed=false;  
-  JTableHeader header = (JTableHeader)(e.getSource());  
-  JTable tableView = header.getTable();  
-  TableColumnModel columnModel = tableView.getColumnModel();  
-  int viewColumn = columnModel.getColumnIndexAtX(e.getX());  
-  int column = tableView.convertColumnIndexToModel(viewColumn);  
-
-  if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) {  
-    doClick();  
-  }  
-}  
-}  
-public void mouseClicked(MouseEvent e) {  
-handleClickEvent(e);  
-((JTableHeader)e.getSource()).repaint();  
-}  
-public void mousePressed(MouseEvent e) {  
-mousePressed = true;  
-}  
-public void mouseReleased(MouseEvent e) {  
-}  
-public void mouseEntered(MouseEvent e) {  
-}  
-public void mouseExited(MouseEvent e) {  
-}  
-}  
diff --git a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
index 965de752..8fb4b057 100644
--- a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java
@@ -1,6 +1,5 @@
 package gui.image;
 
-
 import gui.intro.About_GUI;
 import gui.intro.MainMenue_GUI;
 
@@ -70,32 +69,32 @@ public class PermissionEditImage_GUI extends JFrame {
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name","Read", "Write","ChangePermission", "Link Allowed",
-			"Admin" };
-	
-	final DefaultTableModel model = new DefaultTableModel(titles, 0){
-		
-		
-		
-		 public boolean isCellEditable(int rowIndex, int mColIndex) {
-			 	if(mColIndex>=1){
-			 		return true;
-			 	}
-		        return false;
-		      }
-		    public Class getColumnClass(int c) {
-		    	switch(c){
-		    	case 0:
-		        return String.class;
-		        default:
-		        	return Boolean.class;
-		    	}
-		      }
-		    
-		    
+	Object[] titles = { "Name", "Read", "Write", "Link allowed","Admin"};
+
+	final DefaultTableModel model = new DefaultTableModel(titles, 0) {
+
+		public boolean isCellEditable(int rowIndex, int mColIndex) {
+			if (mColIndex >= 1) {
+				return true;
+			}
+			return false;
+		}
+
+		public Class getColumnClass(int c) {
+			switch (c) {
+			case 0:
+				return String.class;
+			default:
+				return Boolean.class;
+			}
+		}
 
 	};
 	private JTextField textField;
+	private JLabel lblLinkAllowed;
+	private JLabel label_5;
+	private JLabel label_6;
+	private JLabel label_7;
 
 	public PermissionEditImage_GUI() {
 		addWindowListener(new WindowAdapter() {
@@ -105,7 +104,7 @@ public class PermissionEditImage_GUI extends JFrame {
 			}
 		});
 		setResizable(false);
-		
+
 		try {
 			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
 		} catch (ClassNotFoundException | InstantiationException
@@ -126,16 +125,18 @@ public class PermissionEditImage_GUI extends JFrame {
 			getContentPane().add(panel);
 			panel.setLayout(null);
 			{
-				JLabel lblNewLabel = new JLabel("Image Berechtigungen (Nur zur Veranschaulichung)");
+				JLabel lblNewLabel = new JLabel(
+						"Image Berechtigungen (Nur zur Veranschaulichung)");
 				lblNewLabel.setBounds(10, 11, 509, 22);
 				panel.add(lblNewLabel);
 				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
 			}
-			
+
 			JTextPane txtpnBitteWhlenSie = new JTextPane();
 			txtpnBitteWhlenSie.setEditable(false);
 			txtpnBitteWhlenSie.setBackground(SystemColor.menu);
-			txtpnBitteWhlenSie.setText("Definieren Sie hier bitte die gew\u00FCnschten Berechtigungen f\u00FCr ihr Image");
+			txtpnBitteWhlenSie
+					.setText("Definieren Sie hier bitte die gew\u00FCnschten Berechtigungen f\u00FCr ihr Image");
 			txtpnBitteWhlenSie.setBounds(10, 36, 509, 32);
 			panel.add(txtpnBitteWhlenSie);
 		}
@@ -144,149 +145,154 @@ public class PermissionEditImage_GUI extends JFrame {
 		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, "Berechtigungen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel_1.setBorder(new TitledBorder(null, "Berechtigungen",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel_1.setBounds(10, 207, 557, 313);
 		contentPanel.add(panel_1);
 		panel_1.setLayout(null);
-		
+
 		JScrollPane scrollPane = new JScrollPane();
-		scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+		scrollPane
+				.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
 		scrollPane.setBounds(10, 21, 537, 281);
 		panel_1.add(scrollPane);
-		
+
 		table = new JTable();
 		table.setModel(model);
 		table.setSelectionForeground(Color.WHITE);
-		Object[] rowdata={"Max Mustermann", new Boolean(false),new Boolean(false),new Boolean(false),new Boolean(false)};
+		Object[] rowdata = { "Max Mustermann", new Boolean(false),
+				new Boolean(false), new Boolean(false), new Boolean(false) };
 		model.addRow(rowdata);
 
-		TableCellRenderer rend=table.getTableHeader().getDefaultRenderer();
-		
-		
-	    TableColumn tc1 = table.getColumnModel().getColumn(1);  
-	    tc1.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),(String) titles[1]));
-	    
-	    TableColumn tc2 = table.getColumnModel().getColumn(2);  
-	    tc2.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),(String) titles[2]));
-	    
-	    TableColumn tc3 = table.getColumnModel().getColumn(3);  
-	    tc3.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
-	    
-	    TableColumn tc4 = table.getColumnModel().getColumn(4);  
-	    tc4.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4]));
-	    
-	    TableColumn tc5 = table.getColumnModel().getColumn(5);  
-	    tc5.setCellEditor(table.getDefaultEditor(Boolean.class));  
-	    tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
-	    tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),(String) titles[5]));
+		TableCellRenderer rend = table.getTableHeader().getDefaultRenderer();
+
+		TableColumn tc1 = table.getColumnModel().getColumn(1);
+		tc1.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc1.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc1.setHeaderRenderer(new CheckBoxHeader(new MyItemListener1(),
+				(String) titles[1]));
+
+		TableColumn tc2 = table.getColumnModel().getColumn(2);
+		tc2.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc2.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc2.setHeaderRenderer(new CheckBoxHeader(new MyItemListener2(),
+				(String) titles[2]));
+
+		TableColumn tc3 = table.getColumnModel().getColumn(3);
+		tc3.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),
+				(String) titles[3]));
+
+		TableColumn tc4 = table.getColumnModel().getColumn(4);
+		tc4.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),
+				(String) titles[4]));
+		/*
+		TableColumn tc5 = table.getColumnModel().getColumn(5);
+		tc5.setCellEditor(table.getDefaultEditor(Boolean.class));
+		tc5.setCellRenderer(table.getDefaultRenderer(Boolean.class));
+		tc5.setHeaderRenderer(new CheckBoxHeader(new MyItemListener5(),
+				(String) titles[5]));
+		*/
 		scrollPane.setViewportView(table);
-		
+
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
 		lblHauptmen.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseClicked(MouseEvent arg0) {
-				
+
 				PermissionEditImage_GUI.this.setVisible(false);
-				MainMenue_GUI main=new MainMenue_GUI();
+				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("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("Berechtigung");
 		lblNewLabel_1.setBounds(146, 11, 80, 14);
 		contentPanel.add(lblNewLabel_1);
-		
+
 		JLabel lblName = new JLabel("Name:");
 		lblName.setBounds(10, 36, 46, 20);
 		contentPanel.add(lblName);
-		
+
 		textField = new JTextField();
 		textField.setBounds(69, 36, 171, 20);
 		contentPanel.add(textField);
 		textField.setColumns(10);
-		
+
 		JLabel lblHochschule = new JLabel("Hochschule:");
 		lblHochschule.setBounds(275, 36, 80, 20);
 		contentPanel.add(lblHochschule);
-		
+
 		JComboBox comboBox = new JComboBox();
-		comboBox.setModel(new DefaultComboBoxModel(new String[] {"Hochschule Offenburg", "Hochschule Reutlingen", "Universit\u00E4t Freiburg"}));
+		comboBox.setModel(new DefaultComboBoxModel(new String[] {
+				"Hochschule Offenburg", "Hochschule Reutlingen",
+				"Universit\u00E4t Freiburg" }));
 		comboBox.setBounds(365, 36, 202, 20);
 		contentPanel.add(comboBox);
-		
+
 		JPanel panel = new JPanel();
 		panel.setBounds(10, 67, 557, 129);
 		contentPanel.add(panel);
 		panel.setLayout(null);
-		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
+		panel.setBorder(new TitledBorder(null, "Beschreibung",
+				TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
-		
+
 		JLabel label = new JLabel("Read");
 		label.setBounds(20, 18, 90, 20);
 		panel.add(label);
-		
+
 		JLabel label_3 = new JLabel("Write");
 		label_3.setBounds(20, 38, 90, 20);
 		panel.add(label_3);
-		
-		JLabel label_4 = new JLabel("ChangePermission");
-		label_4.setBounds(20, 58, 90, 20);
-		panel.add(label_4);
-		
-		JLabel label_5 = new JLabel("Admin");
-		label_5.setBounds(20, 78, 90, 20);
-		panel.add(label_5);
-		
-		JLabel label_6 = new JLabel("Link_allowed");
-		label_6.setBounds(20, 98, 90, 20);
-		panel.add(label_6);
-		
-		JLabel lblImageLesenUnd = new JLabel("Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
+
+		JLabel lblImageLesenUnd = new JLabel(
+				"Image lesen und starten, in Suchfenster und VMchooser sichtbar.");
 		lblImageLesenUnd.setBounds(120, 18, 380, 20);
 		panel.add(lblImageLesenUnd);
-		
-		JLabel lblImageAnpassenUnd = new JLabel("Image anpassen und überschrieben, jedoch nicht löschen.");
+
+		JLabel lblImageAnpassenUnd = new JLabel(
+				"Image anpassen und überschrieben, jedoch nicht löschen.");
 		lblImageAnpassenUnd.setBounds(120, 38, 380, 20);
 		panel.add(lblImageAnpassenUnd);
 		
-		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
-		label_9.setBounds(120, 58, 380, 20);
-		panel.add(label_9);
+		lblLinkAllowed = new JLabel("Link allowed");
+		lblLinkAllowed.setBounds(20, 58, 90, 20);
+		panel.add(lblLinkAllowed);
+		
+		label_5 = new JLabel("Admin");
+		label_5.setBounds(20, 78, 90, 20);
+		panel.add(label_5);
 		
-		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
-		label_10.setBounds(120, 78, 380, 20);
-		panel.add(label_10);
+		label_6 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
+		label_6.setBounds(120, 58, 380, 20);
+		panel.add(label_6);
 		
-		JLabel label_11 = new JLabel("Erzeugung einer Veranstaltung auf ein Image ist erlaubt.");
-		label_11.setBounds(120, 98, 380, 20);
-		panel.add(label_11);
+		label_7 = new JLabel("<HTML>Volle Rechte: read, write, löschen, Link_allowed und<br>Berechtigungen für andere Benutzer festlegen.</HTML>");
+		label_7.setBounds(120, 78, 380, 40);
+		panel.add(label_7);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
@@ -297,26 +303,25 @@ public class PermissionEditImage_GUI extends JFrame {
 				JButton cancelButton = new JButton("Zur\u00FCck");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						
-						EditImageFreigabe_GUI sr=new EditImageFreigabe_GUI();
+
+						EditImageFreigabe_GUI sr = new EditImageFreigabe_GUI();
 						sr.setVisible(true);
 						dispose();
 					}
 				});
 				cancelButton.setActionCommand("OK");
 				buttonPane.add(cancelButton);
-				//getRootPane().setDefaultButton(cancelButton);
+				// getRootPane().setDefaultButton(cancelButton);
 			}
 			{
 				JButton continueButton = new JButton("Weiter");
 				continueButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						
-						FTPEditUploader_GUI ea=new FTPEditUploader_GUI();
+
+						FTPEditUploader_GUI ea = new FTPEditUploader_GUI();
 						ea.setVisible(true);
 						dispose();
-						
+
 					}
 				});
 				continueButton.setActionCommand("Cancel");
@@ -324,34 +329,34 @@ public class PermissionEditImage_GUI extends JFrame {
 				getRootPane().setDefaultButton(continueButton);
 			}
 		}
-		
+
 		JSeparator separator = new JSeparator();
 		separator.setBounds(0, 78, 597, 2);
 		getContentPane().add(separator);
-		
+
 		JSeparator separator_1 = new JSeparator();
 		separator_1.setBounds(0, 627, 597, 2);
 		getContentPane().add(separator_1);
-		
+
 		JMenuBar menuBar = new JMenuBar();
 		setJMenuBar(menuBar);
-				
+
 		JMenu mnNewMenu_1 = new JMenu("Hilfe");
 		menuBar.add(mnNewMenu_1);
-		
+
 		JMenuItem mntmFaq = new JMenuItem("FAQ");
 		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();
@@ -359,7 +364,6 @@ public class PermissionEditImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmFaq);
-		
 
 		JMenuItem mntmOtrs = new JMenuItem("OTRS");
 		mntmOtrs.addMouseListener(new MouseAdapter() {
@@ -367,22 +371,22 @@ public class PermissionEditImage_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) {
@@ -391,132 +395,102 @@ public class PermissionEditImage_GUI extends JFrame {
 			}
 		});
 		mnNewMenu_1.add(mntmAbout);
-		
+
+	}
+
+	class MyItemListener1 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 1);
+			}
+		}
+	}
+
+	class MyItemListener2 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 2);
+			}
+		}
+	}
+
+	class MyItemListener3 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 3);
+			}
+		}
+	}
+
+	class MyItemListener4 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 4);
+			}
+		}
+	}
+
+	class MyItemListener5 implements ItemListener {
+		public void itemStateChanged(ItemEvent e) {
+			Object source = e.getSource();
+			if (source instanceof AbstractButton == false)
+				return;
+			boolean checked = e.getStateChange() == ItemEvent.SELECTED;
+			for (int x = 0, y = table.getRowCount(); x < y; x++) {
+				table.setValueAt(new Boolean(checked), x, 5);
+			}
+		}
 	}
-	  class MyItemListener1 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,1);  
-	      }  
-	    }
-	   }
-	  class MyItemListener2 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,2);  
-	      }  
-	    }
-	   }
-	  class MyItemListener3 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,3);  
-	      }  
-	    }
-	   }
-	  class MyItemListener4 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,4);  
-	      }  
-	    }
-	   }
-	  class MyItemListener5 implements ItemListener  
-	  {  
-	    public void itemStateChanged(ItemEvent e) {  
-	      Object source = e.getSource();  
-	      if (source instanceof AbstractButton == false) return;  
-	      boolean checked = e.getStateChange() == ItemEvent.SELECTED;  
-	      for(int x = 0, y = table.getRowCount(); x < y; x++)  
-	      {  
-	        table.setValueAt(new Boolean(checked),x,5);  
-	      }  
-	    }
-	   }
 }
 
-/*class CheckBoxHeader extends JCheckBox
-implements TableCellRenderer, MouseListener {  
-protected CheckBoxHeader rendererComponent;  
-protected int column;  
-protected boolean mousePressed = false;  
-
-public CheckBoxHeader(ItemListener itemListener ,String text) {  
-rendererComponent = this;  
-rendererComponent.addItemListener(itemListener);  
-rendererComponent.setText(text);
-}  
-
-public Component getTableCellRendererComponent(  
-  JTable table, Object value,  
-  boolean isSelected, boolean hasFocus, int row, int column) {  
-if (table != null) {  
-  JTableHeader header = table.getTableHeader();  
-  if (header != null) {  
-   rendererComponent.setForeground(header.getForeground());  
-   rendererComponent.setBackground(header.getBackground());  
-   rendererComponent.setFont(header.getFont());
-   rendererComponent.setBorder(header.getBorder());
-   header.addMouseListener(rendererComponent);  
-  }  
-}  
-setColumn(column);  
-//rendererComponent.setText("Check All");  
-//setBorder(UIManager.getBorder("TableHeader.cellBorder"));  
-
-return rendererComponent;  
-}  
-protected void setColumn(int column) {  
-this.column = column;  
-}  
-public int getColumn() {  
-return column;  
-}  
-protected void handleClickEvent(MouseEvent e) {  
-if (mousePressed) {  
-  mousePressed=false;  
-  JTableHeader header = (JTableHeader)(e.getSource());  
-  JTable tableView = header.getTable();  
-  TableColumnModel columnModel = tableView.getColumnModel();  
-  int viewColumn = columnModel.getColumnIndexAtX(e.getX());  
-  int column = tableView.convertColumnIndexToModel(viewColumn);  
-
-  if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) {  
-    doClick();  
-  }  
-}  
-}  
-public void mouseClicked(MouseEvent e) {  
-handleClickEvent(e);  
-((JTableHeader)e.getSource()).repaint();  
-}  
-public void mousePressed(MouseEvent e) {  
-mousePressed = true;  
-}  
-public void mouseReleased(MouseEvent e) {  
-}  
-public void mouseEntered(MouseEvent e) {  
-}  
-public void mouseExited(MouseEvent e) {  
-}  
-}  */
+/*
+ * class CheckBoxHeader extends JCheckBox implements TableCellRenderer,
+ * MouseListener { protected CheckBoxHeader rendererComponent; protected int
+ * column; protected boolean mousePressed = false;
+ * 
+ * public CheckBoxHeader(ItemListener itemListener ,String text) {
+ * rendererComponent = this; rendererComponent.addItemListener(itemListener);
+ * rendererComponent.setText(text); }
+ * 
+ * public Component getTableCellRendererComponent( JTable table, Object value,
+ * boolean isSelected, boolean hasFocus, int row, int column) { if (table !=
+ * null) { JTableHeader header = table.getTableHeader(); if (header != null) {
+ * rendererComponent.setForeground(header.getForeground());
+ * rendererComponent.setBackground(header.getBackground());
+ * rendererComponent.setFont(header.getFont());
+ * rendererComponent.setBorder(header.getBorder());
+ * header.addMouseListener(rendererComponent); } } setColumn(column);
+ * //rendererComponent.setText("Check All");
+ * //setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+ * 
+ * return rendererComponent; } protected void setColumn(int column) {
+ * this.column = column; } public int getColumn() { return column; } protected
+ * void handleClickEvent(MouseEvent e) { if (mousePressed) { mousePressed=false;
+ * JTableHeader header = (JTableHeader)(e.getSource()); JTable tableView =
+ * header.getTable(); TableColumnModel columnModel = tableView.getColumnModel();
+ * int viewColumn = columnModel.getColumnIndexAtX(e.getX()); int column =
+ * tableView.convertColumnIndexToModel(viewColumn);
+ * 
+ * if (viewColumn == this.column && e.getClickCount() == 1 && column != -1) {
+ * doClick(); } } } public void mouseClicked(MouseEvent e) {
+ * handleClickEvent(e); ((JTableHeader)e.getSource()).repaint(); } public void
+ * mousePressed(MouseEvent e) { mousePressed = true; } public void
+ * mouseReleased(MouseEvent e) { } public void mouseEntered(MouseEvent e) { }
+ * public void mouseExited(MouseEvent e) { } }
+ */
diff --git a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
index f75a8081..67bed213 100644
--- a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java
@@ -70,8 +70,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name","Read", "Write",
-			"ChangePermission","Admin"};
+	Object[] titles = { "Name","Read", "Write","Admin"};
 	
 	final DefaultTableModel model = new DefaultTableModel(titles, 0){
 		
@@ -180,12 +179,12 @@ public class PermissionCreateLecture_GUI extends JFrame {
 	    tc3.setCellEditor(table.getDefaultEditor(Boolean.class));  
 	    tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
 	    tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
-	    
+	    /*
 	    TableColumn tc4 = table.getColumnModel().getColumn(4);  
 	    tc4.setCellEditor(table.getDefaultEditor(Boolean.class));  
 	    tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
 	    tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4]));
-	    
+	    */
 		scrollPane.setViewportView(table);
 		
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
@@ -238,7 +237,7 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		contentPanel.add(comboBox);
 		
 		JPanel panel = new JPanel();
-		panel.setBounds(10, 67, 557, 109);
+		panel.setBounds(10, 67, 557, 129);
 		contentPanel.add(panel);
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
@@ -252,10 +251,6 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		label_3.setBounds(20, 38, 90, 20);
 		panel.add(label_3);
 		
-		JLabel label_4 = new JLabel("ChangePermission");
-		label_4.setBounds(20, 58, 90, 20);
-		panel.add(label_4);
-		
 		JLabel label_5 = new JLabel("Admin");
 		label_5.setBounds(20, 78, 90, 20);
 		panel.add(label_5);
@@ -264,17 +259,13 @@ public class PermissionCreateLecture_GUI extends JFrame {
 		label_7.setBounds(120, 18, 380, 20);
 		panel.add(label_7);
 		
-		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
-		label_8.setBounds(120, 38, 380, 20);
-		panel.add(label_8);
-		
-		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
-		label_9.setBounds(120, 58, 380, 20);
-		panel.add(label_9);
+		JLabel lblimageDarfAngepasst = new JLabel("<HTML>Image darf angepasst und überschrieben, jedoch nicht gelöscht werden. Berechtigungen für andere Benutzer festlegen</HTML>");
+		lblimageDarfAngepasst.setBounds(120, 38, 380, 45);
+		panel.add(lblimageDarfAngepasst);
 		
-		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
-		label_10.setBounds(120, 78, 380, 20);
-		panel.add(label_10);
+		JLabel lblvolleRechteRead = new JLabel("<HTML>Volle Rechte: read, write, löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
+		lblvolleRechteRead.setBounds(120, 78, 380, 40);
+		panel.add(lblvolleRechteRead);
 		{
 			JPanel buttonPane = new JPanel();
 			buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
index 5a77c230..da8864c7 100644
--- a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java
@@ -70,8 +70,7 @@ public class PermissionEditLecture_GUI extends JFrame {
 	String[] result;
 	private JTable table;
 	private Class[] classes;
-	Object[] titles = { "Name","Read", "Write",
-			 "ChangePermission","Admin"};
+	Object[] titles = { "Name","Read", "Write","Admin"};
 	
 	final DefaultTableModel model = new DefaultTableModel(titles, 0){
 		
@@ -149,40 +148,32 @@ public class PermissionEditLecture_GUI extends JFrame {
 		panel.setLayout(null);
 		panel.setBorder(new TitledBorder(null, "Beschreibung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
 		panel.setBackground(SystemColor.menu);
-		panel.setBounds(10, 67, 557, 109);
+		panel.setBounds(10, 67, 557, 129);
 		contentPanel.add(panel);
 		
 		JLabel label = new JLabel("Read");
 		label.setBounds(20, 18, 90, 20);
 		panel.add(label);
 		
-		JLabel label_3 = new JLabel("Write");
-		label_3.setBounds(20, 38, 90, 20);
+		JLabel label_3 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
+		label_3.setBounds(120, 18, 380, 20);
 		panel.add(label_3);
 		
-		JLabel label_4 = new JLabel("ChangePermission");
-		label_4.setBounds(20, 58, 90, 20);
+		JLabel label_4 = new JLabel("Write");
+		label_4.setBounds(20, 38, 90, 20);
 		panel.add(label_4);
 		
-		JLabel label_5 = new JLabel("Admin");
-		label_5.setBounds(20, 78, 90, 20);
+		JLabel label_5 = new JLabel("<HTML>Image darf angepasst und überschrieben, jedoch nicht gelöscht werden. Berechtigungen für andere Benutzer festlegen</HTML>");
+		label_5.setBounds(120, 38, 380, 45);
 		panel.add(label_5);
 		
-		JLabel label_7 = new JLabel("Image darf gelesen und gestartet werden und ist in Suchfenster sichtbar.");
-		label_7.setBounds(120, 18, 380, 20);
-		panel.add(label_7);
-		
-		JLabel label_8 = new JLabel("Image darf angepasst und überschrieben, jedoch nicht gelöscht werden.");
-		label_8.setBounds(120, 38, 380, 20);
-		panel.add(label_8);
-		
-		JLabel label_9 = new JLabel("Berechtigungen für das Image dürfen geändert werden.");
-		label_9.setBounds(120, 58, 380, 20);
-		panel.add(label_9);
+		JLabel label_6 = new JLabel("Admin");
+		label_6.setBounds(20, 78, 90, 20);
+		panel.add(label_6);
 		
-		JLabel label_10 = new JLabel("Volle Rechte: write + changePermission + löschen.");
-		label_10.setBounds(120, 78, 380, 20);
-		panel.add(label_10);
+		JLabel label_7 = new JLabel("<HTML>Volle Rechte: read, write, löschen und Berechtigungen für andere Benutzer festlegen.</HTML>");
+		label_7.setBounds(120, 78, 380, 40);
+		panel.add(label_7);
 		
 		JPanel panel_1 = new JPanel();
 		panel_1.setBackground(SystemColor.menu);
@@ -219,12 +210,12 @@ public class PermissionEditLecture_GUI extends JFrame {
 	    tc3.setCellEditor(table.getDefaultEditor(Boolean.class));  
 	    tc3.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
 	    tc3.setHeaderRenderer(new CheckBoxHeader(new MyItemListener3(),(String) titles[3]));
-	    
+	    /*
 	    TableColumn tc4 = table.getColumnModel().getColumn(4);  
 	    tc4.setCellEditor(table.getDefaultEditor(Boolean.class));  
 	    tc4.setCellRenderer(table.getDefaultRenderer(Boolean.class));  
 	    tc4.setHeaderRenderer(new CheckBoxHeader(new MyItemListener4(),(String) titles[4]));
-	    
+	    */
 		scrollPane.setViewportView(table);
 		
 		JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 37963440..80e3182e 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -6,7 +6,7 @@ public class Links {
 	private static String OTRS = "http://bwlehrpool.hs-offenburg.de/";
 	private static String uriWindows = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
 	private static String uriLinux = "https://my.vmware.com/de/web/vmware/free#desktop_end_user_computing/vmware_player/6_0";
-	private static String AnleitungVMDK = "http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/2_bwLehrpool_-_Eigene_Images_erstellen.pdf";
+	private static String AnleitungVMDK = "http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf";
 
 	public static String getFAQ() {
 		return FAQ;