Changeset 138

Timestamp:

07/29/11 14:33:36 (13 years ago)

Author:

jhall

Message:

Console is unlocked when DlgSequences? is disposed

File:

• trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java (modified) (8 diffs)

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequences.java

@@ -18 +18 @@
 import javax.swing.border.EtchedBorder;
 import javax.swing.JScrollPane;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 public class DlgSequences {
@@ -28 +30 @@
          */
         public static void showDialog() {
+
                 EventQueue.invokeLater(new Runnable() {
                         public void run() {
@@ -50 +53 @@
          * Initialize the contents of the frame.
          */
+        @SuppressWarnings("unchecked")
         private void initialize() {
                 frmSequences = new JFrame();
+                frmSequences.addWindowListener(new WindowAdapter() {
+                        @Override
+                        public void windowClosed(WindowEvent arg0) {
+
+                                synchronized (Console.getInstance()) {
+                                        Console.getInstance().notify();
+                                }
+                        }
+                });
                 final javax.swing.DefaultListModel modelListSequences = new javax.swing.DefaultListModel();
                 final JButton btnSequence = new JButton("Show details");
                 final JButton btnClose = new JButton("Close");
                 JPanel panel = new JPanel();
-                
-                
+
                 // JFrame: frmSequence ***
                 frmSequences.setTitle("Sequences");
@@ -65 +77 @@
                 frmSequences.getContentPane().setLayout(null);
 
-
-                //!!!
-                // is checked by calling "showSequences" -> Needed?
-                //!!!
                 try {
-                        containedSequences = (List<List<Event<?>>>) GlobalDataContainer.getInstance().getData("sequences");
-                }
-                catch(ClassCastException e) {
+                        containedSequences = (List<List<Event<?>>>) GlobalDataContainer
+                                        .getInstance().getData("sequences");
+                } catch (ClassCastException e) {
                         Console.println("Not able to cast Data in GlobalDataContainer to List of Sequences");
                 }
-                
+
                 try {
-                        for(int i=0; i<containedSequences.size(); i++) {
-                                modelListSequences.addElement("Sequence " + (i+1) + ": " + containedSequences.get(i).size() + " Events");
+                        for (int i = 0; i < containedSequences.size(); i++) {
+                                modelListSequences.addElement("Sequence " + (i + 1) + ": "
+                                                + containedSequences.get(i).size() + " Events");
                         }
-                }
-                catch(NullPointerException e) {
+                } catch (NullPointerException e) {
                         Console.println("No sequences found.");
                 }
-                
-                
+
                 panel.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null));
                 panel.setBounds(10, 11, 244, 218);
@@ -91 +98 @@
                 panel.setLayout(null);
                 // ***
-                
-                
+
                 // JScrollPane: scrollPane
                 JScrollPane scrollPane = new JScrollPane();
@@ -101 +107 @@
                 // ***
 
-                
-                
                 // JList: listSequnces
                 listSequences.addListSelectionListener(new ListSelectionListener() {
                         public void valueChanged(ListSelectionEvent arg0) {
-                                if(listSequences.getSelectedIndex() >= 0) btnSequence.setEnabled(true);
-                                else btnSequence.setEnabled(false);
+                                if (listSequences.getSelectedIndex() >= 0)
+                                        btnSequence.setEnabled(true);
+                                else
+                                        btnSequence.setEnabled(false);
                         }
                 });
-                
+
                 JPanel panel_1 = new JPanel();
                 panel_1.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null));
@@ -117 +123 @@
                 panel_1.setLayout(null);
                 // ***
-                
-                
+
                 // JButton: btnSequence ***
                 btnSequence.addMouseListener(new MouseAdapter() {
                         public void mouseClicked(MouseEvent arg0) {
-                                if(btnSequence.isEnabled()) {
-                                        DlgSequenceDetails dlgSequences = new DlgSequenceDetails(frmSequences, containedSequences.get(listSequences.getSelectedIndex()));
-                                        dlgSequences.showDialog(frmSequences, containedSequences.get(listSequences.getSelectedIndex()));
+                                if (btnSequence.isEnabled()) {
+                                        DlgSequenceDetails dlgSequences = new DlgSequenceDetails(
+                                                        frmSequences, containedSequences.get(listSequences
+                                                                        .getSelectedIndex()));
+                                        dlgSequences.showDialog(frmSequences, containedSequences
+                                                        .get(listSequences.getSelectedIndex()));
                                         frmSequences.setVisible(false);
                                 }
@@ -133 +141 @@
                 btnSequence.setEnabled(false);
                 // ***
-                
-                
-                //JButton: btnClose ***         
+
+                // JButton: btnClose ***
                 btnClose.addMouseListener(new MouseAdapter() {
                         public void mouseClicked(MouseEvent arg0) {