Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

3 files changed, 44 insertions, 54 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index f1c3901c..04a20359 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -5,21 +5,13 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
 
 import org.apache.log4j.Logger;
-import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
 import org.openslx.bwlp.thrift.iface.LectureRead;
-import org.openslx.bwlp.thrift.iface.OperatingSystem;
-import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.window.layout.LectureDetailsWindowLayout;
-import org.openslx.dozmod.permissions.ImagePerms;
-import org.openslx.dozmod.thrift.MetaDataCache;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.dozmod.thrift.UserCache;
 import org.openslx.dozmod.util.FormatHelper;
@@ -59,7 +51,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout {
 	}
 
 	/**
-	 * @param lectureId the id of the image to be displayed
+	 * @param lectureId the id of the lecture to be displayed
 	 */
 	public void setLecture(final String lectureId) {
 
@@ -94,7 +86,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout {
 	}
 
 	/**
-	 * callback function when we received the image's details from the server
+	 * callback function when we received the lecture's details from the server
 	 */
 	private void fill() {
 		if (lecture == null)
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index c0c32f71..0e4ed935 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -58,6 +58,9 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
     	setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
     	setLayout(new BorderLayout());
 
+    	// helper for row index
+    	int row = 0;
+    	
     	// use panel to put every info related widget in it
     	// then we will set the panel in BorderLayout.CENTER
     	JPanel infoPanel = new JPanel();
@@ -66,29 +69,30 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
     	// -- name --
 		txtTitle = new JLabel();
 		txtTitle.setFont(txtTitle.getFont().deriveFont(Font.BOLD, txtTitle.getFont().getSize2D() * 2));
-		infoPanel.add(txtTitle, GridPos.get(0,  0, 2, 1, true, false));
+		infoPanel.add(txtTitle, GridPos.get(0,  row++, 2, 1, true, false));
+		System.out.println(row);
 		
 		// description
 		txtDescription = new JTextArea();
-		infoPanel.add(new JLabel("Beschreibung"), GridPos.get(0, 1, false, false));
-		infoPanel.add(new JScrollPane(txtDescription), GridPos.get(1, 1, true, false));
+		infoPanel.add(new JLabel("Beschreibung"), GridPos.get(0, row, false, false));
+		infoPanel.add(new JScrollPane(txtDescription), GridPos.get(1, row++, true, false));
 		
 		// owner
 		lblOwner = new PersonLabel();
-		infoPanel.add(new JLabel("Besitzer"), GridPos.get(0,  2, false, false));
-		infoPanel.add(lblOwner, GridPos.get(1,  2, true, false));
+		infoPanel.add(new JLabel("Besitzer"), GridPos.get(0,  row, false, false));
+		infoPanel.add(lblOwner, GridPos.get(1,  row++, true, false));
 		// creation time
 		lblCreateTime = new JLabel();
-		infoPanel.add(new JLabel("Erstellt"), GridPos.get(0,  3, false, false));
-		infoPanel.add(lblCreateTime, GridPos.get(1,  3, true, false));
+		infoPanel.add(new JLabel("Erstellt"), GridPos.get(0,  row, false, false));
+		infoPanel.add(lblCreateTime, GridPos.get(1,  row++, true, false));
 		// last updater
 		lblUpdater = new PersonLabel();
-		infoPanel.add(new JLabel("Geändert durch"), GridPos.get(0,  4, false, false));
-		infoPanel.add(lblUpdater, GridPos.get(1,  4, true, false));
+		infoPanel.add(new JLabel("Geändert durch"), GridPos.get(0,  row, false, false));
+		infoPanel.add(lblUpdater, GridPos.get(1,  row++, true, false));
 		// last updated
 		lblUpdateTime = new JLabel();
-		infoPanel.add(new JLabel("Änderungszeitpunkt"), GridPos.get(0,  5, false, false));
-		infoPanel.add(lblUpdateTime, GridPos.get(1,  5, true, false));
+		infoPanel.add(new JLabel("Änderungszeitpunkt"), GridPos.get(0,  row, false, false));
+		infoPanel.add(lblUpdateTime, GridPos.get(1,  row++, true, false));
 		// os
 		cboOperatingSystem = new JComboBox<>();
 		cboOperatingSystem.setEditable(false);
@@ -103,32 +107,32 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 				return this;
 			}
 		});
-		infoPanel.add(new JLabel("Betriebssystem"), GridPos.get(0,  6, false, false));
-		infoPanel.add(cboOperatingSystem, GridPos.get(1,  6, true, false));
+		infoPanel.add(new JLabel("Betriebssystem"), GridPos.get(0,  row, false, false));
+		infoPanel.add(cboOperatingSystem, GridPos.get(1,  row++, true, false));
 		// virtualizer
 		lblVirtualizer = new JLabel();
-		infoPanel.add(new JLabel("Virtualizer"), GridPos.get(0,  7, false, false));
-		infoPanel.add(lblVirtualizer, GridPos.get(1,  7, true, false));
+		infoPanel.add(new JLabel("Virtualizer"), GridPos.get(0,  row, false, false));
+		infoPanel.add(lblVirtualizer, GridPos.get(1,  row++, true, false));
 		// tags
 		txtTags = new JTextField();
-		infoPanel.add(new JLabel("Tags"), GridPos.get(0,  8, false, false));
-		infoPanel.add(txtTags, GridPos.get(1,  8, true, false));
+		infoPanel.add(new JLabel("Tags"), GridPos.get(0,  row, false, false));
+		infoPanel.add(txtTags, GridPos.get(1,  row++, true, false));
 		// share mode
 		cboShareMode = new JComboBox<ShareMode>();
