Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java =================================================================== --- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java (revision 138) +++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgInsert.java (revision 139) @@ -29,5 +29,5 @@ public class DlgInsert extends JDialog { - + /** * Id for object serialization. @@ -43,7 +43,9 @@ * Launch the application. */ - public static void showDialog(List> sequences, int selectedIndex, final boolean insertBefore) { + public static void showDialog(List> sequences, int selectedIndex, + final boolean insertBefore) { try { - DlgInsert dialog = new DlgInsert(sequences, selectedIndex, insertBefore); + DlgInsert dialog = new DlgInsert(sequences, selectedIndex, + insertBefore); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setVisible(true); @@ -56,12 +58,12 @@ * Create the dialog. */ - public DlgInsert(final List> sequences, final int selectedIndex, final boolean insertBefore) { - + public DlgInsert(final List> sequences, final int selectedIndex, + final boolean insertBefore) { + final javax.swing.DefaultListModel modelListTargets = new javax.swing.DefaultListModel(); - + setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); setTitle("Insert testcase"); - - + setModal(true); setBounds(100, 100, 522, 482); @@ -73,18 +75,17 @@ final JPanel panelTextEquals = new JPanel(); final JPanel panelFileEquals = new JPanel(); - - + // JComboBox: comboBoxTestcase comboBoxTestcase.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { if ("comboBoxChanged".equals(arg0.getActionCommand())) { - - //TextEquals - if(comboBoxTestcase.getSelectedIndex() == 0) { + + // TextEquals + if (comboBoxTestcase.getSelectedIndex() == 0) { panelTextEquals.setVisible(true); panelFileEquals.setVisible(false); } - //FileEquals - else if(comboBoxTestcase.getSelectedIndex() == 1) { + // FileEquals + else if (comboBoxTestcase.getSelectedIndex() == 1) { panelTextEquals.setVisible(false); panelFileEquals.setVisible(true); @@ -93,24 +94,23 @@ } }); - comboBoxTestcase.setModel(new DefaultComboBoxModel(new String[] {"TextEquals", "OutputFileEquals"})); + comboBoxTestcase.setModel(new DefaultComboBoxModel(new String[] { + "TextEquals", "OutputFileEquals" })); comboBoxTestcase.setSelectedIndex(0); comboBoxTestcase.setBounds(128, 11, 178, 20); contentPanel.add(comboBoxTestcase); // *** - - - // JLabel + + // JLabel JLabel label = new JLabel("Testcase:"); label.setBounds(10, 14, 86, 14); contentPanel.add(label); - + JLabel label_1 = new JLabel("Expected value:"); label_1.setBounds(10, 11, 83, 14); - + JLabel label_2 = new JLabel("Target:"); label_2.setBounds(10, 38, 86, 14); // *** - - + // JTextField: textFieldExpectedValue textFieldExpectedValue = new JTextField(); @@ -118,6 +118,5 @@ textFieldExpectedValue.setBounds(116, 8, 368, 20); // *** - - + // JPanel: panel panelTextEquals.setLayout(null); @@ -127,46 +126,49 @@ panelTextEquals.add(label_2); panelTextEquals.add(textFieldExpectedValue); - + JScrollPane scrollPane = new JScrollPane(); scrollPane.setBounds(116, 36, 368, 163); panelTextEquals.add(scrollPane); - + final JList listTargets = new JList(modelListTargets); scrollPane.setViewportView(listTargets); - - for(int i=0; i e = new AssertEvent("FileEquals"); + file.setActualFile(textFieldActualFile + .getText()); + file.setExpectedFile(textFieldExpectedFile + .getText()); + + AssertEvent e = new AssertEvent( + "FileEquals"); e.addReplayEvent(file); e.setTarget(" "); - if(insertBefore) sequences.add(selectedIndex, e); - else sequences.add(selectedIndex+1, e); + if (insertBefore) + sequences.add(selectedIndex, e); + else + sequences.add(selectedIndex + 1, e); } } - //TextEquals + // TextEquals else { - if(textFieldExpectedValue.getText().length() == 0) { - JOptionPane.showMessageDialog(null, "\"Expected value\" is missing.", "Expected value", JOptionPane.OK_OPTION); + if (textFieldExpectedValue.getText().length() == 0) { + JOptionPane + .showMessageDialog( + null, + "\"Expected value\" is missing.", + "Expected value", + JOptionPane.OK_OPTION); return; - } - else if(listTargets.getSelectedIndex() == -1) { - JOptionPane.showMessageDialog(null, "Please select a target.", "No target selected", JOptionPane.OK_OPTION); + } else if (listTargets.getSelectedIndex() == -1) { + JOptionPane.showMessageDialog(null, + "Please select a target.", + "No target selected", + JOptionPane.OK_OPTION); return; - } - else { + } else { TextEqualsReplay text = new TextEqualsReplay(); - text.setExpectedValue(textFieldExpectedValue.getText()); - text.setTarget(modelListTargets.get(listTargets.getSelectedIndex()).toString()); - - AssertEvent e = new AssertEvent("TextEquals"); + text.setExpectedValue(textFieldExpectedValue + .getText()); + text.setTarget(modelListTargets.get( + listTargets.getSelectedIndex()) + .toString()); + + AssertEvent e = new AssertEvent( + "TextEquals"); e.addReplayEvent(text); e.setTarget(" "); - if(insertBefore) sequences.add(selectedIndex, e); - else sequences.add(selectedIndex+1, e); + if (insertBefore) + sequences.add(selectedIndex, e); + else + sequences.add(selectedIndex + 1, e); } } - + dispose(); } @@ -234,11 +269,13 @@ // *** } - + { // JButton: cancelButton JButton cancelButton = new JButton("Cancel"); cancelButton.addMouseListener(new MouseAdapter() { - - public void mouseClicked(MouseEvent arg0) { dispose(); } + + public void mouseClicked(MouseEvent arg0) { + dispose(); + } }); cancelButton.setActionCommand("Cancel"); Index: /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java =================================================================== --- /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java (revision 138) +++ /trunk/EventBenchConsole/src/de/ugoe/cs/eventbench/swing/DlgSequenceDetails.java (revision 139) @@ -1,3 +1,4 @@ package de.ugoe.cs.eventbench.swing; + import java.awt.EventQueue; @@ -23,5 +24,4 @@ import javax.swing.border.EtchedBorder; - public class DlgSequenceDetails { @@ -30,13 +30,15 @@ /** - * Launch the application, the index of the sequence to work on is stored in sequenceIndex + * Launch the application, the index of the sequence to work on is stored in + * sequenceIndex */ public void showDialog(JFrame parent, final List> events) { frmParent = parent; - + EventQueue.invokeLater(new Runnable() { public void run() { try { - DlgSequenceDetails window = new DlgSequenceDetails(frmParent, events); + DlgSequenceDetails window = new DlgSequenceDetails( + frmParent, events); window.frmEvents.setVisible(true); } catch (Exception e) { @@ -59,6 +61,5 @@ */ private void initialize(final List> events) { - - + final javax.swing.DefaultListModel modelListEvents = new javax.swing.DefaultListModel(); final javax.swing.DefaultListModel modelListTargets = new javax.swing.DefaultListModel(); @@ -66,6 +67,5 @@ final JList listTargets = new JList(modelListTargets); // *** - - + // JFrame: frmEvents frmEvents = new JFrame(); @@ -82,7 +82,7 @@ } }); - + updateLists(events, modelListEvents, modelListTargets); - + JPanel panel = new JPanel(); panel.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null)); @@ -94,20 +94,19 @@ panel.add(btnInsertBefore); // *** - - + // JButton: btnInsertBefore *** btnInsertBefore.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent arg0) { - if(!btnInsertBefore.isEnabled()) return; - + if (!btnInsertBefore.isEnabled()) + return; + 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); listSequences.setSelectedIndex(selectedIndex); } }); - + btnInsertBefore.setEnabled(false); final JButton btnInsertAfter = new JButton("Insert after"); @@ -115,26 +114,25 @@ panel.add(btnInsertAfter); // *** - - + // JButton: btnInsertAfter btnInsertAfter.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent arg0) { - if(!btnInsertAfter.isEnabled()) return; - + if (!btnInsertAfter.isEnabled()) + return; + 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); - listSequences.setSelectedIndex(selectedIndex+1); - } - }); - + listSequences.setSelectedIndex(selectedIndex + 1); + } + }); + btnInsertAfter.setEnabled(false); - + final JButton btnClose = new JButton("Back to sequences"); btnClose.setBounds(505, 11, 124, 31); panel.add(btnClose); - + JPanel panel_1 = new JPanel(); panel_1.setBorder(new EtchedBorder(EtchedBorder.LOWERED, null, null)); @@ -142,5 +140,5 @@ frmEvents.getContentPane().add(panel_1); panel_1.setLayout(null); - + JScrollPane scrollPane_1 = new JScrollPane(); scrollPane_1.setBounds(10, 29, 309, 339); @@ -148,26 +146,25 @@ scrollPane_1.setViewportView(listSequences); // *** - - + // JList: listSequences *** - listSequences.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, null, null, null)); + listSequences.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, + null, null, null)); listSequences.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - - + // JScrollPane: scrollPane JScrollPane scrollPane = new JScrollPane(); scrollPane.setBounds(329, 29, 298, 339); panel_1.add(scrollPane); - + listTargets.addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent arg0) { - if(listTargets.getSelectedIndex() > -1) { - listSequences.setSelectedIndex(listTargets.getSelectedIndex()); + if (listTargets.getSelectedIndex() > -1) { + listSequences.setSelectedIndex(listTargets + .getSelectedIndex()); btnInsertAfter.setEnabled(true); - - if(listTargets.getSelectedIndex() == 0) { - btnInsertBefore.setEnabled(false); - } - else { + + if (listTargets.getSelectedIndex() == 0) { + btnInsertBefore.setEnabled(false); + } else { btnInsertBefore.setEnabled(true); } @@ -177,28 +174,28 @@ scrollPane.setViewportView(listTargets); // *** - - - // JList for targets *** - listTargets.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, null, null, null)); + + // JList for targets *** + listTargets.setBorder(new SoftBevelBorder(BevelBorder.LOWERED, null, + null, null, null)); listTargets.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - + JLabel lblEvents = new JLabel("Events:"); lblEvents.setBounds(10, 11, 46, 14); panel_1.add(lblEvents); - + JLabel lblTargets = new JLabel("Targets:"); lblTargets.setBounds(329, 11, 58, 14); panel_1.add(lblTargets); - + listSequences.addListSelectionListener(new ListSelectionListener() { public void valueChanged(ListSelectionEvent arg0) { - if(listSequences.getSelectedIndex() > -1) { - listTargets.setSelectedIndex(listSequences.getSelectedIndex()); - - if(listSequences.getSelectedIndex() == 0) { + if (listSequences.getSelectedIndex() > -1) { + listTargets.setSelectedIndex(listSequences + .getSelectedIndex()); + + if (listSequences.getSelectedIndex() == 0) { btnInsertBefore.setEnabled(false); btnInsertAfter.setEnabled(true); - } - else { + } else { btnInsertBefore.setEnabled(true); btnInsertAfter.setEnabled(true); @@ -208,6 +205,5 @@ }); // *** - - + // JButton: btnClose *** btnClose.addMouseListener(new MouseAdapter() { @@ -223,8 +219,8 @@ final javax.swing.DefaultListModel modelListEvents, final javax.swing.DefaultListModel modelListTargets) { - + modelListEvents.clear(); modelListTargets.clear(); - for(int i=0; i