Skip to content

Commit dec140e

Browse files
authored
0.8.14
* page rework * src import optimization * pom and readme update
1 parent c15b56d commit dec140e

61 files changed

Lines changed: 542 additions & 368 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

ReadMe.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,16 @@ Free to use and modify for whatever purposes. No copyrights apply.
99

1010
## Requirements
1111

12+
### For running and compiling
13+
1214
* JDK: 18
13-
* Maven compiler (source & target) : 18
14-
* [Maven Surefire Plugin](https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin) : 3.0.0-M7
15+
* Maven compiler: 18
16+
17+
### Dependencies
18+
1519
* [JetBrains Java Annotations](https://mvnrepository.com/artifact/org.jetbrains/annotations) : 23.0.0
1620
* [ThreadAbstraction](https://github.com/KruMF/ThreadAbstraction) : 0.4.2
1721
* [FileHandler](https://github.com/KruMF/FileHandler) : 0.2.5
18-
* JUnit: Jupiter 5.9.0
1922

2023

2124
## Instructions

pom.xml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@
66

77
<groupId>com.github.KruMF</groupId>
88
<artifactId>GraphicsEngine</artifactId>
9-
<version>0.8.13</version>
9+
<version>0.8.14</version>
1010

1111
<properties>
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<maven.compiler.source>18</maven.compiler.source>
1414
<maven.compiler.target>18</maven.compiler.target>
15-
<maven.surefire.version>3.0.0-M7</maven.surefire.version>
1615

1716
<jetbrains.annotations.version>23.0.0</jetbrains.annotations.version>
1817
<threadAbstraction.version>0.4.2</threadAbstraction.version>
1918
<fileHandler.version>0.2.5</fileHandler.version>
20-
21-
<junit.jupiter.version>5.9.0</junit.jupiter.version>
2219
</properties>
2320

2421
<repositories>
@@ -29,12 +26,6 @@
2926
</repositories>
3027

3128
<dependencies>
32-
<dependency>
33-
<groupId>org.apache.maven.plugins</groupId>
34-
<artifactId>maven-surefire-plugin</artifactId>
35-
<version>${maven.surefire.version}</version>
36-
</dependency>
37-
3829
<dependency>
3930
<groupId>org.jetbrains</groupId>
4031
<artifactId>annotations</artifactId>
@@ -51,27 +42,5 @@
5142
<artifactId>FileHandler</artifactId>
5243
<version>${fileHandler.version}</version>
5344
</dependency>
54-
55-
<dependency>
56-
<groupId>org.junit.jupiter</groupId>
57-
<artifactId>junit-jupiter-engine</artifactId>
58-
<version>${junit.jupiter.version}</version>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.junit.jupiter</groupId>
63-
<artifactId>junit-jupiter-api</artifactId>
64-
<version>${junit.jupiter.version}</version>
65-
<scope>test</scope>
66-
</dependency>
6745
</dependencies>
68-
69-
<build>
70-
<plugins>
71-
<plugin>
72-
<artifactId>maven-surefire-plugin</artifactId>
73-
<version>${maven.surefire.version}</version>
74-
</plugin>
75-
</plugins>
76-
</build>
7746
</project>

src/main/java/graphicsEngine/GraphicsAdapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package graphicsEngine;
22

3-
import graphicsEngine.windows.WindowManager;
4-
import graphicsEngine.windows.WindowUpdater;
3+
import org.jetbrains.annotations.NotNull;
4+
import org.jetbrains.annotations.Nullable;
55

66
import static consoleUtils.ConsoleUtils.printLine;
77

8-
import org.jetbrains.annotations.NotNull;
9-
import org.jetbrains.annotations.Nullable;
8+
import graphicsEngine.windows.WindowManager;
9+
import graphicsEngine.windows.WindowUpdater;
1010

1111
/**
1212
* A graphics adapter class.

src/main/java/graphicsEngine/input/InputChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package graphicsEngine.input;
22

3-
import graphicsEngineOld.parts.containers.ButtonContainer;
4-
53
import org.jetbrains.annotations.Nullable;
64
import org.jetbrains.annotations.NotNull;
75

6+
import graphicsEngineOld.parts.containers.ButtonContainer;
7+
88
/**
99
* A class for checking user input.
1010
* Intended to be added to a page.

src/main/java/graphicsEngine/input/InputManager.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package graphicsEngine.input;
22

3+
import javax.swing.JFrame;
4+
5+
import org.jetbrains.annotations.NotNull;
6+
37
import graphicsEngine.input.listeners.ListenerAdder;
8+
49
import graphicsEngineOld.engine.ExitManager;
510
import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
6-
import org.jetbrains.annotations.NotNull;
711

8-
import javax.swing.*;
912

1013
/**
1114
* Input manager for managing input.

src/main/java/graphicsEngine/input/listeners/KeyboardListenerAdder.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package graphicsEngine.input.listeners;
22

3-
import graphicsEngine.input.InputData;
4-
5-
import javax.swing.*;
6-
import java.awt.event.KeyEvent;
73
import java.awt.event.KeyListener;
4+
import java.awt.event.KeyEvent;
5+
import javax.swing.JFrame;
86

97
import org.jetbrains.annotations.NotNull;
108

9+
import graphicsEngine.input.InputData;
10+
1111
/**
1212
* Keyboard listener adder class.
1313
*/

src/main/java/graphicsEngine/input/listeners/ListenerAdder.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package graphicsEngine.input.listeners;
22

3+
import javax.swing.JFrame;
4+
5+
import org.jetbrains.annotations.NotNull;
6+
37
import graphicsEngine.input.InputData;
8+
49
import graphicsEngineOld.engine.ExitManager;
510
import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
611

7-
import javax.swing.*;
8-
9-
import org.jetbrains.annotations.NotNull;
10-
1112
/**
1213
* Default window, keyboard and mouse listener adder for input.
1314
* Extendable for extra listeners.

src/main/java/graphicsEngine/input/listeners/MouseListenerAdder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package graphicsEngine.input.listeners;
22

3-
import graphicsEngine.input.InputData;
4-
5-
import javax.swing.*;
3+
import javax.swing.JFrame;
64
import java.awt.event.*;
75

86
import org.jetbrains.annotations.NotNull;
97

8+
import graphicsEngine.input.InputData;
9+
1010
/**
1111
* Mouse listener adder class.
1212
*/

src/main/java/graphicsEngine/input/listeners/WindowListenerAdder.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package graphicsEngine.input.listeners;
22

3-
import graphicsEngine.input.InputData;
4-
import graphicsEngineOld.engine.ExitManager;
5-
import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
6-
7-
import javax.swing.*;
3+
import javax.swing.JFrame;
84
import java.awt.event.ComponentAdapter;
95
import java.awt.event.ComponentEvent;
106
import java.awt.event.WindowEvent;
117
import java.awt.event.WindowListener;
128

139
import org.jetbrains.annotations.NotNull;
1410

11+
import graphicsEngine.input.InputData;
12+
13+
import graphicsEngineOld.engine.ExitManager;
14+
import graphicsEngineOld.engine.data.windowParameters.WindowParameters;
15+
1516
/**
1617
* Window listener adder class.
1718
*/

src/main/java/graphicsEngine/windows/AbstractPage.java renamed to src/main/java/graphicsEngine/pages/AbstractPage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
package graphicsEngine.windows;
2-
3-
import graphicsEngine.colors.SimpleColorScheme;
4-
import graphicsEngine.panels.DynamicPanel;
1+
package graphicsEngine.pages;
52

63
import java.util.Objects;
74
import java.util.List;
@@ -12,6 +9,9 @@
129
import org.jetbrains.annotations.NotNull;
1310
import org.jetbrains.annotations.Nullable;
1411

12+
import graphicsEngine.colors.SimpleColorScheme;
13+
import graphicsEngine.panels.DynamicPanel;
14+
1515
//TODO: add javadoc
1616
public abstract class AbstractPage extends DynamicPanel {
1717

0 commit comments

Comments
 (0)