[client] Fix bwLehrstuhl

1 files changed, 35 insertions, 41 deletions

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 eea13ceb..14708376 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
@@ -1,24 +1,21 @@
 package org.openslx.dozmod.gui.window.layout;
 
+import java.awt.Button;
+import java.awt.Composite;
+import java.awt.Font;
 import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.security.acl.Group;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.border.TitledBorder;
 
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-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.dozmod.gui.Gui;
+import org.openslx.dozmod.gui.control.table.LectureTable;
 import org.openslx.dozmod.gui.helper.CompositePage;
 import org.openslx.dozmod.gui.helper.LectureListFilter;
 
@@ -34,25 +31,24 @@ public abstract class LectureListWindowLayout extends CompositePage {
 	protected String filterGroupLabel = "Filter";
 
 	// buttons
-	protected Button newButton;
-	protected Button deleteButton;
-	protected Button editButton;
-	protected Button backButton; 
-
+	protected JButton newButton;
+	protected JButton deleteButton;
+	protected JButton editButton;
+	protected JButton backButton;
 
 	// imageDetail texts
-	protected Text lectureName;
-	protected Text idInfo;
-	protected Text imageBaseId;
-	protected Text lastusedInfo;
-	protected Text permissionInfo;
-	protected Text ownerInfo;
-	protected Text startTime;
-	protected Text endTime;
-
-	protected final Text searchTextField;
-
-	protected final TableViewer tableViewer;
+	protected JTextField lectureName;
+	protected JTextField idInfo;
+	protected JTextField imageBaseId;
+	protected JTextField lastusedInfo;
+	protected JTextField permissionInfo;
+	protected JTextField ownerInfo;
+	protected JTextField startTime;
+	protected JTextField endTime;
+
+	protected final JTextField searchTextField;
+
+	protected final LectureTable lectureTable;
 	protected LectureListFilter filter;
 
 	protected String infoTextString = "Hier können Sie Veranstaltungen anlegen, bearbeiten und löschen.";
@@ -60,12 +56,11 @@ public abstract class LectureListWindowLayout extends CompositePage {
 	public LectureListWindowLayout() {
 		super(new GridBagLayout());
 
-		// the layout and layoutData of the LectureListWindow
-		this.setLayout(new GridLayout(2, false));
-		this.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
 		// -- info group with title and text --
-		Composite infoComposite = new Composite(this, SWT.BORDER);
+		JPanel infoComposite = new JPanel();
+		infoComposite.setLayout(new BoxLayout(infoComposite, BoxLayout.PAGE_AXIS));
+		infoComposite.setBorder(new TitledBorder(infoTitleString));
+		
 		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));
@@ -75,14 +70,14 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		infoTitle.setText(infoTitleString);
 		// set the fond
 		FontData fontData = infoTitle.getFont().getFontData()[0];
-		final Font titleFont = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(), SWT.BOLD));
+		final Font titleFont = new Font(Gui.display, new FontData(fontData.getName(), fontData.getHeight(),
+				SWT.BOLD));
 		infoTitle.setFont(titleFont);
 		// the infotext
 		Label infoText = new Label(infoComposite, SWT.NONE);
 		infoText.setText(infoTextString);
 		// -- end group of title --
 
-
 		// -- group for the table --
 		Group tableGroup = new Group(this, SWT.BORDER);
 		tableGroup.setText(tableGroupLabel);
@@ -117,7 +112,6 @@ public abstract class LectureListWindowLayout extends CompositePage {
 		tableViewer = new TableViewer(vmTable);
 		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);