diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandBundle.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandBundle.java
similarity index 63%
rename from BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandBundle.java
rename to BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandBundle.java
index 6a4f0966b9c22d610df337f16a588bc50f0de693..5600b99d5cb2bef5374c224aca868fe88454ec83 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandBundle.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandBundle.java
@@ -1,9 +1,8 @@
-package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+package de.deadlocker8.budgetmasterclient.ui.commandLine;
+import java.text.MessageFormat;
import java.util.ResourceBundle;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandLineController;
-
public class CommandBundle
{
private CommandLineController controller;
@@ -22,7 +21,17 @@ public class CommandBundle
public ResourceBundle getLanguageBundle()
{
return languageBundle;
- }
+ }
+
+ public String getString(String key)
+ {
+ return languageBundle.getString(key);
+ }
+
+ public String getString(String key, Object... args)
+ {
+ return MessageFormat.format(languageBundle.getString(key), args);
+ }
public void setController(CommandLineController controller)
{
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLine.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLine.java
index 0e642519db353996d07e1738e1bfdc3d48e64c79..eba15f5f9083421d932d6010f8fad5e35d81648b 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLine.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLine.java
@@ -4,8 +4,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.ResourceBundle;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.CommandBundle;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.HistoryEntry;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLineController.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLineController.java
index e3f15027e9d0ca3f8dded3f6f7dcae7baf9bf2b4..c84fec6b9943921975d76060a00b124dd0eb2da3 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLineController.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/CommandLineController.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.Command;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.HistoryEntry;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.HistoryType;
import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.PossibleCommands;
import javafx.application.Platform;
import javafx.event.EventHandler;
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryEntry.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryEntry.java
similarity index 84%
rename from BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryEntry.java
rename to BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryEntry.java
index ff972e700aaa3b04dbe5d7c138a400d0f2719c0a..3454e2876e9d6b4d8841d7e947659e24b176f30a 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryEntry.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryEntry.java
@@ -1,4 +1,4 @@
-package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+package de.deadlocker8.budgetmasterclient.ui.commandLine;
public class HistoryEntry
{
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryType.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryType.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b6f3c87866f1bb39268eaca24d58b8f1f918c15
--- /dev/null
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/HistoryType.java
@@ -0,0 +1,6 @@
+package de.deadlocker8.budgetmasterclient.ui.commandLine;
+
+public enum HistoryType
+{
+ COMMAND, MESSAGE
+}
\ No newline at end of file
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/Command.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/Command.java
index 1e3ddc4fef5abe8983bbd0184ac0ce65bb72a9cd..c2ad67b0cee0bbfd210b6e4ac508bb7df4834c74 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/Command.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/Command.java
@@ -1,5 +1,7 @@
package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+
public abstract class Command
{
public String keyword;
@@ -23,13 +25,13 @@ public abstract class Command
public boolean isValid(String[] command)
{
- if((command.length - 1) < numberOfParams || (command.length -1) > numberOfParams)
+ if((command.length - 1) == numberOfParams)
{
- return false;
+ return true;
}
else
{
- return true;
+ return false;
}
}
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandClear.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandClear.java
index 69f59bbd6afed18573f9293f6eaec3bb3fd95db0..f9aa8f8aac586091e1f14fd9ad8c97895844b6e9 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandClear.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandClear.java
@@ -1,5 +1,7 @@
package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+
/**
* Clears the history log and console
*/
@@ -17,7 +19,7 @@ public class CommandClear extends Command
{
if(!isValid(command))
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ bundle.getController().print(bundle.getString("error.invalid.arguments"));
return;
}
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandDelete.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandDelete.java
new file mode 100644
index 0000000000000000000000000000000000000000..c160bb38233563208207f5aacd5738751e250ea2
--- /dev/null
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandDelete.java
@@ -0,0 +1,41 @@
+package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+import logger.Logger;
+
+public class CommandDelete extends Command
+{
+ public CommandDelete()
+ {
+ super.keyword = "delete";
+ super.numberOfParams = 1;
+ super.helptText = "help.delete";
+ }
+
+ @Override
+ public void execute(String[] command, CommandBundle bundle)
+ {
+ if(!isValid(command))
+ {
+ bundle.getController().print(bundle.getString("error.invalid.arguments"));
+ return;
+ }
+
+ if(command[1].equals("log-client"))
+ {
+ Logger.clearLogFile();
+ bundle.getController().print(bundle.getString("delete.success", "log-client", Logger.getFolder()));
+ return;
+ }
+
+ if(command[1].equals("log-server"))
+ {
+ //TODO
+// Logger.clearLogFile();
+// bundle.getController().print(bundle.getString("delete.success", "log-server", Logger.getFolder()));
+ return;
+ }
+
+ bundle.getController().print(bundle.getString("error.invalid.parameter", command[1], keyword));
+ }
+}
\ No newline at end of file
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandHelp.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandHelp.java
index 0358b33d3be5de5b27834cc3c599e80cd6ba89e7..88680e5ede1108b2613c683dbec53c23809bb1ca 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandHelp.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandHelp.java
@@ -2,6 +2,8 @@ package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
import java.util.MissingResourceException;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+
/**
* prints help for given command
*/
@@ -20,7 +22,7 @@ public class CommandHelp extends Command
{
if(!isValid(command))
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ bundle.getController().print(bundle.getString("error.invalid.arguments"));
return;
}
@@ -30,16 +32,16 @@ public class CommandHelp extends Command
{
try
{
- bundle.getController().print(bundle.getLanguageBundle().getString("help." + command[1]));
+ bundle.getController().print(bundle.getString("help." + command[1]));
}
catch(MissingResourceException e)
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.general"));
+ bundle.getController().print(bundle.getString("error.general"));
}
return;
}
}
- bundle.getController().print(bundle.getLanguageBundle().getString("error.no.help"));
+ bundle.getController().print(bundle.getString("error.no.help"));
}
}
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandList.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandList.java
index 92ba1054ae02dadf704cdaeec4382fc0c3567caf..6ea40040cc6bfd976210c28791c20187dab56608 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandList.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandList.java
@@ -3,6 +3,8 @@ package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
import java.util.ArrayList;
import java.util.Comparator;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+
/**
* Lists all available commands
*/
@@ -21,7 +23,7 @@ public class CommandList extends Command
{
if(!isValid(command))
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ bundle.getController().print(bundle.getString("error.invalid.arguments"));
return;
}
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandOpen.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandOpen.java
index d2e74e4e59a8872d724d5615cd933feaa76aa3e9..bf4ef69b82c290420b338382f55694e99119dcc3 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandOpen.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandOpen.java
@@ -6,6 +6,7 @@ import java.io.IOException;
import java.nio.file.Paths;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
import tools.Localization;
import tools.PathUtils;
@@ -23,13 +24,13 @@ public class CommandOpen extends Command
{
if(!isValid(command))
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ bundle.getController().print(bundle.getString("error.invalid.arguments"));
return;
}
if(!command[1].equals("settings"))
{
- bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ bundle.getController().print(bundle.getString("error.invalid.parameter", command[1], keyword));
return;
}
@@ -37,7 +38,7 @@ public class CommandOpen extends Command
{
File folder = Paths.get(PathUtils.getOSindependentPath() + Localization.getString(Strings.FOLDER)).toFile();
Desktop.getDesktop().open(folder);
- bundle.getController().print(bundle.getLanguageBundle().getString("help.success") + " " + folder.getAbsolutePath());
+ bundle.getController().print(bundle.getString("open.success", folder.getAbsolutePath()));
}
catch(IOException e)
{
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandShortcuts.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandShortcuts.java
index e442ac2160bb71839b82e13da38c2ed23049267e..bb99c3e1ed20a1a3627cf092e89a1dedec9b3bde 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandShortcuts.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/CommandShortcuts.java
@@ -1,5 +1,7 @@
package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
+
/**
* Lists all available Shortcuts
*/
@@ -16,6 +18,6 @@ public class CommandShortcuts extends Command
public void execute(String[] command, CommandBundle bundle)
{
bundle.getController().print("Available Shortcuts:");
- bundle.getController().print(bundle.getLanguageBundle().getString("info.shortcuts"));
+ bundle.getController().print(bundle.getString("info.shortcuts"));
}
}
\ No newline at end of file
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryType.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryType.java
deleted file mode 100644
index fe72a3bd100be9fb1362a657d6e2569f572f0a2f..0000000000000000000000000000000000000000
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/HistoryType.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package de.deadlocker8.budgetmasterclient.ui.commandLine.commands;
-
-public enum HistoryType
-{
- COMMAND, MESSAGE
-}
\ No newline at end of file
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/PossibleCommands.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/PossibleCommands.java
index 88aff006d839839c93f56e7fc8669f59ba6f6103..907982b0500c6e3d60d9a1a2d6bcc78a4096e71a 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/PossibleCommands.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/commandLine/commands/PossibleCommands.java
@@ -10,6 +10,7 @@ public class PossibleCommands
new CommandHelp(),
new CommandClear(),
new CommandShortcuts(),
- new CommandOpen()
+ new CommandOpen(),
+ new CommandDelete()
));
}
\ No newline at end of file
diff --git a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
index bcedcde8fe0197bbf748deadae48bf3ad972cb9c..d21c150858ebbcfc1294da80abe75bd024aa13b2 100644
--- a/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
+++ b/BudgetMasterClient/src/main/java/de/deadlocker8/budgetmasterclient/ui/controller/Controller.java
@@ -26,8 +26,8 @@ import de.deadlocker8.budgetmaster.logic.updater.VersionInformation;
import de.deadlocker8.budgetmaster.logic.utils.Colors;
import de.deadlocker8.budgetmaster.logic.utils.Helpers;
import de.deadlocker8.budgetmaster.logic.utils.Strings;
+import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandBundle;
import de.deadlocker8.budgetmasterclient.ui.commandLine.CommandLine;
-import de.deadlocker8.budgetmasterclient.ui.commandLine.commands.CommandBundle;
import de.deadlocker8.budgetmasterclient.utils.UIHelpers;
import fontAwesome.FontIconType;
import javafx.animation.FadeTransition;
diff --git a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/commandLine/_en.properties b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/commandLine/_en.properties
index b58ee7894a27a46ae37ab4a2fe2a8f5e5141e1c6..c88d1ad9a022e8886251a010694c6669dae1dff9 100644
--- a/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/commandLine/_en.properties
+++ b/BudgetMasterClient/src/main/resources/de/deadlocker8/budgetmaster/ui/commandLine/_en.properties
@@ -2,13 +2,19 @@ help.list=list - lists all possible commands
help.help=help - shows help for given command\nSYNTAX: help [COMMAND]
help.clear=clear - clears the history
help.shortcuts=shortcuts - lists all available shortcuts
-help.open=open - opens files and folders\nSYNTAX: open [FILE]\npossible Files: settings
error.general=An error occurred.
error.unknown.command=Unknown command. Use \"list\" for a list of possible commands.
error.invalid.arguments=Invalid arguments. Use \"help commandname\" for help.
+error.invalid.parameter=Invalid parameter {0}.\nUse \"help {1}\" for a detailed list.
error.no.help=Unknown command as parameter. Can't display help. Use \"list\" for a list of possible commands.
info.shortcuts=[ENTER] - execute command\n[UP] - scroll through recently used commands\n[ESC] - clear input\n[TAB] - autocomplete
-help.success=Successfully opened folder
\ No newline at end of file
+# open
+help.open=open - opens files and folders\nSYNTAX: open [PARAMETER]\npossible parameters: settings
+open.success=Successfully opened folder {0}
+
+# delete
+help.delete=delte - deletes files\nSYNTAX: delete [PARAMETER]\npossible parameters:\nlog-client\nlog-server
+delete.success=Successfully deleted {0} (in folder: {1})