[client] remove unneeded wrapped class for netrules/runscript + fix some save button enable problems once more...

1 files changed, 13 insertions, 16 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 ac45900a..750a4c0e 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
@@ -36,6 +36,7 @@ import org.openslx.bwlp.thrift.iface.ImageVersionDetails;
 import org.openslx.bwlp.thrift.iface.LecturePermissions;
 import org.openslx.bwlp.thrift.iface.LectureRead;
 import org.openslx.bwlp.thrift.iface.LectureWrite;
+import org.openslx.bwlp.thrift.iface.NetRule;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
@@ -43,8 +44,6 @@ import org.openslx.dozmod.gui.control.JCheckBoxTree.CheckChangeEvent;
 import org.openslx.dozmod.gui.control.JCheckBoxTree.CheckChangeEventListener;
 import org.openslx.dozmod.gui.control.LectureCustomPermissionManager.UserChangeEvent;
 import org.openslx.dozmod.gui.control.LectureCustomPermissionManager.UserChangeEventListener;
-import org.openslx.dozmod.gui.control.NetrulesConfigurator.NetrulesConfiguration;
-import org.openslx.dozmod.gui.control.RunscriptConfigurator.RunscriptConfiguration;
 import org.openslx.dozmod.gui.control.RunscriptConfigurator.RunscriptConfigurationChangeEvent;
 import org.openslx.dozmod.gui.control.RunscriptConfigurator.RunscriptConfigurationChangeEventListener;
 import org.openslx.dozmod.gui.helper.DateTimeHelper;
@@ -137,8 +136,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 	/**
 	 * Holder of the netrules/runscript of this lecture
 	 */
-	private NetrulesConfiguration currentNetrules = null;
-	private RunscriptConfiguration currentRunscript = null;
+	private List<NetRule> currentNetrules = null;
+	private String currentRunscript = null;
 
  	/**
 	 * Constructor
@@ -263,7 +262,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		btnNetrules.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				NetrulesConfiguration newNetrules = LectureNetrulesWindow.open(me, new NetrulesConfiguration(currentNetrules.netRulesList));
+				List<NetRule> newNetrules = LectureNetrulesWindow.open(me, currentNetrules);
 				if (newNetrules != null)
 					currentNetrules = newNetrules;
 				reactToChange();
@@ -282,9 +281,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		ctlRunscriptConfigurator.addRunscriptConfigurationChangeEventListener(new RunscriptConfigurationChangeEventListener() {
 			@Override
 			public void stateChanged(RunscriptConfigurationChangeEvent event) {
-				RunscriptConfiguration rc = ctlRunscriptConfigurator.getState();
-				if (rc != null)
-					currentRunscript = rc;
+				currentRunscript = ctlRunscriptConfigurator.getState();
 				reactToChange();
 			}
 
@@ -384,8 +381,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			lblImageNameInfo.setText(image.getImageName());
 		}
 		// remember original advanced config
-		currentNetrules = new NetrulesConfiguration(lecture.networkExceptions);
-		currentRunscript = new RunscriptConfiguration(lecture.runscript);
+		currentNetrules = lecture.networkExceptions;
+		currentRunscript = lecture.runscript;
 
 		// remember default permissions
 		if (lecture.defaultPermissions != null) {
@@ -413,7 +410,7 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 		ctlLocationSelector.setSelectedLocationsAsIds(locationInfo.locationList);
 
 		// init advanced info
-		ctlRunscriptConfigurator.setState(new RunscriptConfiguration(lecture.runscript));
+		ctlRunscriptConfigurator.setState(lecture.runscript);
 		
 		txtTitle.setText(lecture.getLectureName());
 		lblTitleInfo.setText(lecture.getLectureName());
@@ -623,8 +620,8 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 				|| !lecture.defaultPermissions.equals(originalDefaultPermissions)
 				|| (locationInfo != null && lecture.locationIds != null && !lecture.locationIds.equals(locationInfo.locationList))
 				|| (locationInfo != null && lecture.limitToLocations != locationInfo.limitToLocations)
-				|| (currentNetrules.netRulesList != null && lecture.networkExceptions != null && !lecture.networkExceptions.equals(currentNetrules.netRulesList))
-				|| (currentRunscript.runScriptText != null && lecture.runscript != null && !lecture.runscript.equals(currentRunscript.runScriptText))
+				|| (currentNetrules != null && lecture.networkExceptions != null && !lecture.networkExceptions.equals(currentNetrules))
+				|| (currentRunscript != null && lecture.runscript != null && !lecture.runscript.equals(currentRunscript))
 				|| imageLinkChanged;
 
 		return changed;
@@ -663,19 +660,19 @@ public class LectureDetailsWindow extends LectureDetailsWindowLayout implements
 			pnlTabs.setSelectedIndex(pnlTabs.indexOfTab("Startskript"));
 			return false;
 		}
-		metadataChanged |= (currentNetrules.netRulesList != lecture.networkExceptions || currentRunscript.runScriptText != lecture.runscript);
+		metadataChanged |= (currentNetrules != lecture.networkExceptions || currentRunscript != lecture.runscript);
 		// now check if we need to push a new LectureWrite
 		if (metadataChanged) {
 			// first build the LectureWrite from the GUI fields
 			final LectureWrite metadata = new LectureWrite(txtTitle.getText(), txtDescription.getText(),
 					lecture.getImageVersionId(), chkAutoUpdate.isSelected(), chkIsActive.isSelected(),
 					DateTimeHelper.getDateFrom(dtpStartDate, spnStartTime).getTime() / 1000L,
-					DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime).getTime() / 1000L, currentRunscript.runScriptText, null,
+					DateTimeHelper.getDateFrom(dtpEndDate, spnEndTime).getTime() / 1000L, currentRunscript, null,
 					chkIsExam.isSelected(), chkHasInternetAccess.isSelected(), // TODO USBACCESS
 					lecture.getDefaultPermissions(), locationInfo.locationList, locationInfo.limitToLocations,
 					// TODO: coming "false" is Location related
 					false, chkHasUsbAccess.isSelected());
-			metadata.setNetworkExceptions(currentNetrules.netRulesList);
+			metadata.setNetworkExceptions(currentNetrules);
 			// now trigger the actual action 
 			try {
 				ThriftManager.getSatClient().updateLecture(Session.getSatelliteToken(),