Move interfaces, enums & classes around again

This commit is contained in:
JeremyStar™ 2024-06-27 20:08:34 +02:00
parent 9202eaeb4a
commit cc3cd52d22
Signed by: JeremyStarTM
GPG key ID: E366BAEF67E4704D
54 changed files with 67 additions and 93 deletions

View file

@ -30,7 +30,7 @@ import de.staropensource.sosengine.base.logging.CrashHandler;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.*;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -22,8 +22,8 @@ package de.staropensource.sosengine.base;
import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.utility.PropertyParser;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.annotations.EventListener;
import de.staropensource.sosengine.base.classes.events.Event;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.ListFormatter;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -17,8 +17,9 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.types;
package de.staropensource.sosengine.base.classes.logging;
import de.staropensource.sosengine.base.types.CodePart;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.types;
package de.staropensource.sosengine.base.classes.logging;
/**
* Used for determining a log message's priority.

View file

@ -19,8 +19,6 @@
package de.staropensource.sosengine.base.classes.logging;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -19,8 +19,6 @@
package de.staropensource.sosengine.base.classes.logging;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -1,25 +0,0 @@
/*
* STAROPENSOURCE ENGINE SOURCE FILE
* Copyright (c) 2024 The StarOpenSource Engine Contributors
* 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 <https://www.gnu.org/licenses/>.
*/
/**
* Contains data types.
*
* @since 1-alpha1
*/
package de.staropensource.sosengine.base.classes.types;

View file

@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.data.info;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.types.VersionType;
import de.staropensource.sosengine.base.utility.PropertyParser;
import lombok.Getter;

View file

@ -21,8 +21,8 @@ package de.staropensource.sosengine.base.events;
import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.classes.events.Event;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.classes.helpers.EventHelper;
import org.jetbrains.annotations.NotNull;

View file

@ -24,8 +24,8 @@ import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.events.EngineCrashEvent;
import de.staropensource.sosengine.base.logging.placeholders.crashhandler.*;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.utility.PlaceholderEngine;
import lombok.Getter;
import lombok.Setter;

View file

@ -21,8 +21,8 @@ package de.staropensource.sosengine.base.logging;
import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.utility.ShortcodeConverter;
import org.fusesource.jansi.Ansi;
import org.fusesource.jansi.AnsiConsole;

View file

