KruMF · Krumuvecis · Aug 21, 2022 · Sep 6, 2022 · Sep 7, 2022 · Sep 7, 2022
diff --git a/.run/Demo 1 - simplest.run.xml b/.run/Demo 1 - simplest.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Demo 1 - simplest" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineDemo.d1_simplestDemo.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineDemo.d1_simplestDemo.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Demo 2 - overlay.run.xml b/.run/Demo 2 - overlay.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Demo 2 - overlay" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineDemo.d2_overlayDemo.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineDemo.d2_overlayDemo.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Demo 3 - twoPage.run.xml b/.run/Demo 3 - twoPage.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Demo 3 - twoPage" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineDemo.d3_twoPageDemo.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineDemo.d3_twoPageDemo.parts.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Demo 4 - multiAdapter.run.xml b/.run/Demo 4 - multiAdapter.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Demo 4 - multiAdapter" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineDemo.d4_multiAdapterDemo.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineDemo.d4_multiAdapterDemo.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Demo 5 - featurePreview.run.xml b/.run/Demo 5 - featurePreview.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Demo 5 - featurePreview" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineDemo.d5_featurePreview.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineDemo.d5_featurePreview.window.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/Sandbox.run.xml b/.run/Sandbox.run.xml
@@ -0,0 +1,15 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Sandbox" type="Application" factoryName="Application">
+    <option name="MAIN_CLASS_NAME" value="graphicsEngineSandbox.main.Main" />
+    <module name="GraphicsEngine" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="graphicsEngineSandbox.main.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/ReadMe.md b/ReadMe.md
@@ -9,13 +9,16 @@ Free to use and modify for whatever purposes. No copyrights apply.
 
 ## Requirements
 
+### For running and compiling
+
 * JDK: 18
 * Maven compiler: 18
