From 0f92aa9b7637d4d937d135de758dc6efe5beb4f6 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Thu, 15 Jul 2021 21:04:07 -0400 Subject: [PATCH 01/27] add timer end field, #72 --- .../goistreamtoolredux/controller/TimerPane.java | 12 ++++++------ .../resources/goistreamtoolredux/fxml/TimerPane.fxml | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java index 38ec322..4d40cb4 100644 --- a/src/main/java/goistreamtoolredux/controller/TimerPane.java +++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java @@ -1,9 +1,6 @@ package goistreamtoolredux.controller; -import com.jfoenix.controls.JFXButton; -import com.jfoenix.controls.JFXSnackbar; -import com.jfoenix.controls.JFXSnackbarLayout; -import com.jfoenix.controls.JFXToggleButton; +import com.jfoenix.controls.*; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView; import goistreamtoolredux.App; import goistreamtoolredux.algorithm.FileManager; @@ -56,6 +53,9 @@ public class TimerPane { @FXML // fx:id="timerToggler" private JFXToggleButton timerToggler; // Value injected by FXMLLoader + @FXML // fx:id="timerEndTextField" + private JFXTextField timerEndTextField; // Value injected by FXMLLoader + @FXML // fx:id="timerOneSpinner" private Spinner timerOneSpinner; // Value injected by FXMLLoader @@ -73,8 +73,6 @@ public class TimerPane { - - @FXML void lobbyPauseClicked(MouseEvent event) { LobbyTimer.getInstance().pause(); @@ -226,6 +224,8 @@ public void save(ActionEvent actionEvent) { //todo exception.printStackTrace(); } + + //todo update the finished preference } } diff --git a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml index f987d9f..666709c 100644 --- a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml +++ b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml @@ -1,6 +1,7 @@ + @@ -36,6 +37,11 @@ + + + + + From 233a3299dd22d91a12bf4c92923e5a6cdac8668c Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Thu, 15 Jul 2021 21:10:51 -0400 Subject: [PATCH 02/27] set timer end text in preference API --- .../java/goistreamtoolredux/controller/TimerPane.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java index 4d40cb4..534ce29 100644 --- a/src/main/java/goistreamtoolredux/controller/TimerPane.java +++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java @@ -70,6 +70,7 @@ public class TimerPane { private static final String TIMER_ONE_LENGTH = "timer_one_length"; private static final String TIMER_TWO_LENGTH = "timer_two_length"; private static final String IS_TIMER_ONE = "is_timer_one"; + private static final String TIMER_END_TEXT = "timer_end_text"; @@ -165,6 +166,9 @@ void initialize() { //init timer 2 spinner initTimerSpinner(timerTwoSpinner, prefs.getInt(TIMER_TWO_LENGTH, 240)); + //init value for end text TextField + timerEndTextField.setText(prefs.get(TIMER_END_TEXT, "0:00")); + } static void initTimerSpinner(Spinner timerSpinner, int initialLength) { @@ -225,7 +229,9 @@ public void save(ActionEvent actionEvent) { exception.printStackTrace(); } - //todo update the finished preference + //update timer end text + prefs.put(TIMER_END_TEXT, timerEndTextField.getText()); + System.out.println("updating end preference: " + prefs.get(TIMER_END_TEXT, "NOT THERE?")); } } From e60c2be1c56f7d4ffc2de5342ebdfb1a40a35aba Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Thu, 15 Jul 2021 21:36:50 -0400 Subject: [PATCH 03/27] timer can now resume from custom finished state #72 --- .../goistreamtoolredux/algorithm/LobbyTimer.java | 8 ++++++++ .../java/goistreamtoolredux/algorithm/Timers.java | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java b/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java index e26e2e7..da4bb11 100644 --- a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java @@ -4,10 +4,13 @@ import goistreamtoolredux.controller.TimerPane; import java.io.FileNotFoundException; +import java.io.FileWriter; import java.io.IOException; +import java.io.Writer; import java.util.NoSuchElementException; import java.util.Timer; import java.util.TimerTask; +import java.util.prefs.Preferences; /** * Singleton timer class. @@ -136,6 +139,11 @@ public void run() { System.out.println("Timer Finished!\n>"); LobbyTimer.getInstance().isTimerRunning = false; timer.getCurrentTimer().cancel(); + + //set timer text to be the preferred text upon ending + Writer fileWriter = new FileWriter(FileManager.outputPath + "Timer.txt"); + fileWriter.write(Preferences.userRoot().node("/goistreamtoolredux/algorithm").get("timer_end_text","0:00")); + fileWriter.close(); } else { timer.set(currentTime - 1); TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController(); diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java index 98003b7..6c5de48 100644 --- a/src/main/java/goistreamtoolredux/algorithm/Timers.java +++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java @@ -82,6 +82,9 @@ public void set(int seconds) throws IOException { * Gets the current value of the timer. * If the timer file is empty or invalid, the file will be fixed, * and the default length (TimerLength.txt will be returned) + * + * @// TODO: 7/15/21 remove TimerLength.txt logic! Depreciated and unexpected + * * @return time left in seconds. * @throws FileNotFoundException timer.txt cannot be found * @throws InvalidDataException incorrect values in TimerLength.txt @@ -91,7 +94,14 @@ public int get() throws IOException, InvalidDataException { File timerSettings = new File(timerTXT); Scanner scanner = new Scanner(timerSettings); try { - return convertFromMinuteFormat(scanner.nextLine()); + int foo = convertFromMinuteFormat(scanner.nextLine()); + return foo; + } catch (NumberFormatException exception) { + //occurs when timer.txt does not contain int - this can be because of user input + // but more commonly due to user setting their own end text in the file. + // in this case, we just return the preferred length. + return getInitialTimerLength(); + } catch (NoSuchElementException e) { //timer file is empty or invalid. //write value of "TimerLength.txt" to "Timer.txt", and return such From 8c78e1e81229add4e84f89778773f4371e5cc36a Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Thu, 15 Jul 2021 21:46:16 -0400 Subject: [PATCH 04/27] fix forgotten change --- src/main/java/goistreamtoolredux/algorithm/Timers.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java index 6c5de48..7a13e9a 100644 --- a/src/main/java/goistreamtoolredux/algorithm/Timers.java +++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java @@ -94,8 +94,7 @@ public int get() throws IOException, InvalidDataException { File timerSettings = new File(timerTXT); Scanner scanner = new Scanner(timerSettings); try { - int foo = convertFromMinuteFormat(scanner.nextLine()); - return foo; + return convertFromMinuteFormat(scanner.nextLine()); } catch (NumberFormatException exception) { //occurs when timer.txt does not contain int - this can be because of user input // but more commonly due to user setting their own end text in the file. From b9b8a6063bdd67acd685708490a820902d0a8711 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Fri, 16 Jul 2021 10:37:00 -0400 Subject: [PATCH 05/27] remove old timerLength logic --- .../goistreamtoolredux/algorithm/Timers.java | 41 +++++++------------ 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java index 7a13e9a..c09bfc5 100644 --- a/src/main/java/goistreamtoolredux/algorithm/Timers.java +++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java @@ -48,11 +48,9 @@ public void setInitialTimerTwoLength(int seconds) { * Gotten from the preferences API, defaults to 240 if no preference set yet. * * @return timer length in seconds - * @throws IOException - * @throws NoSuchElementException TimerLength.txt contains an unexpected character. * @see #setInitialTimerLength(int) */ - public int getInitialTimerLength() throws IOException, NoSuchElementException, InvalidDataException { + public int getInitialTimerLength() { if (prefs.getBoolean(IS_TIMER_ONE, true)) { //if timer one is selected, or must be defaulted to return prefs.getInt(TIMER_ONE_LENGTH, 240); @@ -80,42 +78,31 @@ public void set(int seconds) throws IOException { /** * Gets the current value of the timer. - * If the timer file is empty or invalid, the file will be fixed, - * and the default length (TimerLength.txt will be returned) - * - * @// TODO: 7/15/21 remove TimerLength.txt logic! Depreciated and unexpected + * If the timer file is empty or invalid, the default timer will be retrieved * * @return time left in seconds. * @throws FileNotFoundException timer.txt cannot be found - * @throws InvalidDataException incorrect values in TimerLength.txt */ - public int get() throws IOException, InvalidDataException { + public int get() throws IOException { //open Timer.txt and scan first integer File timerSettings = new File(timerTXT); Scanner scanner = new Scanner(timerSettings); try { return convertFromMinuteFormat(scanner.nextLine()); - } catch (NumberFormatException exception) { - //occurs when timer.txt does not contain int - this can be because of user input - // but more commonly due to user setting their own end text in the file. - // in this case, we just return the preferred length. + } catch (NumberFormatException | NoSuchElementException exception) { + /* + NumberFormatException: + occurs when timer.txt does not contain int - this can be because of user input + but more commonly due to user setting their own end text in the file. + in this case, we just return the preferred length. + NoSuchElementException: + timer file is empty (no line found) + return preferred timer start value + */ + return getInitialTimerLength(); - } catch (NoSuchElementException e) { - //timer file is empty or invalid. - //write value of "TimerLength.txt" to "Timer.txt", and return such - Writer fileWriter = new FileWriter(timerTXT); - try { - fileWriter.write(convertToMinuteFormat(getInitialTimerLength())); - } catch (NoSuchElementException | InvalidDataException exception) { - //getInitial error, so write new value to getInitial - Writer fileWriterInitial = new FileWriter(FileManager.inputPath + "TimerLength.txt"); - fileWriterInitial.write(240); - fileWriterInitial.close(); - } - fileWriter.close(); } - return 240; } /** From ea0638d7dd2d5caea135660715a96ec19b1305e3 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Fri, 16 Jul 2021 13:30:11 -0400 Subject: [PATCH 06/27] remove non-thrown exception, was causing build to fail --- src/main/java/goistreamtoolredux/algorithm/CustomTimer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java b/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java index b4e0249..6d62025 100644 --- a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java @@ -141,8 +141,6 @@ public void run() { exception.printStackTrace(); } catch (IOException exception) { exception.printStackTrace(); - } catch (InvalidDataException exception) { - exception.printStackTrace(); } } } From eb177ac09db321ee1f7d806df007dc326a8cdabd Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 11:47:55 -0400 Subject: [PATCH 07/27] remove broken catch block --- src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java b/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java index da4bb11..a1faeee 100644 --- a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java @@ -153,8 +153,6 @@ public void run() { exception.printStackTrace(); } catch (IOException exception) { exception.printStackTrace(); - } catch (InvalidDataException exception) { - exception.printStackTrace(); } } } From 1c45641e8721940847a0e0ba6d30cd00808ee31e Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 11:53:33 -0400 Subject: [PATCH 08/27] Delete CustomTimer.java --- .../algorithm/CustomTimer.java | 147 ------------------ 1 file changed, 147 deletions(-) delete mode 100644 src/main/java/goistreamtoolredux/algorithm/CustomTimer.java diff --git a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java b/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java deleted file mode 100644 index 6d62025..0000000 --- a/src/main/java/goistreamtoolredux/algorithm/CustomTimer.java +++ /dev/null @@ -1,147 +0,0 @@ -package goistreamtoolredux.algorithm; - -import goistreamtoolredux.App; -import goistreamtoolredux.controller.TimerPane; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.NoSuchElementException; -import java.util.Timer; -import java.util.TimerTask; - -public class CustomTimer extends Timers { - - private static CustomTimer singleton = new CustomTimer(); - private Timer currentTimer; - protected boolean isTimerRunning = false; - - public Timer getCurrentTimer() { - return currentTimer; - } - - private CustomTimer() {} - - /* Static 'instance' method */ - public static CustomTimer getInstance() { - return singleton; - } - - //File paths -// String timerLength = FileManager.inputPath + "TimerLength.txt"; -// String timerTXT = FileManager.outputPath + "Timer.txt"; - - - /*--- Methods ---*/ - - /** - * Start the timer (initial or after a pause) - * @throws IOException - * @throws NoSuchElementException - * @see #stop() - * @see #pause() - * @see #restart() - */ - public void start() throws IOException, NoSuchElementException, InvalidDataException { - if (!isTimerRunning) { //prevent starting when there is already a timer. no doubling up! - if (get() <= 0) { //if timer is currently at 0, restart - restart(); - } else { //otherwise, resume from last position by starting goistreamtoolredux.algorithm.CountdownTimer task - isTimerRunning = true; - currentTimer = new Timer(); - TimerTask task = new CountdownTimerCustom(); - currentTimer.schedule(task,0, 1000); - } - } else System.err.println("Timer already running!"); - } - - /** - * Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE. - * Starting after this state will restart the timer. - * - * @throws NullPointerException there is no current timer or {@link TimerTask} running - * @throws IOException if I/O error is encountered when writing to Timer.txt - * @see #start() - * @see #pause() - * @see #restart() - */ - public void stop() throws NullPointerException, IOException { - //stop the current TimerTask - if (currentTimer != null) { - currentTimer.cancel(); - isTimerRunning = false; - } - //set Timer.txt to nothing [will cause start() to restart timer if called next] - set(0); - } - - /** - * Pauses the current timer state. Starting from this after this state will - * continue the timer from where the timer left off. - * Does nothing if there is no active timer - * - * @see #start() - * @see #stop() - * @see #restart() - */ - public void pause() { - //cancel TimerTask to stop countdown. Keeps value, so start() can resume from it - if (currentTimer != null) { - currentTimer.cancel(); - isTimerRunning = false; - } - } - - /** - * Resets the timer back to beginning value and starts it again - * @see #start() - * @see #stop() - * @see #pause() - */ - public void restart() throws IOException, InvalidDataException { - //stop timer - if (currentTimer != null) { - currentTimer.cancel(); - isTimerRunning = false; - } - - //write initial timer length to Timer.txt - set(getInitialTimerLength()); - - //start - start(); - } -} - -/** - * Begins countdown from current value in the Timer.txt file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system. - * @implNote Be careful with scheduling this function too fast/often, it doesn't implement any - * file locks and is not atomic as of the current version. - * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks - */ -class CountdownTimerCustom extends TimerTask { - - public void run() { - - /*todo, implement lock*/ - - LobbyTimer timer = LobbyTimer.getInstance(); - - try { - int currentTime = timer.get(); - if (currentTime <= 0) { - System.out.println("Timer Finished!\n>"); - LobbyTimer.getInstance().isTimerRunning = false; - timer.getCurrentTimer().cancel(); - } else { - timer.set(currentTime - 1); - TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController(); - timerPaneController.setLobbyTimerText(String.valueOf(currentTime - 1)); - } - } catch (FileNotFoundException exception) { - exception.printStackTrace(); - } catch (IOException exception) { - exception.printStackTrace(); - } - } -} - From 90b79b293f31dd2ca9f36ffe3551351079f5e449 Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 11:53:55 -0400 Subject: [PATCH 09/27] remove broken catch in TimerPane --- src/main/java/goistreamtoolredux/controller/TimerPane.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java index 534ce29..c380e90 100644 --- a/src/main/java/goistreamtoolredux/controller/TimerPane.java +++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java @@ -149,9 +149,6 @@ void initialize() { e.printStackTrace(); //todo, handle failed file creation } - } catch (InvalidDataException invalidDataException) { - invalidDataException.printStackTrace(); - //todo handle } catch (IOException exception) { exception.printStackTrace(); //todo handle From a19aa1927b677f6a62172482be620e78c0897cf3 Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 12:00:33 -0400 Subject: [PATCH 10/27] rename LobbyTimer > AppTimer --- src/main/java/goistreamtoolredux/App.java | 6 ++-- .../{LobbyTimer.java => AppTimer.java} | 12 +++---- .../algorithm/FileManager.java | 10 +++--- .../goistreamtoolredux/algorithm/Timers.java | 7 ---- .../controller/TimerPane.java | 14 ++++---- .../goistreamtoolredux/AlgorithmTest.java | 34 +++++++++---------- 6 files changed, 38 insertions(+), 45 deletions(-) rename src/main/java/goistreamtoolredux/algorithm/{LobbyTimer.java => AppTimer.java} (94%) diff --git a/src/main/java/goistreamtoolredux/App.java b/src/main/java/goistreamtoolredux/App.java index 0a892ad..61146ee 100644 --- a/src/main/java/goistreamtoolredux/App.java +++ b/src/main/java/goistreamtoolredux/App.java @@ -1,7 +1,7 @@ package goistreamtoolredux; +import goistreamtoolredux.algorithm.AppTimer; import goistreamtoolredux.algorithm.FileManager; -import goistreamtoolredux.algorithm.LobbyTimer; import goistreamtoolredux.controller.Master; import javafx.application.Application; import javafx.application.Platform; @@ -99,8 +99,8 @@ public void handle(WorkerStateEvent event) { public void stop() { System.out.println("Shutting Down"); //cancel the current TimerTask so the app doesn't hang on quit - if (LobbyTimer.getInstance().getCurrentTimer() != null) { - LobbyTimer.getInstance().getCurrentTimer().cancel(); + if (AppTimer.getInstance().getCurrentTimer() != null) { + AppTimer.getInstance().getCurrentTimer().cancel(); } } diff --git a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java similarity index 94% rename from src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java rename to src/main/java/goistreamtoolredux/algorithm/AppTimer.java index a1faeee..f7be553 100644 --- a/src/main/java/goistreamtoolredux/algorithm/LobbyTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java @@ -16,9 +16,9 @@ * Singleton timer class. * Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class. */ -public class LobbyTimer extends Timers { +public class AppTimer extends Timers { - private static LobbyTimer singleton = new LobbyTimer(); + private static AppTimer singleton = new AppTimer(); private Timer currentTimer; protected boolean isTimerRunning = false; @@ -26,10 +26,10 @@ public Timer getCurrentTimer() { return currentTimer; } - private LobbyTimer() {} + private AppTimer() {} /* Static 'instance' method */ - public static LobbyTimer getInstance() { + public static AppTimer getInstance() { return singleton; } @@ -131,13 +131,13 @@ public void run() { /*todo, implement lock*/ - LobbyTimer timer = LobbyTimer.getInstance(); + AppTimer timer = AppTimer.getInstance(); try { int currentTime = timer.get(); if (currentTime <= 0) { System.out.println("Timer Finished!\n>"); - LobbyTimer.getInstance().isTimerRunning = false; + AppTimer.getInstance().isTimerRunning = false; timer.getCurrentTimer().cancel(); //set timer text to be the preferred text upon ending diff --git a/src/main/java/goistreamtoolredux/algorithm/FileManager.java b/src/main/java/goistreamtoolredux/algorithm/FileManager.java index 2144baf..36cd45c 100644 --- a/src/main/java/goistreamtoolredux/algorithm/FileManager.java +++ b/src/main/java/goistreamtoolredux/algorithm/FileManager.java @@ -239,7 +239,7 @@ private static void CLIParse(String input) { break; case "timer set": - LobbyTimer timer = LobbyTimer.getInstance(); + AppTimer timer = AppTimer.getInstance(); try { System.out.println("How many seconds would you like to set the timer for"); int setTime = scanner.nextInt(); @@ -259,7 +259,7 @@ private static void CLIParse(String input) { case "timer start": try { - LobbyTimer.getInstance().start(); + AppTimer.getInstance().start(); } catch (IOException exception) { exception.printStackTrace(); } catch (NoSuchElementException exception) { @@ -271,7 +271,7 @@ private static void CLIParse(String input) { case "timer stop": try { - LobbyTimer.getInstance().stop(); + AppTimer.getInstance().stop(); System.out.println("Stopped!"); } catch (IOException exception) { exception.printStackTrace(); @@ -279,12 +279,12 @@ private static void CLIParse(String input) { break; case "timer pause": - LobbyTimer.getInstance().pause(); + AppTimer.getInstance().pause(); break; case "timer restart": case "timer reset": try { - LobbyTimer.getInstance().restart(); + AppTimer.getInstance().restart(); } catch (IOException | InvalidDataException exception) { exception.printStackTrace(); } diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java index c09bfc5..f173455 100644 --- a/src/main/java/goistreamtoolredux/algorithm/Timers.java +++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java @@ -7,8 +7,6 @@ public class Timers { -// private Timer currentTimer; -// protected boolean isTimerRunning = false; private static Preferences prefs = Preferences.userRoot().node("/goistreamtoolredux/algorithm"); private static final String TIMER_ONE_LENGTH = "timer_one_length"; @@ -28,11 +26,6 @@ public class Timers { * @see #getInitialTimerLength() */ public void setInitialTimerLength(int seconds) throws IOException, IllegalArgumentException { -// if (seconds <= 0) throw new IllegalArgumentException("Cannot set initial timer value to 0"); -// //open TimerLength file and set a new value -// Writer fileWriter = new FileWriter(timerLength); -// fileWriter.write(String.valueOf(seconds)); -// fileWriter.close(); prefs.putInt(TIMER_TWO_LENGTH, seconds); } diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java index c380e90..e235793 100644 --- a/src/main/java/goistreamtoolredux/controller/TimerPane.java +++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java @@ -3,9 +3,9 @@ import com.jfoenix.controls.*; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIconView; import goistreamtoolredux.App; +import goistreamtoolredux.algorithm.AppTimer; import goistreamtoolredux.algorithm.FileManager; import goistreamtoolredux.algorithm.InvalidDataException; -import goistreamtoolredux.algorithm.LobbyTimer; import javafx.application.Platform; import javafx.event.ActionEvent; import javafx.fxml.FXML; @@ -76,13 +76,13 @@ public class TimerPane { @FXML void lobbyPauseClicked(MouseEvent event) { - LobbyTimer.getInstance().pause(); + AppTimer.getInstance().pause(); } @FXML void lobbyPlayClicked(MouseEvent event) { try { - LobbyTimer.getInstance().start(); + AppTimer.getInstance().start(); } catch (IOException exception) { exception.printStackTrace(); //todo handle @@ -95,7 +95,7 @@ void lobbyPlayClicked(MouseEvent event) { @FXML void lobbyRestartClicked(MouseEvent event) { try { - LobbyTimer.getInstance().restart(); + AppTimer.getInstance().restart(); } catch (IOException exception) { exception.printStackTrace(); //todo handle @@ -109,7 +109,7 @@ void lobbyRestartClicked(MouseEvent event) { @FXML void lobbyStopClicked(MouseEvent event) { try { - LobbyTimer.getInstance().stop(); + AppTimer.getInstance().stop(); lobbyTimerText.setText("0"); } catch (IOException exception) { exception.printStackTrace(); @@ -136,7 +136,7 @@ void initialize() { //get initial lobby timer length try { - lobbyTimerText.setText(String.valueOf(LobbyTimer.getInstance().get())); + lobbyTimerText.setText(String.valueOf(AppTimer.getInstance().get())); } catch (FileNotFoundException exception) { //if file is not found - then there is no current timer, so the default '00:00' is what we want // so no changes need to be made @@ -217,7 +217,7 @@ public void save(ActionEvent actionEvent) { anchorPane.requestFocus(); //pulls focus away from spinners - allowing them to update their values JFXSnackbar bar = new JFXSnackbar(anchorPane); try { - LobbyTimer.getInstance().setInitialTimerLength(timerOneSpinner.getValue()); + AppTimer.getInstance().setInitialTimerLength(timerOneSpinner.getValue()); prefs.putInt(TIMER_ONE_LENGTH, timerOneSpinner.getValue()); prefs.putInt(TIMER_TWO_LENGTH, timerTwoSpinner.getValue()); bar.enqueue(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout("Saving Timers"),new Duration(1000))); diff --git a/src/test/java/goistreamtoolredux/AlgorithmTest.java b/src/test/java/goistreamtoolredux/AlgorithmTest.java index c6730dc..f6a53bd 100644 --- a/src/test/java/goistreamtoolredux/AlgorithmTest.java +++ b/src/test/java/goistreamtoolredux/AlgorithmTest.java @@ -2,7 +2,7 @@ import goistreamtoolredux.algorithm.FileManager; import goistreamtoolredux.algorithm.InvalidDataException; -import goistreamtoolredux.algorithm.LobbyTimer; +import goistreamtoolredux.algorithm.AppTimer; import goistreamtoolredux.algorithm.Team; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -25,16 +25,16 @@ public class AlgorithmTest { @Test public void settingAndGettingInitialTimerTest() throws IOException, InvalidDataException { - LobbyTimer lobbyTimer = LobbyTimer.getInstance(); + AppTimer appTimer = AppTimer.getInstance(); //10 - lobbyTimer.setInitialTimerLength(10); - assertEquals(10, lobbyTimer.getInitialTimerLength()); + appTimer.setInitialTimerLength(10); + assertEquals(10, appTimer.getInitialTimerLength()); //120 - lobbyTimer.setInitialTimerLength(120); - assertEquals(120, lobbyTimer.getInitialTimerLength()); + appTimer.setInitialTimerLength(120); + assertEquals(120, appTimer.getInitialTimerLength()); Exception exception = assertThrows(NumberFormatException.class, () -> { Integer.parseInt("1a"); @@ -53,7 +53,7 @@ public void exceptionSetInitialTimerInvalidTest() { // due to start calling restart if timer is 0, and restart starting from the initial value (which would be 0) // then calling start Exception exception = assertThrows(IllegalArgumentException.class, () -> { - LobbyTimer.getInstance().setInitialTimerLength(0); + AppTimer.getInstance().setInitialTimerLength(0); }); } @@ -75,20 +75,20 @@ public void readTeamsFromDiskTest() throws IOException { @Test public void convertToMinTest() { - assertEquals("3:20", LobbyTimer.convertToMinuteFormat(200)); - assertEquals("0:59", LobbyTimer.convertToMinuteFormat(59)); - assertEquals("1:00", LobbyTimer.convertToMinuteFormat(60)); - assertEquals("34:12", LobbyTimer.convertToMinuteFormat(2052)); + assertEquals("3:20", AppTimer.convertToMinuteFormat(200)); + assertEquals("0:59", AppTimer.convertToMinuteFormat(59)); + assertEquals("1:00", AppTimer.convertToMinuteFormat(60)); + assertEquals("34:12", AppTimer.convertToMinuteFormat(2052)); } @Test public void convertFromMinTest() { - assertEquals(60, LobbyTimer.convertFromMinuteFormat("01:00")); - assertEquals(60, LobbyTimer.convertFromMinuteFormat("1:00")); - assertEquals(200, LobbyTimer.convertFromMinuteFormat("03:20")); - assertEquals(200, LobbyTimer.convertFromMinuteFormat("3:20")); - assertEquals(0, LobbyTimer.convertFromMinuteFormat("00:00")); - assertEquals(0, LobbyTimer.convertFromMinuteFormat("0:00")); + assertEquals(60, AppTimer.convertFromMinuteFormat("01:00")); + assertEquals(60, AppTimer.convertFromMinuteFormat("1:00")); + assertEquals(200, AppTimer.convertFromMinuteFormat("03:20")); + assertEquals(200, AppTimer.convertFromMinuteFormat("3:20")); + assertEquals(0, AppTimer.convertFromMinuteFormat("00:00")); + assertEquals(0, AppTimer.convertFromMinuteFormat("0:00")); } @Test From 1dd1730cf9f584d6d554a85d343870947f59b3ae Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 12:05:57 -0400 Subject: [PATCH 11/27] update JavaDoc --- docs/javadoc/allclasses-frame.html | 3 +- docs/javadoc/allclasses-noframe.html | 3 +- docs/javadoc/goistreamtoolredux/App.html | 8 +- docs/javadoc/goistreamtoolredux/Main.html | 4 +- .../{CustomTimer.html => AppTimer.html} | 82 ++-- .../algorithm/FileManager.html | 8 +- .../algorithm/InvalidDataException.html | 8 +- .../algorithm/LobbyTimer.html | 405 ------------------ .../goistreamtoolredux/algorithm/Team.html | 8 +- .../goistreamtoolredux/algorithm/Timers.html | 22 +- .../algorithm/package-frame.html | 5 +- .../algorithm/package-summary.html | 28 +- .../algorithm/package-tree.html | 19 +- .../controller/MapPane.html | 4 +- .../goistreamtoolredux/controller/Master.html | 12 +- .../controller/SettingsPane.html | 10 +- .../controller/SplashScreenLoader.html | 8 +- .../controller/TeamPane.html | 8 +- .../controller/TimerPane.html | 8 +- .../controller/TournamentPane.html | 4 +- .../controller/package-frame.html | 2 +- .../controller/package-summary.html | 18 +- .../controller/package-tree.html | 18 +- .../goistreamtoolredux/package-frame.html | 2 +- .../goistreamtoolredux/package-summary.html | 8 +- .../goistreamtoolredux/package-tree.html | 8 +- docs/javadoc/index-all.html | 56 +-- docs/javadoc/overview-tree.html | 3 +- docs/javadoc/package-list | 3 + 29 files changed, 163 insertions(+), 612 deletions(-) rename docs/javadoc/goistreamtoolredux/algorithm/{CustomTimer.html => AppTimer.html} (69%) delete mode 100644 docs/javadoc/goistreamtoolredux/algorithm/LobbyTimer.html diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html index 42b027a..e4500b8 100644 --- a/docs/javadoc/allclasses-frame.html +++ b/docs/javadoc/allclasses-frame.html @@ -12,10 +12,9 @@

