[client] Resolve user ids to names in image list window.

2 files changed, 22 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableHelper.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableHelper.java
index 0e0af351..a599cd4c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableHelper.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/TableHelper.java
@@ -2,6 +2,7 @@ package org.openslx.dozmod.gui.helper;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.TableViewer;
@@ -14,6 +15,7 @@ import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.thrift.MetaDataCache;
+import org.openslx.dozmod.thrift.UserCache;
 
 public final class TableHelper {
 	private TableHelper() {
@@ -37,7 +39,7 @@ public final class TableHelper {
 		// for column sorting
 		col.getColumn().addSelectionListener(getSelectionAdapter(col, colNumber, tableViewer));
 	}
-	
+
 	/**
 	 * Create a column for the given table viewer without sorting functionality
 	 * @param tableViewer
@@ -89,7 +91,7 @@ public final class TableHelper {
 			public String getText(Object element) {
 				ImageSummaryRead image = (ImageSummaryRead) element;
 				OperatingSystem os = MetaDataCache.getOsById(image.getOsId());
-				
+
 				if (os == null) {
 					return "Unknown";
 				} else {
@@ -102,8 +104,15 @@ public final class TableHelper {
 			@Override
 			public String getText(Object element) {
 				ImageSummaryRead image = (ImageSummaryRead) element;
-				return image.getOwnerId();
+				String ownerId = image.getOwnerId();
+				UserInfo user = UserCache.find(ownerId);
+				if (user == null){
+					return "Unknown";
+				}else {
+					return user.firstName + " " + user.getLastName();
+				}
 			}
+
 		});
 
 		createSortedColumn(table, "Letztes Update", 110, 3, new ColumnLabelProvider() {
@@ -141,7 +150,7 @@ public final class TableHelper {
 				return user.firstName + " " + user.lastName;
 			}
 		});
-		
+
 		createUnsortedColumn(permissionTableViewer, "Link", 90, new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -149,7 +158,7 @@ public final class TableHelper {
 				return " ";
 			}
 		});
-		
+
 		createUnsortedColumn(permissionTableViewer, "Download", 90, new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -157,7 +166,7 @@ public final class TableHelper {
 				return " ";
 			}
 		});
-		
+
 		createUnsortedColumn(permissionTableViewer, "Edit", 90, new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -165,7 +174,7 @@ public final class TableHelper {
 				return " ";
 			}
 		});
-		
+
 		createUnsortedColumn(permissionTableViewer, "Admin", 90, new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -173,6 +182,6 @@ public final class TableHelper {
 				return " ";
 			}
 		});
-		
+
 	};
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index 00e4c3ca..81a89205 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Shell;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
+import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.ImageListComparator;
@@ -26,6 +27,7 @@ import org.openslx.dozmod.gui.window.layout.ImageListWindowLayout;
 import org.openslx.dozmod.gui.wizard.ImageWizard;
 import org.openslx.dozmod.thrift.ImageCache;
 import org.openslx.dozmod.thrift.Session;
+import org.openslx.dozmod.thrift.UserCache;
 import org.openslx.thrifthelper.ThriftManager;
 import org.openslx.util.QuickTimer;
 import org.openslx.util.QuickTimer.Task;
@@ -114,8 +116,9 @@ public class ImageListWindow extends ImageListWindowLayout {
 
 				// the owner id of the selected image
 				String ownerId = selectedElement.getOwnerId();
-				if (ownerId != null) {
-					ownerInfo.setText(ownerId);
+				UserInfo user = UserCache.find(ownerId);
+				if (user != null) {
+					ownerInfo.setText(user.getFirstName() + " " + user.getLastName());
 				} else {
 					ownerInfo.setText("Unknown");
 				}