[client] Rename files/vars

2 files changed, 20 insertions, 20 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java
index 85a63680..f37a45ed 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/RunscriptConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/StartupConfigurator.java
@@ -23,15 +23,15 @@ import org.openslx.util.Util;
 
 /**
  * Widget for advanced configuration options for lectures. This handles
- * Runscript
+ * Runscript and sound (un)muting
  */
-public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
+public class StartupConfigurator extends StartupConfiguratorLayout {
 
 	private static final long serialVersionUID = -3497629601818983994L;
 	
-	private RsSettings runscriptSettings = new RsSettings(null);
+	private StartupSettings startupSettings = new StartupSettings(null);
 
-	public RunscriptConfigurator() {
+	public StartupConfigurator() {
 		super();
 	}
 
@@ -52,19 +52,19 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 		// * user typed its own interpreter into the box -> editorContent will be a castable String
 		Object cboContent = cboRunscriptType.getEditor().getItem();
 		if (cboContent instanceof RunscriptType) {
-			runscriptSettings.put(Field.EXTENSION, ((RunscriptType) cboContent).extension);
+			startupSettings.put(Field.EXTENSION, ((RunscriptType) cboContent).extension);
 		} else if (cboContent instanceof String) {
-			runscriptSettings.put(Field.EXTENSION, (String) cboContent);
+			startupSettings.put(Field.EXTENSION, (String) cboContent);
 		}
 		String taInputText = taRunScript.getText();
 
 		RunscriptVisibility visibility = (RunscriptVisibility) cboRunscriptVisibility.getSelectedItem();
-		runscriptSettings.put(Field.VISIBILITY, Integer.toString(visibility.value));
+		startupSettings.put(Field.VISIBILITY, Integer.toString(visibility.value));
 		SoundState sound = (SoundState)cboSoundState.getSelectedItem();
-		runscriptSettings.put(Field.MUTED, Integer.toString(sound.value));
+		startupSettings.put(Field.MUTED, Integer.toString(sound.value));
 
 		setError("");
-		return runscriptSettings.serialize() + "\n" + taInputText;
+		return startupSettings.serialize() + "\n" + taInputText;
 	}
 
 	/**
@@ -90,8 +90,8 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 		if (header != null) {
 			// we should have following format: ext=<interpreter/extension>;visibility=<flag>;...
 			// e.g. ext=sh;visibility=0
-			runscriptSettings.deserialize(header);
-			String extension = runscriptSettings.get(Field.EXTENSION);
+			startupSettings.deserialize(header);
+			String extension = startupSettings.get(Field.EXTENSION);
 			for (RunscriptType type : RunscriptType.values()) {
 				if (type.extension.equals(extension)) {
 					cboRunscriptType.setSelectedItem(type);
@@ -100,7 +100,7 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 					break;
 				}
 			}
-			int visibility = Util.parseInt(runscriptSettings.get(Field.VISIBILITY), 1);
+			int visibility = Util.parseInt(startupSettings.get(Field.VISIBILITY), 1);
 			for (RunscriptVisibility windowFlag : RunscriptVisibility.values()) {
 				if (windowFlag.value == visibility) {
 					cboRunscriptVisibility.setSelectedItem(windowFlag);
@@ -108,7 +108,7 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 				}
 			}
 			cboSoundState.setSelectedItem(SoundState.DEFAULT);
-			int mute = Util.parseInt(runscriptSettings.get(Field.MUTED), -1);
+			int mute = Util.parseInt(startupSettings.get(Field.MUTED), -1);
 			for (SoundState s : SoundState.values()) {
 				if (s.value == mute) {
 					cboSoundState.setSelectedItem(s);
@@ -147,10 +147,10 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
 	/**
 	 * Map holding the inline settings from line 1 of the script
 	 */
-	private static class RsSettings extends HashMap<String, String> {
+	private static class StartupSettings extends HashMap<String, String> {
 		private static final long serialVersionUID = -5893345450266600626L;
 
-		public RsSettings(String data) {
+		public StartupSettings(String data) {
 			super();
 			deserialize(data);
 		}
@@ -201,7 +201,7 @@ public class RunscriptConfigurator extends RunscriptConfiguratorLayout {
  * Internal layout class for the advanced configurator (to keep it clean even
  * for widgets)
  */
-class RunscriptConfiguratorLayout extends JPanel {
+class StartupConfiguratorLayout extends JPanel {
 
 	private static final long serialVersionUID = 648729071828404053L;
 
@@ -213,7 +213,7 @@ class RunscriptConfiguratorLayout extends JPanel {
 	protected final ComboBox<RunscriptVisibility> cboRunscriptVisibility;
 	protected final ComboBox<SoundState> cboSoundState;
 
-	public RunscriptConfiguratorLayout() {
+	public StartupConfiguratorLayout() {
 		GridManager grid = new GridManager(this, 2, true, new Insets(5, 5, 5, 5));
 		grid.add(new QLabel("Audio"));
 		cboSoundState = new ComboBox<>(new ComboBoxRenderer<SoundState>() {
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index c8b46316..1b0baf94 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -31,7 +31,7 @@ import org.openslx.dozmod.gui.configurator.LdapFilterConfigurator;
 import org.openslx.dozmod.gui.configurator.LecturePermissionConfigurator;
 import org.openslx.dozmod.gui.configurator.NetrulesConfigurator;
 import org.openslx.dozmod.gui.configurator.NetshareConfigurator;
-import org.openslx.dozmod.gui.configurator.RunscriptConfigurator;
+import org.openslx.dozmod.gui.configurator.StartupConfigurator;
 import org.openslx.dozmod.gui.control.ComboBox;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
 import org.openslx.dozmod.gui.control.LocationSelector;
@@ -88,7 +88,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 	protected final JTabbedPane pnlTabs;
 	protected final LecturePermissionConfigurator ctlPermissionManager;
 	protected final LocationSelector ctlLocationSelector;
-	protected final RunscriptConfigurator ctlRunscriptConfigurator;
+	protected final StartupConfigurator ctlRunscriptConfigurator;
 	protected final NetshareConfigurator ctlNetshareConfigurator;
 	protected final LdapFilterConfigurator ctlLdapFilterConfigurator;
 	protected final NetrulesConfigurator ctlNetrulesConfigurator;
@@ -360,7 +360,7 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		 *                        		Tab "Runscript"
 		 *
 		 ********************************************************************************/
-		ctlRunscriptConfigurator = new RunscriptConfigurator();
+		ctlRunscriptConfigurator = new StartupConfigurator();
 		pnlTabRunscript = new JPanel();
 		GridManager grdAdvanced = new GridManager(pnlTabRunscript, 1, false);
 		grdAdvanced.add(ctlRunscriptConfigurator).fill(true, true).expand(true, true);