All Classes

  • App
    • -
  • CustomTimer
    • +
  • AppTimer
  • FileManager
  • InvalidDataException
    • -
  • LobbyTimer
  • Main
  • MapPane
  • Master
    • diff --git a/docs/javadoc/allclasses-noframe.html b/docs/javadoc/allclasses-noframe.html index cb3c7c0..c5bda47 100644 --- a/docs/javadoc/allclasses-noframe.html +++ b/docs/javadoc/allclasses-noframe.html @@ -12,10 +12,9 @@

    All Classes

    • App
      • -
    • CustomTimer
      • +
    • AppTimer
    • FileManager
    • InvalidDataException
      • -
    • LobbyTimer
    • Main
    • MapPane
    • Master
      • diff --git a/docs/javadoc/goistreamtoolredux/App.html b/docs/javadoc/goistreamtoolredux/App.html index d07a9bd..0947652 100644 --- a/docs/javadoc/goistreamtoolredux/App.html +++ b/docs/javadoc/goistreamtoolredux/App.html @@ -48,7 +48,7 @@
      • Frames
        • @@ -191,7 +191,7 @@

        Method Summary

        Method and Description -static Master +static Master getMasterController()  @@ -298,7 +298,7 @@

        getPrimaryStage

        • getMasterController

          -
          public static Master getMasterController()
          +
          public static Master getMasterController()
        @@ -382,7 +382,7 @@

        showExceptionDialog

        • Frames
          • diff --git a/docs/javadoc/goistreamtoolredux/Main.html b/docs/javadoc/goistreamtoolredux/Main.html index 95ac6b1..097e4eb 100644 --- a/docs/javadoc/goistreamtoolredux/Main.html +++ b/docs/javadoc/goistreamtoolredux/Main.html @@ -47,7 +47,7 @@
          @@ -223,7 +223,7 @@

          main

          diff --git a/docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html b/docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html similarity index 69% rename from docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html rename to docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html index a076746..37005b8 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/CustomTimer.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/AppTimer.html @@ -3,7 +3,7 @@ -CustomTimer (GoIStreamToolRedux 1.0.0 API) +AppTimer (GoIStreamToolRedux 1.0.0 API) @@ -11,7 +11,7 @@ - - - - - -
          - - -
          Skip navigation links
          - - - - -
          -
          - - - -
          - -
          -
          -
            -
          • Summary: 
            • -
          • Nested | 
            • -
          • Field | 
            • -
          • Constr | 
            • -
          • Method
            • -
          - -
          - - -
          - - -
          -
          goistreamtoolredux.algorithm
          -

          Class LobbyTimer

          -
          -
          - -
          -
            -
          • -
            -
            -
            public class LobbyTimer
