[client/server] add support for advanced configuration for usb/netrules stuff

1 files changed, 27 insertions, 5 deletions

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 7a3f1f6e..38522954 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,6 +1,13 @@
 package org.openslx.dozmod.gui.wizard.page;
 
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.SwingUtilities;
+
 import org.apache.log4j.Logger;
+import org.openslx.dozmod.gui.control.AdvancedConfigurator.AdvancedConfiguration;
+import org.openslx.dozmod.gui.window.LectureAdvancedSettingsWindow;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.layout.LectureOptionsPageLayout;
 import org.openslx.dozmod.state.LectureWizardState;
@@ -8,19 +15,31 @@ import org.openslx.dozmod.state.LectureWizardState;
 @SuppressWarnings("serial")
 public class LectureOptionsPage extends LectureOptionsPageLayout {
 
-	private final static Logger LOGGER = Logger.getLogger(LectureOptionsPage.class);
-
+	private LectureOptionsPage me = this;
 	private LectureWizardState state = null;
+	private AdvancedConfiguration currentConf = new AdvancedConfiguration(null, null);
 
 	/**
 	 * Page for lecture options
 	 */
-	public LectureOptionsPage(Wizard wizard, LectureWizardState state) {
+	public LectureOptionsPage(final Wizard wizard, LectureWizardState state) {
 		super(wizard);
 		this.state = state;
-		setPageComplete(true);
+		this.currentConf = new AdvancedConfiguration(state.netRules, state.runScriptText);
 
-		//TODO Temporarily disabled until implemented
+		setPageComplete(true);
+		btnAdvanced.addActionListener(new ActionListener() {
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				AdvancedConfiguration newConf = LectureAdvancedSettingsWindow.open(
+						SwingUtilities.getWindowAncestor(me), currentConf);
+				if (newConf != null) {
+					currentConf = newConf;
+					updateState();
+				}
+			}
+		});
+		// TODO Temporarily disabled until implemented
 		chkIsExam.setEnabled(false);
 		chkInternetEnabled.setEnabled(false);
 	}
@@ -38,6 +57,9 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		state.autoUpdate = chkAutoUpdate.isSelected();
 		state.internetAccess = chkInternetEnabled.isSelected();
 		state.isEnabled = chkIsActive.isSelected();
+		state.usbAllowed = chkUsbEnabled.isSelected();
+		state.netRules = currentConf.netRulesList;
+		state.runScriptText = currentConf.runScriptText;
 
 		setDescription("Klicken Sie auf 'Weiter' für Berechtigungen oder 'Fertigstellen'.");
 		return true;