[client] first steps for the swingified imagedetailswindow

1 files changed, 26 insertions, 21 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 66a1a321..8238f2a0 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,6 +1,6 @@
 package org.openslx.dozmod.gui.window;
 
-import java.awt.Window;
+import java.awt.Frame;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -29,16 +29,16 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 
 	private ImageDetailsRead image = null;
 
-	public ImageDetailsWindow(Window parent) {
-		super(parent);
+	public ImageDetailsWindow(Frame modalParent) {
+		super(modalParent);
 
-		// Close button closes window
-		btnClose.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				getShell().dispose();
-			}
-		});
+//		// Close button closes window
+//		btnClose.addSelectionListener(new SelectionAdapter() {
+//			@Override
+//			public void widgetSelected(SelectionEvent e) {
+//				getShell().dispose();
+//			}
+//		});
 	}
 
 	public void setImage(final String imageBaseId) {
@@ -64,9 +64,9 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 					@Override
 					public void run() {
 						if (e != null || image == null) {
-							MainWindow.showMessageBox("Konnte Daten des Images nicht abrufen",
+							Gui.showMessageBox(null, "Konnte Daten des Images nicht abrufen",
 									MessageType.ERROR, LOGGER, e);
-							getShell().dispose();
+							dispose();
 						} else {
 							fill();
 						}
@@ -77,19 +77,19 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 	}
 
 	private void fill() {
-		if (isDisposed() || image == null)
+		if (image == null)
 			return;
 		txtTitle.setText(SwtUtil.replaceMnemonics(image.getImageName()));
 		txtDescription.setText(SwtUtil.replaceMnemonics(image.getDescription()));
-		lblOwner.setUser(UserCache.find(image.getOwnerId()));
-		lblUpdater.setUser(UserCache.find(image.getUpdaterId()));
+		lblOwner.setText(FormatHelper.userName(UserCache.find(image.getOwnerId())));
+		lblUpdater.setText(FormatHelper.userName(UserCache.find(image.getUpdaterId())));
 		lblCreateTime.setText(FormatHelper.longDate(image.getCreateTime()));
 		lblUpdateTime.setText(FormatHelper.longDate(image.getUpdateTime()));
 		List<OperatingSystem> osList = MetaDataCache.getOperatingSystems();
-		cboOperatingSystem.setInput(osList);
+//		cboOperatingSystem.setInput(osList);
 		OperatingSystem os = MetaDataCache.getOsById(image.getOsId());
 		if (os != null) {
-			cboOperatingSystem.setSelection(new StructuredSelection(os), true);
+//			cboOperatingSystem.setSelection(new StructuredSelection(os), true);
 		}
 		Virtualizer virt = MetaDataCache.getVirtualizerById(image.getVirtId());
 		if (virt != null)
@@ -99,10 +99,10 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 			tagsString = tagsString + ", " + tag;
 		}
 		txtTags.setText(tagsString);
-		btnIsTemplate.setSelection(image.isTemplate);
+//		btnIsTemplate.setSelection(image.isTemplate);
 		makeEditable(ImagePerms.canEdit(image));
-		getShell().layout(true, true);
-		MainWindow.centerShell(getShell());
+//		getShell().layout(true, true);
+//		MainWindow.centerShell(getShell());
 	}
 
 
@@ -110,8 +110,13 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout {
 	private void makeEditable(boolean editable){
 		txtTitle.setEnabled(editable);
 		txtDescription.setEnabled(editable);
-		cboOperatingSystem.getCombo().setEnabled(editable);
+//		cboOperatingSystem.getCombo().setEnabled(editable);
 		txtTags.setEnabled(editable);
 		btnIsTemplate.setEnabled(editable);
 	}
+	public static void open(Frame modalParent) {
+		ImageDetailsWindow win = new ImageDetailsWindow(modalParent);
+		MainWindow.centerShell(win);
+		win.setVisible(true);
+	}
 }