[client] Cleaned up layout code of gui a bit.

7 files changed, 16 insertions, 37 deletions

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 be0f74ca..6397c820 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
@@ -63,9 +63,7 @@ public abstract class ImageListWindowLayout extends CompositePage {
 
 		// -- info group with title and text --
 		Composite infoComposite = new Composite(this, SWT.BORDER);
-		GridData infoGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		infoGridData.horizontalSpan = 2;
-		infoComposite.setLayoutData(infoGridData);
+		infoComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
 		// layout for the items of the group
 		infoComposite.setLayout(new GridLayout(1, false));
 
@@ -94,10 +92,9 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		// -- group for the filter --
 		Group filterGroup = new Group(tableGroup, SWT.BORDER);
 		filterGroup.setText(filterGroupLabel);
-		GridData fgGridData = new GridData(SWT.FILL, SWT.TOP, true, false);
+		GridData fgGridData = new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1);
 		fgGridData.minimumWidth = 400;
 		fgGridData.widthHint = 800;
-		fgGridData.horizontalSpan = 2;
 		filterGroup.setLayoutData(fgGridData);
 		filterGroup.setLayout(new GridLayout());
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
index 9bfbe3ee..6ce50dc2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
@@ -62,9 +62,7 @@ public abstract class LectureListWindowLayout extends CompositePage {
 
 		// -- info group with title and text --
 		Composite infoComposite = new Composite(this, SWT.BORDER);
-		GridData infoGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
-		infoGridData.horizontalSpan = 2;
-		infoComposite.setLayoutData(infoGridData);
+		infoComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1));
 		// layout for the items of the group
 		infoComposite.setLayout(new GridLayout(1, false));
 
@@ -93,10 +91,9 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		// -- group for the filter --
 		Group filterGroup = new Group(tableGroup, SWT.BORDER);
 		filterGroup.setText(filterGroupLabel);
-		GridData fgGridData = new GridData(SWT.FILL, SWT.TOP, true, false);
+		GridData fgGridData = new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1);
 		fgGridData.minimumWidth = 400;
 		fgGridData.widthHint = 800;
-		fgGridData.horizontalSpan = 2;
 		filterGroup.setLayoutData(fgGridData);
 		filterGroup.setLayout(new GridLayout());
 
@@ -117,7 +114,6 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		tableViewer.setContentProvider(ArrayContentProvider.getInstance());
 
 
-
 		// create, modify and delete buttons
 		Composite buttonComposite = new Composite(tableGroup, SWT.NONE);
 		GridData buttonCompositeGridData = new GridData(SWT.FILL, SWT.FILL, true, false);
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 14a88860..ae665e23 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
@@ -71,8 +71,7 @@ public abstract class LoginWindowLayout extends Composite {
 
 		Label titlePicture = new Label(this, SWT.NONE);
 		titlePicture.setImage(loadImage());
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalSpan = 2;
+		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
 		gridData.horizontalAlignment = SWT.CENTER;
 		titlePicture.setLayoutData(gridData);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
index 46656667..92708cad 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
@@ -55,35 +55,29 @@ public abstract class MainMenuWindowLayout extends CompositePage {
 		Group vmGroup = new Group(this, SWT.NONE);
 		vmGroup.setLayout(new GridLayout());
 		vmGroup.setText("VMs");
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		vmGroup.setLayoutData(gridData);
+		vmGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		vmButton = new Button(vmGroup, SWT.PUSH);
 		vmButton.setText("VM  - Übersicht");
-		gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
-		vmButton.setLayoutData(gridData);
+		vmButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
 
 		Label vmInfoLabel = new Label(vmGroup, SWT.NONE);
 		vmInfoLabel.setText(vmInfo);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		vmInfoLabel.setLayoutData(gridData);
+		vmInfoLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		//g group for the lecture selection
 		Group lecturesGroup = new Group(this, SWT.NONE);
 		lecturesGroup.setLayout(new GridLayout());
 		lecturesGroup.setText("Veranstaltungen");
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		lecturesGroup.setLayoutData(gridData);
+		lecturesGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
 		lecturesButton = new Button(lecturesGroup, SWT.PUSH);
 		lecturesButton.setText("Veranstanstaltungen");
-		gridData = new GridData(SWT.CENTER, SWT.CENTER, true, true);
-		lecturesButton.setLayoutData(gridData);
+		lecturesButton.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, true, true));
 
 		Label lecturesInfoLabel = new Label(lecturesGroup, SWT.NONE);
 		lecturesInfoLabel.setText(lecturesInfo);
-		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		lecturesInfoLabel.setLayoutData(gridData);
+		lecturesInfoLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index ef6818d7..0227d701 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -44,14 +44,12 @@ public abstract class VirtualizerNoticeWindowLayout extends Composite {
 		// infotext
 		Label infoLabel = new Label(this, SWT.NONE | SWT.WRAP);
 		infoLabel.setText(infoText);
-		GridData gridData = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
-		infoLabel.setLayoutData(gridData);
+		infoLabel.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
 
 		// composite for the windows vmware-download button
 		Composite windowsComposite = new Composite(this, SWT.NONE);
 		windowsComposite.setLayout(new GridLayout());
-		gridData = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
-		windowsComposite.setLayoutData(gridData);
+		windowsComposite.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
 
 		new Label(windowsComposite, SWT.NONE).setText("Windows:");
 		windowsDLButton = new Button(windowsComposite, SWT.PUSH);
@@ -60,8 +58,7 @@ public abstract class VirtualizerNoticeWindowLayout extends Composite {
 		// composite for the linux vmware-download button
 		Composite linuxComposite = new Composite(this, SWT.NONE);
 		linuxComposite.setLayout(new GridLayout());
-		gridData = new GridData(GridData.FILL, GridData.BEGINNING, true, false);
-		linuxComposite.setLayoutData(gridData);
+		linuxComposite.setLayoutData(new GridData(GridData.FILL, GridData.BEGINNING, true, false));
 
 		new Label(windowsComposite, SWT.NONE).setText("Linux:");
 		linuxDLButton = new Button(windowsComposite, SWT.PUSH);
@@ -69,13 +66,11 @@ public abstract class VirtualizerNoticeWindowLayout extends Composite {
 
 		readCheck = new Button(this, SWT.CHECK);
 		readCheck.setText("Diese Benachrichtigung nicht mehr anzeigen.");
-		gridData = new GridData(GridData.BEGINNING, GridData.END, false, false);
-		readCheck.setLayoutData(gridData);
+		readCheck.setLayoutData(new GridData(GridData.BEGINNING, GridData.END, false, false));
 
 		continueButton = new Button(this, SWT.PUSH);
 		continueButton.setText("Weiter");
-		gridData = new GridData(GridData.BEGINNING, GridData.END, false, false);
-		continueButton.setLayoutData(gridData);
+		continueButton.setLayoutData(new GridData(GridData.BEGINNING, GridData.END, false, false));
 
 	}
 }
\ No newline at end of file
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
index 7a56b016..311f6684 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageCustomPermissionPageLayout.java
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
-import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index 4294a727..09bb9c54 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -57,7 +57,6 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		Label descriptionCation = new Label(container, SWT.NONE);
 		descriptionCation.setText("Beschreibung:");
 		descriptionText = new Text(container, SWT.BORDER | SWT.MULTI |  SWT.V_SCROLL);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
 		gd.heightHint = 80;
 		descriptionText.setLayoutData(gd);