-extends Timers
            -
            Singleton timer class. - Warning: gets confusing with all the uses of timer as a word, vs the actual JDK Timer class.
            -
            • -
          -
          -
          - -
          -
          -
            -
          • - -
              -
            • - - -

              Field Detail

              - - - -
                -
              • -

                isTimerRunning

                -
                protected boolean isTimerRunning
                -
                • -
              -
              • -
            - -
              -
            • - - -

              Method Detail

              - - - -
                -
              • -

                getCurrentTimer

                -
                public java.util.Timer getCurrentTimer()
                -
                • -
              - - - -
                -
              • -

                getInstance

                -
                public static LobbyTimer getInstance()
                -
                • -
              - - - - - - - -
                -
              • -

                stop

                -
                public void stop()
-          throws java.lang.NullPointerException,
-                 java.io.IOException
                -
                Completely stops and cancels the timer. NOT EQUIVALENT TO A PAUSE. - Starting after this state will restart the timer.
                -
                -
                Throws:
                -
                java.lang.NullPointerException - there is no current timer or TimerTask running
                -
                java.io.IOException - if I/O error is encountered when writing to Timer.txt
                -
                See Also:
                -
                start(), -pause(), -restart()
                -
                -
                • -
              - - - -
                -
              • -

                pause

                -
                public void pause()
                -
                Pauses the current timer state. Starting from this after this state will - continue the timer from where the timer left off. - Does nothing if there is no active timer
                -
                -
                See Also:
                -
                start(), -stop(), -restart()
                -
                -
                • -
              - - - - -
              • -
            -
            • -
          -
          -
          - - -
          - - -
          Skip navigation links
          - - - - -
          -
          - - - -
          - -
          -
          -
            -
          • Summary: 
            • -
          • Nested | 
            • -
          • Field | 
            • -
          • Constr | 
            • -
          • Method
            • -
          - -
          - - -
          - - - diff --git a/docs/javadoc/goistreamtoolredux/algorithm/Team.html b/docs/javadoc/goistreamtoolredux/algorithm/Team.html index 6abf945..6b9ea8e 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/Team.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/Team.html @@ -47,8 +47,8 @@
        • Frames
          • @@ -334,8 +334,8 @@

          compareTo

        • Frames
          • diff --git a/docs/javadoc/goistreamtoolredux/algorithm/Timers.html b/docs/javadoc/goistreamtoolredux/algorithm/Timers.html index 9ea66ab..1509fbe 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/Timers.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/Timers.html @@ -47,7 +47,7 @@
          @@ -107,7 +107,7 @@

          Class Timers

        • Direct Known Subclasses:
          -
          CustomTimer, LobbyTimer
          +
          AppTimer

          @@ -263,10 +263,7 @@

          setInitialTimerTwoLength

          • getInitialTimerLength

            -
            public int getInitialTimerLength()
