Changeset 134 for trunk/EventBenchConsole/src/de/ugoe/cs

Timestamp:

07/27/11 18:32:43 (13 years ago)

Author:

jhall

Message:

Fixed some bugs

Location:

trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing

Files:

• DlgInsert.java (modified) (9 diffs)
• DlgSequenceDetails.java (modified) (4 diffs)
• DlgSequences.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import java.awt.FlowLayout;
 import java.util.List;
-import de.ugoe.cs.util.console.Console;
+
+import de.ugoe.cs.eventbench.assertions.AssertEvent;
+import de.ugoe.cs.eventbench.assertions.FileEqualsReplay;
+import de.ugoe.cs.eventbench.assertions.TextEqualsReplay;
 import de.ugoe.cs.eventbench.data.Event;
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
 
 import javax.swing.JButton;
@@ -13 +15 @@
 import javax.swing.border.EmptyBorder;
 import javax.swing.JComboBox;
-import javax.swing.ComboBoxModel;
 import javax.swing.JLabel;
 import javax.swing.JTextField;
@@ -21 +22 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeEvent;
 import java.io.File;
 import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
 import javax.swing.JScrollPane;
 import javax.swing.JList;
 
 public class DlgInsert extends JDialog {
+        
+        /**
+         * Id for object serialization.
+         */
+        private static final long serialVersionUID = 1L;
 
         private final JPanel contentPanel = new JPanel();
         private JTextField textFieldExpectedValue;
-        private JTextField textFieldTestFile;
-        private JTextField textFieldMatchingFile;
+        private JTextField textFieldActualFile;
+        private JTextField textFieldExpectedFile;
 
         /**
          * Launch the application.
          */
-        public static void ShowDialog(List<Event<?>> sequences, int selectedIndex, final boolean insertBefore) {
+        public static void showDialog(List<Event<?>> sequences, int selectedIndex, final boolean insertBefore) {
                 try {
                         DlgInsert dialog = new DlgInsert(sequences, selectedIndex, insertBefore);
@@ -130 +132 @@
                 panelTextEquals.add(scrollPane);
                 
-                JList listTargets = new JList(modelListTargets);
+                final JList listTargets = new JList(modelListTargets);
                 scrollPane.setViewportView(listTargets);
                 
                 for(int i=0; i<sequences.size(); i++) {
-                        modelListTargets.addElement(sequences.get(i).getTarget());
+                        if(sequences.get(i).getTarget() != " ") modelListTargets.addElement(sequences.get(i).getTarget());
                 }
+                listTargets.setSelectedIndex(0);
                 
                 
@@ -143 +146 @@
                 panelFileEquals.setVisible(false);
                 
-                JLabel lblNewLabel = new JLabel("Testfile:");
-                lblNewLabel.setBounds(10, 11, 46, 14);
+                JLabel lblNewLabel = new JLabel("Actual file:");
+                lblNewLabel.setBounds(10, 11, 89, 14);
                 panelFileEquals.add(lblNewLabel);
                 
-                textFieldTestFile = new JTextField();
-                textFieldTestFile.setBounds(10, 36, 474, 20);
-                panelFileEquals.add(textFieldTestFile);
-                textFieldTestFile.setColumns(10);
+                textFieldActualFile = new JTextField();
+                textFieldActualFile.setBounds(10, 36, 474, 20);
+                panelFileEquals.add(textFieldActualFile);
+                textFieldActualFile.setColumns(10);
                 
                 JButton btnNewButton = new JButton("Search file");
@@ -156 +159 @@
                         public void mouseClicked(MouseEvent arg0) {
                                 final JFileChooser fc = new JFileChooser();
-                                if(fc.showOpenDialog(contentPanel) == 0) { textFieldMatchingFile.setText(fc.getSelectedFile().getAbsolutePath());       }
+                                if(fc.showOpenDialog(contentPanel) == 0) { textFieldExpectedFile.setText(fc.getSelectedFile().getAbsolutePath());       }
                         }
                 });
@@ -162 +165 @@
                 panelFileEquals.add(btnNewButton);
                 
-                JLabel lblNewLabel_1 = new JLabel("Matching file:");
+                JLabel lblNewLabel_1 = new JLabel("Expected file:");
                 lblNewLabel_1.setBounds(10, 84, 89, 14);
                 panelFileEquals.add(lblNewLabel_1);
                 
-                textFieldMatchingFile = new JTextField();
-                textFieldMatchingFile.setColumns(10);
-                textFieldMatchingFile.setBounds(10, 109, 474, 20);
-                panelFileEquals.add(textFieldMatchingFile);
+                textFieldExpectedFile = new JTextField();
+                textFieldExpectedFile.setColumns(10);
+                textFieldExpectedFile.setBounds(10, 109, 474, 20);
+                panelFileEquals.add(textFieldExpectedFile);
                 {
                         JPanel buttonPane = new JPanel();
@@ -182 +185 @@
                                                 //FileEquals
                                                 if(panelFileEquals.isVisible()) {
-                                                        if(! new File(textFieldTestFile.getText()).exists()) {
-                                                                if(textFieldTestFile.getText().length() == 0) JOptionPane.showMessageDialog(null, "Please choose a test file.", "No test file chosen", JOptionPane.OK_OPTION);
-                                                                else JOptionPane.showMessageDialog(null, "The test file \"" + textFieldTestFile.getText() + "\" does not exist.", "Test file does not exist", JOptionPane.OK_OPTION);
+                                                        if(textFieldActualFile.getText().length() == 0) JOptionPane.showMessageDialog(null, "Please declare an actual file.", "No actual file declared", JOptionPane.OK_OPTION);
+                                                        else if(! new File(textFieldExpectedFile.getText()).exists()) {
+                                                                if(textFieldExpectedFile.getText().length() == 0) JOptionPane.showMessageDialog(null, "Please choose an expected file.", "No expected file chosen", JOptionPane.OK_OPTION);
+                                                                else JOptionPane.showMessageDialog(null, "The expected file \"" + textFieldActualFile.getText() + "\" does not exist.", "Expected file does not exist", JOptionPane.OK_OPTION);
                                                                 return;
                                                         }
-                                                        else if(! new File(textFieldMatchingFile.getText()).exists()) {
-                                                                if(textFieldMatchingFile.getText().length() == 0) JOptionPane.showMessageDialog(null, "Please choose a matching file.", "No matching file chosen", JOptionPane.OK_OPTION);
-                                                                else JOptionPane.showMessageDialog(null, "The matching file \"" + textFieldTestFile.getText() + "\" does not exist.", "Matching file does not exist", JOptionPane.OK_OPTION);
-                                                                return;
-                                                        }
                                                         else {
-                                                                Event<?> e = new Event("FileEquals");
+                                                                FileEqualsReplay file = new FileEqualsReplay();
+                                                                file.setActualFile(textFieldActualFile.getText());
+                                                                file.setExpectedFile(textFieldExpectedFile.getText());
+                                                                
+                                                                AssertEvent<FileEqualsReplay> e = new AssertEvent<FileEqualsReplay>("FileEquals");
+                                                                e.addReplayEvent(file);
                                                                 e.setTarget(" ");
                                                                 if(insertBefore) sequences.add(selectedIndex, e);
@@ -205 +209 @@
                                                                 return;
                                                         }
+                                                        else if(listTargets.getSelectedIndex() == -1) {
+                                                                JOptionPane.showMessageDialog(null, "Please select a target.", "No target selected", JOptionPane.OK_OPTION);
+                                                                return;
+                                                        }
                                                         else {
-                                                                Event<?> e = new Event("TextEquals");
+                                                                TextEqualsReplay text = new TextEqualsReplay();
+                                                                text.setExpectedValue(textFieldExpectedValue.getText());
+                                                                text.setTarget(modelListTargets.get(listTargets.getSelectedIndex()).toString());
+                                                                
+                                                                AssertEvent<TextEqualsReplay> e = new AssertEvent<TextEqualsReplay>("TextEquals");
+                                                                e.addReplayEvent(text);
                                                                 e.setTarget(" ");
                                                                 if(insertBefore) sequences.add(selectedIndex, e);

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

@@ -7 +7 @@
 import java.awt.event.MouseEvent;
 import javax.swing.JList;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-import java.util.Vector;
 import java.util.List;
-
-import javax.swing.AbstractListModel;
 import javax.swing.ListSelectionModel;
-import javax.swing.border.CompoundBorder;
-import javax.swing.border.LineBorder;
-import java.awt.Color;
 import javax.swing.border.SoftBevelBorder;
 import javax.swing.border.BevelBorder;
-import javax.swing.border.TitledBorder;
-import javax.swing.UIManager;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.ListSelectionEvent;
 
-import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.data.IReplayable;
-import de.ugoe.cs.util.console.Console;
 import de.ugoe.cs.eventbench.data.Event;
-import de.ugoe.cs.eventbench.windows.WindowsEvent;
 
 import javax.swing.JLabel;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
-import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JPanel;
@@ -47 +32 @@
          * Launch the application, the index of the sequence to work on is stored in sequenceIndex
          */
-        public void ShowDialog(JFrame parent, final List<Event<?>> events) {
+        public void showDialog(JFrame parent, final List<Event<?>> events) {
                 frmParent = parent;
                 
@@ -118 +103 @@
                                 int selectedIndex = listSequences.getSelectedIndex();
                                 DlgInsert dlgInsert = new DlgInsert(events, selectedIndex, true);
-                                dlgInsert.ShowDialog(events, selectedIndex, true);
+                                dlgInsert.showDialog(events, selectedIndex, true);
                                 
                                 updateLists(events, modelListEvents, modelListTargets);
@@ -139 +124 @@
                                 int selectedIndex = listSequences.getSelectedIndex();
                                 DlgInsert dlgInsert = new DlgInsert(events, selectedIndex, false);
-                                dlgInsert.ShowDialog(events, selectedIndex, false);
+                                dlgInsert.showDialog(events, selectedIndex, false);
                                 
                                 updateLists(events, modelListEvents, modelListTargets);

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

@@ -4 +4 @@
 import javax.swing.JFrame;
 import javax.swing.JList;
-import java.awt.BorderLayout;
 import java.util.List;
 
 import javax.swing.JButton;
-import javax.swing.AbstractListModel;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.ListSelectionEvent;
 import de.ugoe.cs.eventbench.data.Event;
 import de.ugoe.cs.eventbench.data.GlobalDataContainer;
-import de.ugoe.cs.eventbench.windows.data.WindowsMessage;
 import de.ugoe.cs.util.console.Console;
 
@@ -21 +18 @@
 import javax.swing.border.EtchedBorder;
 import javax.swing.JScrollPane;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 
 public class DlgSequences {
@@ -34 +27 @@
          * Launch the application.
          */
-        public static void ShowDialog() {
+        public static void showDialog() {
                 EventQueue.invokeLater(new Runnable() {
                         public void run() {
@@ -73 +66 @@
 
 
+                //!!!
+                // is checked by calling "showSequences" -> Needed?
+                //!!!
                 try {
                         containedSequences = (List<List<Event<?>>>) GlobalDataContainer.getInstance().getData("sequences");
@@ -128 +124 @@
                                 if(btnSequence.isEnabled()) {
                                         DlgSequenceDetails dlgSequences = new DlgSequenceDetails(frmSequences, containedSequences.get(listSequences.getSelectedIndex()));
-                                        dlgSequences.ShowDialog(frmSequences, containedSequences.get(listSequences.getSelectedIndex()));
+                                        dlgSequences.showDialog(frmSequences, containedSequences.get(listSequences.getSelectedIndex()));
                                         frmSequences.setVisible(false);
                                 }