-* Maven Surefire: 3.0.0-M7
-* jetbrains annotations: 23.0.0
-* [ThreadAbstraction](https://github.com/KruMF/ThreadAbstraction) : 0.4.1
+
+### Dependencies
+
+* [JetBrains Java Annotations](https://mvnrepository.com/artifact/org.jetbrains/annotations) : 23.0.0
+* [ThreadAbstraction](https://github.com/KruMF/ThreadAbstraction) : 0.4.2
 * [FileHandler](https://github.com/KruMF/FileHandler) : 0.2.5
-* JUnit: Jupiter 5.9.0-M1
 
 
 ## Instructions
@@ -27,7 +30,7 @@ Maven support recently added. Detailed info coming...
 
 ## Standalone demo
 
-Check `graphicsEngine\demo` for standalone demo versions.
+Check `src\test\java\graphicsEngineDemo` for standalone demo versions.
 
 *Launch instructions available there.*
 

diff --git a/jitpack.yml b/jitpack.yml
@@ -0,0 +1,9 @@
+jdk:
+  - openjdk18
+before_install:
+  - sdk install java 18.0.2.1-open
+  - sdk use java 18.0.2.1-open
+  - sdk install maven
+  - mvn -v
+install:
+  - mvn install -Dmaven.javadoc.skip=true -DskipTests
diff --git a/pom.xml b/pom.xml
@@ -6,19 +6,16 @@
 
     <groupId>com.github.KruMF</groupId>
     <artifactId>GraphicsEngine</artifactId>
-    <version>0.8.3</version>
+    <version>0.8.15</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>18</maven.compiler.source>
         <maven.compiler.target>18</maven.compiler.target>
-        <maven.surefire.version>3.0.0-M7</maven.surefire.version>
 
         <jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
-        <threadAbstraction.version>0.4.1</threadAbstraction.version>
+        <threadAbstraction.version>0.4.2</threadAbstraction.version>
         <fileHandler.version>0.2.5</fileHandler.version>
-
-        <junit.jupiter.version>5.9.0-M1</junit.jupiter.version>
     </properties>
 
     <repositories>
@@ -29,12 +26,6 @@
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${maven.surefire.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
@@ -51,27 +42,5 @@
             <artifactId>FileHandler</artifactId>
             <version>${fileHandler.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>${junit.jupiter.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>${maven.surefire.version}</version>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/src/main/java/graphicsEngine/AbstractGraphicsAdapter.java b/src/main/java/graphicsEngine/AbstractGraphicsAdapter.java
diff --git a/src/main/java/graphicsEngine/GraphicsAdapter.java b/src/main/java/graphicsEngine/GraphicsAdapter.java
@@ -0,0 +1,57 @@
+package graphicsEngine;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import static consoleUtils.ConsoleUtils.printLine;
+
+import graphicsEngine.windows.WindowManager;
+import graphicsEngine.windows.WindowUpdater;
+
+/**
+ * A graphics adapter class.
+ * Intended for allowing not to use the GraphicsManager directly.
+ * Reference this to use the GraphicsEngine.
+ * TODO: check redundancy; originally meant for security; fix javadocs
+ */
+public class GraphicsAdapter extends WindowManager {
+    /**
+     * Starts a new blank graphics adapter.
+     */
+    public GraphicsAdapter() {
+        super();
+    }
+
+    /**
+     * Adds a new window to this graphics adapter.
+     *
+     * @param window A corresponding WindowUpdater object.
+     */
+    @Override
+    public final void newWindow(@NotNull WindowUpdater window) {
+        super.newWindow(window);
+    }
+
+    /**
+     * Gets a WindowUpdater object that contains a window with corresponding key.
+     * If multiple windows with the same key exist, returns the first one.
+     * Returns null, if provided key is null or no such window found.
+     *
+     * @param windowKey Key of the window.
+     *
+     * @return The specified WindowUpdater object.
+     */
+    @Override
+    public final @Nullable WindowUpdater getWindow(@Nullable String windowKey) {
+        return super.getWindow(windowKey);
+    }
+
+    /**
+     * Ends all windows.
+     */
+    @Override
+    public final void end() {
+        printLine("Graphics ending.");
+        super.end();
+    }
+}
diff --git a/src/main/java/graphicsEngine/GraphicsManager.java b/src/main/java/graphicsEngine/GraphicsManager.java
diff --git a/src/main/java/graphicsEngine/Utilities.java b/src/main/java/graphicsEngine/Utilities.java
@@ -1,44 +1,24 @@
 package graphicsEngine;
 
-import java.awt.*;
-import javax.swing.*;
-import javax.swing.border.LineBorder;
+import javax.swing.ImageIcon;
 
-import java.util.Objects;
-
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * A utility class for containing generic methods.
  */
 public class Utilities {
-    private static final Color DEFAULT_BORDER_COLOR = Color.red;
-
-    /**
-     * Prints a message in console as new line.
-     *
-     * @param message Message to print.
-     */
-    public static void printLine(String message) {
-        System.out.println(message);
-    }
+    private static final String
+            RESOURCES_PATH = "src/main/resources/graphicsEngine/",
+            SAMPLE_ICON_RELATIVE_PATH = "images/sample_icon.png";
 
-    //rounds a number to a specified number of decimal places
-    // TODO: add javadoc
-    public static String roundNumber(double value, int decimalPlaces) {
-        double conversionCoefficient = Math.pow(10, decimalPlaces);
-        return String.valueOf(((int) (value * conversionCoefficient))/conversionCoefficient);
+    //TODO: add javadoc
+    public static @NotNull ImageIcon getSampleIcon() {
+        return new ImageIcon(getFulResourcePath(SAMPLE_ICON_RELATIVE_PATH));
     }
 
-    // TODO: add javadoc
-    public interface BorderInterface {
-        static void setBorderState(@NotNull JComponent component, boolean state, @Nullable Color color) {
-            if (state) {
-                component.setBorder(new LineBorder(Objects.requireNonNullElse(color, DEFAULT_BORDER_COLOR)));
-            } else {
-                component.setBorder(null);
-            }
-        }
+    @SuppressWarnings("SameParameterValue")
+    private static @NotNull String getFulResourcePath(@NotNull String relative) {
+        return RESOURCES_PATH + relative;
     }
 }