From 373341d3eab0020043a6b62f7692ffc88c6a0d5a Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Thu, 28 Jul 2016 17:33:48 +0200
Subject: [PATCH] Move classes (Fade, Warning)
---
.../action/cartaction/PadPositionWarningListener.java | 2 +-
.../action/cartaction/PadStatusFeedbackListener.java | 2 +-
.../de/tobias/playpad/layout/classic/ClassicCartLayout.java | 2 +-
.../tobias/playpad/layout/classic/ClassicGlobalLayout.java | 2 +-
.../de/tobias/playpad/layout/modern/ModernLayoutCart.java | 2 +-
.../de/tobias/playpad/layout/modern/ModernLayoutGlobal.java | 2 +-
.../de/tobias/playpad/pad/listener/PadPositionListener.java | 2 +-
.../option/pad/PlayerPadTabViewController.java | 4 ++--
.../playpad/viewcontroller/settings/FadeViewController.java | 2 +-
PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java | 2 +-
PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java | 2 +-
PlayWallCore/src/de/tobias/playpad/pad/Pad.java | 2 ++
PlayWallCore/src/de/tobias/playpad/project/Project.java | 6 +++---
.../src/de/tobias/playpad/{pad => settings}/Fade.java | 2 +-
.../src/de/tobias/playpad/settings/ProfileSettings.java | 2 --
.../src/de/tobias/playpad/{pad => settings}/Warning.java | 2 +-
16 files changed, 19 insertions(+), 19 deletions(-)
rename PlayWallCore/src/de/tobias/playpad/{pad => settings}/Fade.java (98%)
rename PlayWallCore/src/de/tobias/playpad/{pad => settings}/Warning.java (96%)
diff --git a/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java b/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
index 7691158c..cd3d5a10 100644
--- a/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
+++ b/PlayWall/src/de/tobias/playpad/action/cartaction/PadPositionWarningListener.java
@@ -2,8 +2,8 @@ package de.tobias.playpad.action.cartaction;
import de.tobias.playpad.action.feedback.FeedbackMessage;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
+import de.tobias.playpad.settings.Warning;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java b/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
index 5d1bb8c3..2dcc8211 100644
--- a/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
+++ b/PlayWall/src/de/tobias/playpad/action/cartaction/PadStatusFeedbackListener.java
@@ -4,7 +4,7 @@ import de.tobias.playpad.action.feedback.FeedbackMessage;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
import de.tobias.playpad.pad.conntent.Durationable;
-import de.tobias.playpad.pad.Warning;
+import de.tobias.playpad.settings.Warning;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
index 013765c7..0e6d1952 100644
--- a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
+++ b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicCartLayout.java
@@ -15,8 +15,8 @@ import de.tobias.playpad.PseudoClasses;
import de.tobias.playpad.layout.CartLayout;
import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.IPadView;
import de.tobias.utils.util.ColorXMLUtils;
import javafx.application.Platform;
diff --git a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
index 8618a813..2f067be0 100644
--- a/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
+++ b/PlayWall/src/de/tobias/playpad/layout/classic/ClassicGlobalLayout.java
@@ -11,9 +11,9 @@ import de.tobias.playpad.layout.CartLayout;
import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.IPadView;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.utils.application.ApplicationUtils;
diff --git a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
index fef4f679..123f4127 100644
--- a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
+++ b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutCart.java
@@ -9,9 +9,9 @@ import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.layout.LayoutColorAssociator;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
import javafx.scene.paint.Color;
import javafx.util.Duration;
diff --git a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
index 925b392b..c8e79942 100644
--- a/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
+++ b/PlayWall/src/de/tobias/playpad/layout/modern/ModernLayoutGlobal.java
@@ -13,11 +13,11 @@ import de.tobias.playpad.layout.GlobalLayout;
import de.tobias.playpad.layout.Layout;
import de.tobias.playpad.layout.LayoutColorAssociator;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
diff --git a/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java b/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
index b9f60d71..bdb5f35a 100644
--- a/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
+++ b/PlayWall/src/de/tobias/playpad/pad/listener/PadPositionListener.java
@@ -2,11 +2,11 @@ package de.tobias.playpad.pad.listener;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.PadStatus;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.conntent.Durationable;
import de.tobias.playpad.pad.conntent.Fadeable;
import de.tobias.playpad.pad.conntent.PadContent;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.pad.PadViewController;
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
index 6c6274b3..4cae57b1 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/option/pad/PlayerPadTabViewController.java
@@ -2,9 +2,9 @@ package de.tobias.playpad.viewcontroller.option.pad;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
-import de.tobias.playpad.pad.Fade;
import de.tobias.playpad.pad.Pad;
-import de.tobias.playpad.pad.Warning;
+import de.tobias.playpad.settings.Fade;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.PadSettingsTabViewController;
import de.tobias.playpad.viewcontroller.settings.FadeViewController;
import de.tobias.playpad.viewcontroller.settings.WarningFeedbackViewController;
diff --git a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java b/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
index 2a4ee972..dfa3c733 100644
--- a/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
+++ b/PlayWall/src/de/tobias/playpad/viewcontroller/settings/FadeViewController.java
@@ -2,7 +2,7 @@ package de.tobias.playpad.viewcontroller.settings;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.Strings;
-import de.tobias.playpad.pad.Fade;
+import de.tobias.playpad.settings.Fade;
import de.tobias.utils.ui.ContentViewController;
import de.tobias.utils.util.Localization;
import javafx.fxml.FXML;
diff --git a/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java b/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
index 46dec367..9f9fabc5 100644
--- a/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
+++ b/PlayWallCore/src/de/tobias/playpad/layout/CartLayout.java
@@ -2,8 +2,8 @@ package de.tobias.playpad.layout;
import org.dom4j.Element;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
+import de.tobias.playpad.settings.Warning;
public interface CartLayout {
diff --git a/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java b/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
index 8622bca5..e7b95f72 100644
--- a/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
+++ b/PlayWallCore/src/de/tobias/playpad/layout/GlobalLayout.java
@@ -14,9 +14,9 @@ import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
import org.dom4j.io.XMLWriter;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.viewcontroller.main.IMainViewController;
import javafx.stage.Stage;
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
index 71dbdce7..fc37a849 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java
@@ -16,7 +16,9 @@ import de.tobias.playpad.pad.triggerlistener.PadTriggerDurationListener;
import de.tobias.playpad.pad.triggerlistener.PadTriggerStatusListener;
import de.tobias.playpad.pad.view.IPadViewController;
import de.tobias.playpad.project.Project;
+import de.tobias.playpad.settings.Fade;
import de.tobias.playpad.settings.Profile;
+import de.tobias.playpad.settings.Warning;
import de.tobias.playpad.tigger.Trigger;
import de.tobias.playpad.tigger.TriggerPoint;
import de.tobias.utils.settings.UserDefaults;
diff --git a/PlayWallCore/src/de/tobias/playpad/project/Project.java b/PlayWallCore/src/de/tobias/playpad/project/Project.java
index 8cda094d..39beedc9 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/Project.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/Project.java
@@ -124,9 +124,6 @@ public class Project {
Path projectPath = ref.getProjectPath();
if (Files.exists(projectPath)) {
- SAXReader reader = new SAXReader();
- Document document = reader.read(Files.newInputStream(projectPath));
-
if (ref.getProfileReference() != null) {
Profile.load(ref.getProfileReference()); // Lädt das entsprechende Profile und aktiviert es
} else {
@@ -136,6 +133,9 @@ public class Project {
Project project = new Project(ref);
+ SAXReader reader = new SAXReader();
+ Document document = reader.read(Files.newInputStream(projectPath));
+
Element rootElement = document.getRootElement();
for (Object padObj : rootElement.elements(PAD_ELEMENT)) {
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Fade.java b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
similarity index 98%
rename from PlayWallCore/src/de/tobias/playpad/pad/Fade.java
rename to PlayWallCore/src/de/tobias/playpad/settings/Fade.java
index 09e47651..73d9ba15 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Fade.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Fade.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.pad;
+package de.tobias.playpad.settings;
import org.dom4j.Element;
diff --git a/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java b/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
index 78bc49db..9189fb33 100644
--- a/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/ProfileSettings.java
@@ -17,9 +17,7 @@ import org.dom4j.io.XMLWriter;
import de.tobias.playpad.audio.AudioRegistry;
import de.tobias.playpad.layout.LayoutRegistry;
-import de.tobias.playpad.pad.Fade;
import de.tobias.playpad.pad.TimeMode;
-import de.tobias.playpad.pad.Warning;
import de.tobias.playpad.update.UpdateChannel;
import de.tobias.utils.application.ApplicationUtils;
import de.tobias.utils.application.container.PathType;
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Warning.java b/PlayWallCore/src/de/tobias/playpad/settings/Warning.java
similarity index 96%
rename from PlayWallCore/src/de/tobias/playpad/pad/Warning.java
rename to PlayWallCore/src/de/tobias/playpad/settings/Warning.java
index 11cef972..56de8f3d 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/Warning.java
+++ b/PlayWallCore/src/de/tobias/playpad/settings/Warning.java
@@ -1,4 +1,4 @@
-package de.tobias.playpad.pad;
+package de.tobias.playpad.settings;
import org.dom4j.Element;
--
GitLab