Fix fade settings loading, rename fade settings view controller

PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java

@@ -7,7 +7,7 @@ import de.tobias.playpad.pad.PadSettings;
 import de.tobias.playpad.settings.FadeSettings;
 import de.tobias.playpad.view.PseudoClasses;
 import de.tobias.playpad.viewcontroller.PadSettingsTabViewController;
-import de.tobias.playpad.viewcontroller.settings.FadeViewController;
+import de.tobias.playpad.viewcontroller.settings.FadeSettingsViewController;
 import de.tobias.playpad.viewcontroller.settings.WarningFeedbackViewController;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
@@ -21,7 +21,7 @@ public class PlayerPadTabViewController extends PadSettingsTabViewController {
 	private CheckBox customFadeCheckBox;
 	@FXML
 	private VBox fadeContainer;
-	private FadeViewController fadeViewController;
+	private FadeSettingsViewController fadeViewController;
 
 	@FXML
 	private VBox warningFeedbackContainer;
@@ -42,7 +42,7 @@ public class PlayerPadTabViewController extends PadSettingsTabViewController {
 	@Override
 	public void init() {
 		// Embed ViewController
-		fadeViewController = new FadeViewController();
+		fadeViewController = new FadeSettingsViewController();
 		fadeContainer.getChildren().add(fadeViewController.getParent());
 
 		warningFeedbackViewController = WarningFeedbackViewController.newViewControllerForPad();

PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/profile/PlayerTabViewController.java

@@ -7,7 +7,7 @@ import de.tobias.playpad.profile.Profile;
 import de.tobias.playpad.profile.ProfileSettings;
 import de.tobias.playpad.viewcontroller.cell.EnumCell;
 import de.tobias.playpad.viewcontroller.option.ProfileSettingsTabViewController;
-import de.tobias.playpad.viewcontroller.settings.FadeViewController;
+import de.tobias.playpad.viewcontroller.settings.FadeSettingsViewController;
 import de.tobias.playpad.viewcontroller.settings.WarningFeedbackViewController;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
@@ -32,7 +32,7 @@ public class PlayerTabViewController extends ProfileSettingsTabViewController {
 		load("view/option/profile", "PlayerTab", Localization.getBundle());
 
 		// Player
-		FadeViewController fadeViewController = new FadeViewController();
+		FadeSettingsViewController fadeViewController = new FadeSettingsViewController();
 		fadeViewController.setFadeSettings(Profile.currentProfile().getProfileSettings().getFade());
 		fadeContainer.getChildren().add(fadeViewController.getParent());
 		setAnchor(fadeViewController.getParent(), 0, 0, 0, 0);

PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/FadeViewController.java → PlayWall/src/main/java/de/tobias/playpad/viewcontroller/settings/FadeSettingsViewController.java

@@ -10,7 +10,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Slider;
 import javafx.util.Duration;
 
-public class FadeViewController extends NVC {
+public class FadeSettingsViewController extends NVC {
 
 	@FXML
 	private Slider fadeInSlider;
@@ -34,7 +34,7 @@ public class FadeViewController extends NVC {
 
 	private FadeSettings fade;
 
-	public FadeViewController() {
+	public FadeSettingsViewController() {
 		load("view/settings", "FadeView", Localization.getBundle());
 	}
 

PlayWallCore/src/main/java/de/tobias/playpad/settings/FadeSettings.java

@@ -148,9 +148,9 @@ public class FadeSettings {
 			FadeSettings fade = new FadeSettings();
 
 			Element fadeInElement = container.element(FADE_IN);
-			if (fadeInElement.attributeValue(ON_PAUSE_ATTR) != null)
+			if (fadeInElement.attributeValue(ON_START_ATTR) != null)
 				fade.setFadeInStart(Boolean.parseBoolean(fadeInElement.attributeValue(ON_START_ATTR)));
-			if (fadeInElement.attributeValue(ON_STOP_ATTR) != null)
+			if (fadeInElement.attributeValue(ON_PAUSE_ATTR) != null)
 				fade.setFadeInPause(Boolean.parseBoolean(fadeInElement.attributeValue(ON_PAUSE_ATTR)));
 			fade.setFadeIn(Duration.valueOf(fadeInElement.getStringValue().replace(" ", "")));