fix: #main path fix

marcinbator · marcinbator · commit 5343a804384e · 2025-04-19T22:22:29.000+02:00
diff --git a/src/main/java/pl/bator/lso_list_generator/controller/NavbarController.java b/src/main/java/pl/bator/lso_list_generator/controller/NavbarController.java
@@ -6,6 +6,7 @@
 
 import javax.swing.*;
 import java.awt.*;
+import java.nio.file.Path;
 import java.text.DateFormatSymbols;
 import java.time.Year;
 import java.util.Arrays;
@@ -15,7 +16,7 @@ public class NavbarController {
     private JComboBox<String> monthComboBox;
     private JComboBox<Integer> yearComboBox;
     private JLabel pathLabel;
-    private String pdfSavePath = System.getProperty("user.home") + "\\Desktop";
+    private Path pdfSavePath = Path.of(System.getProperty("user.home"), "Desktop");
 
     private final PDFGenerationService pdfGenerationService;
     private final Component parent;
@@ -72,13 +73,13 @@ private void initializeButtons(@NotNull JPanel buttonPanel) {
     }
 
     private void changeSavePath() {
-        JFileChooser fileChooser = new JFileChooser(pdfSavePath);
+        JFileChooser fileChooser = new JFileChooser(pdfSavePath.toString());
         fileChooser.setDialogTitle("Wybierz folder zapisu");
         fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
         int userSelection = fileChooser.showSaveDialog(parent);
 
         if (userSelection == JFileChooser.APPROVE_OPTION) {
-            pdfSavePath = fileChooser.getSelectedFile().getAbsolutePath();
+            pdfSavePath = Path.of(fileChooser.getSelectedFile().getAbsolutePath());
             pathLabel.setText("Aktualna ścieżka: " + pdfSavePath);
         }
     }
diff --git a/src/main/java/pl/bator/lso_list_generator/service/PDFGenerationService.java b/src/main/java/pl/bator/lso_list_generator/service/PDFGenerationService.java
@@ -5,6 +5,7 @@
 import pl.bator.lso_list_generator.util.PDFUtil;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.text.DateFormatSymbols;
 import java.time.Month;
 import java.time.Year;
@@ -18,7 +19,7 @@ public PDFGenerationService(GroupJSONRepository groupJSONRepository) {
         this.groupJSONRepository = groupJSONRepository;
     }
 
-    public void handleGenerateClick(String selectedMonth, int selectedYear, String savePath) throws NotFoundException, IOException {
+    public void handleGenerateClick(String selectedMonth, int selectedYear, Path savePath) throws NotFoundException, IOException {
 
         int monthIndex = -1;
         String[] polishMonths = new DateFormatSymbols(new Locale("pl")).getMonths();
diff --git a/src/main/java/pl/bator/lso_list_generator/util/PDFUtil.java b/src/main/java/pl/bator/lso_list_generator/util/PDFUtil.java
@@ -13,14 +13,15 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.Path;
 import java.time.*;
 import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
 public class PDFUtil {
-    public void generatePdf(Group group, Month month, Year year, String path) throws IOException {
+    public void generatePdf(Group group, Month month, Year year, Path path) throws IOException {
         String html = parseThymeleafTemplate(group, month, year);
 
         String outputFolder = path + "/lista_" + month.getDisplayName(TextStyle.FULL_STANDALONE, new Locale("PL")) + "_" + year + "_grupa_" + group.getNumber() + ".pdf";
diff --git a/src/main/resources/list_template.html b/src/main/resources/list_template.html
@@ -1,4 +1,4 @@
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.thymeleaf.org" lang="pl">
 <head>
     <meta charset="UTF-8"/>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
@@ -23,7 +23,7 @@
             margin: 0;
             padding: 2px 5px;
             min-width: 15px;
-            text-wrap: none;
+            text-wrap: nowrap;
             text-align: center;
         }
 
