2 files changed, 19 insertions(+), 7 deletions(-)

M bin/main/tokenJar/Tab.form
M src/tokenJar/RegexWindow.java

@@ 145,10 145,12 @@
               <Properties>
                 <Property name="autoCreateRowSorter" type="boolean" value="true"/>
                 <Property name="model" type="javax.swing.table.TableModel" editor="org.netbeans.modules.form.editors2.TableModelEditor">
-                  <Table columnCount="14" rowCount="0">
+                  <Table columnCount="16" rowCount="0">
                     <Column editable="true" title="Enable" type="java.lang.Boolean"/>
                     <Column editable="true" title="Name" type="java.lang.String"/>
-                    <Column editable="true" title="header" type="java.lang.Boolean"/>
+                    <Column editable="true" title="Extract from Request" type="java.lang.Boolean"/>
+                    <Column editable="true" title="Extract from Response" type="java.lang.Boolean"/>
+                    <Column editable="true" title="Apply to header" type="java.lang.Boolean"/>
                     <Column editable="true" title="Apply to url" type="java.lang.Boolean"/>
                     <Column editable="true" title="Apply to body" type="java.lang.Boolean"/>
                     <Column editable="true" title="Apply to cookie" type="java.lang.Boolean"/>


@@ 234,6 236,16 @@
                       <Editor/>
                       <Renderer/>
                     </Column>
+                    <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                      <Title/>
+                      <Editor/>
+                      <Renderer/>
+                    </Column>
+                    <Column maxWidth="-1" minWidth="-1" prefWidth="-1" resizable="true">
+                      <Title/>
+                      <Editor/>
+                      <Renderer/>
+                    </Column>
                   </TableColumnModel>
                 </Property>
                 <Property name="columnSelectionAllowed" type="boolean" value="true"/>

@@ 43,9 43,9 @@ public class RegexWindow extends javax.swing.JFrame {
 		this.persistSettings = parent.getPersistSettings();
 
 		String name = parent.getCell(selectedRow, 1).toString();
-		String evalJS = parent.getCell(selectedRow, 11).toString();
-		Object regex = parent.getCell(selectedRow, 12);
-		String path = parent.getCell(selectedRow, 13).toString();
+		String evalJS = parent.getCell(selectedRow, 13).toString();
+		Object regex = parent.getCell(selectedRow, 14);
+		String path = parent.getCell(selectedRow, 15).toString();
 
 		//Indicate in UI the name of the parameter and the path
 		nameField.setText(name);


@@ 294,8 294,8 @@ public class RegexWindow extends javax.swing.JFrame {
 		groupDebug.setText(groupDebug.getText() +"\n Saved");
 
 		//save Eval and Extract to parent window
-		parent.setCell(selectedRow, 8, (Object) evalField.getSelectedItem()); //evelCol
-		parent.setCell(selectedRow, 9, (Object) regexField.getSelectedItem()); //regexCol
+		parent.setCell(selectedRow, 13, (Object) evalField.getSelectedItem()); //evelCol
+		parent.setCell(selectedRow, 14, (Object) regexField.getSelectedItem()); //regexCol
 
 		//save Eval and Extract in persistant object
 		String evalJS = evalField.getSelectedItem().toString();