diff --git a/pom.xml b/pom.xml index daebc2b..24bf149 100644 --- a/pom.xml +++ b/pom.xml @@ -40,6 +40,14 @@ + + + redrise + redrise.ru repository + http://repo.redrise.ru/releases + + + UTF-8 yyyyMMdd.HHmmss @@ -199,11 +207,11 @@ 5.9.0 test - + ru.redrise libKonogonka - 0.1-SNAPSHOT + 0.1 compile diff --git a/src/main/java/nsusbloader/AppPreferences.java b/src/main/java/nsusbloader/AppPreferences.java index d774ae0..58fae45 100644 --- a/src/main/java/nsusbloader/AppPreferences.java +++ b/src/main/java/nsusbloader/AppPreferences.java @@ -88,8 +88,6 @@ public class AppPreferences { public String getHostIp(){ return preferences.get("HOSTIP", "0.0.0.0").replaceAll("(\\s)|(\t)", "");} // who the hell said 'paranoid'? public void setHostIp(String ip){preferences.put("HOSTIP", ip);} - public void give(){preferences.putBoolean("man", true);} - public boolean take(){return preferences.getBoolean("man", false);} public String getHostPort(){ String value = preferences.get("HOSTPORT", "6042"); if (!value.matches("^[0-9]{1,5}$")) diff --git a/src/main/java/nsusbloader/Controllers/NSLMainController.java b/src/main/java/nsusbloader/Controllers/NSLMainController.java index cc051b3..cfff368 100644 --- a/src/main/java/nsusbloader/Controllers/NSLMainController.java +++ b/src/main/java/nsusbloader/Controllers/NSLMainController.java @@ -73,7 +73,7 @@ public class NSLMainController implements Initializable { if (AppPreferences.getInstance().getAutoCheckUpdates()){ checkForUpdates(); } - if (! AppPreferences.getInstance().take()) mainTabPane.getTabs().remove(3); + openLastOpenedTab(); } private void checkForUpdates(){ diff --git a/src/main/java/nsusbloader/cli/CommandLineInterface.java b/src/main/java/nsusbloader/cli/CommandLineInterface.java index 2ced0f1..d5965c8 100644 --- a/src/main/java/nsusbloader/cli/CommandLineInterface.java +++ b/src/main/java/nsusbloader/cli/CommandLineInterface.java @@ -18,12 +18,9 @@ */ package nsusbloader.cli; -import nsusbloader.AppPreferences; -import nsusbloader.Main; import nsusbloader.NSLMain; import org.apache.commons.cli.*; -import java.time.LocalTime; import java.util.prefs.Preferences; public class CommandLineInterface { @@ -35,12 +32,9 @@ public class CommandLineInterface { } final Options cliOptions = createCliOptions(); - final Options cliOptionsToBeExact = - createCliOptions().addOption(Option.builder().longOpt("gimmegimmegimme").hasArg(false).build()); - CommandLineParser cliParser = new DefaultParser(); try{ - CommandLine cli = cliParser.parse(cliOptionsToBeExact, args); + CommandLine cli = cliParser.parse(cliOptions, args); if (cli.hasOption('v') || cli.hasOption("version")){ handleVersion(); return; @@ -80,16 +74,6 @@ public class CommandLineInterface { return; } */ - if (cli.hasOption("gimmegimmegimme")){ - if (LocalTime.now().isBefore(LocalTime.parse("09:00:00"))){ - AppPreferences.getInstance().give(); - AppPreferences.getInstance().setLastOpenedTab("PatchesTabHolder"); - System.out.println("=)"); - Main.main(new String[]{}); - return; - } - throw new ParseException("Unhandled LocalTime() exception;"); - } if (cli.hasOption("s") || cli.hasOption("split")){ final String[] arguments = cli.getOptionValues("split"); new SplitCli(arguments);