From 6d50aafd99d5c73c6823256fc1fc79116de3266b Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 27 Feb 2019 12:11:42 +0100 Subject: [client] Make change monitor react to changed runscripts --- .../dozmod/gui/configurator/StartupConfigurator.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java index 7013e437..eaa64af3 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java @@ -25,10 +25,9 @@ import javax.swing.JDialog; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.JTextField; import javax.swing.SwingUtilities; -import javax.swing.event.ChangeListener; -import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.LectureRead; import org.openslx.bwlp.thrift.iface.PresetRunScript; @@ -63,7 +62,10 @@ public class StartupConfigurator extends StartupConfiguratorLayout { private LectureRead lecture; - private ChangeListener mightyListener; + /** + * Used to fool the change monitoeur + */ + protected final JTextField fakeTextField = new JTextField(); public StartupConfigurator() { super(); @@ -152,8 +154,8 @@ public class StartupConfigurator extends StartupConfiguratorLayout { // Call blocks as it's a modal window if (selectedScripts.get() != null) { // User clicked OK - startupSettings.selectedScripts = selectedScripts.get(); - mightyListener.stateChanged(null); + lecture.presetScriptIds = startupSettings.selectedScripts = selectedScripts.get(); + fakeTextField.setText(startupSettings.selectedScripts.toString()); } } @@ -211,6 +213,9 @@ public class StartupConfigurator extends StartupConfiguratorLayout { } } }); + if (lecture.presetScriptIds != null) { + fakeTextField.setText(lecture.presetScriptIds.toString()); + } } private void setCustomScript(final String lecture) { @@ -269,7 +274,7 @@ public class StartupConfigurator extends StartupConfiguratorLayout { changeMonitor.addEditableCombo(cboRunscriptType, null); changeMonitor.addFixedCombo(cboRunscriptVisibility, null); changeMonitor.addFixedCombo(cboSoundState, null); - // TODO: Preset runscript + changeMonitor.add(fakeTextField); } private static enum Field { -- cgit v1.2.3-55-g7522