Merge develop to Release_2_8_3_Branch

[jalview.git] / src / jalview / datamodel / DBRefSource.java

diff --git a/src/jalview/datamodel/DBRefSource.java b/src/jalview/datamodel/DBRefSource.java
index 1af18b6..6982594 100755 (executable)
--- a/src/jalview/datamodel/DBRefSource.java
+++ b/src/jalview/datamodel/DBRefSource.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -38,12 +38,15 @@ public class DBRefSource
   /**
    * UNIPROT Entry Name
    */
-  public static String UP_NAME = "UNIPROT_NAME";
+  public static String UP_NAME = "UNIPROT_NAME".toUpperCase();
 
   /**
    * Uniprot Knowledgebase/TrEMBL as served from EMBL protein products.
    */
-  public static final String UNIPROTKB = "UniProtKB/TrEMBL";
+  public static final String UNIPROTKB = "UniProtKB/TrEMBL".toUpperCase();
+  
+  public static final String EMBLCDSProduct = "EMBLCDSProtein"
+          .toUpperCase();
 
   /**
    * PDB Entry Code
@@ -73,7 +76,7 @@ public class DBRefSource
   /**
    * GeneDB ID
    */
-  public static final String GENEDB = "GeneDB";
+  public static final String GENEDB = "GeneDB".toUpperCase();
 
   /**
    * List of databases whose sequences might have coding regions annotated
@@ -85,10 +88,10 @@ public class DBRefSource
   { EMBLCDS, GENEDB };
 
   public static final String[] PROTEINDBS =
-  { UNIPROT, PDB, UNIPROTKB };
+  { UNIPROT, PDB, UNIPROTKB, EMBLCDSProduct };
 
   public static final String[] PROTEINSEQ =
-  { UNIPROT, UNIPROTKB };
+  { UNIPROT, UNIPROTKB, EMBLCDSProduct };
 
   public static final String[] PROTEINSTR =
   { PDB };