From 34ff591ec1c59782ab50e7ce81364cd0b5c1e4bb Mon Sep 17 00:00:00 2001
From: joalhelk <joalhelk@jyu.fi>
Date: Thu, 10 Feb 2022 14:38:44 +0200
Subject: [PATCH] close the timer
---
.../java/com/joelhelkala/watcherGui/frames/WelcomePage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/WatcherGui/src/main/java/com/joelhelkala/watcherGui/frames/WelcomePage.java b/WatcherGui/src/main/java/com/joelhelkala/watcherGui/frames/WelcomePage.java
index 5c88b2b..9c4476d 100644
--- a/WatcherGui/src/main/java/com/joelhelkala/watcherGui/frames/WelcomePage.java
+++ b/WatcherGui/src/main/java/com/joelhelkala/watcherGui/frames/WelcomePage.java
@@ -52,6 +52,7 @@ public class WelcomePage implements MouseListener, ActionListener {
private static JFrame frame;
private static JLabel chosen_label;
+ private static final Timer timer = new Timer();
private static NodeDataFrame nodeDataFrame = new NodeDataFrame(leftPanelWidth, topPanelHeight, width-leftPanelWidth, height-topPanelHeight-bottomPanelHeight);
private static NodeSettingsFrame nodeSettingFrame = new NodeSettingsFrame(width-leftPanelWidth, height-topPanelHeight-bottomPanelHeight);
@@ -202,8 +203,6 @@ public class WelcomePage implements MouseListener, ActionListener {
* Polls the backend for new data every given interval
*/
private static void PollData() {
- final Timer timer = new Timer();
-
timer.scheduleAtFixedRate(new TimerTask() {
int timeRemaining = pollInterval;
public void run() {
@@ -300,6 +299,7 @@ public class WelcomePage implements MouseListener, ActionListener {
if(result == JOptionPane.YES_OPTION) {
User.clear();
+ timer.cancel();
frame.dispose();
LoginPage login = new LoginPage();
}
@@ -389,6 +389,7 @@ public class WelcomePage implements MouseListener, ActionListener {
JOptionPane.showConfirmDialog(frame, message, title,
JOptionPane.ERROR_MESSAGE);
User.clear();
+ timer.cancel();
frame.dispose();
LoginPage login = new LoginPage();
}
--
GitLab