From 0bfbcbaf5f8ca13b855c34bb8a2f392793b537be Mon Sep 17 00:00:00 2001 From: carlosuc3m <100329787@alumnos.uc3m.es> Date: Fri, 22 Nov 2024 18:41:01 +0100 Subject: [PATCH] keep improving User Experience --- .../samj/gui/components/ModelDrawerPanel.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/main/java/ai/nets/samj/gui/components/ModelDrawerPanel.java b/src/main/java/ai/nets/samj/gui/components/ModelDrawerPanel.java index 325a52c..09fbe03 100644 --- a/src/main/java/ai/nets/samj/gui/components/ModelDrawerPanel.java +++ b/src/main/java/ai/nets/samj/gui/components/ModelDrawerPanel.java @@ -26,7 +26,9 @@ public class ModelDrawerPanel extends JPanel implements ActionListener { - private JLabel drawerTitle = new JLabel(); + private static final long serialVersionUID = 6708853280844731445L; + + private JLabel drawerTitle = new JLabel(); private JButton install = new JButton("Install"); private JButton uninstall = new JButton("Uninstall"); HTMLPane html = new HTMLPane("Arial", "#000", "#CCCCCC", 200, 200); @@ -35,6 +37,8 @@ public class ModelDrawerPanel extends JPanel implements ActionListener { private ModelDrawerPanelListener listener; private int hSize; private Thread modelInstallThread; + private Thread infoThread; + private Thread installedThread; private static final String MODEL_TITLE = "
%s"; @@ -95,13 +99,14 @@ public void setSelectedModel(SAMModel model) { setInfo(); install.setEnabled(false); uninstall.setEnabled(false); - new Thread(() -> { + installedThread = new Thread(() -> { boolean installed = model.isInstalled(); SwingUtilities.invokeLater(() -> { if (installed) this.uninstall.setEnabled(true); else this.install.setEnabled(true); }); - }).start();; + }); + installedThread.start(); } private void setTitle(String title) { @@ -110,14 +115,17 @@ private void setTitle(String title) { private void setInfo() { html.clear(); - new Thread(() -> { + infoThread =new Thread(() -> { String description = model.getDescription(); SwingUtilities.invokeLater(() -> html.append("p", description)); - }).start(); + }); + infoThread.start(); } @Override public void setVisible(boolean visible) { + if (!visible) + interruptThreads(); super.setVisible(visible); } @@ -163,5 +171,14 @@ public interface ModelDrawerPanelListener { void setGUIEnabled(boolean enabled); } + + private void interruptThreads() { + if (infoThread != null) + this.infoThread.interrupt(); + if (installedThread != null) + this.installedThread.interrupt(); + if (modelInstallThread != null) + this.modelInstallThread.interrupt(); + } }