-                          throws java.io.IOException,
-                                 java.util.NoSuchElementException,
-                                 InvalidDataException
            +
            public int getInitialTimerLength()
            Gets the total length of the timer. Not to be confused with the current length, this value is where the timer will go to when restarting or starting after a stop. @@ -274,10 +271,6 @@

            getInitialTimerLength

            Returns:
            timer length in seconds
            -
            Throws:
            -
            java.io.IOException
            -
            java.util.NoSuchElementException - TimerLength.txt contains an unexpected character.
            -
            InvalidDataException
            See Also:
            setInitialTimerLength(int)
            @@ -307,17 +300,14 @@

            set

          • get

            public int get()
-        throws java.io.IOException,
-               InvalidDataException
            + throws java.io.IOException
            Gets the current value of the timer. - If the timer file is empty or invalid, the file will be fixed, - and the default length (TimerLength.txt will be returned)
            + If the timer file is empty or invalid, the default timer will be retrieved
        Returns:
        time left in seconds.
        Throws:
        java.io.FileNotFoundException - timer.txt cannot be found
        -
        InvalidDataException - incorrect values in TimerLength.txt
        java.io.IOException
        @@ -380,7 +370,7 @@

        convertFromMinuteFormat

        diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html b/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html index f065146..2e4aff3 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/package-frame.html @@ -8,13 +8,12 @@ -

        goistreamtoolredux.algorithm

        +

        goistreamtoolredux.algorithm

        Classes

        diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html index f0f9153..c1194f4 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html @@ -41,8 +41,8 @@
        • Frames
          • diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html b/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html index e06de41..82c3304 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/package-tree.html @@ -41,8 +41,8 @@
        • Frames
          • @@ -79,21 +79,20 @@

          Class Hierarchy

          • java.lang.Object
              -
            • goistreamtoolredux.algorithm.FileManager
              • -
            • goistreamtoolredux.algorithm.Team (implements java.lang.Comparable<T>)
              • +
            • goistreamtoolredux.algorithm.FileManager
              • +
            • goistreamtoolredux.algorithm.Team (implements java.lang.Comparable<T>)
            • java.lang.Throwable (implements java.io.Serializable)
              • -
            • goistreamtoolredux.algorithm.Timers +
            • goistreamtoolredux.algorithm.Timers
            @@ -120,8 +119,8 @@

            Class Hierarchy

        • Frames
          • diff --git a/docs/javadoc/goistreamtoolredux/controller/MapPane.html b/docs/javadoc/goistreamtoolredux/controller/MapPane.html index 1c5fd01..7d012e0 100644 --- a/docs/javadoc/goistreamtoolredux/controller/MapPane.html +++ b/docs/javadoc/goistreamtoolredux/controller/MapPane.html @@ -48,7 +48,7 @@
          • Frames
            • @@ -260,7 +260,7 @@

            save

            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/Master.html b/docs/javadoc/goistreamtoolredux/controller/Master.html index f4c1925..667d4e7 100644 --- a/docs/javadoc/goistreamtoolredux/controller/Master.html +++ b/docs/javadoc/goistreamtoolredux/controller/Master.html @@ -47,8 +47,8 @@
            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html b/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html index 14ad453..07ac61c 100644 --- a/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html +++ b/docs/javadoc/goistreamtoolredux/controller/SettingsPane.html @@ -47,8 +47,8 @@
            • Frames
              • @@ -197,7 +197,7 @@

              Method Detail

              resetPreferencesAction

              public void resetPreferencesAction(javafx.event.ActionEvent actionEvent)
              Prompts the user if they would like to reset preferences. - Calls FileManager.resetPreferences() if the user selects 'OK'. + Calls FileManager.resetPreferences() if the user selects 'OK'. Will prompt user to restart app afterwards.
              Parameters:
              @@ -232,8 +232,8 @@

              resetPreferencesAction

            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html b/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html index 732d458..ead99be 100644 --- a/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html +++ b/docs/javadoc/goistreamtoolredux/controller/SplashScreenLoader.html @@ -47,8 +47,8 @@
            • Frames
              • @@ -321,8 +321,8 @@

              handleApplicationNotification

            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/TeamPane.html b/docs/javadoc/goistreamtoolredux/controller/TeamPane.html index 3538e5a..5de5c64 100644 --- a/docs/javadoc/goistreamtoolredux/controller/TeamPane.html +++ b/docs/javadoc/goistreamtoolredux/controller/TeamPane.html @@ -47,8 +47,8 @@
            • Frames
              • @@ -259,8 +259,8 @@

              save

            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/TimerPane.html b/docs/javadoc/goistreamtoolredux/controller/TimerPane.html index 4103f14..723b0d3 100644 --- a/docs/javadoc/goistreamtoolredux/controller/TimerPane.html +++ b/docs/javadoc/goistreamtoolredux/controller/TimerPane.html @@ -47,8 +47,8 @@
            • Frames
              • @@ -255,8 +255,8 @@

              save

            • Frames
              • diff --git a/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html b/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html index 0a98792..9147685 100644 --- a/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html +++ b/docs/javadoc/goistreamtoolredux/controller/TournamentPane.html @@ -41,7 +41,7 @@
              @@ -189,7 +189,7 @@

              TournamentPane

              diff --git a/docs/javadoc/goistreamtoolredux/controller/package-frame.html b/docs/javadoc/goistreamtoolredux/controller/package-frame.html index bb8ffc3..58831f6 100644 --- a/docs/javadoc/goistreamtoolredux/controller/package-frame.html +++ b/docs/javadoc/goistreamtoolredux/controller/package-frame.html @@ -8,7 +8,7 @@ -

              goistreamtoolredux.controller

              +

              goistreamtoolredux.controller

              Classes

                diff --git a/docs/javadoc/goistreamtoolredux/controller/package-summary.html b/docs/javadoc/goistreamtoolredux/controller/package-summary.html index 795a68c..a2d5034 100644 --- a/docs/javadoc/goistreamtoolredux/controller/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/controller/package-summary.html @@ -41,7 +41,7 @@
              @@ -118,7 +118,7 @@

              Class Hierarchy

                diff --git a/docs/javadoc/goistreamtoolredux/package-frame.html b/docs/javadoc/goistreamtoolredux/package-frame.html index baca5cb..9942d08 100644 --- a/docs/javadoc/goistreamtoolredux/package-frame.html +++ b/docs/javadoc/goistreamtoolredux/package-frame.html @@ -8,7 +8,7 @@ -

                goistreamtoolredux

                +

                goistreamtoolredux

                Classes

                  diff --git a/docs/javadoc/goistreamtoolredux/package-summary.html b/docs/javadoc/goistreamtoolredux/package-summary.html index 99afe5c..4fc17d4 100644 --- a/docs/javadoc/goistreamtoolredux/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/package-summary.html @@ -42,7 +42,7 @@
                  • Frames
                    • @@ -81,11 +81,11 @@

                    Package goistreamtoolredux

                    -App +App   -Main +Main   @@ -114,7 +114,7 @@

                    Package goistreamtoolredux

                    • Frames
                      • diff --git a/docs/javadoc/goistreamtoolredux/package-tree.html b/docs/javadoc/goistreamtoolredux/package-tree.html index cf33123..cdd8779 100644 --- a/docs/javadoc/goistreamtoolredux/package-tree.html +++ b/docs/javadoc/goistreamtoolredux/package-tree.html @@ -42,7 +42,7 @@
                      • Frames
                        • @@ -81,10 +81,10 @@

                        Class Hierarchy

                        • javafx.application.Application
                            -
                          • goistreamtoolredux.App
                            • +
                          • goistreamtoolredux.App
                          • -
                        • goistreamtoolredux.Main
                          • +
                        • goistreamtoolredux.Main
                      @@ -110,7 +110,7 @@

                      Class Hierarchy

                      • Frames
                        • diff --git a/docs/javadoc/index-all.html b/docs/javadoc/index-all.html index 76553f5..f803a60 100644 --- a/docs/javadoc/index-all.html +++ b/docs/javadoc/index-all.html @@ -67,7 +67,7 @@
                      -
                      A C F G H I K L M N O P R S T V  +
                      A C F G H I K M N O P R S T V 

                      A

                      @@ -90,6 +90,10 @@

                      A

                       
                      App() - Constructor for class goistreamtoolredux.App
                       
                      +
                      AppTimer - Class in goistreamtoolredux.algorithm
                      +
                      +
                      Singleton timer class.
                      +
                      @@ -120,8 +124,6 @@

                      C

                      createScene() - Method in class goistreamtoolredux.controller.SplashScreenLoader
                       
                      -
                      CustomTimer - Class in goistreamtoolredux.algorithm
                      -
                       
                      @@ -156,9 +158,7 @@

                      G

                      Loads all teams in from the input/teams.txt file
                      -
                      getCurrentTimer() - Method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                       
                      -
                      getCurrentTimer() - Method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      getCurrentTimer() - Method in class goistreamtoolredux.algorithm.AppTimer
                       
                      getDefaultInputPath() - Static method in class goistreamtoolredux.algorithm.FileManager
                      @@ -176,9 +176,7 @@

                      G

                      Gets the currently set application input folder path.
                      -
                      getInstance() - Static method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                       
                      -
                      getInstance() - Static method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      getInstance() - Static method in class goistreamtoolredux.algorithm.AppTimer
                       
                      getMasterController() - Static method in class goistreamtoolredux.App
                       
                      @@ -242,9 +240,7 @@

                      I

                      InvalidDataException(String) - Constructor for exception goistreamtoolredux.algorithm.InvalidDataException
                       
                      -
                      isTimerRunning - Variable in class goistreamtoolredux.algorithm.CustomTimer
                      -
                       
                      -
                      isTimerRunning - Variable in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      isTimerRunning - Variable in class goistreamtoolredux.algorithm.AppTimer
                       
                      @@ -258,16 +254,6 @@

                      K

                      the currently active controller for the right side (main) content.
                      - - - -

                      L

                      -
                      -
                      LobbyTimer - Class in goistreamtoolredux.algorithm
                      -
                      -
                      Singleton timer class.
                      -
                      -
                      @@ -315,11 +301,7 @@

                      O

                      P

                      -
                      pause() - Method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                      -
                      Pauses the current timer state.
                      -
                      -
                      pause() - Method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      pause() - Method in class goistreamtoolredux.algorithm.AppTimer
                      Pauses the current timer state.
                      @@ -351,11 +333,7 @@

                      R

                      Prompts the user if they would like to reset preferences.
                      -
                      restart() - Method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                      -
                      Resets the timer back to beginning value and starts it again
                      -
                      -
                      restart() - Method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      restart() - Method in class goistreamtoolredux.algorithm.AppTimer
                      Resets the timer back to beginning value and starts it again
                      @@ -427,11 +405,7 @@

                      S

                       
                      SplashScreenLoader() - Constructor for class goistreamtoolredux.controller.SplashScreenLoader
                       
                      -
                      start() - Method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                      -
                      Start the timer (initial or after a pause)
                      -
                      -
                      start() - Method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      start() - Method in class goistreamtoolredux.algorithm.AppTimer
                      Start the timer (initial or after a pause)
                      @@ -439,11 +413,7 @@

                      S

                       
                      start(Stage) - Method in class goistreamtoolredux.controller.SplashScreenLoader
                       
                      -
                      stop() - Method in class goistreamtoolredux.algorithm.CustomTimer
                      -
                      -
                      Completely stops and cancels the timer.
                      -
                      -
                      stop() - Method in class goistreamtoolredux.algorithm.LobbyTimer
                      +
                      stop() - Method in class goistreamtoolredux.algorithm.AppTimer
                      Completely stops and cancels the timer.
                      @@ -494,7 +464,7 @@

                      V

                      version - Static variable in class goistreamtoolredux.App
                       
                      -A C F G H I K L M N O P R S T V 
                      +A C F G H I K M N O P R S T V 
                      diff --git a/docs/javadoc/overview-tree.html b/docs/javadoc/overview-tree.html index aa7fe96..4224ee6 100644 --- a/docs/javadoc/overview-tree.html +++ b/docs/javadoc/overview-tree.html @@ -110,8 +110,7 @@

                      Class Hierarchy

                    • goistreamtoolredux.controller.TimerPane
                    • goistreamtoolredux.algorithm.Timers
                    • goistreamtoolredux.controller.TournamentPane
                      • diff --git a/docs/javadoc/package-list b/docs/javadoc/package-list index e69de29..8fc3246 100644 --- a/docs/javadoc/package-list +++ b/docs/javadoc/package-list @@ -0,0 +1,3 @@ +goistreamtoolredux +goistreamtoolredux.algorithm +goistreamtoolredux.controller From a43c37a61188aa687098d5f0a7d04abd067e5baf Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 12:45:00 -0400 Subject: [PATCH 12/27] move timer to System Clock based approach, #12 --- .../algorithm/AppTimer.java | 36 ++++++++++++++----- .../goistreamtoolredux/algorithm/Timers.java | 2 +- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java index f7be553..901c12d 100644 --- a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java @@ -21,10 +21,18 @@ public class AppTimer extends Timers { private static AppTimer singleton = new AppTimer(); private Timer currentTimer; protected boolean isTimerRunning = false; + private long startTime; + private int currentTimerStartLength; public Timer getCurrentTimer() { return currentTimer; } + public long getStartTime() { + return startTime; + } + public int getCurrentTimerStartLength() { + return currentTimerStartLength; + } private AppTimer() {} @@ -48,6 +56,14 @@ public void start() throws IOException, NoSuchElementException, InvalidDataExcep restart(); } else { //otherwise, resume from last position by starting goistreamtoolredux.algorithm.CountdownTimer task isTimerRunning = true; + + //set start time/date + startTime = System.currentTimeMillis(); + + //set length this timer will use + currentTimerStartLength = getInitialTimerLength(); + + //set up and start TimerTask currentTimer = new Timer(); TimerTask task = new CountdownTimer(); currentTimer.schedule(task,0, 1000); @@ -121,21 +137,17 @@ public void restart() throws IOException, InvalidDataException { /** * Begins countdown from current value in the Timer.txt file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system. - * @implNote Be careful with scheduling this function too fast/often, it doesn't implement any - * file locks and is not atomic as of the current version. * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks */ class CountdownTimer extends TimerTask { public void run() { - /*todo, implement lock*/ - AppTimer timer = AppTimer.getInstance(); try { - int currentTime = timer.get(); - if (currentTime <= 0) { + int currentFileTime = timer.get(); + if (currentFileTime <= 0) { //timer has reached 0 System.out.println("Timer Finished!\n>"); AppTimer.getInstance().isTimerRunning = false; timer.getCurrentTimer().cancel(); @@ -144,10 +156,16 @@ public void run() { Writer fileWriter = new FileWriter(FileManager.outputPath + "Timer.txt"); fileWriter.write(Preferences.userRoot().node("/goistreamtoolredux/algorithm").get("timer_end_text","0:00")); fileWriter.close(); - } else { - timer.set(currentTime - 1); + } else { //timer still has more to count + + //get new time for timer + long elapsedSinceStartMilli = System.currentTimeMillis() - timer.getStartTime(); + // timerLength - timeSinceStart + long foo = timer.getCurrentTimerStartLength() - (elapsedSinceStartMilli/1000); + + timer.set(Math.toIntExact(foo)); //todo catch ArithmeticException TimerPane timerPaneController = (TimerPane) App.getMasterController().getTimerPaneController(); - timerPaneController.setLobbyTimerText(String.valueOf(currentTime - 1)); + timerPaneController.setLobbyTimerText(String.valueOf(foo)); } } catch (FileNotFoundException exception) { exception.printStackTrace(); diff --git a/src/main/java/goistreamtoolredux/algorithm/Timers.java b/src/main/java/goistreamtoolredux/algorithm/Timers.java index f173455..8d50edc 100644 --- a/src/main/java/goistreamtoolredux/algorithm/Timers.java +++ b/src/main/java/goistreamtoolredux/algorithm/Timers.java @@ -70,7 +70,7 @@ public void set(int seconds) throws IOException { } /** - * Gets the current value of the timer. + * Gets the current value of timer.txt. * If the timer file is empty or invalid, the default timer will be retrieved * * @return time left in seconds. From fe0eeaafe07adb9e39cb68558e825a6722b69a18 Mon Sep 17 00:00:00 2001 From: RVRX Date: Sun, 18 Jul 2021 12:54:18 -0400 Subject: [PATCH 13/27] remove another broken catch --- src/main/java/goistreamtoolredux/controller/TimerPane.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/TimerPane.java b/src/main/java/goistreamtoolredux/controller/TimerPane.java index 534ce29..c380e90 100644 --- a/src/main/java/goistreamtoolredux/controller/TimerPane.java +++ b/src/main/java/goistreamtoolredux/controller/TimerPane.java @@ -149,9 +149,6 @@ void initialize() { e.printStackTrace(); //todo, handle failed file creation } - } catch (InvalidDataException invalidDataException) { - invalidDataException.printStackTrace(); - //todo handle } catch (IOException exception) { exception.printStackTrace(); //todo handle From 751ed2cd108b44dd6640482a365b3a2354c2f7b5 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 01:19:32 -0400 Subject: [PATCH 14/27] add cmd+W/Ctrl+W clear teams, #86 --- .../algorithm/FileManager.java | 32 +++++ .../goistreamtoolredux/controller/Master.java | 20 +++ .../controller/TeamPane.java | 121 +++++++++++++----- 3 files changed, 142 insertions(+), 31 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/FileManager.java b/src/main/java/goistreamtoolredux/algorithm/FileManager.java index 2144baf..e2430e5 100644 --- a/src/main/java/goistreamtoolredux/algorithm/FileManager.java +++ b/src/main/java/goistreamtoolredux/algorithm/FileManager.java @@ -948,4 +948,36 @@ public static void refreshPreferences() { inputPath = getInputPath(); outputPath = getOutputPath(); } + + /** + * Remove the currently set team from given team letter/identifier. + * Cancels out the actions done by {@link #setTeam(String, String)} + * @param teamIdentifier Value to identify team. Must be a valid character for filesystem + */ + public static void removeTeam(String teamIdentifier) throws IOException { + /*--- Update TXTs ---*/ + + //get file names + String teamTXT = "Team" + teamIdentifier + ".txt"; + String teamShortTXT = "TeamShort" + teamIdentifier + ".txt"; + + //update output file "TeamShortX.txt" + Writer fileWriter2 = new FileWriter(outputPath + teamShortTXT); //TeamShortX.txt + fileWriter2.write(""); //write shortName to file + fileWriter2.close(); + System.out.println(teamShortTXT + " updated."); + + //update output file "TeamX.txt" + Writer fileWriter = new FileWriter(outputPath + teamTXT); //TeamX.txt + fileWriter.write(""); + fileWriter.close(); + System.out.println(teamTXT + " updated."); + + + /*--- Remove Image ---*/ + File outputTeamLogo = new File(outputPath + "Team" + teamIdentifier + ".png"); + if (outputTeamLogo.exists()) { + outputTeamLogo.delete(); + } + } } \ No newline at end of file diff --git a/src/main/java/goistreamtoolredux/controller/Master.java b/src/main/java/goistreamtoolredux/controller/Master.java index 0ae9c25..bdda329 100644 --- a/src/main/java/goistreamtoolredux/controller/Master.java +++ b/src/main/java/goistreamtoolredux/controller/Master.java @@ -102,6 +102,26 @@ public void keyListener(KeyEvent keyEvent) { break; } } + else if ((keyEvent.isMetaDown() && keyEvent.getText().equalsIgnoreCase("w")) || (keyEvent.isControlDown() && keyEvent.getText().equalsIgnoreCase("w"))) { + switch (currentPage) { + case "/goistreamtoolredux/fxml/TeamPane.fxml": + //save team content + teamPaneController.clear(); + break; + case "/goistreamtoolredux/fxml/MapPane.fxml": + mapPaneController.save(); + break; + case "/goistreamtoolredux/fxml/TournamentPane.fxml": + tournamentPaneController.saveChanges(null); + break; + case "/goistreamtoolredux/fxml/SettingsPane.fxml": + settingsPaneController.save(); + break; + case "/goistreamtoolredux/fxml/TimerPane.fxml": + timerPaneController.save(null); + break; + } + } } @FXML diff --git a/src/main/java/goistreamtoolredux/controller/TeamPane.java b/src/main/java/goistreamtoolredux/controller/TeamPane.java index 028793e..1b71848 100644 --- a/src/main/java/goistreamtoolredux/controller/TeamPane.java +++ b/src/main/java/goistreamtoolredux/controller/TeamPane.java @@ -113,72 +113,116 @@ private void setTeamIfNotNull(Team aTeam, String letter) { exception.printStackTrace(); //todo, handle } - } else System.out.println("null team"); + } else { + //remove content + try { + FileManager.removeTeam(letter); + } catch (IOException exception) { + //todo, handle + exception.printStackTrace(); + } + } } @FXML void selectTeamA(ActionEvent event) { selectedATeam = teamAComboBox.getSelectionModel().getSelectedItem(); - //update UI image - if (selectedATeam.getTeamLogo() == null) { //if there isn't an image - //delete image + + if (selectedATeam == null) { //comboBox selection has been cleared + //remove image and text from UI teamAImage.setImage(null); + teamALabel.setText(null); + } else { - //update image - teamAImage.setImage(new Image(selectedATeam.getTeamLogo().toUri().toString())); + //update UI image + if (selectedATeam.getTeamLogo() == null) { //if there isn't an image + //delete image + teamAImage.setImage(null); + } else { + //update image + teamAImage.setImage(new Image(selectedATeam.getTeamLogo().toUri().toString())); + } + + //update label + teamALabel.setText(selectedATeam.getAbbreviatedName()); } - //update label - teamALabel.setText(selectedATeam.getAbbreviatedName()); } @FXML void selectTeamB(ActionEvent event) { selectedBTeam = teamBComboBox.getSelectionModel().getSelectedItem(); - //update UI image - if (selectedBTeam.getTeamLogo() == null) { //if there isn't an image - //delete image + + if (selectedBTeam == null) { //comboBox selection has been cleared + //remove image and text from UI teamBImage.setImage(null); + teamBLabel.setText(null); + } else { - //update image - teamBImage.setImage(new Image(selectedBTeam.getTeamLogo().toUri().toString())); - } + //update UI image + if (selectedBTeam.getTeamLogo() == null) { //if there isn't an image + //delete image + teamBImage.setImage(null); + } else { + //update image + teamBImage.setImage(new Image(selectedBTeam.getTeamLogo().toUri().toString())); + } - //update label - teamBLabel.setText(selectedBTeam.getAbbreviatedName()); + //update label + teamBLabel.setText(selectedBTeam.getAbbreviatedName()); + } } @FXML void selectTeamC(ActionEvent event) { selectedCTeam = teamCComboBox.getSelectionModel().getSelectedItem(); - //update UI image - if (selectedCTeam.getTeamLogo() == null) { //if there isn't an image - //delete image + + if (selectedCTeam == null) { //comboBox selection has been cleared + //remove image and text from UI teamCImage.setImage(null); + teamCLabel.setText(null); + } else { - //update image - teamCImage.setImage(new Image(selectedCTeam.getTeamLogo().toUri().toString())); + + //update UI image + if (selectedCTeam.getTeamLogo() == null) { //if there isn't an image + //delete image + teamCImage.setImage(null); + } else { + //update image + teamCImage.setImage(new Image(selectedCTeam.getTeamLogo().toUri().toString())); + } + + //update label + teamCLabel.setText(selectedCTeam.getAbbreviatedName()); } - //update label - teamCLabel.setText(selectedCTeam.getAbbreviatedName()); } @FXML void selectTeamD(ActionEvent event) { selectedDTeam = teamDComboBox.getSelectionModel().getSelectedItem(); - //update UI image - if (selectedDTeam.getTeamLogo() == null) { //if there isn't an image - //delete image + + if (selectedDTeam == null) { //comboBox selection has been cleared + //remove image and text from UI teamDImage.setImage(null); + teamDLabel.setText(null); + } else { - //update image - teamDImage.setImage(new Image(selectedDTeam.getTeamLogo().toUri().toString())); - } - //update label - teamDLabel.setText(selectedDTeam.getAbbreviatedName()); + //update UI image + if (selectedDTeam.getTeamLogo() == null) { //if there isn't an image + //delete image + teamDImage.setImage(null); + } else { + //update image + teamDImage.setImage(new Image(selectedDTeam.getTeamLogo().toUri().toString())); + } + + //update label + teamDLabel.setText(selectedDTeam.getAbbreviatedName()); + } } @FXML @@ -326,4 +370,19 @@ public Team fromString(String string) { } }); } + + /** + * Clears the currently selected data, and empties the associated files. + */ + public void clear() { + + //clear UI + teamAComboBox.getSelectionModel().clearSelection(); //change is heard by FXML! + teamBComboBox.getSelectionModel().clearSelection(); + teamCComboBox.getSelectionModel().clearSelection(); + teamDComboBox.getSelectionModel().clearSelection(); + + //clear files + save(); + } } From 6c009f28bcbc1bf82e4353a8892869b1a89a73f9 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 01:35:41 -0400 Subject: [PATCH 15/27] add clear map feature, #86 --- .../algorithm/FileManager.java | 22 +++++++++++++++++- .../controller/MapPane.java | 23 +++++++++++++++++++ .../goistreamtoolredux/controller/Master.java | 2 +- 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/FileManager.java b/src/main/java/goistreamtoolredux/algorithm/FileManager.java index e2430e5..59db7da 100644 --- a/src/main/java/goistreamtoolredux/algorithm/FileManager.java +++ b/src/main/java/goistreamtoolredux/algorithm/FileManager.java @@ -951,7 +951,9 @@ public static void refreshPreferences() { /** * Remove the currently set team from given team letter/identifier. - * Cancels out the actions done by {@link #setTeam(String, String)} + * Cancels out the actions done by {@link #setTeam(String, String)}. + * + * @throws IOException if files (Team.txt and TeamShort.txt) couldn't be written to * @param teamIdentifier Value to identify team. Must be a valid character for filesystem */ public static void removeTeam(String teamIdentifier) throws IOException { @@ -980,4 +982,22 @@ public static void removeTeam(String teamIdentifier) throws IOException { outputTeamLogo.delete(); } } + + /** + * Remove the map image and name. + * Intended to cancel out all actions taken by {@link #setMap(String)}. + * + * @throws IOException if Map.txt couldn't be written to + */ + public static void removeMap() throws IOException { + //remove Map.png + File outputTeamLogo = new File(outputPath + "Map.png"); + if (outputTeamLogo.exists()) { + outputTeamLogo.delete(); + } + //remove text contents + Writer fileWriter = new FileWriter(outputPath + "Map.txt"); //TeamX.txt + fileWriter.write(""); + fileWriter.close(); + } } \ No newline at end of file diff --git a/src/main/java/goistreamtoolredux/controller/MapPane.java b/src/main/java/goistreamtoolredux/controller/MapPane.java index f6723ec..8b984ff 100644 --- a/src/main/java/goistreamtoolredux/controller/MapPane.java +++ b/src/main/java/goistreamtoolredux/controller/MapPane.java @@ -61,6 +61,8 @@ void selectMap(ActionEvent event) { mapFile = new File(FileManager.inputPath + "map_images" + File.separator + selectedMap + ".png"); } mapImage.setImage(new Image(mapFile.toURI().toString())); + } else { + mapImage.setImage(null); } } @@ -105,6 +107,27 @@ public void save() { JFXSnackbar bar = new JFXSnackbar(anchorPane); bar.enqueue(new JFXSnackbar.SnackbarEvent(new JFXSnackbarLayout("Error Setting Map...",null,null),new Duration(1000))); } + } else { //No map was selected + //Delete Map file + try { + FileManager.removeMap(); + } catch (IOException exception) { + exception.printStackTrace(); + //todo handle + } } } + + /** + * Clears the current map (In UI and filesystem). + */ + public void clear() { + + //Clear UI + mapComboBox.getSelectionModel().clearSelection(); + + //Clear Map File and Map Text + save(); + + } } diff --git a/src/main/java/goistreamtoolredux/controller/Master.java b/src/main/java/goistreamtoolredux/controller/Master.java index bdda329..d800115 100644 --- a/src/main/java/goistreamtoolredux/controller/Master.java +++ b/src/main/java/goistreamtoolredux/controller/Master.java @@ -109,7 +109,7 @@ else if ((keyEvent.isMetaDown() && keyEvent.getText().equalsIgnoreCase("w")) || teamPaneController.clear(); break; case "/goistreamtoolredux/fxml/MapPane.fxml": - mapPaneController.save(); + mapPaneController.clear(); break; case "/goistreamtoolredux/fxml/TournamentPane.fxml": tournamentPaneController.saveChanges(null); From c2c1e23dddf8b3670cc39b60087293db2687f021 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 01:37:14 -0400 Subject: [PATCH 16/27] remove unnecessary saving on cmd+w --- src/main/java/goistreamtoolredux/controller/Master.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/Master.java b/src/main/java/goistreamtoolredux/controller/Master.java index d800115..c3f6ffc 100644 --- a/src/main/java/goistreamtoolredux/controller/Master.java +++ b/src/main/java/goistreamtoolredux/controller/Master.java @@ -111,15 +111,6 @@ else if ((keyEvent.isMetaDown() && keyEvent.getText().equalsIgnoreCase("w")) || case "/goistreamtoolredux/fxml/MapPane.fxml": mapPaneController.clear(); break; - case "/goistreamtoolredux/fxml/TournamentPane.fxml": - tournamentPaneController.saveChanges(null); - break; - case "/goistreamtoolredux/fxml/SettingsPane.fxml": - settingsPaneController.save(); - break; - case "/goistreamtoolredux/fxml/TimerPane.fxml": - timerPaneController.save(null); - break; } } } From 827c83fd49ecf9da9f1587bd60efccfcd75363fb Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 01:46:27 -0400 Subject: [PATCH 17/27] prompt user on clearing team page --- .../controller/TeamPane.java | 32 +++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/TeamPane.java b/src/main/java/goistreamtoolredux/controller/TeamPane.java index 1b71848..d088d51 100644 --- a/src/main/java/goistreamtoolredux/controller/TeamPane.java +++ b/src/main/java/goistreamtoolredux/controller/TeamPane.java @@ -10,6 +10,8 @@ import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.scene.control.Alert; +import javafx.scene.control.ButtonType; import javafx.scene.control.ComboBox; import javafx.scene.control.Label; import javafx.scene.image.Image; @@ -23,6 +25,7 @@ import java.net.URL; import java.util.Collections; import java.util.LinkedList; +import java.util.Optional; import java.util.ResourceBundle; public class TeamPane { @@ -375,14 +378,25 @@ public Team fromString(String string) { * Clears the currently selected data, and empties the associated files. */ public void clear() { - - //clear UI - teamAComboBox.getSelectionModel().clearSelection(); //change is heard by FXML! - teamBComboBox.getSelectionModel().clearSelection(); - teamCComboBox.getSelectionModel().clearSelection(); - teamDComboBox.getSelectionModel().clearSelection(); - - //clear files - save(); + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setTitle("Confirmation Dialog"); + alert.setHeaderText("Output files will be cleared"); + alert.setContentText("This action does not need saving, and will be executed immediately. Are you ok with this?"); + + Optional result = alert.showAndWait(); + if (result.get() == ButtonType.OK){ + // ... user chose OK + + //clear UI + teamAComboBox.getSelectionModel().clearSelection(); //change is heard by FXML! + teamBComboBox.getSelectionModel().clearSelection(); + teamCComboBox.getSelectionModel().clearSelection(); + teamDComboBox.getSelectionModel().clearSelection(); + + //clear files + save(); + } else { + // ... user chose CANCEL or closed the dialog + } } } From 9a1dbfa1d5bae240ea15f1f27a6ae4f8891d131d Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 01:47:56 -0400 Subject: [PATCH 18/27] prompt user on clearing MapPage, fix Team prompt typo --- .../goistreamtoolredux/controller/MapPane.java | 18 ++++++++++++++---- .../controller/TeamPane.java | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/main/java/goistreamtoolredux/controller/MapPane.java b/src/main/java/goistreamtoolredux/controller/MapPane.java index 8b984ff..32609bf 100644 --- a/src/main/java/goistreamtoolredux/controller/MapPane.java +++ b/src/main/java/goistreamtoolredux/controller/MapPane.java @@ -9,6 +9,8 @@ import javafx.collections.ObservableList; import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.scene.control.Alert; +import javafx.scene.control.ButtonType; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.layout.AnchorPane; @@ -20,6 +22,7 @@ import java.net.URL; import java.util.Collections; import java.util.LinkedList; +import java.util.Optional; import java.util.ResourceBundle; public class MapPane { @@ -123,11 +126,18 @@ public void save() { */ public void clear() { - //Clear UI - mapComboBox.getSelectionModel().clearSelection(); + Alert alert = new Alert(Alert.AlertType.CONFIRMATION); + alert.setTitle("Confirmation Dialog"); + alert.setHeaderText("Map files will be cleared"); + alert.setContentText("This action does not need saving, and will be executed immediately. Are you ok with this?"); - //Clear Map File and Map Text - save(); + Optional result = alert.showAndWait(); + if (result.get() == ButtonType.OK){ + //Clear UI + mapComboBox.getSelectionModel().clearSelection(); + //Clear Map File and Map Text + save(); + } } } diff --git a/src/main/java/goistreamtoolredux/controller/TeamPane.java b/src/main/java/goistreamtoolredux/controller/TeamPane.java index d088d51..29128b6 100644 --- a/src/main/java/goistreamtoolredux/controller/TeamPane.java +++ b/src/main/java/goistreamtoolredux/controller/TeamPane.java @@ -380,7 +380,7 @@ public Team fromString(String string) { public void clear() { Alert alert = new Alert(Alert.AlertType.CONFIRMATION); alert.setTitle("Confirmation Dialog"); - alert.setHeaderText("Output files will be cleared"); + alert.setHeaderText("Team files will be cleared"); alert.setContentText("This action does not need saving, and will be executed immediately. Are you ok with this?"); Optional result = alert.showAndWait(); From d91278cacaccd3bbee0cb9ef955947f65201d4b9 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 11:51:00 -0400 Subject: [PATCH 19/27] fix timer pane save button alignment --- src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml index 666709c..ddd437e 100644 --- a/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml +++ b/src/main/resources/goistreamtoolredux/fxml/TimerPane.fxml @@ -68,7 +68,7 @@ - + From 052f618c97395ee5986a855a9d6762ceab69d27a Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 11:53:16 -0400 Subject: [PATCH 20/27] add save button to map page, fixes #84 --- .../goistreamtoolredux/fxml/MapPane.fxml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml b/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml index f0080fb..2632965 100644 --- a/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml +++ b/src/main/resources/goistreamtoolredux/fxml/MapPane.fxml @@ -1,5 +1,6 @@ + @@ -44,5 +45,26 @@ + + + + + + + + + + + + + + + + + + + + + From 01ce42238e5980164192f0043f17b5cf09171b39 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 12:00:36 -0400 Subject: [PATCH 21/27] remove resizability, closes 85 --- src/main/java/goistreamtoolredux/App.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/App.java b/src/main/java/goistreamtoolredux/App.java index 0a892ad..34ed533 100644 --- a/src/main/java/goistreamtoolredux/App.java +++ b/src/main/java/goistreamtoolredux/App.java @@ -26,7 +26,7 @@ public class App extends Application { - //current application version. User for update checking + //current application version. Used for update checking public static final String version = "1.0.0"; /**The JavaFX application's primary stage. All Scenes are built upon this stage*/ @@ -68,8 +68,10 @@ public void start(Stage primaryStage) throws IOException { primaryStage.getIcons().addAll(icon32, icon64, icon256); System.out.println("Icons Added"); + //primary stage settings primaryStage.setScene(new Scene(root, 700, 400)); // 600 (page) + 100 (sidebar) by 400 primaryStage.setOpacity(0); + primaryStage.setResizable(false); primaryStage.show(); //manual application delay for setup (allow user to disable), and preloader calls @@ -132,7 +134,7 @@ public static void showExceptionDialog(Exception exception, String headerText, S expContent.add(label, 0, 0); expContent.add(textArea, 0, 1); -// Set expandable Exception into the dialog pane. + // Set expandable Exception into the dialog pane. alert.getDialogPane().setExpandableContent(expContent); System.out.println("posting"); From 849d855ca5bfaad0405d7e47fc432098ce0dfc71 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Mon, 19 Jul 2021 14:06:06 -0400 Subject: [PATCH 22/27] fix resuming implementation, #12 --- .../algorithm/AppTimer.java | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java index 901c12d..58e6000 100644 --- a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java @@ -23,6 +23,7 @@ public class AppTimer extends Timers { protected boolean isTimerRunning = false; private long startTime; private int currentTimerStartLength; + private long timeAtPause = -1; //Positive value indicates the time at paused, -1 indicates timer is not resuming from pause public Timer getCurrentTimer() { return currentTimer; @@ -33,6 +34,9 @@ public long getStartTime() { public int getCurrentTimerStartLength() { return currentTimerStartLength; } + public void setTimeAtPause(long timeAtPause) { + this.timeAtPause = timeAtPause; + } private AppTimer() {} @@ -58,7 +62,15 @@ public void start() throws IOException, NoSuchElementException, InvalidDataExcep isTimerRunning = true; //set start time/date - startTime = System.currentTimeMillis(); + if (timeAtPause < 0) { //new timer, looking to be created + startTime = System.currentTimeMillis(); + } else { //paused timer, looking to resume + //if timer was paused, use a time calculated off of the saved state. + //New start time will be old start time plus the time elapsed between resume and start, + // thereby pushing forward the start time by however long the timer was paused for. + //T_s = T_s + (T_resume - T_pause) + startTime = startTime + (System.currentTimeMillis() - timeAtPause); + } //set length this timer will use currentTimerStartLength = getInitialTimerLength(); @@ -89,6 +101,8 @@ public void stop() throws NullPointerException, IOException { } //set Timer.txt to nothing [will cause start() to restart timer if called next] set(0); + //remove saved state + timeAtPause = -1; } /** @@ -105,6 +119,8 @@ public void pause() { if (currentTimer != null) { currentTimer.cancel(); isTimerRunning = false; + //save state + timeAtPause = System.currentTimeMillis(); } } @@ -116,16 +132,13 @@ public void pause() { */ public void restart() throws IOException, InvalidDataException { //stop timer - if (currentTimer != null) { - currentTimer.cancel(); - isTimerRunning = false; - } + stop(); //write initial timer length to Timer.txt try { set(getInitialTimerLength()); } catch (NoSuchElementException exception) { - App.showExceptionDialog(exception, "Error starting/restarting timer.", "Please go to the settings page and specify a lobby timer length, and save it (Cmd+S), before attempting to start the timer."); + App.showExceptionDialog(exception, "Error starting/restarting timer.", "Please delete your 'Timer.txt' and restart the application. Submit a bug report if the problem persists."); return; } @@ -136,6 +149,7 @@ public void restart() throws IOException, InvalidDataException { } /** + * @// TODO: 7/19/21 UPDATE JAVADOC - HORRIDLY INCORRECT AND OUTDATED * Begins countdown from current value in the Timer.txt file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system. * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks */ @@ -156,6 +170,9 @@ public void run() { Writer fileWriter = new FileWriter(FileManager.outputPath + "Timer.txt"); fileWriter.write(Preferences.userRoot().node("/goistreamtoolredux/algorithm").get("timer_end_text","0:00")); fileWriter.close(); + + //remove saved state + AppTimer.getInstance().setTimeAtPause(-1); } else { //timer still has more to count //get new time for timer From 771a8d58244dcfb718da0b3b99350f3924700aeb Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Tue, 20 Jul 2021 14:56:31 -0400 Subject: [PATCH 23/27] update timer JavaDoc --- .../algorithm/AppTimer.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java index 58e6000..d8b516d 100644 --- a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java @@ -47,9 +47,19 @@ public static AppTimer getInstance() { /** - * Start the timer (initial or after a pause) + * Starts the timer (initial or after a pause), is one is not already running (i.e., {@link #isTimerRunning} is false). + *

                      + * Sets the value of {@link #startTime} to be either: + *

                        + *
                      • If resuming from a pause – time at initial start, plus difference between resume and initial pause + *
                      • If initial start – Current system time. + *
                      + * + *

                      Sets the value of {@link #isTimerRunning} to true before starting the + * * @throws IOException * @throws NoSuchElementException + * * @see #stop() * @see #pause() * @see #restart() @@ -66,7 +76,7 @@ public void start() throws IOException, NoSuchElementException, InvalidDataExcep startTime = System.currentTimeMillis(); } else { //paused timer, looking to resume //if timer was paused, use a time calculated off of the saved state. - //New start time will be old start time plus the time elapsed between resume and start, + //New start time will be old start time plus the time elapsed between resume and pause, // thereby pushing forward the start time by however long the timer was paused for. //T_s = T_s + (T_resume - T_pause) startTime = startTime + (System.currentTimeMillis() - timeAtPause); @@ -149,9 +159,12 @@ public void restart() throws IOException, InvalidDataException { } /** - * @// TODO: 7/19/21 UPDATE JAVADOC - HORRIDLY INCORRECT AND OUTDATED - * Begins countdown from current value in the Timer.txt file. {@link TimerTask} to be scheduled in {@link Timer#schedule(TimerTask, long, long)} for the countdown timer system. - * @implNote Does not use system clock (or at least efficiently. Timer will start to lag behind if more system resources are used or application is active with other tasks + * Begins countdown from current value in the Timer.txt file. + * When timer reaches zero, sets the Timer.txt file to value of {@link Preferences} key "timer_end_text". + * + *

                      Counts down by comparing value of {@link AppTimer#getStartTime()} with {@link System#currentTimeMillis()}, and converting to int via {@link Math#toIntExact(long)} + * + * @implNote This class is a {@link TimerTask} to be scheduled with {@link Timer#schedule(TimerTask, long, long)}. */ class CountdownTimer extends TimerTask { From 12c6005f07c2cb1380b8f5a662a25eb6d2d25f81 Mon Sep 17 00:00:00 2001 From: RVRX Date: Tue, 20 Jul 2021 21:15:48 -0400 Subject: [PATCH 24/27] Fixed bugs mentioned in #12, see comments --- .../algorithm/AppTimer.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java index d8b516d..7f14e1b 100644 --- a/src/main/java/goistreamtoolredux/algorithm/AppTimer.java +++ b/src/main/java/goistreamtoolredux/algorithm/AppTimer.java @@ -74,16 +74,21 @@ public void start() throws IOException, NoSuchElementException, InvalidDataExcep //set start time/date if (timeAtPause < 0) { //new timer, looking to be created startTime = System.currentTimeMillis(); + + //set length this timer will use + currentTimerStartLength = getInitialTimerLength(); } else { //paused timer, looking to resume //if timer was paused, use a time calculated off of the saved state. //New start time will be old start time plus the time elapsed between resume and pause, // thereby pushing forward the start time by however long the timer was paused for. //T_s = T_s + (T_resume - T_pause) startTime = startTime + (System.currentTimeMillis() - timeAtPause); + + //no need to update currentTimerStartLength, as we want to stick with the one that was used before + // pause, so as to not update the length partway through the timer (not good). } - //set length this timer will use - currentTimerStartLength = getInitialTimerLength(); + //set up and start TimerTask currentTimer = new Timer(); @@ -198,9 +203,25 @@ public void run() { timerPaneController.setLobbyTimerText(String.valueOf(foo)); } } catch (FileNotFoundException exception) { + System.err.println("Error encountered in timer task (FileNotFoundException). Reason: '" + exception.getMessage() + "'\nCancelling Timer..."); exception.printStackTrace(); + AppTimer.getInstance().isTimerRunning = false; + AppTimer.getInstance().setTimeAtPause(-1); + timer.getCurrentTimer().cancel(); } catch (IOException exception) { + System.err.println("Error encountered in timer task (IOException). Reason: '" + exception.getMessage() + "'\nCancelling Timer..."); + exception.printStackTrace(); + AppTimer.getInstance().isTimerRunning = false; + AppTimer.getInstance().setTimeAtPause(-1); + timer.getCurrentTimer().cancel(); + } catch (IllegalArgumentException exception) { + //possibly due to timer being set for negative seconds + // timer should be shut off + System.err.println("Error encountered in timer task (IllegalArgumentException). Reason: '" + exception.getMessage() + "'\nCancelling Timer..."); exception.printStackTrace(); + AppTimer.getInstance().isTimerRunning = false; + AppTimer.getInstance().setTimeAtPause(-1); + timer.getCurrentTimer().cancel(); } } } From 0ec85422f526a53d8aa60b90cb1e526889c19117 Mon Sep 17 00:00:00 2001 From: RVRX Date: Tue, 20 Jul 2021 22:15:14 -0400 Subject: [PATCH 25/27] resets timer file on app shutdown, #12 --- src/main/java/goistreamtoolredux/App.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/main/java/goistreamtoolredux/App.java b/src/main/java/goistreamtoolredux/App.java index 61146ee..5899f09 100644 --- a/src/main/java/goistreamtoolredux/App.java +++ b/src/main/java/goistreamtoolredux/App.java @@ -102,6 +102,16 @@ public void stop() { if (AppTimer.getInstance().getCurrentTimer() != null) { AppTimer.getInstance().getCurrentTimer().cancel(); } + + //reset the timer file to better align with application UI behaviour on start + AppTimer timerInstance = AppTimer.getInstance(); + try { + timerInstance.set(timerInstance.getInitialTimerLength()); + } catch (IOException e) { + //app is closing, there is not much that can be done here but just let the app close... + System.err.println("Failed to update timer file on system exit."); + e.printStackTrace(); + } } public static void showExceptionDialog(Exception exception, String headerText, String contentText) { From 4753b5838a378c651dd48767b9d756cff649d89c Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Tue, 20 Jul 2021 22:52:21 -0400 Subject: [PATCH 26/27] run $ updateVersion.lua 1.1.0 --- CURRENTVERSION | 2 +- GoICC Installation Media Creation Script.iss | 2 +- build.gradle | 4 ++-- src/main/java/goistreamtoolredux/App.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CURRENTVERSION b/CURRENTVERSION index afaf360..1cc5f65 100644 --- a/CURRENTVERSION +++ b/CURRENTVERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.1.0 \ No newline at end of file diff --git a/GoICC Installation Media Creation Script.iss b/GoICC Installation Media Creation Script.iss index 2539b16..84687a4 100644 --- a/GoICC Installation Media Creation Script.iss +++ b/GoICC Installation Media Creation Script.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "Guns of Icarus Caster Companion" -#define MyAppVersion "1.0.0" +#define MyAppVersion "1.1.0" #define MyAppPublisher "Cole Manning, RVRX" #define MyAppURL "https://goicc.skyborne.net/" #define MyAppExeName "GoICasterCompanion.exe" diff --git a/build.gradle b/build.gradle index 9f5e282..077e783 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'edu.sc.seis.launch4j' version '2.5.0' } mainClassName = 'goistreamtoolredux.Main' -project.version = '1.0.0' +project.version = '1.1.0' repositories { mavenCentral() @@ -34,7 +34,7 @@ macAppBundle { icon = "app-icon.png" appName = "GoICasterCompanion" volumeName = "GoICC Install" - dmgName = "GoICC v1.0.0" + dmgName = "GoICC v1.1.0" bundleJRE = false // backgroundImage = "doc/macbackground.png" } diff --git a/src/main/java/goistreamtoolredux/App.java b/src/main/java/goistreamtoolredux/App.java index 10b6b8b..e96bb7e 100644 --- a/src/main/java/goistreamtoolredux/App.java +++ b/src/main/java/goistreamtoolredux/App.java @@ -27,7 +27,7 @@ public class App extends Application { //current application version. Used for update checking - public static final String version = "1.0.0"; + public static final String version = "1.1.0"; /**The JavaFX application's primary stage. All Scenes are built upon this stage*/ private static Stage primaryStage; From 66be6897146b01166c142920080c41cc5435bf21 Mon Sep 17 00:00:00 2001 From: Cole Manning // RVRX Date: Tue, 20 Jul 2021 23:40:14 -0400 Subject: [PATCH 27/27] update JavaDoc --- docs/javadoc/allclasses-frame.html | 2 +- docs/javadoc/allclasses-noframe.html | 2 +- docs/javadoc/constant-values.html | 6 +- docs/javadoc/deprecated-list.html | 4 +- docs/javadoc/goistreamtoolredux/App.html | 12 +-- docs/javadoc/goistreamtoolredux/Main.html | 8 +- .../algorithm/AppTimer.html | 85 ++++++++++++++----- .../algorithm/FileManager.html | 82 ++++++++++++++---- .../algorithm/InvalidDataException.html | 12 +-- .../goistreamtoolredux/algorithm/Team.html | 12 +-- .../goistreamtoolredux/algorithm/Timers.html | 14 +-- .../algorithm/package-frame.html | 4 +- .../algorithm/package-summary.html | 22 ++--- .../algorithm/package-tree.html | 22 ++--- .../controller/MapPane.html | 28 ++++-- .../goistreamtoolredux/controller/Master.html | 16 ++-- .../controller/SettingsPane.html | 14 +-- .../controller/SplashScreenLoader.html | 12 +-- .../controller/TeamPane.html | 32 +++++-- .../controller/TimerPane.html | 12 +-- .../controller/TournamentPane.html | 8 +- .../controller/package-frame.html | 4 +- .../controller/package-summary.html | 22 ++--- .../controller/package-tree.html | 22 ++--- .../goistreamtoolredux/package-frame.html | 4 +- .../goistreamtoolredux/package-summary.html | 12 +-- .../goistreamtoolredux/package-tree.html | 12 +-- docs/javadoc/help-doc.html | 4 +- docs/javadoc/index-all.html | 30 ++++++- docs/javadoc/index.html | 2 +- docs/javadoc/overview-frame.html | 2 +- docs/javadoc/overview-summary.html | 6 +- docs/javadoc/overview-tree.html | 4 +- docs/javadoc/serialized-form.html | 4 +- 34 files changed, 342 insertions(+), 195 deletions(-) diff --git a/docs/javadoc/allclasses-frame.html b/docs/javadoc/allclasses-frame.html index e4500b8..dff7793 100644 --- a/docs/javadoc/allclasses-frame.html +++ b/docs/javadoc/allclasses-frame.html @@ -3,7 +3,7 @@ -All Classes (GoIStreamToolRedux 1.0.0 API) +All Classes (GoIStreamToolRedux 1.1.0 API) diff --git a/docs/javadoc/allclasses-noframe.html b/docs/javadoc/allclasses-noframe.html index c5bda47..637be05 100644 --- a/docs/javadoc/allclasses-noframe.html +++ b/docs/javadoc/allclasses-noframe.html @@ -3,7 +3,7 @@ -All Classes (GoIStreamToolRedux 1.0.0 API) +All Classes (GoIStreamToolRedux 1.1.0 API) diff --git a/docs/javadoc/constant-values.html b/docs/javadoc/constant-values.html index 203a88c..1394dae 100644 --- a/docs/javadoc/constant-values.html +++ b/docs/javadoc/constant-values.html @@ -3,7 +3,7 @@ -Constant Field Values (GoIStreamToolRedux 1.0.0 API) +Constant Field Values (GoIStreamToolRedux 1.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,13 +11,13 @@ @@ -11,13 +11,13 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ -

                      goistreamtoolredux.algorithm

                      +

                      goistreamtoolredux.algorithm

                      Classes

                        diff --git a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html index c1194f4..ff0469d 100644 --- a/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/algorithm/package-summary.html @@ -3,7 +3,7 @@ -goistreamtoolredux.algorithm (GoIStreamToolRedux 1.0.0 API) +goistreamtoolredux.algorithm (GoIStreamToolRedux 1.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,13 +11,13 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,13 +11,13 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ -

                        goistreamtoolredux.controller

                        +

                        goistreamtoolredux.controller

                        Classes

                          diff --git a/docs/javadoc/goistreamtoolredux/controller/package-summary.html b/docs/javadoc/goistreamtoolredux/controller/package-summary.html index a2d5034..a5ec681 100644 --- a/docs/javadoc/goistreamtoolredux/controller/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/controller/package-summary.html @@ -3,7 +3,7 @@ -goistreamtoolredux.controller (GoIStreamToolRedux 1.0.0 API) +goistreamtoolredux.controller (GoIStreamToolRedux 1.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ -

                          goistreamtoolredux

                          +

                          goistreamtoolredux

                          Classes

                            diff --git a/docs/javadoc/goistreamtoolredux/package-summary.html b/docs/javadoc/goistreamtoolredux/package-summary.html index 4fc17d4..4718201 100644 --- a/docs/javadoc/goistreamtoolredux/package-summary.html +++ b/docs/javadoc/goistreamtoolredux/package-summary.html @@ -3,7 +3,7 @@ -goistreamtoolredux (GoIStreamToolRedux 1.0.0 API) +goistreamtoolredux (GoIStreamToolRedux 1.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ diff --git a/docs/javadoc/overview-summary.html b/docs/javadoc/overview-summary.html index 5cfc570..34b698d 100644 --- a/docs/javadoc/overview-summary.html +++ b/docs/javadoc/overview-summary.html @@ -3,7 +3,7 @@ -Overview (GoIStreamToolRedux 1.0.0 API) +Overview (GoIStreamToolRedux 1.1.0 API) @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@