diff --git a/src/app/Artifacts.java b/src/app/Artifacts.java index 5d5e863..d9c258e 100644 --- a/src/app/Artifacts.java +++ b/src/app/Artifacts.java @@ -4,11 +4,11 @@ import java.io.File; public class Artifacts { - Tools tools = new Tools(); + private Tools tools = new Tools(); /** - * @param file - * @return + * @param file File + * @return file with md5 field */ public MFile getMFile(File file) { MFile mfile = new MFile(); diff --git a/src/app/Controller.java b/src/app/Controller.java index 701a422..ec31b42 100644 --- a/src/app/Controller.java +++ b/src/app/Controller.java @@ -1,10 +1,8 @@ package app; -import javafx.beans.property.StringProperty; import javafx.concurrent.Task; import javafx.fxml.FXML; import javafx.scene.control.*; -import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.text.Text; @@ -55,7 +53,7 @@ public class Controller { Task loadDirTask = new Task() { @Override - public Void call() throws Exception { + public Void call() { loadDirState.setText(""); calcMd5State.setText(""); @@ -103,7 +101,7 @@ public class Controller { Task delDoubleTask = new Task() { @Override - public Void call() throws Exception { + public Void call() { for (int i = 0; i < doubles.size(); i++) { new Execute().execute(new String[]{"rm", doubles.get(i).file.getAbsolutePath()}); diff --git a/src/app/Main.java b/src/app/Main.java index 866edbb..0088ff6 100644 --- a/src/app/Main.java +++ b/src/app/Main.java @@ -2,12 +2,8 @@ package app; import javafx.application.Application; import javafx.fxml.FXMLLoader; -import javafx.geometry.Insets; import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.TextField; -import javafx.scene.layout.GridPane; import javafx.stage.Stage; diff --git a/src/app/QuicksortMd5.java b/src/app/QuicksortMd5.java index dd338ab..44491fe 100644 --- a/src/app/QuicksortMd5.java +++ b/src/app/QuicksortMd5.java @@ -4,7 +4,7 @@ import app.Artifacts.MFile; import java.util.Map; -public class QuicksortMd5 { +class QuicksortMd5 { private Map md5Pool; private int i; private int j; diff --git a/src/app/Routines.java b/src/app/Routines.java index 21c6614..77a2c50 100644 --- a/src/app/Routines.java +++ b/src/app/Routines.java @@ -10,15 +10,13 @@ import java.util.Map; import app.Artifacts.MFile; -public class Routines { +class Routines { - Execute x; - Tools tools; + private final Execute x; public Routines() { this.x = new Execute(); - this.tools = new Tools(); } @@ -43,10 +41,10 @@ public class Routines { e.printStackTrace(); } // [3] - Map filepool = new HashMap(); + Map filepool = new HashMap<>(); int j = 0; - for (int i = 0; i < lines.size(); i++) { - File file = new File(lines.get(i)); + for (String line : lines) { + File file = new File(line); if (type == "dir" && file.isDirectory() || type == "file" && file.isFile()) { filepool.put(j, file); j++; diff --git a/src/app/Tools.java b/src/app/Tools.java index d9b076d..bde8c67 100644 --- a/src/app/Tools.java +++ b/src/app/Tools.java @@ -3,9 +3,9 @@ package app; import java.io.BufferedReader; import java.io.IOException; -public class Tools { +class Tools { - Execute x; + private final Execute x; public Tools() { x = new Execute(); diff --git a/src/app/Write.java b/src/app/Write.java index 1ac81cc..ea7cad1 100644 --- a/src/app/Write.java +++ b/src/app/Write.java @@ -7,7 +7,7 @@ import java.util.Map; import app.Artifacts.MFile; -public class Write { +class Write { /** * Write text to file at path . diff --git a/src/app/layout.fxml b/src/app/layout.fxml index bba9d9f..b6217ff 100644 --- a/src/app/layout.fxml +++ b/src/app/layout.fxml @@ -1,11 +1,8 @@ - - - + - @@ -38,7 +35,6 @@ /> @@ -50,7 +46,6 @@ /> @@ -62,7 +57,6 @@ /> @@ -74,7 +68,6 @@ /> @@ -86,7 +79,6 @@ />