[client] Minor tweaks to ImageDetailsWindow

2 files changed, 40 insertions, 39 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 be2ff02c..5c36b23a 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
@@ -15,8 +15,6 @@ import javax.swing.JMenuItem;
 
 import org.apache.log4j.Logger;
 import org.openslx.bwlp.thrift.iface.ImageDetailsRead;
-import org.openslx.bwlp.thrift.iface.ImagePermissions;
-import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.Virtualizer;
 import org.openslx.dozmod.gui.Gui;
@@ -41,7 +39,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 	private final ImageDetailsWindow me = this;
 
 	private ImageDetailsRead image = null;
-	
+
 	private final JMenuItem[] popupMenuItems = new JMenuItem[2];
 
 	public ImageDetailsWindow(Frame modalParent) {
@@ -102,10 +100,12 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 			public void mousePressed(MouseEvent e) {
 				processClick(e);
 			}
+
 			@Override
 			public void mouseReleased(MouseEvent e) {
 				processClick(e);
 			}
+
 			private void processClick(MouseEvent e) {
 				int r = versionTable.rowAtPoint(e.getPoint());
 				if (r >= 0 && r < versionTable.getRowCount()) {
@@ -125,7 +125,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 
 	}
 
-
 	/**
 	 * @param imageBaseId the id of the image to be displayed
 	 */
@@ -177,10 +176,8 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 		lblUpdater.setUser(UserCache.find(image.getUpdaterId()));
 		lblCreateTime.setText(FormatHelper.longDate(image.getCreateTime()));
 		lblUpdateTime.setText(FormatHelper.longDate(image.getUpdateTime()));
-		txtId.setText(image.getImageBaseId());
 		txtVersion.setText(image.getLatestVersionId());
 
-
 		List<OperatingSystem> osList = MetaDataCache.getOperatingSystems();
 		// all fine, lets sort it
 		Collections.sort(osList, new Comparator<OperatingSystem>() {
@@ -221,7 +218,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 	 * @param editable true to make fields editable, false otherwise.
 	 */
 	private void makeEditable(boolean editable) {
-		txtTitle.setEnabled(editable);
+		txtTitle.setEditable(editable);
 		txtDescription.setEditable(editable);
 		txtTags.setEditable(editable);
 		txtVersion.setEditable(editable);
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 845bddcb..20d99fe9 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
@@ -32,7 +32,7 @@ import org.openslx.dozmod.gui.helper.GridPos;
 @SuppressWarnings("serial")
 public abstract class ImageDetailsWindowLayout extends JDialog {
 
-	protected final JLabel txtTitle;
+	protected final JTextField txtTitle;
 	protected final JTextArea txtDescription;
 
 	protected final PersonLabel lblOwner;
@@ -58,7 +58,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 	// TODO: Permissions, ...
 
 	public ImageDetailsWindowLayout(Frame modalParent) {
-		super(modalParent, "Platzhalter wärend das Fenster sich noch nicht gefüllt hat", ModalityType.APPLICATION_MODAL);
+		super(modalParent, "Platzhalter wärend das Fenster sich noch nicht gefüllt hat",
+				ModalityType.APPLICATION_MODAL);
 		setResizable(true);
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
 		setLayout(new BorderLayout());
@@ -72,33 +73,35 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		infoPanel.setLayout(new GridBagLayout());
 		infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		// -- name --
-		txtTitle = new JLabel();
+		txtTitle = new JTextField();
 		txtTitle.setFont(txtTitle.getFont().deriveFont(Font.BOLD, txtTitle.getFont().getSize2D() * 2));
-		infoPanel.add(txtTitle, GridPos.get(0,  row++, 2, 1, true, false));
+		infoPanel.add(txtTitle, GridPos.get(0, row++, 2, 1, true, false));
 
 		// description
 		txtDescription = new JTextArea();
 		txtDescription.setLineWrap(true);
-		txtDescription.setPreferredSize(new Dimension(450, 100));
+		txtDescription.setWrapStyleWord(true);
+		txtDescription.setMinimumSize(new Dimension(0, 100));
 		infoPanel.add(new JLabel("Beschreibung"), GridPos.get(0, row, false, false));
-		infoPanel.add(new JScrollPane(txtDescription), GridPos.get(1, row++, true, true));
+		infoPanel.add(new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
+				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), GridPos.get(1, row++, true, true));
 
 		// owner
 		lblOwner = new PersonLabel();
-		infoPanel.add(new JLabel("Besitzer"), GridPos.get(0,  row, false, false));
-		infoPanel.add(lblOwner, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(lblCreateTime, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(lblUpdater, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(lblUpdateTime, GridPos.get(1,  row++, 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);
@@ -113,32 +116,33 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 				return this;
 			}
 		});
-		infoPanel.add(new JLabel("Betriebssystem"), GridPos.get(0,  row, false, false));
-		infoPanel.add(cboOperatingSystem, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(lblVirtualizer, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(txtTags, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(cboShareMode, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(btnIsTemplate, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(txtVersion, GridPos.get(1,  row++, 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,  row, false, false));
-		infoPanel.add(txtId, GridPos.get(1,  row++, true, false));
+		txtId.setEditable(false);
+		infoPanel.add(new JLabel("ID"), GridPos.get(0, row, false, false));
+		infoPanel.add(txtId, GridPos.get(1, row++, true, false));
 
 		infoPanel.setPreferredSize(new Dimension(500, 400));
 
@@ -153,7 +157,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		buttonPanel.add(btnSaveChanges);
 		buttonPanel.add(Box.createGlue());
 		buttonPanel.add(btnClose);
-		add(buttonPanel, BorderLayout.SOUTH);
+		add(buttonPanel, BorderLayout.PAGE_END);
 
 		// --- Version table on the right (EAST) side
 		JPanel versionTablePanel = new JPanel();
@@ -161,11 +165,11 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		versionTablePanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 		JLabel lblVersion = new JLabel("Image Versionen");
 		lblVersion.setFont(lblVersion.getFont().deriveFont(Font.BOLD));
-		versionTablePanel.add(lblVersion, BorderLayout.NORTH);
+		versionTablePanel.add(lblVersion, BorderLayout.PAGE_START);
 		versionTable = new ImageVersionTable();
-		versionTablePanel.setPreferredSize(new Dimension(400, 200));
+		versionTablePanel.setPreferredSize(new Dimension(450, 200));
 		versionTableScrollPane = new JScrollPane(versionTable);
 		versionTablePanel.add(versionTableScrollPane, BorderLayout.CENTER);
-		add(versionTablePanel, BorderLayout.EAST);
+		add(versionTablePanel, BorderLayout.LINE_END);
 	}
 }