From ea93d1215184e564f91cc3770b0e40202ec89f35 Mon Sep 17 00:00:00 2001 From: JeremyStarTM Date: Tue, 5 Nov 2024 21:15:30 +0100 Subject: [PATCH] Move the very internal shutdown event to the non-internal events package --- .../de/staropensource/engine/base/Engine.java | 2 +- .../event/InternalEngineShutdownEvent.java | 2 +- .../base/implementable/SubsystemClass.java | 2 +- .../base/internal/event/package-info.java | 24 ------------------- base/src/main/java/module-info.java | 6 ++--- .../engine/windowing/WindowingSubsystem.java | 2 +- 6 files changed, 6 insertions(+), 32 deletions(-) rename base/src/main/java/de/staropensource/engine/base/{internal => }/event/InternalEngineShutdownEvent.java (96%) delete mode 100644 base/src/main/java/de/staropensource/engine/base/internal/event/package-info.java diff --git a/base/src/main/java/de/staropensource/engine/base/Engine.java b/base/src/main/java/de/staropensource/engine/base/Engine.java index 0ebbbb20..c8fb49ba 100644 --- a/base/src/main/java/de/staropensource/engine/base/Engine.java +++ b/base/src/main/java/de/staropensource/engine/base/Engine.java @@ -27,7 +27,7 @@ import de.staropensource.engine.base.implementable.ShutdownHandler; import de.staropensource.engine.base.implementable.SubsystemClass; import de.staropensource.engine.base.implementable.helper.EventHelper; import de.staropensource.engine.base.implementation.versioning.StarOpenSourceVersioningSystem; -import de.staropensource.engine.base.internal.event.InternalEngineShutdownEvent; +import de.staropensource.engine.base.event.InternalEngineShutdownEvent; import de.staropensource.engine.base.internal.type.DependencySubsystemVector; import de.staropensource.engine.base.logging.PrintStreamService; import de.staropensource.engine.base.logging.*; diff --git a/base/src/main/java/de/staropensource/engine/base/internal/event/InternalEngineShutdownEvent.java b/base/src/main/java/de/staropensource/engine/base/event/InternalEngineShutdownEvent.java similarity index 96% rename from base/src/main/java/de/staropensource/engine/base/internal/event/InternalEngineShutdownEvent.java rename to base/src/main/java/de/staropensource/engine/base/event/InternalEngineShutdownEvent.java index 5985927b..7daf15e0 100644 --- a/base/src/main/java/de/staropensource/engine/base/internal/event/InternalEngineShutdownEvent.java +++ b/base/src/main/java/de/staropensource/engine/base/event/InternalEngineShutdownEvent.java @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -package de.staropensource.engine.base.internal.event; +package de.staropensource.engine.base.event; import de.staropensource.engine.base.implementable.Event; import de.staropensource.engine.base.implementable.helper.EventHelper; diff --git a/base/src/main/java/de/staropensource/engine/base/implementable/SubsystemClass.java b/base/src/main/java/de/staropensource/engine/base/implementable/SubsystemClass.java index 4d299c79..316ef8e6 100644 --- a/base/src/main/java/de/staropensource/engine/base/implementable/SubsystemClass.java +++ b/base/src/main/java/de/staropensource/engine/base/implementable/SubsystemClass.java @@ -22,7 +22,7 @@ package de.staropensource.engine.base.implementable; import de.staropensource.engine.base.Engine; import de.staropensource.engine.base.annotation.EngineSubsystem; import de.staropensource.engine.base.annotation.EventListener; -import de.staropensource.engine.base.internal.event.InternalEngineShutdownEvent; +import de.staropensource.engine.base.event.InternalEngineShutdownEvent; import de.staropensource.engine.base.type.DependencyVector; import org.jetbrains.annotations.NotNull; diff --git a/base/src/main/java/de/staropensource/engine/base/internal/event/package-info.java b/base/src/main/java/de/staropensource/engine/base/internal/event/package-info.java deleted file mode 100644 index 04b1538f..00000000 --- a/base/src/main/java/de/staropensource/engine/base/internal/event/package-info.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * STAROPENSOURCE ENGINE SOURCE FILE - * Copyright (c) 2024 The StarOpenSource Engine Authors - * Licensed under the GNU Affero General Public License v3 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -/** - * Events used for engine-internal communication. - * These events are meant to be listened on by the base engine and it's subsystems. - */ -package de.staropensource.engine.base.internal.event; diff --git a/base/src/main/java/module-info.java b/base/src/main/java/module-info.java index eeae5180..1ee10ce2 100644 --- a/base/src/main/java/module-info.java +++ b/base/src/main/java/module-info.java @@ -18,13 +18,13 @@ module sosengine.base { exports de.staropensource.engine.base.implementable; exports de.staropensource.engine.base.implementable.helper; exports de.staropensource.engine.base.utility.information; + exports de.staropensource.engine.base.implementation.shortcode; exports de.staropensource.engine.base.implementation.versioning; exports de.staropensource.engine.base.event; exports de.staropensource.engine.base.exception; exports de.staropensource.engine.base.exception.dependency; exports de.staropensource.engine.base.exception.reflection; exports de.staropensource.engine.base.exception.versioning; - exports de.staropensource.engine.base.internal.event; // Internal: Required for subsystems exports de.staropensource.engine.base.logging; exports de.staropensource.engine.base.implementation.logging; exports de.staropensource.engine.base.reflection; @@ -34,7 +34,6 @@ module sosengine.base { exports de.staropensource.engine.base.type.reflection; exports de.staropensource.engine.base.type.vector; exports de.staropensource.engine.base.utility; - exports de.staropensource.engine.base.implementation.shortcode; // Reflection access opens de.staropensource.engine.base; @@ -42,13 +41,13 @@ module sosengine.base { opens de.staropensource.engine.base.implementable; opens de.staropensource.engine.base.implementable.helper; opens de.staropensource.engine.base.utility.information; + opens de.staropensource.engine.base.implementation.shortcode; opens de.staropensource.engine.base.implementation.versioning; opens de.staropensource.engine.base.event; opens de.staropensource.engine.base.exception; opens de.staropensource.engine.base.exception.dependency; opens de.staropensource.engine.base.exception.reflection; opens de.staropensource.engine.base.exception.versioning; - opens de.staropensource.engine.base.internal.event; // Internal: Required for subsystems opens de.staropensource.engine.base.logging; opens de.staropensource.engine.base.implementation.logging; opens de.staropensource.engine.base.reflection; @@ -58,5 +57,4 @@ module sosengine.base { opens de.staropensource.engine.base.type.reflection; opens de.staropensource.engine.base.type.vector; opens de.staropensource.engine.base.utility; - opens de.staropensource.engine.base.implementation.shortcode; } diff --git a/windowing/src/main/java/de/staropensource/engine/windowing/WindowingSubsystem.java b/windowing/src/main/java/de/staropensource/engine/windowing/WindowingSubsystem.java index ab543c0f..f07f9611 100644 --- a/windowing/src/main/java/de/staropensource/engine/windowing/WindowingSubsystem.java +++ b/windowing/src/main/java/de/staropensource/engine/windowing/WindowingSubsystem.java @@ -26,7 +26,7 @@ import de.staropensource.engine.base.implementable.helper.EventHelper; import de.staropensource.engine.base.logging.Logger; import de.staropensource.engine.base.utility.information.EngineInformation; import de.staropensource.engine.base.implementation.versioning.StarOpenSourceVersioningSystem; -import de.staropensource.engine.base.internal.event.InternalEngineShutdownEvent; +import de.staropensource.engine.base.event.InternalEngineShutdownEvent; import de.staropensource.engine.base.type.DependencyVector; import de.staropensource.engine.base.utility.Miscellaneous; import de.staropensource.engine.windowing.implementable.api.ApiClass;