Compare commits
4 commits
f96584ccd9
...
5766072fd7
Author | SHA1 | Date | |
---|---|---|---|
5766072fd7 | |||
b49ff9a569 | |||
f342555b8a | |||
9be753b4df |
14 changed files with 38 additions and 27 deletions
|
@ -6,17 +6,13 @@
|
|||
*/
|
||||
module sosengine.ansi {
|
||||
// Dependencies
|
||||
// -> Java <-
|
||||
// -> Java
|
||||
requires transitive java.management;
|
||||
|
||||
// -> Engine <-
|
||||
// -> Engine
|
||||
requires transitive sosengine.base;
|
||||
|
||||
// -> Common stuff <-
|
||||
// -> Libraries
|
||||
requires transitive static lombok;
|
||||
requires transitive org.jetbrains.annotations;
|
||||
|
||||
// -> Subystem-specific dependencies <-
|
||||
requires org.fusesource.jansi;
|
||||
|
||||
// API access
|
||||
|
|
|
@ -56,7 +56,7 @@ public final class StacktraceAll implements Placeholder {
|
|||
.append(" priority=")
|
||||
.append(thread.getPriority())
|
||||
.append(" group=")
|
||||
.append(thread.getThreadGroup().getName())
|
||||
.append(thread.getThreadGroup() == null ? "<unknown>" : thread.getThreadGroup().getName())
|
||||
.append(" state=")
|
||||
.append(thread.getState().name())
|
||||
.append(" daemon=")
|
||||
|
|
|
@ -238,8 +238,8 @@ public final class LoggerInstance {
|
|||
/**
|
||||
* Builds a new {@link LoggerInstance} instance.
|
||||
*
|
||||
* @return new {@link LoggerInstance}
|
||||
* @throws IllegalStateException if the class or origin is unset
|
||||
* @return new {@link LoggerInstance} instance
|
||||
* @throws IllegalStateException if {@link #clazz} is unset
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public LoggerInstance build() throws IllegalStateException {
|
||||
|
@ -294,6 +294,7 @@ public final class LoggerInstance {
|
|||
*
|
||||
* @param clazz new class of the issuer
|
||||
* @return builder instance
|
||||
* @see LoggerInstance#clazz
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setClazz(@Nullable Class<?> clazz) {
|
||||
|
@ -306,6 +307,7 @@ public final class LoggerInstance {
|
|||
*
|
||||
* @param origin new origin of the issuer
|
||||
* @return builder instance
|
||||
* @see LoggerInstance#origin
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setOrigin(@Nullable String origin) {
|
||||
|
@ -318,6 +320,7 @@ public final class LoggerInstance {
|
|||
*
|
||||
* @param metadata new metadata about the issuer
|
||||
* @return builder instance
|
||||
* @see LoggerInstance#metadata
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setMetadata(@Nullable String metadata) {
|
||||
|
|
|
@ -173,8 +173,8 @@ public class DependencyVector {
|
|||
/**
|
||||
* Builds a new {@link DependencyVector} instance.
|
||||
*
|
||||
* @return new {@link DependencyVector}
|
||||
* @throws IllegalStateException when the identifier, versioning system or version is unset or the version string is invalid
|
||||
* @return new {@link DependencyVector} instance
|
||||
* @throws IllegalStateException if {@link #identifier}, {@link #versioningSystem} or {@link #version} is unset or the version string is invalid
|
||||
* @since v1-alpha4
|
||||
*/
|
||||
public @NotNull DependencyVector build() throws IllegalStateException {
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
package de.staropensource.sosengine.base.type;
|
||||
|
||||
import de.staropensource.sosengine.base.exception.TristateConversionException;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
/**
|
||||
* Just a {@link Boolean}, but it can be {@link #UNSET}.
|
||||
|
@ -50,16 +49,15 @@ public enum Tristate {
|
|||
FALSE;
|
||||
|
||||
/**
|
||||
* Converts a {@link Tristate} into a {@link Boolean}.
|
||||
* Converts the {@link Tristate} into a {@link Boolean}.
|
||||
* Make sure to check for {@link #UNSET} first.
|
||||
*
|
||||
* @param tristate {@link Tristate} to convert
|
||||
* @return booleanized {@link Tristate}
|
||||
* @throws TristateConversionException when encountering {@link #UNSET}
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public static boolean toBoolean(@NotNull Tristate tristate) {
|
||||
return switch (tristate) {
|
||||
public boolean toBoolean() {
|
||||
return switch (this) {
|
||||
case UNSET -> throw new TristateConversionException();
|
||||
case TRUE -> true;
|
||||
case FALSE -> false;
|
||||
|
|
|
@ -80,7 +80,7 @@ public final class Miscellaneous {
|
|||
* @since v1-alpha2
|
||||
*/
|
||||
public static boolean getBooleanizedInteger(@Range(from = 0, to = 1) int integer) throws TristateConversionException {
|
||||
return Tristate.toBoolean(getTristatedInteger(integer));
|
||||
return getTristatedInteger(integer).toBoolean();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -5,7 +5,9 @@
|
|||
*/
|
||||
module sosengine.base {
|
||||
// Dependencies
|
||||
// -> Java
|
||||
requires transitive java.management;
|
||||
// -> Dependencies
|
||||
requires transitive static lombok;
|
||||
requires transitive org.jetbrains.annotations;
|
||||
requires org.reflections;
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
module sosengine.slf4j_compat {
|
||||
// Dependencies
|
||||
// -> Subsystems
|
||||
// -> Engine
|
||||
requires transitive sosengine.base;
|
||||
// -> Libraries
|
||||
requires transitive static lombok;
|
||||
|
|
|
@ -6,10 +6,8 @@
|
|||
*/
|
||||
open module sosengine.testapp {
|
||||
// Dependencies
|
||||
// -> Subsystems
|
||||
requires sosengine.base;
|
||||
// -> Engine
|
||||
requires sosengine.windowing;
|
||||
requires sosengine.slf4j_compat;
|
||||
// -> Libraries
|
||||
requires static lombok;
|
||||
}
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
module sosengine.testing {
|
||||
// Dependencies
|
||||
// -> Subsystems
|
||||
// -> Engine
|
||||
requires transitive sosengine.base;
|
||||
// -> Libraries
|
||||
requires transitive static lombok;
|
||||
|
|
|
@ -328,7 +328,7 @@ public class GlfwWindow extends Window {
|
|||
if (isTerminated())
|
||||
return false;
|
||||
|
||||
return Tristate.toBoolean(Miscellaneous.getTristatedInteger(glfwGetWindowAttrib(identifierLong, GLFW_FOCUSED)));
|
||||
return Miscellaneous.getTristatedInteger(glfwGetWindowAttrib(identifierLong, GLFW_FOCUSED)).toBoolean();
|
||||
}
|
||||
|
||||
/** {@inheritDoc} */
|
||||
|
|
|
@ -8,7 +8,7 @@ import de.staropensource.sosengine.windowing.implementable.Window;
|
|||
*/
|
||||
module sosengine.windowing.glfw {
|
||||
// Dependencies
|
||||
// -> Subsystems
|
||||
// -> Engine
|
||||
requires transitive sosengine.base;
|
||||
requires transitive sosengine.windowing;
|
||||
// -> Libraries
|
||||
|
|
|
@ -736,7 +736,7 @@ public abstract class Window implements AutoCloseable {
|
|||
/**
|
||||
* Builds a new {@link Window} instance.
|
||||
*
|
||||
* @throws IllegalStateException if the window title, size or position is unset
|
||||
* @throws IllegalStateException if {@link #title}, {@link #size} or {@link #position} is unset
|
||||
* @throws Exception thrown when creating a new {@link Window} instance fails
|
||||
* @return {@link Window} instance
|
||||
* @since v1-alpha2
|
||||
|
@ -949,6 +949,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param name new window name
|
||||
* @return builder instance
|
||||
* @see Window#name
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setName(@Nullable String name) {
|
||||
|
@ -961,6 +962,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param title new window title
|
||||
* @return builder instance
|
||||
* @see Window#title
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setTitle(@Nullable String title) {
|
||||
|
@ -973,6 +975,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param size new window size
|
||||
* @return builder instance
|
||||
* @see Window#size
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setSize(@Nullable Vec2i size) {
|
||||
|
@ -985,6 +988,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param minimumSize new minimum window size
|
||||
* @return builder instance
|
||||
* @see Window#minimumSize
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setMinimumSize(@Nullable Vec2i minimumSize) {
|
||||
|
@ -997,6 +1001,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param maximumSize new maximum window size
|
||||
* @return builder instance
|
||||
* @see Window#maximumSize
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setMaximumSize(@Nullable Vec2i maximumSize) {
|
||||
|
@ -1009,6 +1014,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param position new window position
|
||||
* @return builder instance
|
||||
* @see Window#position
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setPosition(@Nullable Vec2i position) {
|
||||
|
@ -1021,6 +1027,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param windowMode new window mode
|
||||
* @return builder instance
|
||||
* @see Window#windowMode
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setWindowMode(@Nullable WindowMode windowMode) {
|
||||
|
@ -1033,6 +1040,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param monitor new target monitor
|
||||
* @return builder instance
|
||||
* @see Window#monitor
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
private synchronized @NotNull Builder setMonitor(@Nullable Monitor monitor) {
|
||||
|
@ -1045,6 +1053,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param resizable new resizable flag state
|
||||
* @return builder instance
|
||||
* @see Window#resizable
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setResizable(@NotNull Tristate resizable) {
|
||||
|
@ -1057,6 +1066,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param borderless new borderless flag state
|
||||
* @return builder instance
|
||||
* @see Window#borderless
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setBorderless(@NotNull Tristate borderless) {
|
||||
|
@ -1069,6 +1079,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param focusable new focusable flag state
|
||||
* @return builder instance
|
||||
* @see Window#focusable
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setFocusable(@NotNull Tristate focusable) {
|
||||
|
@ -1081,6 +1092,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param onTop new on top flag state
|
||||
* @return builder instance
|
||||
* @see Window#onTop
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setOnTop(@NotNull Tristate onTop) {
|
||||
|
@ -1093,6 +1105,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param transparent new transparency flag state
|
||||
* @return builder instance
|
||||
* @see Window#transparent
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setTransparent(@NotNull Tristate transparent) {
|
||||
|
@ -1105,6 +1118,7 @@ public abstract class Window implements AutoCloseable {
|
|||
*
|
||||
* @param rendering new rendering flag state
|
||||
* @return builder instance
|
||||
* @see Window#rendering
|
||||
* @since v1-alpha2
|
||||
*/
|
||||
public @NotNull Builder setRendering(@NotNull Tristate rendering) {
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
module sosengine.windowing {
|
||||
// Dependencies
|
||||
// -> Subsystems
|
||||
// -> Engine
|
||||
requires transitive sosengine.base;
|
||||
// -> Libraries
|
||||
requires transitive static lombok;
|
||||
|
|
Loading…
Reference in a new issue