[client] Move netrules configurator into tab

2 files changed, 8 insertions, 30 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
index 51ac6491..86c68e44 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/LectureOptionsPageLayout.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.wizard.layout;
 
 import javax.swing.Box;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
 
@@ -19,7 +18,6 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 	protected final JCheckBox chkIsExam;
 	protected final JCheckBox chkAutoUpdate;
 	protected final JCheckBox chkIsActive;
-	protected final JButton btnNetrules;
 
 	/**
 	 * Page for additional options of lecture
@@ -27,41 +25,40 @@ public abstract class LectureOptionsPageLayout extends WizardPage {
 	public LectureOptionsPageLayout(Wizard wizard) {
 		super(wizard, title);
 		setDescription("Bitte wählen Sie aus folgenden Optionen aus:");
-		GridManager grid = new GridManager(this, 3);
+		GridManager grid = new GridManager(this, 2);
 
 		// first column for labels hopefully clearing up some of the mess...
 		// first category for general options
 		JLabel lblGeneral = new JLabel("Allgemeines");
 		grid.add(lblGeneral);
 		chkAutoUpdate = new JCheckBox("Immer auf aktuellste VM-Version updaten", true);
-		grid.add(chkAutoUpdate, 2);
+		grid.add(chkAutoUpdate);
 		grid.nextRow();
 
 		chkIsActive = new JCheckBox("Veranstaltung ist aktiv", true);
 		grid.skip();
-		grid.add(chkIsActive, 2);
+		grid.add(chkIsActive);
 		grid.nextRow();
 
 		chkIsExam = new JCheckBox("Veranstaltung ist eine Prüfung", false);
 		grid.skip();
-		grid.add(chkIsExam, 2);
+		grid.add(chkIsExam);
 		grid.nextRow();
 
-		grid.add(Box.createVerticalStrut(10), 3);
+		grid.add(Box.createVerticalStrut(10), 2);
 		grid.nextRow();
 		// second category for restrictions options
 		JLabel lblRestriction = new JLabel("Beschränkungen");
 		grid.add(lblRestriction);
 
 		chkInternetEnabled = new JCheckBox("Netzwerk-/Internetzugriff zulassen", true);
-		btnNetrules = new JButton("Ausnahmen...");
+		// TODO: Hint at exception editor in lecture details window, or include here...
 		grid.add(chkInternetEnabled).fill(true, false).expand(true,  false);
-		grid.add(btnNetrules);
 		grid.nextRow();
 
 		chkUsbEnabled = new JCheckBox("Speichermedien zulassen", true);
 		grid.skip();
-		grid.add(chkUsbEnabled, 2);
+		grid.add(chkUsbEnabled);
 		grid.nextRow();
 
 		grid.finish(true);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
index 73dc407e..a9d5bcef 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureOptionsPage.java
@@ -1,14 +1,8 @@
 package org.openslx.dozmod.gui.wizard.page;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
 import java.util.List;
 
-import javax.swing.SwingUtilities;
-
 import org.openslx.bwlp.thrift.iface.NetRule;
-import org.openslx.dozmod.gui.window.LectureNetrulesWindow;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.LectureOptionsPageLayout;
 import org.openslx.dozmod.state.LectureWizardState;
@@ -17,9 +11,8 @@ import org.openslx.dozmod.thrift.Session;
 @SuppressWarnings("serial")
 public class LectureOptionsPage extends LectureOptionsPageLayout {
 
-	private LectureOptionsPage me = this;
 	private LectureWizardState state = null;
-	private List<NetRule> currentNetrules = new ArrayList<NetRule>();
+	private List<NetRule> currentNetrules;
 	private String currentRunscript = new String("");
 
 	/**
@@ -32,22 +25,10 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		this.currentRunscript = state.runScriptText;
 
 		setPageComplete(true);
-		btnNetrules.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				List<NetRule> newNetrules = LectureNetrulesWindow.open(
-						SwingUtilities.getWindowAncestor(me), currentNetrules, null);
-				if (newNetrules != null) {
-					currentNetrules = newNetrules;
-					updateState();
-				}
-			}
-		});
 		if (!Session.isLectureRestrictionsSupported()) {
 			chkIsExam.setEnabled(false);
 			chkInternetEnabled.setEnabled(false);
 			chkUsbEnabled.setEnabled(false);
-			btnNetrules.setEnabled(false);
 		}
 	}