add with/from to controlled_curation

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@15787 ee4ac58c-ac51-4696-9907-e4b3aa274f04

uk/ac/sanger/artemis/components/genebuilder/cv/CVPanel.java

@@ -400,6 +400,11 @@ public class CVPanel extends JPanel
                               dimension.height));
           xHeadings.add(termLabel);
           
+
+          final JLabel withLabel = new JLabel("With/From");
+          withLabel.setPreferredSize(dimension);
+          xHeadings.add(withLabel);
+          
           final JLabel dbxrefLabel = new JLabel("Dbxref");
           dbxrefLabel.setPreferredSize(dimension);
           xHeadings.add(dbxrefLabel);
@@ -425,7 +430,7 @@ public class CVPanel extends JPanel
           xBox = Box.createHorizontalBox();
           final String qualifierString = 
              (String)qualifier_strings.elementAt(value_index);
-          
+
           final ControlledCurationBox ccBox = new ControlledCurationBox(
                   this_qualifier,
                   qualifierString, value_index, 

uk/ac/sanger/artemis/components/genebuilder/cv/ControlledCurationBox.java

@@ -44,6 +44,7 @@ class ControlledCurationBox extends AbstractCvBox
   private Box xBox;
   private int value_index;
   private WrapTextArea termTextField;
+  private JTextField withTextField;
   private JTextField dbxrefTextField;
   private JExtendedComboBox evidenceList;
   private JTextField qualfTextField;
@@ -95,7 +96,15 @@ class ControlledCurationBox extends AbstractCvBox
     termTextField.setCaretPosition(0);
     xBox.add(termTextField);
     
-
+    //
+    String with = getField("with=", qualifierString);
+    withTextField = new JTextField(with);
+    withTextField.setToolTipText("with/from column");
+    withTextField.setPreferredSize(dimension);
+    withTextField.setMaximumSize(dimension);
+    withTextField.setActionCommand("with=");
+    xBox.add(withTextField);
+    
     String dbxref = getField("db_xref=", qualifierString);
     dbxrefTextField = new JTextField(dbxref);
     dbxrefTextField.setToolTipText("dbxref column");
@@ -138,7 +147,11 @@ class ControlledCurationBox extends AbstractCvBox
   
   protected boolean isQualifierChanged()
   {
-    String old = getField("db_xref=", origQualifierString);
+    String old = getField("with=", origQualifierString);
+    if(!old.equals(withTextField.getText().trim()))
+      return true;
+    
+    old = getField("db_xref=", origQualifierString);
     if(!old.equals(dbxrefTextField.getText().trim()))
       return true;
     
@@ -236,7 +249,14 @@ class ControlledCurationBox extends AbstractCvBox
   {
     String newQualifierString = origQualifierString;
     
-    String old = getField("date=", origQualifierString);
+    String old = getField("with=", origQualifierString);
+    if(!old.equals(withTextField.getText().trim()))
+    {
+      newQualifierString = changeField("with=", withTextField.getText().trim(), 
+                                       newQualifierString);
+    }
+    
+    old = getField("date=", origQualifierString);
     if(!old.equals(dateField.getText()))
     {
       newQualifierString = changeField("date=", dateField.getText().trim(),