[client] fine tune popup menu of image details

1 files changed, 14 insertions, 28 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 5f9a5767..042824f3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -1,33 +1,19 @@
 package org.openslx.dozmod.gui.window;
 
-import java.awt.Color;
 import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-import javax.swing.JCheckBox;
-import javax.swing.JComboBox;
-import javax.swing.JLabel;
 import javax.swing.JMenuItem;
-import javax.swing.JTextField;
-import javax.swing.RowFilter;
-import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.ListDataEvent;
-import javax.swing.event.ListDataListener;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
@@ -58,7 +44,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 
 	private ImageDetailsRead image = null;
 
-	private final JMenuItem[] popupMenuItems = new JMenuItem[2];
+	private JMenuItem popupItemNew = new JMenuItem("Neue Veranstaltung");
+	private JMenuItem popupItemDelete = new JMenuItem("Löschen");
 
 	public ImageDetailsWindow(Frame modalParent) {
 		super(modalParent);
@@ -92,24 +79,22 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		// Setup popup menu for the right panel
 		final PopupMenu pop = new PopupMenu(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				if (e.getSource().equals(popupMenuItems[0])) {
+				if (e.getSource().equals(popupItemNew)) {
 					// TODO new lecture wizard with this image preset
 					LOGGER.debug("New lecture clicked");
 				}
-				if (e.getSource().equals(popupMenuItems[1])) {
+				if (e.getSource().equals(popupItemDelete)) {
 					// TODO delete that image
 					LOGGER.debug("Delete image clicked");
 				}
 
 			}
 		});
-		// our menu items
-		popupMenuItems[0] = new JMenuItem("Neue Veranstaltung");
-		popupMenuItems[1] = new JMenuItem("Löschen");
 		// add them to the popup menu
-		pop.addMenuItem(popupMenuItems[0]);
+		pop.addMenuItem(popupItemNew);
 		pop.addSeparator();
-		pop.addMenuItem(popupMenuItems[1]);
+		pop.addMenuItem(popupItemDelete);
+		// TODO check permissions and disable them if needed
 
 		// mouse adapter to register clicks and react on the right panel
 		final MouseAdapter ma = new MouseAdapter() {
@@ -221,13 +206,10 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		txtTags.setText(tagsString);
 		btnIsTemplate.setSelected(image.isTemplate);
 
+		// set the versions of the image to the table
 		versionTable.setData(image.getVersions(), true);
 
-		makeEditable(ImagePerms.canEdit(image));
-		pack();
-		MainWindow.centerShell(this);
-
-		// final step, add listeners
+		// final step, add listeners to react to change
 		final DocumentListener docListener = new DocumentListener() {
 			@Override
 			public void removeUpdate(DocumentEvent e) {
@@ -267,7 +249,11 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 
 			}
 		});
-		// finally do show it
+		// make fields editable is allowed
+		makeEditable(ImagePerms.canEdit(image));
+		// finally do show it all
+		pack();
+		MainWindow.centerShell(this);
 		setVisible(true);
 	}