@ -27,8 +27,8 @@ import de.staropensource.sosengine.base.classes.logging.LoggerImpl;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.events.LogEvent;
import de.staropensource.sosengine.base.logging.placeholders.logger.*;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.utility.PlaceholderEngine;
import lombok.Getter;
import lombok.Setter;

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.base.logging;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -19,8 +19,8 @@
package de.staropensource.sosengine.base.logging;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.crashhandler;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -31,20 +31,20 @@ import org.jetbrains.annotations.NotNull;
@SuppressWarnings({ "unused" })
public final class LogLevel implements Placeholder {
/**
* The {@link de.staropensource.sosengine.base.types.LogLevel} to use.
* The {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use.
*
* @since 1-alpha0
*/
@NotNull
private final de.staropensource.sosengine.base.types.LogLevel level;
private final de.staropensource.sosengine.base.classes.logging.LogLevel level;
/**
* Constructor.
*
* @param level the {@link de.staropensource.sosengine.base.types.LogLevel} to use
* @param level the {@link de.staropensource.sosengine.base.classes.logging.LogLevel} to use
* @since 1-alpha0
*/
public LogLevel(@NotNull de.staropensource.sosengine.base.types.LogLevel level) {
public LogLevel(@NotNull de.staropensource.sosengine.base.classes.logging.LogLevel level) {
this.level = level;
}

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -20,7 +20,7 @@
package de.staropensource.sosengine.base.logging.placeholders.logger;
import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -19,6 +19,8 @@
package de.staropensource.sosengine.base.types;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
/**
* Indicates whether the class belongs to the engine, application or modification.
*

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.classes.types;
package de.staropensource.sosengine.base.types;
/**
* tl;dr just a boolean but it can be UNSET too.

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.classes.types;
package de.staropensource.sosengine.base.types;
import lombok.Getter;
import lombok.Setter;

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.classes.types;
package de.staropensource.sosengine.base.types;
import lombok.Getter;
import lombok.Setter;

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.classes.types;
package de.staropensource.sosengine.base.types;
import lombok.Getter;
import lombok.Setter;

View file

@ -17,7 +17,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package de.staropensource.sosengine.base.classes.types;
package de.staropensource.sosengine.base.types;
import lombok.Getter;
import lombok.Setter;

View file

@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.classes.Placeholder;
import de.staropensource.sosengine.base.data.placeholders.*;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -21,7 +21,7 @@ package de.staropensource.sosengine.base.utility;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import lombok.Getter;
import org.fusesource.jansi.Ansi;
import org.jetbrains.annotations.NotNull;

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.unittests;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
/**
* Static configuration for the sos!engine unit testing helpers.

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.unittests;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

View file

@ -1,7 +1,7 @@
package de.staropensource.sosengine.base.srctests;
import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.unittests.UnitLogger;
import org.jetbrains.annotations.NotNull;
import org.joor.Reflect;

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.graphics.opengl;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
import de.staropensource.sosengine.graphics.opengl.classes.Window;
import org.jetbrains.annotations.NotNull;

View file

@ -24,7 +24,7 @@ import de.staropensource.sosengine.base.classes.events.EventPriority;
import de.staropensource.sosengine.base.classes.helpers.EventHelper;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.Miscellaneous;
import de.staropensource.sosengine.graphics.GraphicsSubsystem;
import de.staropensource.sosengine.graphics.classes.ApiMainClass;

View file

@ -19,10 +19,10 @@
package de.staropensource.sosengine.graphics.opengl.classes;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.graphics.events.GraphicsApiErrorEvent;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -26,7 +26,7 @@ import de.staropensource.sosengine.base.classes.helpers.EventHelper;
import de.staropensource.sosengine.base.events.internal.InternalEngineShutdownEvent;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.ListFormatter;
import de.staropensource.sosengine.base.utility.Miscellaneous;
import de.staropensource.sosengine.graphics.classes.ApiMainClass;

View file

@ -22,7 +22,7 @@ package de.staropensource.sosengine.graphics;
import de.staropensource.sosengine.base.classes.SubsystemConfiguration;
import de.staropensource.sosengine.base.logging.Logger;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.PropertyParser;
import lombok.Getter;
import org.jetbrains.annotations.NotNull;

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.graphics.classes;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import org.jetbrains.annotations.NotNull;
/**

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.graphics.classes;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import org.jetbrains.annotations.NotNull;
import java.util.HashSet;

View file

@ -2,8 +2,8 @@ package de.staropensource.sosengine.graphics.events;
import de.staropensource.sosengine.base.classes.events.Event;
import de.staropensource.sosengine.base.events.LogEvent;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.classes.helpers.EventHelper;
import org.jetbrains.annotations.NotNull;

View file

@ -2,8 +2,8 @@ package de.staropensource.sosengine.graphics.events;
import de.staropensource.sosengine.base.classes.events.Event;
import de.staropensource.sosengine.base.events.LogEvent;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import de.staropensource.sosengine.base.classes.helpers.EventHelper;
import org.jetbrains.annotations.NotNull;

View file

@ -19,7 +19,7 @@
package de.staropensource.sosengine.graphics.vulkan;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import de.staropensource.sosengine.graphics.classes.ApiManagementClass;
import de.staropensource.sosengine.graphics.classes.Window;
import org.jetbrains.annotations.NotNull;

View file

@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.annotations.EventListener;
import de.staropensource.sosengine.base.classes.events.EventPriority;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.utility.Miscellaneous;
import de.staropensource.sosengine.graphics.GraphicsSubsystem;
import de.staropensource.sosengine.graphics.classes.ApiMainClass;

View file

@ -23,8 +23,8 @@ import de.staropensource.sosengine.base.Engine;
import de.staropensource.sosengine.base.EngineConfiguration;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.types.LogLevel;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogLevel;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Marker;

View file

@ -23,7 +23,7 @@ import de.staropensource.sosengine.base.classes.SubsystemMainClass;
import de.staropensource.sosengine.base.events.LogEvent;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import lombok.Getter;
import org.slf4j.LoggerFactory;

View file

@ -20,10 +20,10 @@
package de.staropensource.sosengine.testapp;
import de.staropensource.sosengine.base.Engine;
import de.staropensource.sosengine.base.classes.types.Vec2i;
import de.staropensource.sosengine.base.types.Vec2i;
import de.staropensource.sosengine.base.logging.LoggerInstance;
import de.staropensource.sosengine.base.types.CodePart;
import de.staropensource.sosengine.base.types.LogIssuer;
import de.staropensource.sosengine.base.classes.logging.LogIssuer;
import de.staropensource.sosengine.graphics.GraphicsSubsystem;
import de.staropensource.sosengine.graphics.classes.ApiMainClass;
import de.staropensource.sosengine.graphics.classes.ApiManagementClass;