From b3f6ae6cc001f6e460cc77319012ac4092ab008a Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 12 Dec 2021 17:48:40 +0100
Subject: [PATCH] #157 - refactor: renamed class
---
PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java | 8 ++++----
PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java | 4 ++--
...signHandlerImpl.java => ModernDesignProviderImpl.java} | 3 ++-
.../tobias/playpad/pad/listener/PadPositionListener.java | 7 +++----
...ModernDesignHandler.java => ModernDesignProvider.java} | 3 ++-
5 files changed, 13 insertions(+), 12 deletions(-)
rename PlayWall/src/main/java/de/tobias/playpad/design/{ModernDesignHandlerImpl.java => ModernDesignProviderImpl.java} (90%)
rename PlayWallCore/src/main/java/de/tobias/playpad/design/{ModernDesignHandler.java => ModernDesignProvider.java} (85%)
diff --git a/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java
index f7eb8026..c49bbd13 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java
@@ -9,7 +9,7 @@ import de.thecodelabs.utils.threading.Worker;
import de.thecodelabs.utils.ui.NVC;
import de.thecodelabs.utils.util.SystemUtils;
import de.thecodelabs.versionizer.service.UpdateService;
-import de.tobias.playpad.design.ModernDesignHandler;
+import de.tobias.playpad.design.ModernDesignProvider;
import de.tobias.playpad.initialize.*;
import de.tobias.playpad.plugin.*;
import de.tobias.playpad.profile.ProfileNotFoundException;
@@ -65,7 +65,7 @@ public class PlayPadImpl implements PlayPad {
private UpdateService updateService;
protected GlobalSettings globalSettings;
- private ModernDesignHandler modernDesign;
+ private ModernDesignProvider modernDesign;
private Session session;
@@ -239,11 +239,11 @@ public class PlayPadImpl implements PlayPad {
return parameters;
}
- public ModernDesignHandler getModernDesign() {
+ public ModernDesignProvider getModernDesign() {
return modernDesign;
}
- void setModernDesign(ModernDesignHandler modernDesign) {
+ void setModernDesign(ModernDesignProvider modernDesign) {
this.modernDesign = modernDesign;
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
index d52ffecf..b4e36711 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/PlayPadMain.java
@@ -12,7 +12,7 @@ import de.thecodelabs.utils.ui.Alerts;
import de.thecodelabs.utils.util.OS;
import de.thecodelabs.utils.util.OS.OSType;
import de.thecodelabs.utils.util.SystemUtils;
-import de.tobias.playpad.design.ModernDesignHandlerImpl;
+import de.tobias.playpad.design.ModernDesignProviderImpl;
import de.tobias.playpad.design.ModernStyleableImpl;
import de.tobias.playpad.profile.ref.ProfileReferenceManager;
import de.tobias.playpad.project.Project;
@@ -108,7 +108,7 @@ public class PlayPadMain extends Application {
impl.setIcon(stageIcon, getClass().getClassLoader().getResourceAsStream(ICON_PATH));
PlayPadPlugin.setStyleable(new ModernStyleableImpl());
- impl.setModernDesign(new ModernDesignHandlerImpl());
+ impl.setModernDesign(new ModernDesignProviderImpl());
PlayPadPlugin.setInstance(impl);
}
diff --git a/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignHandlerImpl.java b/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
similarity index 90%
rename from PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignHandlerImpl.java
rename to PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
index 4d14df99..48e5588b 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignHandlerImpl.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/design/ModernDesignProviderImpl.java
@@ -3,7 +3,8 @@ package de.tobias.playpad.design;
import de.tobias.playpad.design.modern.ModernCartDesignHandler;
import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
-public class ModernDesignHandlerImpl implements ModernDesignHandler {
+public class ModernDesignProviderImpl implements ModernDesignProvider
+{
private ModernCartDesignHandler cartDesignHandler;
private ModernGlobalDesignHandler globalDesignHandler;
diff --git a/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
index 761fae5a..e14523b6 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/pad/listener/PadPositionListener.java
@@ -2,7 +2,7 @@ package de.tobias.playpad.pad.listener;
import de.tobias.playpad.PlayPadMain;
import de.tobias.playpad.action.actions.CartAction;
-import de.tobias.playpad.design.ModernDesignHandler;
+import de.tobias.playpad.design.ModernDesignProvider;
import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
import de.tobias.playpad.design.modern.model.ModernCartDesign;
import de.tobias.playpad.design.modern.model.ModernGlobalDesign;
@@ -109,7 +109,7 @@ public class PadPositionListener implements Runnable, IPadPositionListener {
final ModernGlobalDesign globalDesign = Profile.currentProfile().getProfileSettings().getDesign();
final ModernCartDesign cartDesign = padSettings.getDesign();
- final ModernDesignHandler modernDesign = PlayPadMain.getProgramInstance().getModernDesign();
+ final ModernDesignProvider modernDesign = PlayPadMain.getProgramInstance().getModernDesign();
final ModernGlobalDesignHandler handler = modernDesign.global();
@@ -131,8 +131,7 @@ public class PadPositionListener implements Runnable, IPadPositionListener {
warningThread = null;
}
- PadSettings padSettings = pad.getPadSettings();
- final ModernDesignHandler modernDesign = PlayPadMain.getProgramInstance().getModernDesign();
+ final ModernDesignProvider modernDesign = PlayPadMain.getProgramInstance().getModernDesign();
final ModernGlobalDesignHandler handler = modernDesign.global();
handler.stopWarning(controller);
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignHandler.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
similarity index 85%
rename from PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignHandler.java
rename to PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
index a96e7a9b..dac6d57a 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignHandler.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/ModernDesignProvider.java
@@ -3,7 +3,8 @@ package de.tobias.playpad.design;
import de.tobias.playpad.design.modern.ModernCartDesignHandler;
import de.tobias.playpad.design.modern.ModernGlobalDesignHandler;
-public interface ModernDesignHandler {
+public interface ModernDesignProvider
+{
ModernGlobalDesignHandler global();
ModernCartDesignHandler cart();
--
GitLab