[client] Moved functions from ImageListWindowLayout to ImageListWindow and reduced code replication.

5 files changed, 152 insertions, 227 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 2df16976..be26e541 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
@@ -1,11 +1,21 @@
 package org.openslx.dozmod.gui.window;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import org.apache.thrift.TException;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.events.SelectionAdapter;
+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.dozmod.gui.window.layout.ImageListWindowLayout;
+import org.openslx.dozmod.gui.wizard.ImageWizard;
 import org.openslx.dozmod.thrift.Session;
 import org.openslx.thrifthelper.ThriftManager;
 
@@ -14,12 +24,103 @@ public class ImageListWindow extends ImageListWindowLayout {
 	public ImageListWindow(final Shell mainShell) {
 		super(mainShell);
 
+		// the listeners to set the detailed info of the selected image
+		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
+			@Override
+			public void selectionChanged(SelectionChangedEvent event) {
+				IStructuredSelection selection = (IStructuredSelection)
+						tableViewer.getSelection();
+				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
+
+				String imageName = selectedElement.getImageName();
+				if (imageName == null) {
+					imageSelectedNameLabel.setText("Unknown");
+				} else {
+					imageSelectedNameLabel.setText(imageName);
+				}
+
+				// set the image
+				String imageBaseId = selectedElement.getImageBaseId();
+				if (imageBaseId == null) {
+					idInfo.setText("Unknown");
+				} else {
+					idInfo.setText(imageBaseId);
+				}
+
+				// set the current version of the image
+				String currentVersionId = selectedElement.getCurrentVersionId();
+				if (currentVersionId == null) {
+					versionInfo.setText("Unknown");
+				} else {
+					versionInfo.setText(currentVersionId);
+				}
+
+				// set the time, the image has last been updated
+				long unixTimestamp = selectedElement.getUpdateTime();
+				if (unixTimestamp == 0) {
+					lastUpdateInfo.setText("Unknown");
+				} else {
+					Date date = new Date(unixTimestamp*1000L);
+					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+					String formattedDate = sdf.format(date);
+					lastUpdateInfo.setText(formattedDate);
+				}
+
+				// 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");
+				}
+
+				// the owner id of the selected image
+				String ownerId = selectedElement.getOwnerId();
+				if (ownerId != null) {
+					ownerInfo.setText(ownerId);
+				} else {
+					ownerInfo.setText("Unknown");
+				}
+
+				// set the template info
+				if (selectedElement.isTemplate) {
+					templateInfo.setText("ja");
+				} else {
+					templateInfo.setText("Nein");
+				}
+			}
+		});
+
+
+		newButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				ImageWizard wizard = new ImageWizard(false);
+				WizardDialog wd = new WizardDialog(getShell(), wizard);
+				wd.open();
+			}
+		});
+
+		editButton.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				ImageWizard wizard = new ImageWizard(true);
+				WizardDialog wd = new WizardDialog(getShell(), wizard);
+				wd.open();
+			}
+		});
+
 		refreshList();
 	}
