use history qualifiers rather than private qualifiers and store them as feature_cvterms

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

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

@@ -164,17 +164,17 @@ public class CVPanel extends JPanel
     });
     xBox.add(lookUp);
     
-    JButton addPrivate = new JButton("ADD PRIVATE");
-    addPrivate.setOpaque(false);
-    addPrivate.addActionListener(new ActionListener()
+    JButton addHistory = new JButton("ADD HISTORY");
+    addHistory.setOpaque(false);
+    addHistory.addActionListener(new ActionListener()
     {
       public void actionPerformed(ActionEvent e)
       { 
-        addPrivateQualifier();
+        addHistoryQualifier();
       }
     });
-    if(ChadoTransactionManager.PRIVATE_CV != null)
-      xBox.add(addPrivate);
+    if(ChadoTransactionManager.HISTORY_CV != null)
+      xBox.add(addHistory);
     
     xBox.add(Box.createHorizontalGlue());
     cvBox.add(xBox);
@@ -299,14 +299,14 @@ public class CVPanel extends JPanel
     if(n > 0)
       GeneEditorPanel.addLightSeparator(cvBox);
     
-    // private field
+    // history field
     n = 0;
     for(int qualifier_index = 0; qualifier_index < cvQualifiers.size();
         ++qualifier_index) 
     {
       final Qualifier this_qualifier = 
         (Qualifier)cvQualifiers.elementAt(qualifier_index);
-      if(this_qualifier.getName().equals("private"))
+      if(this_qualifier.getName().equals("history"))
       {
         final StringVector qualifier_strings = this_qualifier.getValues();
 
@@ -321,20 +321,20 @@ public class CVPanel extends JPanel
           empty = false;
             
           xBox = Box.createHorizontalBox();            
-          final PrivateBox privateBox = new PrivateBox(
+          final HistoryBox historyBox = new HistoryBox(
                     this_qualifier,
                     qualifierString, value_index, 
                     dimension, go_dimension);
-          editableComponents.add(privateBox);
+          editableComponents.add(historyBox);
             
-          xBox = privateBox.getBox();
+          xBox = historyBox.getBox();
           xBox.add(Box.createHorizontalGlue());
           xBox.add(getRemoveButton(this_qualifier, v_index));
           
           if(n == 0)
           {
             final Box xLabel = Box.createHorizontalBox();
-            JLabel lab = new JLabel("Private");
+            JLabel lab = new JLabel("History");
             lab.setFont(lab.getFont().deriveFont(Font.BOLD));
             xLabel.add(lab);
             xLabel.add(Box.createHorizontalGlue());
@@ -621,24 +621,24 @@ public class CVPanel extends JPanel
   }
   
   /**
-   * Add a private qualifier
+   * Add a history qualifier
    */
-  private void addPrivateQualifier()
+  private void addHistoryQualifier()
   {
     cvQualifiers = getCvQualifiers();
-    Qualifier cv_qualifier = cvQualifiers.getQualifierByName("private");
+    Qualifier cv_qualifier = cvQualifiers.getQualifierByName("history");
     
     final int index;
     if(cv_qualifier == null)
     {
-      cv_qualifier = new Qualifier("private");
+      cv_qualifier = new Qualifier("history");
       index = -1;
     }
     else
      index = cvQualifiers.indexOf(cv_qualifier);
     
     cv_qualifier.addValue(
-        "term="+PrivateBox.getDefaultTerm().getName()+";"+
+        "term="+HistoryBox.getDefaultTerm().getName()+";"+
         "curatorName="+doc.getUserName()+";"+
         "date="+ DatePanel.getDate());
     

uk/ac/sanger/artemis/components/genebuilder/cv/PrivateBox.java → uk/ac/sanger/artemis/components/genebuilder/cv/HistoryBox.java

-/* PrivateBox
+/* HistoryBox
  *
  * created: 2007
  *
@@ -40,7 +40,7 @@ import uk.ac.sanger.artemis.io.QualifierVector;
 import uk.ac.sanger.artemis.util.DatabaseDocument;
 import uk.ac.sanger.artemis.util.StringVector;
 
-class PrivateBox extends AbstractCvBox
+class HistoryBox extends AbstractCvBox
 {
   private Box xBox;
   private int value_index;
@@ -52,14 +52,14 @@ class PrivateBox extends AbstractCvBox
   private Qualifier origQualifier;
   
   /**
-   * Display private qualifiers
+   * Display history qualifiers
    * @param qualifier
    * @param qualifierString
    * @param value_index
    * @param dimension
    * @param go_dimension
    */
-  public PrivateBox(final Qualifier qualifier,
+  public HistoryBox(final Qualifier qualifier,
                     final String qualifierString,
                     final int value_index,
                     final Dimension dimension,
@@ -255,7 +255,7 @@ class PrivateBox extends AbstractCvBox
   
   protected static Vector<CvTerm> getCvTerms()
   {
-    return DatabaseDocument.getCvterms("", ChadoTransactionManager.PRIVATE_CV, false);
+    return DatabaseDocument.getCvterms("", ChadoTransactionManager.HISTORY_CV, false);
   }
   
   private static Vector<String> getCvTermStrings()
@@ -273,7 +273,7 @@ class PrivateBox extends AbstractCvBox
   protected static CvTerm getDefaultTerm()
   {
     CvTerm cvterm =
-      (CvTerm) DatabaseDocument.getCvterms("", ChadoTransactionManager.PRIVATE_CV, false).get(0);
+      (CvTerm) DatabaseDocument.getCvterms("", ChadoTransactionManager.HISTORY_CV, false).get(0);
     return cvterm;
   }
 }