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

2 files changed, 3 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index 0d651c0b..7484cb6f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -13,6 +13,7 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
 
+import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -88,6 +89,6 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 		grid.finish(false);
 
 		pack();
-		setLocationRelativeTo(modalParent);
+		Gui.centerShellOverShell(modalParent, this);
 	}
 }
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 92c02cc6..f5b41f9d 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
@@ -152,15 +152,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		*/
 
 		// share mode
-		cboShareMode = new ComboBox<ShareMode>(Comparators.sharemode,
-				new ComboBoxRenderer<ShareMode>() {
-			@Override
-			public String renderItem(ShareMode item) {
-				if (item == null)
-					return null;
-				return item.name();
-			}
-		});
+		cboShareMode = new JComboBox<ShareMode>();
 		grid.add(new QLabel("Freigabemodus"));
 		grid.add(cboShareMode, 2).expand(true, false).fill(true, false);
 		grid.nextRow();