0.8.14

* page rework * src import optimization * pom and readme update
KruMF · Dec 29, 2022 · dec140e · dec140e
1 parent c15b56d
commit dec140e
Show file tree

Hide file tree

Showing 61 changed files with 542 additions and 368 deletions.
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 (source & target) : 18
-* [Maven Surefire Plugin](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin) : 3.0.0-M7
+* Maven compiler: 18
+
+### 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
 
 
 ## Instructions

diff --git a/pom.xml b/pom.xml
@@ -6,19 +6,16 @@
 
     <groupId>com.github.KruMF</groupId>
     <artifactId>GraphicsEngine</artifactId>
-    <version>0.8.13</version>
+    <version>0.8.14</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.2</threadAbstraction.version>
         <fileHandler.version>0.2.5</fileHandler.version>
-
-        <junit.jupiter.version>5.9.0</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/GraphicsAdapter.java b/src/main/java/graphicsEngine/GraphicsAdapter.java
@@ -1,12 +1,12 @@
 package graphicsEngine;
 
-import graphicsEngine.windows.WindowManager;
-import graphicsEngine.windows.WindowUpdater;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import static consoleUtils.ConsoleUtils.printLine;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import graphicsEngine.windows.WindowManager;
+import graphicsEngine.windows.WindowUpdater;
 
 /**
  * A graphics adapter class.

diff --git a/src/main/java/graphicsEngine/input/InputChecker.java b/src/main/java/graphicsEngine/input/InputChecker.java
@@ -1,10 +1,10 @@
 package graphicsEngine.input;
 
-import graphicsEngineOld.parts.containers.ButtonContainer;
-
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.NotNull;
 
+import graphicsEngineOld.parts.containers.ButtonContainer;
+
 /**
  * A class for checking user input.
  * Intended to be added to a page.

diff --git a/src/main/java/graphicsEngine/input/InputManager.java b/src/main/java/graphicsEngine/input/InputManager.java
@@ -1,11 +1,14 @@
 package graphicsEngine.input;
 
+import javax.swing.JFrame;
+
+import org.jetbrains.annotations.NotNull;
+
 import graphicsEngine.input.listeners.ListenerAdder;
+
 import graphicsEngineOld.engine.ExitManager;
 import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
-import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 
 /**
  * Input manager for managing input.

diff --git a/src/main/java/graphicsEngine/input/listeners/KeyboardListenerAdder.java b/src/main/java/graphicsEngine/input/listeners/KeyboardListenerAdder.java
@@ -1,13 +1,13 @@
 package graphicsEngine.input.listeners;
 
-import graphicsEngine.input.InputData;
-
-import javax.swing.*;
-import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.awt.event.KeyEvent;
+import javax.swing.JFrame;
 
 import org.jetbrains.annotations.NotNull;
 
+import graphicsEngine.input.InputData;
+
 /**
  * Keyboard listener adder class.
  */

diff --git a/src/main/java/graphicsEngine/input/listeners/ListenerAdder.java b/src/main/java/graphicsEngine/input/listeners/ListenerAdder.java
@@ -1,13 +1,14 @@
 package graphicsEngine.input.listeners;
 
+import javax.swing.JFrame;
+
+import org.jetbrains.annotations.NotNull;
+
 import graphicsEngine.input.InputData;
+
 import graphicsEngineOld.engine.ExitManager;
 import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
 
-import javax.swing.*;
-
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Default window, keyboard and mouse listener adder for input.
  * Extendable for extra listeners.

diff --git a/src/main/java/graphicsEngine/input/listeners/MouseListenerAdder.java b/src/main/java/graphicsEngine/input/listeners/MouseListenerAdder.java
@@ -1,12 +1,12 @@
 package graphicsEngine.input.listeners;
 
-import graphicsEngine.input.InputData;
-
-import javax.swing.*;
+import javax.swing.JFrame;
 import java.awt.event.*;
 
 import org.jetbrains.annotations.NotNull;
 
+import graphicsEngine.input.InputData;
+
 /**
  * Mouse listener adder class.
  */

diff --git a/src/main/java/graphicsEngine/input/listeners/WindowListenerAdder.java b/src/main/java/graphicsEngine/input/listeners/WindowListenerAdder.java
@@ -1,17 +1,18 @@
 package graphicsEngine.input.listeners;
 
