From a9d801bcca79358678bd1ac2b3fc933f8f4d415e Mon Sep 17 00:00:00 2001
From: Simon Ebner <simon.ebner@psi.ch>
Date: Tue, 21 May 2013 16:03:35 +0200
Subject: [PATCH] FDA-70 Added support for waitREGEX condition ...

---
 .../ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form    | 5 +++--
 .../ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
index ef089f6..eab879d 100644
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
@@ -25,7 +25,7 @@
   <Layout>
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jPanel1" alignment="0" pref="655" max="32767" attributes="0"/>
+          <Component id="jPanel1" alignment="0" pref="665" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -105,12 +105,13 @@
         <Component class="javax.swing.JComboBox" name="jComboBoxOperation">
           <Properties>
             <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="5">
+              <StringArray count="6">
                 <StringItem index="0" value="put"/>
                 <StringItem index="1" value="putq"/>
                 <StringItem index="2" value="wait"/>
                 <StringItem index="3" value="waitAND"/>
                 <StringItem index="4" value="waitOR"/>
+                <StringItem index="5" value="waitREGEX"/>
               </StringArray>
             </Property>
             <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
diff --git a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
index b02211b..30df371 100644
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
@@ -221,7 +221,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
         jLabel3.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel3.text")); // NOI18N
         jPanel1.add(jLabel3);
 
-        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait", "waitAND", "waitOR" }));
+        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait", "waitAND", "waitOR", "waitREGEX" }));
         jComboBoxOperation.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jComboBoxOperation.toolTipText")); // NOI18N
         jComboBoxOperation.setName("Operation"); // NOI18N
         jPanel1.add(jComboBoxOperation);
@@ -268,7 +268,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 655, Short.MAX_VALUE)
+            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 665, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)