v1.0.2

some changes
Lion6477 · Jan 28, 2024 · 6a6f578 · 6a6f578
1 parent 96b5760
commit 6a6f578
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 87 deletions.
diff --git a/.idea/artifacts/FileSorter_jar.xml b/.idea/artifacts/FileSorter_jar.xml
diff --git a/out/artifacts/FileSorter_jar/FileSorter.jar b/out/artifacts/FileSorter_jar/FileSorter.jar
diff --git a/pom.xml b/pom.xml
@@ -6,28 +6,28 @@
 
     <groupId>ua.skushnerov</groupId>
     <artifactId>FileSorter</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.2</version>
+    <name>FileSorter</name>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
-        <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-controls -->
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
             <version>21</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
             <version>21</version>
         </dependency>
-
     </dependencies>
+
     <build>
         <plugins>
             <plugin>
@@ -47,12 +47,32 @@
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.6</version>
+                <version>0.0.8</version>
+                <executions>
+                    <execution>
+                        <!-- Default configuration for running with: mvn clean javafx:run -->
+                        <id>default-cli</id>
+                    </execution>
+                </executions>
                 <configuration>
                     <mainClass>ua.skushnerov.FileSorterApp</mainClass>
+                    <launcher>app</launcher>
+                    <jlinkZipName>app</jlinkZipName>
+                    <jlinkImageName>app</jlinkImageName>
+                    <noManPages>true</noManPages>
+                    <stripDebug>true</stripDebug>
+                    <noHeaderFiles>true</noHeaderFiles>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.11.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
-
         </plugins>
     </build>
 </project>
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -17,6 +17,6 @@
     requires javafx.graphics;
     requires javafx.fxml;
 
-    opens ua.skushnerov; // Экспорт пакета org.example
+    opens ua.skushnerov;
     opens ua.skushnerov.controller to javafx.fxml;
 }
diff --git a/src/main/java/ua/skushnerov/Launcher.java → src/main/java/ua/skushnerov/App.java b/src/main/java/ua/skushnerov/Launcher.java → src/main/java/ua/skushnerov/App.java
@@ -12,7 +12,7 @@
 // limitations under the License.
 package ua.skushnerov;
 
-public class Launcher {
+public class App {
     public static void main(String[] args) {
         FileSorterApp.main(args);
     }

diff --git a/src/main/java/ua/skushnerov/FileSorterApp.java b/src/main/java/ua/skushnerov/FileSorterApp.java
@@ -26,10 +26,8 @@ public void start(Stage primaryStage) throws Exception {
         FXMLLoader fxmlLoader = new FXMLLoader();
         fxmlLoader.setLocation(getClass().getResource("/fxml/fileSorter.fxml"));
         Parent root = fxmlLoader.load();
-        FileSorterController controller = fxmlLoader.getController();
 
         primaryStage.setTitle("File Sorter");
-//        primaryStage.setScene(new Scene(root, 280, 170));
         primaryStage.setScene(new Scene(root));
         primaryStage.show();
     }

diff --git a/src/main/java/ua/skushnerov/service/Sorter.java b/src/main/java/ua/skushnerov/service/Sorter.java
@@ -14,6 +14,7 @@
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 
@@ -24,23 +25,17 @@ public static void sortFilesByExtension(String directoryPath) {
         File directory = new File(directoryPath);
         File[] files = directory.listFiles();
 
-        // Структура для хранения файлов по расширению
         HashMap<String, List<File>> fileMap = new HashMap<>();
 
-        // Группировка файлов по расширению
         for (File file : files) {
             if (file.isFile()) {
                 String extension = getFileExtension(file);
                 fileMap.computeIfAbsent(extension, k -> new ArrayList<>()).add(file);
             }
         }
 
-        // Сортировка файлов внутри каждой группы
-        fileMap.forEach((extension, fileList) -> {
-            fileList.sort((f1, f2) -> f1.getName().compareTo(f2.getName()));
-        });
+        fileMap.forEach((extension, fileList) -> fileList.sort(Comparator.comparing(File::getName)));
 
-        // Перемещение файлов в новые каталоги
         for (String extension : fileMap.keySet()) {
             File extensionDirectory = new File(directoryPath + "/" + extension);
             if (!extensionDirectory.exists()) {

diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF
@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: ua.skushnerov.Launcher
+Main-Class: ua.skushnerov.App