[client] Move netrules configurator into tab

1 files changed, 5 insertions, 11 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
index 9794c37a..92abe8bf 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LectureDetailsWindow.java
@@ -34,6 +34,7 @@ import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.changemonitor.AbstractControlWrapper;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
+import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor.NotNullConstraint;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor.TextNotEmptyConstraint;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor.ValidationConstraint;
 import org.openslx.dozmod.gui.helper.DateTimeHelper;
@@ -165,6 +166,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		changeMonitor.add(dtpStartDate).addConstraint(dateRangeValidator);
 		changeMonitor.add(spnEndTime).addConstraint(dateRangeValidator);
 		changeMonitor.add(spnStartTime).addConstraint(dateRangeValidator);
+		changeMonitor.add(ctlNetrulesConfigurator).addConstraint(new NotNullConstraint<List<NetRule>>("Fehlerhafte Netzwerkregeln"));
 		changeListenerPermissions = changeMonitor.add(ctlPermissionManager);
 		ctlLocationSelector.addToChangeMonitor(changeMonitor);
 		ctlRunscriptConfigurator.addToChangeMonitor(changeMonitor);
@@ -248,15 +250,6 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		};
 		chkCustomPermAdmin.addItemListener(updateDefaultPermissionListener);
 		chkCustomPermEdit.addItemListener(updateDefaultPermissionListener);
-		
-		btnNetrules.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				List<NetRule> newNetrules = LectureNetrulesWindow.open(me, lecture.networkExceptions, changeMonitor);
-				if (newNetrules != null)
-					lecture.networkExceptions = newNetrules;
-			}
-		});
 
 		// last step, the save button
 		btnSaveChanges.addActionListener(new ActionListener() {
@@ -328,6 +321,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		ctlRunscriptConfigurator.setState(lecture.runscript);
 		ctlNetshareConfigurator.setState(lecture.networkShares);
 		ctlLdapFilterConfigurator.setState(lecture.ldapFilters);
+		ctlNetrulesConfigurator.setState(lecture.networkExceptions);
 
 		txtTitle.setText(lecture.getLectureName());
 		lblTitleInfo.setText(lecture.getLectureName());
@@ -508,7 +502,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 				ctlLocationSelector.getOnlyInSelection(),
 				// TODO: coming "false" is Location related
 				false, chkHasUsbAccess.isSelected());
-		metadata.setNetworkExceptions(lecture.networkExceptions);
+		metadata.setNetworkExceptions(ctlNetrulesConfigurator.getState(false));
 		metadata.setNetworkShares(ctlNetshareConfigurator.getState());
 		metadata.setLdapFilters(ctlLdapFilterConfigurator.getState());
 
@@ -526,7 +520,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		if (changeListenerPermissions.isCurrentlyChanged()) {
 			try {
 				ThriftManager.getSatClient().writeLecturePermissions(Session.getSatelliteToken(),
-						lecture.lectureId, customPermissions);
+						lecture.lectureId, ctlPermissionManager.getPermissions());
 				LOGGER.info("Successfully save new permissions");
 			} catch (TException e) {
 				ThriftError.showMessage(JOptionPane.getFrameForComponent(this), LOGGER, e,