-	
+
 	private boolean refreshList() {
 		List<ImageSummaryRead> imageList;
-		 try {
+		try {
 			imageList = ThriftManager.getSatClient().getImageList(Session.getSatelliteToken(), null, 0);
 		} catch (TException e) {
 			// TODO Auto-generated catch block
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index 59ce3aa4..be64badd 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -12,7 +12,7 @@ import org.eclipse.swt.widgets.Text;
 
 
 public abstract class DisclaimerWindowLayout extends Composite {
-	
+
 	protected String notice = "Bitte lesen und bestätigen Sie folgende rechtliche Hinweise";
 	protected String disclaimer = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n\n"
 			+ "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \n\n"
@@ -31,14 +31,14 @@ public abstract class DisclaimerWindowLayout extends Composite {
 	protected String title = "bwLehrpool Suite";
 	protected String noticeLabel = "Hinweis";
 	protected String continueButtonLabel = "Weiter";
-	
+
 	// Buttons
 	protected Button agreeBox;
 	protected Button continueButton;
 
 	public DisclaimerWindowLayout(final Shell mainShell) {
 		super(mainShell, SWT.NONE);
-		
+
 		mainShell.setText(title);
 
 		// layout for the disclaimer composite
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index ca73bc29..28faf60a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -1,18 +1,9 @@
 package org.openslx.dozmod.gui.window.layout;
 
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.layout.GridData;
@@ -24,11 +15,8 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
-import org.openslx.bwlp.thrift.iface.ImagePermissions;
-import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
 import org.openslx.dozmod.gui.helper.GuiManager;
 import org.openslx.dozmod.gui.helper.TableHelper;
-import org.openslx.dozmod.gui.wizard.ImageWizard;
 
 public abstract class ImageListWindowLayout extends Composite {
 
@@ -39,15 +27,15 @@ public abstract class ImageListWindowLayout extends Composite {
 	protected String downloadButtonLabel = "Download";
 	protected String tableGroupLabel = "Images";
 	protected String vmInfoGroupLabel = "Detailinformationen";
-	
-	
+
+
 	// buttons
 	protected Button newButton;
 	protected Button deleteButton;
 	protected Button editButton;
 	protected Button downloadButton;
-	
-	
+
+
 	// imageDetail texts
 	protected Text imageSelectedNameLabel;
 	protected Text idInfo;
@@ -56,7 +44,7 @@ public abstract class ImageListWindowLayout extends Composite {
 	protected Text permissionInfo;
 	protected Text ownerInfo;
 	protected Text templateInfo;
-	
+
 	protected final TableViewer tableViewer;
 
 
@@ -111,15 +99,16 @@ public abstract class ImageListWindowLayout extends Composite {
 		tableViewer = new TableViewer(vmTable);
 		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 
+		TableHelper.createImageTableColumns(tableViewer);
 
 		// create, modify, download and delete buttons
 		Composite buttonComposite = new Composite(tableGroup, SWT.NONE);
-		GridData buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.horizontalSpan = 4;
-		buttonComositeGridData.minimumWidth = 200;
-		buttonComposite.setLayoutData(buttonComositeGridData);
+		GridData buttonCompositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonCompositeGridData.horizontalSpan = 4;
+		buttonCompositeGridData.minimumWidth = 200;
+		buttonComposite.setLayoutData(buttonCompositeGridData);
 		buttonComposite.setLayout(new RowLayout());
-		
+
 		newButton = new Button(buttonComposite, SWT.PUSH);
 		newButton.setText(newButtonLabel);
 
@@ -136,206 +125,41 @@ public abstract class ImageListWindowLayout extends Composite {
 		// group for the info of the selected image in the tableViewer
 		Group vmInfoGroup = new Group(this, SWT.BORDER);
 		vmInfoGroup.setText(vmInfoGroupLabel);
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 300;
-		vmInfoGroup.setLayoutData(buttonComositeGridData);
+		buttonCompositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonCompositeGridData.minimumWidth = 300;
+		vmInfoGroup.setLayoutData(buttonCompositeGridData);
 		vmInfoGroup.setLayout(new GridLayout(2, false));
 
 
 		// image name info
-		Label imageNameCaption = new Label(vmInfoGroup, SWT.NONE);
-		imageSelectedNameLabel = new Text(vmInfoGroup, SWT.READ_ONLY);
-
-		imageNameCaption.setText("Image Name:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		imageSelectedNameLabel.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-				String s = selectedElement.getImageName();
-				if (s == null) {
-					imageSelectedNameLabel.setText("Unknown");
-				} else {
-					imageSelectedNameLabel.setText(s);
-				}
-			}
-		});
+		imageSelectedNameLabel = createCaptionAndTextfield("Image Name:", vmInfoGroup);
+
 
 
 		// id info
-		Label idInfoCaption = new Label(vmInfoGroup, SWT.NONE);
-		idInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		idInfoCaption.setText("ID:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		idInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-				String s = selectedElement.getImageBaseId();
-				if (s == null) {
-					idInfo.setText("Unknown");
-				} else {
-					idInfo.setText(s);
-				}
-			}
-		});
-		
-		
-		Label versionInfoCaption = new Label(vmInfoGroup, SWT.NONE);
-		versionInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		versionInfoCaption.setText("Version:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		versionInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-				String s = selectedElement.getCurrentVersionId();
-				if (s == null) {
-					versionInfo.setText("Unknown");
-				} else {
-					versionInfo.setText(s);
-				}
-			}
-		});
-
-
-		Label lastUpdateInfoCaption = new Label(vmInfoGroup, SWT.NONE);
-		lastUpdateInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		lastUpdateInfoCaption.setText("Letztes Update:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		lastUpdateInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-				long unixTimestamp = selectedElement.getUpdateTime();
-
-
-				if (unixTimestamp == 0) {
-					lastUpdateInfo.setText("Unknown");
-				} else {
-					Date date = new Date(unixTimestamp*1000L);
-					SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-					String formattedDate = sdf.format(date);
-					lastUpdateInfo.setText(formattedDate);
-				}
-			}
-		});
-
-		Label permissionInfoCaption = new Label(vmInfoGroup, SWT.NONE);
-		permissionInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		permissionInfoCaption.setText("Berechtigungen:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		permissionInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-				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");
-				}
-
-			}
-		});
-
-
-		Label ownerInfoCaption = new Label(vmInfoGroup, SWT.NONE);
-		ownerInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		ownerInfoCaption.setText("Besitzer ID:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		ownerInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-
-				String s = selectedElement.getOwnerId();
-
-				if (s != null) {
-					ownerInfo.setText(s);
-				} else {
-					ownerInfo.setText("Unknown");
-				}
-
-			}
-		});
-
-		Label templateCaption = new Label(vmInfoGroup, SWT.NONE);
-		templateInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
-		templateCaption.setText("Vorlage:");
-		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		buttonComositeGridData.minimumWidth = 100;
-		templateInfo.setLayoutData(buttonComositeGridData);
-
-		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			@Override
-			public void selectionChanged(SelectionChangedEvent event) {
-				IStructuredSelection selection = (IStructuredSelection)
-						tableViewer.getSelection();
-				ImageSummaryRead selectedElement = (ImageSummaryRead) selection.getFirstElement();
-
-				if (selectedElement.isTemplate) {
-					templateInfo.setText("ja");
-				} else {
-					templateInfo.setText("Nein");
-				}
-			}
-		});
-
-
-		newButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				ImageWizard wizard = new ImageWizard(false);
-				WizardDialog wd = new WizardDialog(getShell(), wizard);
-				wd.open();
-			}
-		});
-
-		editButton.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				ImageWizard wizard = new ImageWizard(true);
-				WizardDialog wd = new WizardDialog(getShell(), wizard);
-				wd.open();
-			}
-		});
+		idInfo = createCaptionAndTextfield("ID:", vmInfoGroup);
+		versionInfo = createCaptionAndTextfield("Version", vmInfoGroup);
+		lastUpdateInfo = createCaptionAndTextfield("Letztes Update:", vmInfoGroup);
+		permissionInfo = createCaptionAndTextfield("Berechtigungen:", vmInfoGroup);
+		ownerInfo= createCaptionAndTextfield("Besitzer ID", vmInfoGroup);
+		templateInfo = createCaptionAndTextfield("Vorlage:", vmInfoGroup);
 
 
+
+
+
+	}
+
+
+	public Text createCaptionAndTextfield(String captionString, Group group){
+		Label caption = new Label(group, SWT.NONE);
+		Text textField = new Text(group, SWT.READ_ONLY);
+		caption.setText(captionString);
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		gridData.minimumWidth = 100;
+		textField.setLayoutData(gridData);
+		return textField;
 	}
