From c53097bd6f6db8b9e9f4a3b03dacfad0d7cf4998 Mon Sep 17 00:00:00 2001 From: tobias <tobias@thecodedev.de> Date: Fri, 6 Sep 2019 21:54:03 +0200 Subject: [PATCH] Extract all playout log classes from core to plugin --- .../java/de/tobias/playpad/PlayPadImpl.java | 8 ---- .../log/listener/PadMediaPathLogListener.java | 22 ---------- .../log/listener/PadPlayLogListener.java | 34 --------------- .../main/java/de/tobias/playpad/pad/Pad.java | 32 ++++++-------- .../de/tobias/playpad/plugin/PadListener.java | 8 +++- .../plugin/playout/PlayoutLogPlugin.java | 11 +++++ .../playout/export/PlayoutLogPdfExport.java | 4 +- .../playpad/plugin/playout}/log/LogItem.java | 4 +- .../plugin/playout}/log/LogSeason.java | 4 +- .../plugin/playout}/log/LogSeasons.java | 4 +- .../plugin/playout}/log/PlayOutItem.java | 2 +- .../log/listener/PadPlayLogListener.java | 43 +++++++++++++++++++ .../log/storage/LogSeasonStorageHandler.java | 8 ++-- .../SqlLiteLogSeasonStorageHandler.java | 8 ++-- .../PlayoutLogViewController.java | 4 +- .../playout/PlayOutLogInitializer.scala | 2 +- .../plugin/playout/ProjectListener.scala | 2 +- 17 files changed, 94 insertions(+), 106 deletions(-) delete mode 100644 PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java delete mode 100644 PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java rename {PlayWallCore/src/main/java/de/tobias/playpad => PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout}/log/LogItem.java (93%) rename {PlayWallCore/src/main/java/de/tobias/playpad => PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout}/log/LogSeason.java (92%) rename {PlayWallCore/src/main/java/de/tobias/playpad => PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout}/log/LogSeasons.java (89%) rename {PlayWallCore/src/main/java/de/tobias/playpad => PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout}/log/PlayOutItem.java (92%) create mode 100644 PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/listener/PadPlayLogListener.java rename {PlayWallCore/src/main/java/de/tobias/playpad => PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout}/log/storage/LogSeasonStorageHandler.java (63%) diff --git a/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java index ca2b309d..d555c157 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java +++ b/PlayWall/src/main/java/de/tobias/playpad/PlayPadImpl.java @@ -1,6 +1,5 @@ package de.tobias.playpad; -import de.thecodelabs.logger.LogLevel; import de.thecodelabs.logger.Logger; import de.thecodelabs.utils.application.App; import de.thecodelabs.utils.application.ApplicationUtils; @@ -11,7 +10,6 @@ import de.thecodelabs.utils.util.SystemUtils; import de.thecodelabs.versionizer.service.UpdateService; import de.tobias.playpad.design.ModernDesignHandler; import de.tobias.playpad.initialize.*; -import de.tobias.playpad.log.LogSeasons; import de.tobias.playpad.plugin.*; import de.tobias.playpad.profile.ProfileNotFoundException; import de.tobias.playpad.project.Project; @@ -152,12 +150,6 @@ public class PlayPadImpl implements PlayPad { server.disconnect(); } - try { - LogSeasons.getStorageHandler().close(); - } catch (RuntimeException e) { - Logger.log(LogLevel.ERROR, "Cannot close LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")"); - } - try { Path applicationSupportPath = SystemUtils.getApplicationSupportDirectoryPath("de.tobias.playpad.PlayPadMain"); FileUtils.deleteDirectory(applicationSupportPath); diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java deleted file mode 100644 index c1198d1c..00000000 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadMediaPathLogListener.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.tobias.playpad.log.listener; - -import de.tobias.playpad.log.LogSeason; -import de.tobias.playpad.log.LogSeasons; -import de.tobias.playpad.pad.mediapath.MediaPath; -import javafx.collections.ListChangeListener; - -public class PadMediaPathLogListener implements ListChangeListener<MediaPath> { - @Override - public void onChanged(Change<? extends MediaPath> c) { - LogSeason instance = LogSeasons.getInstance(); - if (instance != null) { - while (c.next()) { - if (c.wasAdded()) { - for (MediaPath mediaPath : c.getAddedSubList()) { - instance.addLogItem(mediaPath); - } - } - } - } - } -} diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java deleted file mode 100644 index 61914c72..00000000 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/listener/PadPlayLogListener.java +++ /dev/null @@ -1,34 +0,0 @@ -package de.tobias.playpad.log.listener; - -import de.thecodelabs.logger.LogLevel; -import de.thecodelabs.logger.Logger; -import de.tobias.playpad.log.LogSeason; -import de.tobias.playpad.log.LogSeasons; -import de.tobias.playpad.log.PlayOutItem; -import de.tobias.playpad.pad.Pad; -import de.tobias.playpad.pad.PadStatus; -import javafx.beans.value.ChangeListener; -import javafx.beans.value.ObservableValue; - -public class PadPlayLogListener implements ChangeListener<PadStatus> { - - private Pad pad; - - public PadPlayLogListener(Pad pad) { - this.pad = pad; - } - - @Override - public void changed(ObservableValue<? extends PadStatus> observable, PadStatus oldValue, PadStatus newValue) { - if (newValue == PadStatus.PLAY) { - LogSeason instance = LogSeasons.getInstance(); - if (instance != null) { - instance.getLogItems().stream().filter(item -> item.getUuid().equals(pad.getPaths().get(0).getId())).forEach(item -> { - PlayOutItem playoutItem = new PlayOutItem(item.getUuid(), instance, System.currentTimeMillis()); - item.addPlayOutItem(playoutItem); - Logger.log(LogLevel.DEBUG, "Play Item: " + playoutItem); - }); - } - } - } -} diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java index 769c80c0..0cb34b30 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/Pad.java @@ -2,8 +2,6 @@ package de.tobias.playpad.pad; import de.thecodelabs.utils.io.PathUtils; import de.tobias.playpad.PlayPadPlugin; -import de.tobias.playpad.log.listener.PadMediaPathLogListener; -import de.tobias.playpad.log.listener.PadPlayLogListener; import de.tobias.playpad.pad.content.PadContent; import de.tobias.playpad.pad.content.PadContentFactory; import de.tobias.playpad.pad.content.play.Pauseable; @@ -27,6 +25,7 @@ import de.tobias.playpad.server.sync.command.Commands; import de.tobias.playpad.server.sync.listener.upstream.PadUpdateListener; import javafx.beans.property.*; import javafx.collections.FXCollections; +import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import org.dom4j.Element; @@ -68,8 +67,7 @@ public class Pad { private transient PadFadeContentListener padFadeContentListener; private transient PadFadeDurationListener padFadeDurationListener; - private transient PadPlayLogListener padPlayLogListener; - private transient PadMediaPathLogListener padMediaPathLogListener; + private transient ListChangeListener<MediaPath> mediaPathUpdateListener; // Trigger Listener private transient PadTriggerStatusListener padTriggerStatusListener; @@ -135,14 +133,6 @@ public class Pad { padFadeContentListener.changed(contentProperty, getContent(), null); } - if (padPlayLogListener != null && statusProperty != null) { - statusProperty.removeListener(padPlayLogListener); - } - - if (padMediaPathLogListener != null && mediaPaths != null) { - mediaPaths.removeListener(padMediaPathLogListener); - } - // init new listener for properties padStatusControlListener = new PadStatusControlListener(this); statusProperty.addListener(padStatusControlListener); @@ -159,15 +149,7 @@ public class Pad { padStatusNotFoundListener = new PadStatusNotFoundListener(project); statusProperty.addListener(padStatusNotFoundListener); - // PlayOutLog Listener - padPlayLogListener = new PadPlayLogListener(this); - statusProperty.addListener(padPlayLogListener); - - padMediaPathLogListener = new PadMediaPathLogListener(); - mediaPaths.addListener(padMediaPathLogListener); - // Trigger - padTriggerStatusListener = new PadTriggerStatusListener(this); statusProperty.addListener(padTriggerStatusListener); @@ -177,6 +159,16 @@ public class Pad { padTriggerContentListener = new PadTriggerContentListener(this); contentProperty.addListener(padTriggerContentListener); padTriggerContentListener.changed(contentProperty, null, getContent()); + + // Pad Listener + if (mediaPathUpdateListener != null) { + mediaPaths.removeListener(mediaPathUpdateListener); + } + mediaPathUpdateListener = value -> PlayPadPlugin + .getInstance() + .getPadListener() + .forEach(listener -> listener.onMediaPathChanged(this, value)); + mediaPaths.addListener(mediaPathUpdateListener); } public void addSyncListener() { diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java index 4123e274..5c9df06f 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/plugin/PadListener.java @@ -2,6 +2,8 @@ package de.tobias.playpad.plugin; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.PadStatus; +import de.tobias.playpad.pad.mediapath.MediaPath; +import javafx.collections.ListChangeListener; /** * Listener für ein Pad. @@ -13,9 +15,13 @@ public interface PadListener { /** * Call then ever the status of a pad will be changed - * @param pad corresponding pad + * + * @param pad corresponding pad * @param newValue new status value */ void onStatusChange(Pad pad, PadStatus newValue); + default void onMediaPathChanged(Pad pad, ListChangeListener.Change<? extends MediaPath> value) { + } + } \ No newline at end of file diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java index 517278cd..88fb53dc 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/PlayoutLogPlugin.java @@ -1,5 +1,6 @@ package de.tobias.playpad.plugin.playout; +import de.thecodelabs.logger.LogLevel; import de.thecodelabs.logger.Logger; import de.thecodelabs.plugins.PluginArtifact; import de.thecodelabs.plugins.PluginDescriptor; @@ -7,6 +8,8 @@ import de.thecodelabs.utils.util.Localization; import de.tobias.playpad.PlayPadPlugin; import de.tobias.playpad.plugin.Module; import de.tobias.playpad.plugin.PlayPadPluginStub; +import de.tobias.playpad.plugin.playout.log.LogSeasons; +import de.tobias.playpad.plugin.playout.log.listener.PadPlayLogListener; import de.tobias.playpad.plugin.playout.viewcontroller.MainViewControllerListener; @SuppressWarnings("unused") @@ -19,8 +22,10 @@ public class PlayoutLogPlugin implements PlayPadPluginStub, PluginArtifact { Localization.addResourceBundle("lang/playoutlog", getClass().getClassLoader()); module = new Module(descriptor.getName(), descriptor.getArtifactId()); + PlayPadPlugin.getInstance().addMainViewListener(new MainViewControllerListener()); PlayPadPlugin.getInstance().addGlobalListener(new ProjectListener()); + PlayPadPlugin.getInstance().addPadListener(new PadPlayLogListener()); PlayOutLogInitializer.init(); @@ -30,6 +35,12 @@ public class PlayoutLogPlugin implements PlayPadPluginStub, PluginArtifact { @Override public void shutdown() { Logger.debug("Disable Playout Log Plugin"); + + try { + LogSeasons.getStorageHandler().close(); + } catch (RuntimeException e) { + Logger.log(LogLevel.ERROR, "Cannot close LogSeasonStorageHandler (" + e.getLocalizedMessage() + ")"); + } } @Override diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java index b35a6789..b7507b32 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/export/PlayoutLogPdfExport.java @@ -3,9 +3,9 @@ package de.tobias.playpad.plugin.playout.export; import com.itextpdf.text.*; import com.itextpdf.text.pdf.*; import de.tobias.playpad.design.modern.ModernColor; -import de.tobias.playpad.log.LogItem; -import de.tobias.playpad.log.LogSeason; import de.tobias.playpad.plugin.playout.ColorUtils; +import de.tobias.playpad.plugin.playout.log.LogItem; +import de.tobias.playpad.plugin.playout.log.LogSeason; import java.io.IOException; import java.nio.file.Files; diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogItem.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogItem.java similarity index 93% rename from PlayWallCore/src/main/java/de/tobias/playpad/log/LogItem.java rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogItem.java index 4306623d..e73cec1b 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogItem.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogItem.java @@ -1,7 +1,7 @@ -package de.tobias.playpad.log; +package de.tobias.playpad.plugin.playout.log; -import de.tobias.playpad.log.storage.LogSeasonStorageHandler; import de.tobias.playpad.pad.mediapath.MediaPath; +import de.tobias.playpad.plugin.playout.log.storage.LogSeasonStorageHandler; import java.util.ArrayList; import java.util.List; diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeason.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeason.java similarity index 92% rename from PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeason.java rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeason.java index 1edfe77a..ea8a183c 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeason.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeason.java @@ -1,8 +1,8 @@ -package de.tobias.playpad.log; +package de.tobias.playpad.plugin.playout.log; -import de.tobias.playpad.log.storage.LogSeasonStorageHandler; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.mediapath.MediaPath; +import de.tobias.playpad.plugin.playout.log.storage.LogSeasonStorageHandler; import de.tobias.playpad.project.Project; import java.util.ArrayList; diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeasons.java similarity index 89% rename from PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeasons.java index 52cf961d..a3c8c8a3 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/LogSeasons.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/LogSeasons.java @@ -1,6 +1,6 @@ -package de.tobias.playpad.log; +package de.tobias.playpad.plugin.playout.log; -import de.tobias.playpad.log.storage.LogSeasonStorageHandler; +import de.tobias.playpad.plugin.playout.log.storage.LogSeasonStorageHandler; import java.util.List; diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/PlayOutItem.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/PlayOutItem.java similarity index 92% rename from PlayWallCore/src/main/java/de/tobias/playpad/log/PlayOutItem.java rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/PlayOutItem.java index 6f370721..c5e57460 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/PlayOutItem.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/PlayOutItem.java @@ -1,4 +1,4 @@ -package de.tobias.playpad.log; +package de.tobias.playpad.plugin.playout.log; import java.util.UUID; diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/listener/PadPlayLogListener.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/listener/PadPlayLogListener.java new file mode 100644 index 00000000..a21ee0b8 --- /dev/null +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/listener/PadPlayLogListener.java @@ -0,0 +1,43 @@ +package de.tobias.playpad.plugin.playout.log.listener; + +import de.thecodelabs.logger.LogLevel; +import de.thecodelabs.logger.Logger; +import de.tobias.playpad.pad.Pad; +import de.tobias.playpad.pad.PadStatus; +import de.tobias.playpad.pad.mediapath.MediaPath; +import de.tobias.playpad.plugin.PadListener; +import de.tobias.playpad.plugin.playout.log.LogSeason; +import de.tobias.playpad.plugin.playout.log.LogSeasons; +import de.tobias.playpad.plugin.playout.log.PlayOutItem; +import javafx.collections.ListChangeListener; + +public class PadPlayLogListener implements PadListener { + + @Override + public void onStatusChange(Pad pad, PadStatus newValue) { + if (newValue == PadStatus.PLAY) { + LogSeason instance = LogSeasons.getInstance(); + if (instance != null) { + instance.getLogItems().stream().filter(item -> item.getUuid().equals(pad.getPaths().get(0).getId())).forEach(item -> { + PlayOutItem playoutItem = new PlayOutItem(item.getUuid(), instance, System.currentTimeMillis()); + item.addPlayOutItem(playoutItem); + Logger.log(LogLevel.DEBUG, "Play Item: " + playoutItem); + }); + } + } + } + + @Override + public void onMediaPathChanged(Pad pad, ListChangeListener.Change<? extends MediaPath> value) { + LogSeason instance = LogSeasons.getInstance(); + if (instance != null) { + while (value.next()) { + if (value.wasAdded()) { + for (MediaPath mediaPath : value.getAddedSubList()) { + instance.addLogItem(mediaPath); + } + } + } + } + } +} diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/storage/LogSeasonStorageHandler.java similarity index 63% rename from PlayWallCore/src/main/java/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java rename to PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/storage/LogSeasonStorageHandler.java index 6b4c8932..639071c9 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/log/storage/LogSeasonStorageHandler.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/log/storage/LogSeasonStorageHandler.java @@ -1,8 +1,8 @@ -package de.tobias.playpad.log.storage; +package de.tobias.playpad.plugin.playout.log.storage; -import de.tobias.playpad.log.LogItem; -import de.tobias.playpad.log.LogSeason; -import de.tobias.playpad.log.PlayOutItem; +import de.tobias.playpad.plugin.playout.log.LogItem; +import de.tobias.playpad.plugin.playout.log.LogSeason; +import de.tobias.playpad.plugin.playout.log.PlayOutItem; import java.util.List; diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java index 1800365a..49390921 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/storage/SqlLiteLogSeasonStorageHandler.java @@ -2,10 +2,10 @@ package de.tobias.playpad.plugin.playout.storage; import de.thecodelabs.logger.LogLevel; import de.thecodelabs.logger.Logger; -import de.tobias.playpad.log.LogItem; -import de.tobias.playpad.log.LogSeason; -import de.tobias.playpad.log.PlayOutItem; -import de.tobias.playpad.log.storage.LogSeasonStorageHandler; +import de.tobias.playpad.plugin.playout.log.LogItem; +import de.tobias.playpad.plugin.playout.log.LogSeason; +import de.tobias.playpad.plugin.playout.log.PlayOutItem; +import de.tobias.playpad.plugin.playout.log.storage.LogSeasonStorageHandler; import java.nio.file.Path; import java.sql.*; diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java index 2d4c8ac3..1d0e1ee4 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/java/de/tobias/playpad/plugin/playout/viewcontroller/PlayoutLogViewController.java @@ -9,10 +9,10 @@ import de.thecodelabs.utils.ui.icon.FontAwesomeType; import de.thecodelabs.utils.ui.icon.FontIcon; import de.thecodelabs.utils.util.Localization; import de.tobias.playpad.PlayPadPlugin; -import de.tobias.playpad.log.LogSeason; -import de.tobias.playpad.log.LogSeasons; import de.tobias.playpad.plugin.playout.Strings; import de.tobias.playpad.plugin.playout.export.PlayoutLogPdfExport; +import de.tobias.playpad.plugin.playout.log.LogSeason; +import de.tobias.playpad.plugin.playout.log.LogSeasons; import de.tobias.playpad.plugin.playout.storage.PlayoutLogSettings; import de.tobias.playpad.project.Project; import de.tobias.playpad.project.ProjectSettings; diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala index b85b36fb..76d5d99b 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/PlayOutLogInitializer.scala @@ -5,7 +5,7 @@ import java.sql.SQLException import de.thecodelabs.logger.Logger import de.thecodelabs.utils.application.ApplicationUtils import de.thecodelabs.utils.application.container.PathType -import de.tobias.playpad.log.LogSeasons +import de.tobias.playpad.plugin.playout.log.LogSeasons import de.tobias.playpad.plugin.playout.storage.SqlLiteLogSeasonStorageHandler object PlayOutLogInitializer { diff --git a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/ProjectListener.scala b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/ProjectListener.scala index 3748f689..b1718d04 100644 --- a/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/ProjectListener.scala +++ b/PlayWallPlugins/PlayWallPluginPlayoutLog/src/main/scala/de/tobias/playpad/plugin/playout/ProjectListener.scala @@ -4,8 +4,8 @@ import java.text.SimpleDateFormat import de.thecodelabs.logger.Logger import de.thecodelabs.storage.proxy.SettingsProxy -import de.tobias.playpad.log.LogSeasons import de.tobias.playpad.plugin.GlobalAdapter +import de.tobias.playpad.plugin.playout.log.LogSeasons import de.tobias.playpad.plugin.playout.storage.PlayoutLogSettings import de.tobias.playpad.project.Project -- GitLab