Multiple instance events anim develop

GlobalQuakeClient/src/main/java/globalquake/ui/archived/ArchivedQuakeUI.java

@@ -10,7 +10,12 @@
 import java.awt.event.KeyEvent;
 import java.time.Instant;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
 public class ArchivedQuakeUI extends JDialog {
+
+    private boolean animationPanelOpen = false;
 
     public ArchivedQuakeUI(Frame parent, ArchivedQuake quake) {
         super(parent);
@@ -42,7 +47,26 @@ public ArchivedQuakeUI(Frame parent, ArchivedQuake quake) {
         animButton.addActionListener(new AbstractAction() {
             @Override
             public void actionPerformed(ActionEvent actionEvent) {
-                new ArchivedQuakeAnimation(parent, quake).setVisible(true);
+                if (!animationPanelOpen) { // if animation panel is not already open then create new one on event
+                    ArchivedQuakeAnimation animUi = new ArchivedQuakeAnimation(parent, quake);
+                    // set panel to visible
+                    animUi.setVisible(true);
+                    // set class tracking boolean to true because the panel is open
+                    animationPanelOpen = true;
+
+                    //listen for animation window closing
+                    animUi.addWindowListener(new WindowAdapter() {
+                        @Override
+                        public void windowClosing(WindowEvent e) {
+                            // set anim traking boolean to false as pane has now closed
+                            animationPanelOpen = false;
+                        }
+                        public void windowClosed(WindowEvent e) {
+                            // set anim traking boolean to false as pane has now closed
+                            animationPanelOpen = false;
+                        }
+                    });
+                }
             }
         });
 
@@ -72,4 +96,4 @@ public void keyPressed(KeyEvent e) {
         setLocationRelativeTo(parent);
         setResizable(false);
     }
-}
+}

GlobalQuakeClient/src/main/java/globalquake/ui/globalquake/EarthquakeListPanel.java

@@ -21,10 +21,18 @@
 import java.util.Locale;
 import java.util.stream.Collectors;
 
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.UUID;
+
 public class EarthquakeListPanel extends JPanel {
     private double scroll = 0;
     protected int mouseY = -999;
 
+    // Holds the list of currently opened archived quakes
+    private ArrayList<UUID> openedQuakes = new ArrayList<UUID>();
+
     public static final DecimalFormat f1d = new DecimalFormat("0.0", new DecimalFormatSymbols(Locale.ENGLISH));
     private static final int cell_height = 50;
 
@@ -65,6 +73,8 @@ public EarthquakeListPanel(Frame parent, List<ArchivedQuake> archivedQuakes) {
             }
         });
 
+
+
         addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent e) {
@@ -77,15 +87,34 @@ public void mousePressed(MouseEvent e) {
 
                 ArchivedQuake quake = filtered.get(i);
 
+                UUID quakeUuid = quake.getUuid();
+
                 if (quake != null && e.getButton() == MouseEvent.BUTTON3 && !isMouseInGoUpRect) {
                     quake.setWrong(!quake.isWrong());
                 }
 
                 if(e.getButton() == MouseEvent.BUTTON1) {
                     if(isMouseInGoUpRect) {
                         scroll = 0;
-                    }else if (quake != null ) {
-                        new ArchivedQuakeUI(parent, quake).setVisible(true);
+                    }
+                    else if (quake != null && !isOpened(quakeUuid) ) {
+                        // Create Instance of quakeUi panel
+                        ArchivedQuakeUI quakeUi = new ArchivedQuakeUI(parent, quake);
+                        // set the panel to be visible
+                        quakeUi.setVisible(true);
+                        // add the quake to the list of opened panels
+                        openedQuakes.add(quakeUuid);
+
+                        // When quake panel is closed, remove quake from the ArrayList of openedQuakes
+                        quakeUi.addWindowListener(new WindowAdapter() {
+                            @Override
+                            public void windowClosing(WindowEvent e) {
+                                openedQuakes.remove(quakeUuid);
+                            }
+                            public void windowClosed(WindowEvent e) {
+                                openedQuakes.remove(quakeUuid);
+                            }
+                        });
                     }
                 }
 
@@ -109,6 +138,23 @@ public void mouseMoved(MouseEvent e) {
         });
     }
 
+    /**
+     * @author Chris Eberle
+     * @param UUID of an archived quake
+     * @return boolean representing whether a quakepanel is open
+     * 
+     * Compares the inputed id with all id's stored in openedquakes list
+    */
+    private boolean isOpened(UUID id) {
+        // loop through openedquakes
+        for( UUID i: openedQuakes) {
+            if( i == id) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public void paint(Graphics gr) {
         super.paint(gr);
@@ -237,4 +283,4 @@ public void paint(Graphics gr) {
         }
     }
 
-}
+}

README.md

@@ -80,4 +80,4 @@ It's important to review and adhere to these additional licenses when using or d
 
 <a href="https://github.com/xspanger3770/GlobalQuake/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=xspanger3770/GlobalQuake" />
-</a>
+</a>