[client] autosort OS in details

1 files changed, 17 insertions, 8 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 22d5f402..55b6332d 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
@@ -5,12 +5,17 @@ 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.OperatingSystem;
+import org.openslx.bwlp.thrift.iface.Organization;
 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.helper.SwtUtil;
 import org.openslx.dozmod.gui.window.layout.ImageDetailsWindowLayout;
@@ -34,8 +39,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 
 	public ImageDetailsWindow(Frame modalParent) {
 		super(modalParent);
-		setVisible(false);
-		setFocusable(true);
+		
 		// Close button closes window
 		btnClose.addActionListener(new ActionListener() {
 			@Override
@@ -53,7 +57,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 				}
 			}
 		});
-
+		setFocusable(true);
 	}
 	/**
 	 * @param imageBaseId the id of the image to be displayed
@@ -107,14 +111,20 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 		lblCreateTime.setText(FormatHelper.longDate(image.getCreateTime()));
 		lblUpdateTime.setText(FormatHelper.longDate(image.getUpdateTime()));
 
-		for (OperatingSystem os : MetaDataCache.getOperatingSystems()) {
+		List<OperatingSystem> osList = MetaDataCache.getOperatingSystems();
+		// all fine, lets sort it
+		Collections.sort(osList, new Comparator<OperatingSystem>() {
+			public int compare(OperatingSystem o1, OperatingSystem o2) {
+				return o1.getOsName().compareTo(o2.getOsName());
+			}
+		});
+		for (OperatingSystem os : osList) {
 			cboOperatingSystem.addItem(os);
 		}
 		OperatingSystem os = MetaDataCache.getOsById(image.getOsId());
 		if (os != null) {
 			cboOperatingSystem.setSelectedItem(os);
 		}
-
 		Virtualizer virt = MetaDataCache.getVirtualizerById(image.getVirtId());
 		if (virt != null)
 			lblVirtualizer.setText(virt.getVirtName());
@@ -127,7 +137,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 		btnIsTemplate.setSelected(image.isTemplate);
 		makeEditable(ImagePerms.canEdit(image));
 		pack();
-		Gui.centerShell(this);
+		MainWindow.centerShell(this);
 		setVisible(true);
 	}
 
@@ -141,7 +151,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 		txtDescription.setEnabled(editable);
 		txtTags.setEnabled(editable);
 		btnIsTemplate.setEnabled(editable);
-		// TODO fix combobox enabling stuff
+		cboOperatingSystem.setEnabled(editable);
 	}
 
 	/**
@@ -153,7 +163,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 	 */
 	public static void open(Frame modalParent, String imageBaseId) {
 		ImageDetailsWindow win = new ImageDetailsWindow(modalParent);
-		Gui.centerShell(win);
 		win.setImage(imageBaseId);
 	}
 }