-		infoPanel.add(new JLabel("Freigabemodus"), GridPos.get(0,  9, false, false));
-		infoPanel.add(cboShareMode, GridPos.get(1,  9, true, false));
+		infoPanel.add(new JLabel("Freigabemodus"), GridPos.get(0,  row, false, false));
+		infoPanel.add(cboShareMode, GridPos.get(1,  row++, true, false));
 		// template
 		btnIsTemplate = new JCheckBox();
-		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  10, false, false));
-		infoPanel.add(btnIsTemplate, GridPos.get(1,  10, true, false));
+		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row, false, false));
+		infoPanel.add(btnIsTemplate, GridPos.get(1,  row++, true, false));
 		
 		txtVersion = new JTextField();
-		infoPanel.add(new JLabel("Version"), GridPos.get(0,  11, false, false));
-		infoPanel.add(txtVersion, GridPos.get(1,  11, true, false));
+		infoPanel.add(new JLabel("Version"), GridPos.get(0,  row, false, false));
+		infoPanel.add(txtVersion, GridPos.get(1,  row++, true, false));
 		
 		txtId = new JTextField();
-		infoPanel.add(new JLabel("ID"), GridPos.get(0,  12, false, false));
-		infoPanel.add(txtId, GridPos.get(1,  12, true, false));
+		infoPanel.add(new JLabel("ID"), GridPos.get(0,  row, false, false));
+		infoPanel.add(txtId, GridPos.get(1,  row++, true, false));
 		
 		// finally add the infoPanel itself to the main view
 		add(infoPanel, BorderLayout.CENTER);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index 18231147..924dc7bd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
-import java.awt.Component;
 import java.awt.Font;
 import java.awt.Frame;
 import java.awt.GridBagLayout;
@@ -9,21 +8,16 @@ import java.awt.GridBagLayout;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
-import javax.swing.DefaultListCellRenderer;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
 import javax.swing.JDialog;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
 
-import org.openslx.bwlp.thrift.iface.OperatingSystem;
-import org.openslx.bwlp.thrift.iface.ShareMode;
 import org.openslx.dozmod.gui.control.PersonLabel;
 import org.openslx.dozmod.gui.helper.GridPos;
 
@@ -79,60 +73,60 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 
 		// description
 		txtDescription = new JTextArea();
-		infoPanel.add(new JLabel("Beschreibung"), GridPos.get(0, row++, false, false));
+		infoPanel.add(new JLabel("Beschreibung"), GridPos.get(0, row, false, false));
 		infoPanel.add(new JScrollPane(txtDescription), GridPos.get(1, row++, true, false));
 
 		// linked image name
 		txtImageName = new JTextField();
-		infoPanel.add(new JLabel("Imagename"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Imagename"), GridPos.get(0,  row, false, false));
 		infoPanel.add(txtImageName, GridPos.get(1,  row++, true, false));
 
 		// start time of the lecture
 		lblStartTime = new JLabel();
-		infoPanel.add(new JLabel("Startzeit"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Startzeit"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblStartTime, GridPos.get(1,  row++, true, false));
 
 		// end time of the lecture
 		lblEndTime = new JLabel();
-		infoPanel.add(new JLabel("Endzeit"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Endzeit"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblEndTime, GridPos.get(1,  row++, true, false));
 
 		// owner
 		lblOwner = new PersonLabel();
-		infoPanel.add(new JLabel("Besitzer"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Besitzer"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblOwner, GridPos.get(1,  row++, true, false));
 		// creation time
 		lblCreateTime = new JLabel();
-		infoPanel.add(new JLabel("Erstellt"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Erstellt"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblCreateTime, GridPos.get(1,  row++, true, false));
 		// last updater
 		lblUpdater = new PersonLabel();
-		infoPanel.add(new JLabel("Geändert durch"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Geändert durch"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblUpdater, GridPos.get(1,  row++, true, false));
 		// last updated
 		lblUpdateTime = new JLabel();
-		infoPanel.add(new JLabel("Änderungszeitpunkt"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Änderungszeitpunkt"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblUpdateTime, GridPos.get(1,  row++, true, false));
 		// enabled
 		btnIsEnabled = new JCheckBox();
-		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row, false, false));
 		infoPanel.add(btnIsEnabled, GridPos.get(1,  row++, true, false));
 		// is exam
 		btnIsExam = new JCheckBox();
-		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row, false, false));
 		infoPanel.add(btnIsExam, GridPos.get(1,  row++, true, false));
 
 		// auto update
 		btnAutoUpdate = new JCheckBox();
-		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("Vorlage"), GridPos.get(0,  row, false, false));
 		infoPanel.add(btnAutoUpdate, GridPos.get(1,  row++, true, false));
 		// id
 		txtId = new JTextField();
-		infoPanel.add(new JLabel("ID"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("ID"), GridPos.get(0,  row, false, false));
 		infoPanel.add(txtId, GridPos.get(1,  row++, true, false));
 		// use count
 		lblUseCount = new JLabel();
-		infoPanel.add(new JLabel("ID"), GridPos.get(0,  row++, false, false));
+		infoPanel.add(new JLabel("ID"), GridPos.get(0,  row, false, false));
 		infoPanel.add(lblUseCount, GridPos.get(1,  row++, true, false));