Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
03a0095
Apply some tweaks
vladcheck Sep 26, 2026
2707587
Add a button
vladcheck Sep 26, 2026
9b8ff69
Add an event handler
vladcheck Sep 26, 2026
c19bb36
Setup fxml
vladcheck Sep 26, 2026
619a0ac
Migrate an event handler to fxml
vladcheck Sep 26, 2026
4565aa2
Setup a login formf
vladcheck Sep 26, 2026
b2ea3cc
Setup scenicview
vladcheck Sep 26, 2026
7928d29
Tons of validators
vladcheck Sep 27, 2026
4ad72dd
Little reorganization and deduplication
vladcheck Sep 27, 2026
77d93ca
Add third name field
vladcheck Sep 27, 2026
bb5aca3
Fix: Вынесли метод main в отдельный класс, исправили ошибку запуска п…
Oct 3, 2026
52ffdfc
fix: add .idea to .gitignore
vladcheck Oct 3, 2026
829ea07
docs: guide to pull
vladcheck Oct 3, 2026
80e9c09
chore: format fxml
vladcheck Oct 3, 2026
337ec5e
chore: add validation, forms and bootstrap env
Deatheh Oct 3, 2026
9d881b9
Доделана структура проекта и добвален модуль Api с Dto
Oct 3, 2026
0729048
Fix: удаление лишних зависимостей
Oct 3, 2026
ff1b346
Fix: Исправлен баг с Response
Oct 3, 2026
e983720
fix: wrong import of ErrorRespnse
vladcheck Oct 3, 2026
ed1f480
fix: failing dependency resolution in CI
vladcheck Oct 3, 2026
60b3b51
chore: configure format job
vladcheck Oct 3, 2026
1128f54
chore: add spotless
vladcheck Oct 3, 2026
1ae7c62
chore: fix format
vladcheck Oct 3, 2026
8b6b3b2
chore: fix job permissions; make format depend on build
vladcheck Oct 3, 2026
d56ac20
chore: rename workflow
vladcheck Oct 3, 2026
08bcfdd
chore: setup reusable setup-jdk action
vladcheck Oct 3, 2026
1d133b7
chore: update checkout and setup-java
vladcheck Oct 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/actions/setup-jdk/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: 'Setup JDK 25'
description: 'Sets up Java 25 with Temurin and Maven cache'

runs:
using: "composite"
steps:
- name: Set up JDK 25
uses: actions/setup-java@v5
with:
java-version: '25'
distribution: 'temurin'
cache: maven
35 changes: 0 additions & 35 deletions .github/workflows/maven.yml

This file was deleted.

36 changes: 36 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: PR pipeline

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]


jobs:
build:
permissions:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK
uses: ./.github/actions/setup-jdk
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@v5
continue-on-error: true
with:
directory: .
maven-args: "-DmergeClassifiers=true"

format:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: Set up JDK
uses: ./.github/actions/setup-jdk
- name: Check formatting
run: mvn -B spotless:check --file pom.xml
65 changes: 64 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,67 @@ buildNumber.properties
# JDT-specific (Eclipse Java Development Tools)
.classpath

.vscode
.vscode
.idea

tools/scenicview/

# General
.DS_Store
.localized
__MACOSX/
.AppleDouble
.LSOverride
Icon[
]

# Resource forks
._*

# Files and directories that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
.com.apple.timemachine.supported
.PKInstallSandboxManager
.PKInstallSandboxManager-SystemSoftware
.hotfiles.btree
.vol
.file
.disk_label*
lost+found
.HFS+ Private Directory Data[
]

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# Mac OS 6 to 9
Desktop DB
Desktop DF
TheFindByContentFolder
TheVolumeSettingsFolder
.FBCIndex
.FBCSemaphoreFile
.FBCLockFolder

# Quota system
.quota.group
.quota.user
.quota.ops.group
.quota.ops.user

# TimeMachine
Backups.backupdb
.MobileBackups
.MobileBackups.trash
MobileBackups.trash
tmbootpicker.efi
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
# DesktopApplicationClientJava
# DesktopApplicationClientJava

```bash
git pull --rebase
```
141 changes: 137 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@

<name>DesktopApplicationClientJava</name>
<description>DesktopApplicationClientJava</description>
<url>
https://github.com/vladcheck/DesktopApplicationClientJava
</url>
<url>https://github.com/vladcheck/DesktopApplicationClientJava</url>

<properties>
<encoding>UTF-8</encoding>
Expand All @@ -25,26 +23,137 @@
<repositories></repositories>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.0</version>
</dependency>

<!-- 2. Модуль Jackson для поддержки дат (LocalDateTime) -->
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.testfx</groupId>
<artifactId>openjfx-monocle</artifactId>
<version>21.0.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testfx</groupId>
<artifactId>testfx-junit5</artifactId>
<version>4.0.18</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.testfx</groupId>
<artifactId>testfx-core</artifactId>
<version>4.0.18</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.10.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-controls</artifactId>
<version>11</version>
<version>27</version>
</dependency>
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
<version>27</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.48</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.dlsc.formsfx</groupId>
<artifactId>formsfx-core</artifactId>
<version>11.6.0</version>
<exclusions>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.synedra</groupId>
<artifactId>validatorfx</artifactId>
<version>0.6.1</version>
<exclusions>
<exclusion>
<groupId>org.openjfx</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.kordamp.bootstrapfx</groupId>
<artifactId>bootstrapfx-core</artifactId>
<version>0.4.0</version>
</dependency>

</dependencies>

<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.11.0</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.4</version>
<configuration>
<argLine>
-Dtestfx.headless=true
-Dtestfx.robot=glass
-Dglass.platform=Monocle
-Dmonocle.platform=Headless
-Dprism.order=sw
-Dprism.text=t2k
-Djava.awt.headless=true
--enable-native-access=ALL-UNNAMED
</argLine>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.1</version>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.48</version>
</path>
</annotationProcessorPaths>
<compilerArgs>
<arg>-proc:full</arg>
</compilerArgs>
<release>25</release>
</configuration>
</plugin>
Expand All @@ -56,6 +165,30 @@
<mainClass>com.DesktopApplicationClientJava.Program</mainClass>
</configuration>
</plugin>
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
<version>3.4.0</version>
<configuration>
<java>
<googleJavaFormat>
<version>1.35.0</version>
</googleJavaFormat>
<removeUnusedImports />
<trimTrailingWhitespace />
<endWithNewline />
</java>
</configuration>
<executions>
<execution>
<id>spotless-check</id>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
19 changes: 19 additions & 0 deletions scenicView.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#ScenicView properties
#Sun Sep 27 00:49:41 MSK 2026
autoRefreshStyleSheets=false
automaticScenegraphStructureRefreshing=true
collapseContainerControls=false
collapseControls=true
ignoreMouseTransparentNodes=true
registerShortcuts=true
showBaseline=false
showBounds=true
showCSSProperties=false
showDefaultProperties=true
showFilteredNodesInTree=true
showInvisibleNodes=false
showNodesIdInTree=false
showSearchBar=true
splitPaneDividerPosition=0.308125
stageHeight=800.0
stageWidth=800.0
Loading
Loading