-import graphicsEngine.input.InputData;
-import graphicsEngineOld.engine.ExitManager;
-import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
-
-import javax.swing.*;
+import javax.swing.JFrame;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
 
 import org.jetbrains.annotations.NotNull;
 
+import graphicsEngine.input.InputData;
+
+import graphicsEngineOld.engine.ExitManager;
+import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
+
 /**
  * Window listener adder class.
  */

diff --git a/.../graphicsEngine/windows/AbstractPage.java → ...va/graphicsEngine/pages/AbstractPage.java b/.../graphicsEngine/windows/AbstractPage.java → ...va/graphicsEngine/pages/AbstractPage.java
@@ -1,7 +1,4 @@
-package graphicsEngine.windows;
-
-import graphicsEngine.colors.SimpleColorScheme;
-import graphicsEngine.panels.DynamicPanel;
+package graphicsEngine.pages;
 
 import java.util.Objects;
 import java.util.List;
@@ -12,6 +9,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import graphicsEngine.colors.SimpleColorScheme;
+import graphicsEngine.panels.DynamicPanel;
+
 //TODO: add javadoc
 public abstract class AbstractPage extends DynamicPanel {
 

diff --git a/src/main/java/graphicsEngine/pages/FullyPaneledPage.java b/src/main/java/graphicsEngine/pages/FullyPaneledPage.java
@@ -0,0 +1,84 @@
+package graphicsEngine.pages;
+
+import java.util.List;
+import java.awt.Color;
+import java.awt.BorderLayout;
+import java.awt.event.ActionListener;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import graphicsEngine.colors.ColorUtilities;
+import graphicsEngine.colors.SimpleColorScheme;
+import graphicsEngine.panels.BorderProperties;
+import graphicsEngine.panels.SimplePanel;
+import graphicsEngine.panels.DynamicPanel;
+import graphicsEngine.pages.panels.PanelLocation;
+import graphicsEngine.pages.panels.AbstractLeftPanel;
+import graphicsEngine.pages.panels.AbstractRightPanel;
+
+//TODO: add javadocs
+public abstract class FullyPaneledPage extends HeaderAndFooterPage implements HorizontalDivisionInterface {
+    private @Nullable AbstractLeftPanel leftPanel;
+    private @Nullable AbstractRightPanel rightPanel;
+    private @Nullable DynamicPanel centralPanel;
+
+    //
+    public FullyPaneledPage(@Nullable List<ActionListener> actionListenerList,
+                            @Nullable Color backgroundColor) {
+        super(actionListenerList, backgroundColor);
+    }
+
+    //
+    @Override
+    public final @NotNull DynamicPanel getBody(@Nullable SimpleColorScheme colors,
+                                               @Nullable BorderProperties borderProperties) {
+        return new DynamicPanel(new SimpleColorScheme(
+                ColorUtilities.DEFAULT_COLOR_TRANSPARENT,
+                null)) {
+            {
+                setLayout(new BorderLayout(0, 0));
+                setSidePanels(colors, borderProperties);
+                addSidePanels(this);
+                setCentralPanel(borderProperties);
+                addCentralPanel(this);
+            }
+        };
+    }
+
+    private void setSidePanels(@Nullable SimpleColorScheme colors,
+                               @Nullable BorderProperties borderProperties) {
+        leftPanel = getLeftPanel(colors, borderProperties);
+        rightPanel = getRightPanel(colors, borderProperties);
+    }
+
+    private void addSidePanels(@NotNull DynamicPanel body) {
+        if (leftPanel != null) {
+            body.add(leftPanel, BorderLayout.WEST);
+        }
+        if (rightPanel != null) {
+            body.add(rightPanel, BorderLayout.EAST);
+        }
+    }
+
+    private void setCentralPanel(@Nullable BorderProperties borderProperties) {
+        centralPanel = getCentralPanel(borderProperties);
+    }
+
+    private void addCentralPanel(@NotNull DynamicPanel body) {
+        if (centralPanel != null) {
+            body.add(centralPanel, BorderLayout.CENTER);
+        }
+    }
+
+    //
+    @Override
+    public final @Nullable SimplePanel getPanelByLocation(@NotNull PanelLocation location) {
+        return switch (location) {
+            case WEST -> leftPanel;
+            case EAST -> rightPanel;
+            case CENTER -> centralPanel;
+            default -> super.getPanelByLocation(location);
+        };
+    }
+}