[client] Added comments and improved readability of code.

3 files changed, 65 insertions, 80 deletions

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 37b1bdae..59ce3aa4 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
@@ -13,8 +13,8 @@ import org.eclipse.swt.widgets.Text;
 
 public abstract class DisclaimerWindowLayout extends Composite {
 	
-	private final String notice = "Bitte lesen und bestätigen Sie folgende rechtliche Hinweise";
-	private final 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"
+	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"
 			+ "Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. 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.\n\n"
 			+ "Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat.\n\n"
@@ -26,10 +26,11 @@ public abstract class DisclaimerWindowLayout extends Composite {
 			+ "Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. 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.\n\n"
 			+ "Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo";
 
-	private final String checkboxText = "Ja, ich aktzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.";
+	protected String checkboxText = "Ja, ich aktzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen.";
 
-	private final String title = "bwLehrpool Suite";
-	private final String noticeLabel = "Hinweis";
+	protected String title = "bwLehrpool Suite";
+	protected String noticeLabel = "Hinweis";
+	protected String continueButtonLabel = "Weiter";
 	
 	// Buttons
 	protected Button agreeBox;
@@ -37,51 +38,43 @@ public abstract class DisclaimerWindowLayout extends Composite {
 
 	public DisclaimerWindowLayout(final Shell mainShell) {
 		super(mainShell, SWT.NONE);
-
-
+		
 		mainShell.setText(title);
 
-		// layout of this composite
+		// layout for the disclaimer composite
 		this.setLayout(new GridLayout(1, true));
 
-
-		// information to read the disclaimer at the beginning of the window.
+		// information before the disclaimer
+		// the group
 		Group noticeGroup = new Group(this, SWT.NONE);
 		noticeGroup.setLayout(new GridLayout());
-		GridData gridData = new GridData(GridData.FILL, GridData.CENTER, true, false);
-		noticeGroup.setLayoutData(gridData);
+		noticeGroup.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		noticeGroup.setText(noticeLabel);
-
+		// text inside the group
 		Label noticeLabel = new Label(noticeGroup, SWT.NONE);
 		noticeLabel.setText(notice);
 
 
 		// the disclaimer text box with scrolling functionality
 		Text disclaimerText = new Text(this, SWT.READ_ONLY | SWT.WRAP| SWT.MULTI | SWT.V_SCROLL | SWT.BORDER);
-		gridData = new GridData(GridData.FILL, GridData.FILL, true, true);
-		gridData.widthHint = 900;
-		gridData.heightHint = 600;
-		disclaimerText.setLayoutData(gridData);
+		GridData disclaimerLayoutData = new GridData(GridData.FILL, GridData.FILL, true, true);
+		disclaimerLayoutData.widthHint = 900;
+		disclaimerLayoutData.heightHint = 600;
+		disclaimerText.setLayoutData(disclaimerLayoutData);
 		disclaimerText.setText(disclaimer);
 
 
 		// checkbox for acknowledging the disclaimer
 		Composite checkboxComposite = new Composite(this, SWT.BORDER);
 		checkboxComposite.setLayout(new GridLayout());
-		gridData = new GridData(GridData.FILL, GridData.CENTER, true, false);
-
-		checkboxComposite.setLayoutData(gridData);
-
+		checkboxComposite.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
 		agreeBox = new Button(checkboxComposite, SWT.CHECK);
 		agreeBox.setText(checkboxText);
 
-
+		// the continue button
 		continueButton = new Button(this, SWT.PUSH);
-		continueButton.setText("Weiter");
+		continueButton.setText(continueButtonLabel);
 		continueButton.setEnabled(false);
-
-		gridData = new GridData(GridData.FILL, GridData.CENTER, true, false);
-		gridData.horizontalAlignment = SWT.RIGHT;
-		continueButton.setLayoutData(gridData);
+		continueButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, true, false));
 	}
 }
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 99d97eac..d0663c82 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
@@ -48,6 +48,7 @@ public abstract class ImageListWindowLayout extends Composite {
 	protected Button editButton;
 	protected Button downloadButton;
 	
+	
 	// imageDetail texts
 	protected Text imageSelectedNameLabel;
 	protected Text idInfo;
@@ -63,27 +64,27 @@ public abstract class ImageListWindowLayout extends Composite {
 	public ImageListWindowLayout(Composite mainShell) {
 		super(mainShell, SWT.NONE);
 
+		// the layout and layoutData of the ImageListWindow
 		this.setLayout(new GridLayout(2, false));
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		this.setLayoutData(gridData);
-
-
+		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.horizontalSpan = 2;
+		// info group with title and text
 		Composite infoComposite = new Composite(this, SWT.BORDER);
-		infoComposite.setLayoutData(gridData);
+		GridData infoGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		infoGridData.horizontalSpan = 2;
+		infoComposite.setLayoutData(infoGridData);
+		// layout for the items of the group
 		infoComposite.setLayout(new GridLayout(1, false));
 
-
-
+		// title of the info group in bold
 		Label infoTitle = new Label(infoComposite, SWT.NONE);
 		infoTitle.setText(infoTitleString);
+		// set the fond
 		FontData fontData = infoTitle.getFont().getFontData()[0];
 		Font font = new Font(GuiManager.getDisplay(), new FontData(fontData.getName(), fontData
 				.getHeight(), SWT.BOLD));
 		infoTitle.setFont(font);
-
+		// the infotext
 		Label infoText = new Label(infoComposite, SWT.NONE);
 		infoText.setText(infoTextString);
 
@@ -92,17 +93,16 @@ public abstract class ImageListWindowLayout extends Composite {
 		// group for the table
 		Group tableGroup = new Group(this, SWT.BORDER);
 		tableGroup.setText(tableGroupLabel);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		tableGroup.setLayoutData(gridData);
+		tableGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 		tableGroup.setLayout(new GridLayout(3, true));
 
 		// jface tableviewer on swt table
 		Table vmTable = new Table(tableGroup, SWT.BORDER | SWT.V_SCROLL
 				| SWT.H_SCROLL);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalSpan = 3;
-		gridData.minimumWidth = 200;
-		vmTable.setLayoutData(gridData);
+		GridData tableGridData = new GridData(SWT.FILL, SWT.FILL, true, true);
+		tableGridData.horizontalSpan = 3;
+		tableGridData.minimumWidth = 200;
+		vmTable.setLayoutData(tableGridData);
 		vmTable.setHeaderVisible(true);
 		vmTable.setLinesVisible(true); 
 
@@ -111,7 +111,6 @@ public abstract class ImageListWindowLayout extends Composite {
 		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 
-
 		// For testing
 		ImageSummaryRead imageSummary = new ImageSummaryRead();
 		imageSummary.setImageName("Windoof");
@@ -131,20 +130,16 @@ public abstract class ImageListWindowLayout extends Composite {
 
 		// The List to be displayed in the viewer
 		tableViewer.setInput(list);
-
 		TableHelper.createImageTableColumns(tableViewer);
-
 		tableViewer.refresh();
 
 		// create, modify, download and delete buttons	
 		Composite buttonComposite = new Composite(tableGroup, SWT.NONE);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.horizontalSpan = 4;
-		gridData.minimumWidth = 200;
-		buttonComposite.setLayoutData(gridData);
+		GridData buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.horizontalSpan = 4;
+		buttonComositeGridData.minimumWidth = 200;
+		buttonComposite.setLayoutData(buttonComositeGridData);
 		buttonComposite.setLayout(new RowLayout());
-
-
 		
 		newButton = new Button(buttonComposite, SWT.PUSH);
 		newButton.setText(newButtonLabel);
@@ -159,12 +154,12 @@ public abstract class ImageListWindowLayout extends Composite {
 		downloadButton.setText(downloadButtonLabel);
 
 
-		// group for the info of the clicked image in the tableViewer
+		// group for the info of the selected image in the tableViewer
 		Group vmInfoGroup = new Group(this, SWT.BORDER);
 		vmInfoGroup.setText(vmInfoGroupLabel);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 300;
-		vmInfoGroup.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 300;
+		vmInfoGroup.setLayoutData(buttonComositeGridData);
 		vmInfoGroup.setLayout(new GridLayout(2, false));
 
 
@@ -173,9 +168,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		imageSelectedNameLabel = new Text(vmInfoGroup, SWT.READ_ONLY);
 
 		imageNameCaption.setText("Image Name:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		imageSelectedNameLabel.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		imageSelectedNameLabel.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -197,9 +192,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		Label idInfoCaption = new Label(vmInfoGroup, SWT.NONE);
 		idInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		idInfoCaption.setText("ID:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		idInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		idInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -215,16 +210,14 @@ public abstract class ImageListWindowLayout extends Composite {
 				}
 			}
 		});
-		//		imageSummary.get
-
 		
 		
 		Label versionInfoCaption = new Label(vmInfoGroup, SWT.NONE);
 		versionInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		versionInfoCaption.setText("Version:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		versionInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		versionInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -245,9 +238,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		Label lastUpdateInfoCaption = new Label(vmInfoGroup, SWT.NONE);
 		lastUpdateInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		lastUpdateInfoCaption.setText("Letztes Update:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		lastUpdateInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		lastUpdateInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -272,9 +265,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		Label permissionInfoCaption = new Label(vmInfoGroup, SWT.NONE);
 		permissionInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		permissionInfoCaption.setText("Berechtigungen:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		permissionInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		permissionInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -301,9 +294,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		Label ownerInfoCaption = new Label(vmInfoGroup, SWT.NONE);
 		ownerInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		ownerInfoCaption.setText("Besitzer ID:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		ownerInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		ownerInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
@@ -326,9 +319,9 @@ public abstract class ImageListWindowLayout extends Composite {
 		Label templateCaption = new Label(vmInfoGroup, SWT.NONE);
 		templateInfo = new Text(vmInfoGroup, SWT.READ_ONLY);
 		templateCaption.setText("Vorlage:");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		gridData.minimumWidth = 100;
-		templateInfo.setLayoutData(gridData);
+		buttonComositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
+		buttonComositeGridData.minimumWidth = 100;
+		templateInfo.setLayoutData(buttonComositeGridData);
 
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			@Override
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
index 4282f9dd..fed7fc2e 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageUploadPageLayout.java
@@ -51,7 +51,6 @@ public abstract class ImageUploadPageLayout extends WizardPage {
 		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
 		imageName.setLayoutData(gd);
 		imageName.setEnabled(!editExistingImage);
-		System.out.println(editExistingImage);
 
 		imageName.addKeyListener(new KeyListener() {
 			@Override