+
+
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index b527070e..943e8c4e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -21,7 +21,7 @@ public abstract class LoginWindowLayout extends Composite {
 		BWIDM(0, "bwidm"),
 		BWLP(1, "bwlp"),
 		SAT(2, "sat");
-		
+
 		private final int id;
 		private final String tag;
 		private LOGIN_TYPE(final int id, final String tag) {
@@ -33,10 +33,10 @@ public abstract class LoginWindowLayout extends Composite {
 
 		public static LOGIN_TYPE getEnum(String tag) {
 			switch(tag) {
-				case "bwidm": return LOGIN_TYPE.BWIDM;
-				case "bwlp": return LOGIN_TYPE.BWLP;
-				case "sat": return LOGIN_TYPE.SAT;
-				default: return null;
+			case "bwidm": return LOGIN_TYPE.BWIDM;
+			case "bwlp": return LOGIN_TYPE.BWLP;
+			case "sat": return LOGIN_TYPE.SAT;
+			default: return null;
 			}
 		}
 	}
@@ -44,7 +44,7 @@ public abstract class LoginWindowLayout extends Composite {
 	protected LOGIN_TYPE loginType = null;
 
 	private Image titleImage;
-	
+
 
 	// textfields for the username/password
 	protected Text usernameText;
@@ -88,7 +88,7 @@ public abstract class LoginWindowLayout extends Composite {
 		gridData.horizontalAlignment = SWT.CENTER;
 		titlePicture.setLayoutData(gridData);
 
-		
+
 		// group for the authentication method.
 		// groups have borders and a title
 		Group authGroup = new Group(this, SWT.NONE);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainWindowLayout.java
index ef4e2676..718c881c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainWindowLayout.java
@@ -43,7 +43,7 @@ public abstract class MainWindowLayout extends Composite {
 
 	// text for the info for the lecture selection
 	protected String lecturesInfo = "Infotext Veranstaltungen.";
-	
+
 	// buttons
 	protected Button vmButton;
 	protected Button lecturesButton;