Compare commits
7 Commits
3623928bb6
...
nix-flake
| Author | SHA1 | Date | |
|---|---|---|---|
| b95f90b7ec | |||
| c55d862e14 | |||
| df29d4f1c3 | |||
| 25e086b62e | |||
| 1cabbd0224 | |||
| 8635770755 | |||
| 2ccea4b107 |
54
README.md
Normal file
54
README.md
Normal file
@@ -0,0 +1,54 @@
|
|||||||
|
# new-shapes
|
||||||
|
|
||||||
|
A shape editor desktop application built with Java Swing. Supports rectangles, circles, triangles, text, shape collections, resize handles, and export to HTML/SVG.
|
||||||
|
|
||||||
|
## Prerequisites
|
||||||
|
|
||||||
|
- JDK >= 16 (project targets Java 16)
|
||||||
|
- A graphical display (X11/Wayland) since this is a Swing GUI application
|
||||||
|
|
||||||
|
## Bootstrap
|
||||||
|
|
||||||
|
### With Nix (recommended)
|
||||||
|
|
||||||
|
If you have [direnv](https://direnv.net/) installed, the environment activates automatically:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
direnv allow # one-time, then auto-activates on cd
|
||||||
|
```
|
||||||
|
|
||||||
|
Otherwise, enter the dev shell manually:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
nix develop
|
||||||
|
```
|
||||||
|
|
||||||
|
Both provide JDK 17 and Maven 3.9.x preconfigured. No other setup needed.
|
||||||
|
|
||||||
|
### Without Nix
|
||||||
|
|
||||||
|
Install JDK 16+ and use the bundled Maven wrapper — no separate Maven installation required:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw --version # downloads Maven 3.9.12 on first run
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run the application
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw compile exec:java -Dexec.mainClass="ovh.gasser.newshapes.App"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Run tests
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw test
|
||||||
|
```
|
||||||
|
|
||||||
|
To run the full verification pipeline (compile, test, JaCoCo coverage check with 50% minimum line coverage):
|
||||||
|
|
||||||
|
```sh
|
||||||
|
./mvnw verify
|
||||||
|
```
|
||||||
|
|
||||||
|
Coverage reports are generated in `target/site/jacoco/`.
|
||||||
27
flake.lock
generated
Normal file
27
flake.lock
generated
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1774386573,
|
||||||
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
|
"owner": "nixos",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nixos",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
48
flake.nix
Normal file
48
flake.nix
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
{
|
||||||
|
description = "new-shapes - Java Swing shape editor";
|
||||||
|
|
||||||
|
inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs }:
|
||||||
|
let
|
||||||
|
# JDK 16 (project target) is non-LTS and unavailable in nixpkgs.
|
||||||
|
# JDK 17 (LTS) is fully backward-compatible with --source 16 --target 16.
|
||||||
|
javaVersion = 17;
|
||||||
|
|
||||||
|
supportedSystems = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
|
||||||
|
|
||||||
|
forEachSystem = f:
|
||||||
|
nixpkgs.lib.genAttrs supportedSystems (system: f {
|
||||||
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
|
overlays = [ self.overlays.default ];
|
||||||
|
};
|
||||||
|
});
|
||||||
|
in
|
||||||
|
{
|
||||||
|
overlays.default = final: prev:
|
||||||
|
let
|
||||||
|
jdk = prev."jdk${toString javaVersion}";
|
||||||
|
in
|
||||||
|
{
|
||||||
|
inherit jdk;
|
||||||
|
# Override Maven to use the same JDK version
|
||||||
|
maven = prev.maven.override { jdk_headless = jdk; };
|
||||||
|
};
|
||||||
|
|
||||||
|
devShells = forEachSystem ({ pkgs }: {
|
||||||
|
default = pkgs.mkShell {
|
||||||
|
packages = with pkgs; [
|
||||||
|
jdk
|
||||||
|
maven
|
||||||
|
];
|
||||||
|
|
||||||
|
shellHook = ''
|
||||||
|
echo "new-shapes dev shell"
|
||||||
|
echo " Java: $(java -version 2>&1 | head -1)"
|
||||||
|
echo " Maven: $(mvn -version 2>&1 | head -1)"
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
});
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,94 @@
|
|||||||
|
package ovh.gasser.newshapes.shapes;
|
||||||
|
|
||||||
|
import org.junit.jupiter.api.Test;
|
||||||
|
import java.awt.Cursor;
|
||||||
|
|
||||||
|
import static org.junit.jupiter.api.Assertions.*;
|
||||||
|
|
||||||
|
class ResizeHandleTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testEightHandlesExist() {
|
||||||
|
assertEquals(8, ResizeHandle.values().length,
|
||||||
|
"ResizeHandle enum should define exactly 8 handles");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testAllHandleNamesExist() {
|
||||||
|
assertNotNull(ResizeHandle.valueOf("NW"), "Handle NW should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("N"), "Handle N should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("NE"), "Handle NE should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("E"), "Handle E should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("SE"), "Handle SE should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("S"), "Handle S should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("SW"), "Handle SW should exist");
|
||||||
|
assertNotNull(ResizeHandle.valueOf("W"), "Handle W should exist");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testNwMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.NW_RESIZE_CURSOR, ResizeHandle.NW.getCursorType(),
|
||||||
|
"NW handle should map to Cursor.NW_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testNMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.N_RESIZE_CURSOR, ResizeHandle.N.getCursorType(),
|
||||||
|
"N handle should map to Cursor.N_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testNeMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.NE_RESIZE_CURSOR, ResizeHandle.NE.getCursorType(),
|
||||||
|
"NE handle should map to Cursor.NE_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testEMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.E_RESIZE_CURSOR, ResizeHandle.E.getCursorType(),
|
||||||
|
"E handle should map to Cursor.E_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testSeMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.SE_RESIZE_CURSOR, ResizeHandle.SE.getCursorType(),
|
||||||
|
"SE handle should map to Cursor.SE_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testSMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.S_RESIZE_CURSOR, ResizeHandle.S.getCursorType(),
|
||||||
|
"S handle should map to Cursor.S_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testSwMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.SW_RESIZE_CURSOR, ResizeHandle.SW.getCursorType(),
|
||||||
|
"SW handle should map to Cursor.SW_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testWMapsToCorrectCursorType() {
|
||||||
|
assertEquals(Cursor.W_RESIZE_CURSOR, ResizeHandle.W.getCursorType(),
|
||||||
|
"W handle should map to Cursor.W_RESIZE_CURSOR");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testValueOfReturnsCorrectConstant() {
|
||||||
|
assertSame(ResizeHandle.NW, ResizeHandle.valueOf("NW"), "valueOf(\"NW\") should return ResizeHandle.NW");
|
||||||
|
assertSame(ResizeHandle.N, ResizeHandle.valueOf("N"), "valueOf(\"N\") should return ResizeHandle.N");
|
||||||
|
assertSame(ResizeHandle.NE, ResizeHandle.valueOf("NE"), "valueOf(\"NE\") should return ResizeHandle.NE");
|
||||||
|
assertSame(ResizeHandle.E, ResizeHandle.valueOf("E"), "valueOf(\"E\") should return ResizeHandle.E");
|
||||||
|
assertSame(ResizeHandle.SE, ResizeHandle.valueOf("SE"), "valueOf(\"SE\") should return ResizeHandle.SE");
|
||||||
|
assertSame(ResizeHandle.S, ResizeHandle.valueOf("S"), "valueOf(\"S\") should return ResizeHandle.S");
|
||||||
|
assertSame(ResizeHandle.SW, ResizeHandle.valueOf("SW"), "valueOf(\"SW\") should return ResizeHandle.SW");
|
||||||
|
assertSame(ResizeHandle.W, ResizeHandle.valueOf("W"), "valueOf(\"W\") should return ResizeHandle.W");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testValueOfWithInvalidNameThrowsIllegalArgumentException() {
|
||||||
|
assertThrows(IllegalArgumentException.class,
|
||||||
|
() -> ResizeHandle.valueOf("INVALID"),
|
||||||
|
"valueOf() with an unknown name should throw IllegalArgumentException");
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user