[client] More copypaste removed

1 files changed, 21 insertions, 41 deletions

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 b54ca750..340ba425 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
@@ -13,6 +13,7 @@ import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
 import org.openslx.bwlp.thrift.iface.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.bwlp.thrift.iface.UserInfo;
@@ -67,53 +68,24 @@ public class ImageListWindow extends ImageListWindowLayout {
 				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
 				if (selectedElement == null)
 					return;
-				String imageName = selectedElement.getImageName();
-				if (imageName == null) {
-					imageSelectedNameLabel.setText("Unknown");
-				} else {
-					imageSelectedNameLabel.setText(imageName);
-				}
-
+				// -- Set details --
+				// set the image name
+				setFieldText(imageSelectedNameLabel, selectedElement.getImageName());
 				// set the image
-				String imageBaseId = selectedElement.getImageBaseId();
-				if (imageBaseId == null) {
-					idInfo.setText("Unknown");
-				} else {
-					idInfo.setText(imageBaseId);
-				}
-
+				setFieldText(idInfo, selectedElement.getImageBaseId());
 				// set the current version of the image
-				String currentVersionId = selectedElement.getCurrentVersionId();
-				if (currentVersionId == null) {
-					versionInfo.setText("Unknown");
-				} else {
-					versionInfo.setText(currentVersionId);
-				}
-
+				setFieldText(versionInfo, selectedElement.getCurrentVersionId());
 				// set the time, the image has last been updated
 				lastUpdateInfo.setText(FormatHelper.shortDate(selectedElement.getUpdateTime()));
-
 				// info about the image permissions
-				ImagePermissions p = selectedElement.getUserPermissions();
-				if (p != null) {
-					String s = p.toString();
-					if (s == null) {
-						permissionInfo.setText("Unknown");
-					} else {
-						permissionInfo.setText(s);
-					}
-				} else {
-					permissionInfo.setText("Unknown");
-				}
-
+				ImagePermissions perms = selectedElement.getUserPermissions();
+				if (perms == null)
+					perms = selectedElement.getDefaultPermissions();
+				if (perms != null)
+					setFieldText(permissionInfo, perms.toString());
 				// the owner id of the selected image
-				String ownerId = selectedElement.getOwnerId();
-				UserInfo user = UserCache.find(ownerId);
-				if (user != null) {
-					ownerInfo.setText(user.getLastName() + ", " + user.getFirstName());
-				} else {
-					ownerInfo.setText("Unknown");
-				}
+				UserInfo user = UserCache.find(selectedElement.getOwnerId());
+				setFieldText(ownerInfo, FormatHelper.userName(user));
 
 				// set the template info
 				if (selectedElement.isTemplate) {
@@ -122,6 +94,14 @@ public class ImageListWindow extends ImageListWindowLayout {
 					templateInfo.setText("Nein");
 				}
 			}
+
+			private void setFieldText(Text control, String content) {
+				if (content == null) {
+					control.setText("<null>");
+				} else {
+					control.setText(content);
+				}
+			}
 		});
 
 		newButton.addSelectionListener(new SelectionAdapter() {