[client] splitted netrules & runscript tab/panel/w/e

1 files changed, 15 insertions, 12 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 a100ab05..3ab7bf45 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
@@ -5,8 +5,9 @@ import java.awt.event.ActionListener;
 
 import javax.swing.SwingUtilities;
 
-import org.openslx.dozmod.gui.control.AdvancedConfigurator.AdvancedConfiguration;
-import org.openslx.dozmod.gui.window.LectureAdvancedSettingsWindow;
+import org.openslx.dozmod.gui.control.NetrulesConfigurator.NetrulesConfiguration;
+import org.openslx.dozmod.gui.control.RunscriptConfigurator.RunscriptConfiguration;
+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,7 +18,8 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 
 	private LectureOptionsPage me = this;
 	private LectureWizardState state = null;
-	private AdvancedConfiguration currentConf = new AdvancedConfiguration(null, null);
+	private NetrulesConfiguration currentNetrules = new NetrulesConfiguration(null);
+	private RunscriptConfiguration currentRunscript = new RunscriptConfiguration(null);
 
 	/**
 	 * Page for lecture options
@@ -25,16 +27,17 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 	public LectureOptionsPage(final Wizard wizard, LectureWizardState state) {
 		super(wizard);
 		this.state = state;
-		this.currentConf = new AdvancedConfiguration(state.netRules, state.runScriptText);
+		this.currentNetrules = new NetrulesConfiguration(state.netRules);
+		this.currentRunscript = new RunscriptConfiguration(state.runScriptText);
 
 		setPageComplete(true);
-		btnAdvanced.addActionListener(new ActionListener() {
+		btnNetrules.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				AdvancedConfiguration newConf = LectureAdvancedSettingsWindow.open(
-						SwingUtilities.getWindowAncestor(me), currentConf);
-				if (newConf != null) {
-					currentConf = newConf;
+				NetrulesConfiguration newNetrules = LectureNetrulesWindow.open(
+						SwingUtilities.getWindowAncestor(me), currentNetrules);
+				if (newNetrules != null) {
+					currentNetrules = newNetrules;
 					updateState();
 				}
 			}
@@ -43,7 +46,7 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 			chkIsExam.setEnabled(false);
 			chkInternetEnabled.setEnabled(false);
 			chkUsbEnabled.setEnabled(false);
-			btnAdvanced.setEnabled(false);
+			btnNetrules.setEnabled(false);
 		}
 	}
 
@@ -61,8 +64,8 @@ public class LectureOptionsPage extends LectureOptionsPageLayout {
 		state.internetAccess = chkInternetEnabled.isSelected();
 		state.isEnabled = chkIsActive.isSelected();
 		state.usbAllowed = chkUsbEnabled.isSelected();
-		state.netRules = currentConf.netRulesList;
-		state.runScriptText = currentConf.runScriptText;
+		state.netRules = currentNetrules.netRulesList;
+		state.runScriptText = currentRunscript.runScriptText;
 
 		setDescription("Klicken Sie auf 'Weiter' für Berechtigungen oder 'Fertigstellen'.");
 		return true;