Skip to content

Refactor and CI added, reorganize view classes/files #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MrSnou merged 5 commits into from
Nov 18, 2025
Merged

Refactor and CI added, reorganize view classes/files #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8930e27
Refactor and CI added, reorganize view classes/files
MrSnou Nov 18, 2025
1e5f43a
Fix CI: run workflow on master branch
MrSnou Nov 18, 2025
cbea5d8
Fix CI: fixed error with java version
MrSnou Nov 18, 2025
fb5d53c
Fix CI: fixed error with running app in java CI
MrSnou Nov 18, 2025
64c564e
Fix in SpringBootApplication annotation
MrSnou Nov 18, 2025
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
21 changes: 21 additions & 0 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Java CI

on:
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '25'
distribution: 'temurin'

- name: Build with Maven
run: mvn clean test
7 changes: 3 additions & 4 deletions src/main/java/com/project/authapi/system_log_analyzer/SystemLogAnalyzerApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.project.authapi.system_log_analyzer;

import com.project.authapi.system_log_analyzer.controller.WelcomeViewFXController;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.stage.Stage;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.context.ConfigurableApplicationContext;

@SpringBootApplication
public class SystemLogAnalyzerApp extends Application {

private ConfigurableApplicationContext springContext;
Expand All @@ -21,9 +20,9 @@ public void init() {

@Override
public void start(Stage primaryStage) throws Exception {
FXMLLoader loader = new FXMLLoader(getClass().getResource("/WelcomeView.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/WelcomeView.fxml"));
loader.setControllerFactory(springContext::getBean);
loader.setController(springContext.getBean(com.project.authapi.system_log_analyzer.controller.LogAnalyzerFXController.class));
loader.setController(springContext.getBean(WelcomeViewFXController.class));
Parent root = loader.load();

Scene scene = new Scene(root);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/project/authapi/system_log_analyzer/controller/LoadingBarFXController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected List<LogEvent> call() throws Exception {

var springContext = com.project.authapi.system_log_analyzer.config.ApplicationContextProvider.getApplicationContext();

FXMLLoader loader = new FXMLLoader(getClass().getResource("/MainWindow.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/MainWindow.fxml"));
loader.setControllerFactory(springContext::getBean);
Parent root = loader.load();

Expand Down
4 changes: 2 additions & 2 deletions ...r/controller/LogAnalyzerFXController.java → ...r/controller/WelcomeViewFXController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.io.IOException;

@Component
public class LogAnalyzerFXController {
public class WelcomeViewFXController {
@FXML private Button scanButton;
@FXML private TextField logFilesDirField;
@FXML private TextField reportDirField;
Expand Down Expand Up @@ -55,7 +55,7 @@ private void scan(ActionEvent event) throws IOException {

ApplicationContext springContext = ApplicationContextProvider.getApplicationContext();

FXMLLoader loader = new FXMLLoader(getClass().getResource("/LoadingScreen.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/LoadingScreen.fxml"));
loader.setControllerFactory(springContext::getBean); // <-- magiczna linia
Parent root = loader.load();

Expand Down
0 src/main/resources/LoadingScreen.fxml → src/main/resources/view/LoadingScreen.fxml
View file
Open in desktop
File renamed without changes.
0 src/main/resources/MainWindow.fxml → src/main/resources/view/MainWindow.fxml
View file
Open in desktop
File renamed without changes.
0 src/main/resources/WelcomeView.fxml → src/main/resources/view/WelcomeView.fxml
View file
Open in desktop
File renamed without changes.