QQMerge branch 'develop' of https://source.jalview.org/git/jalview into develop

[jalview.git] / src / jalview / io / PDBFeatureSettings.java

diff --git a/src/jalview/io/PDBFeatureSettings.java b/src/jalview/io/PDBFeatureSettings.java
index a422a00..5294c45 100644 (file)
--- a/src/jalview/io/PDBFeatureSettings.java
+++ b/src/jalview/io/PDBFeatureSettings.java
@@ -1,28 +1,31 @@
 package jalview.io;
 
 import jalview.api.FeatureColourI;
-import jalview.schemes.FeatureColourAdapter;
+import jalview.schemes.FeatureColour;
 import jalview.schemes.FeatureSettingsAdapter;
-import jalview.ws.dbsources.Pdb;
 
 import java.awt.Color;
 
 public class PDBFeatureSettings extends FeatureSettingsAdapter
 {
+  // TODO find one central place to define feature names
+  private static final String FEATURE_INSERTION = "INSERTION";
+
+  private static final String FEATURE_RES_NUM = "RESNUM";
 
   @Override
   public boolean isFeatureDisplayed(String type)
   {
-    return type.equalsIgnoreCase(Pdb.FEATURE_INSERTION)
-            || type.equalsIgnoreCase(Pdb.FEATURE_RES_NUM);
+    return type.equalsIgnoreCase(FEATURE_INSERTION)
+            || type.equalsIgnoreCase(FEATURE_RES_NUM);
   }
 
   @Override
   public FeatureColourI getFeatureColour(String type)
   {
-    if (type.equalsIgnoreCase(Pdb.FEATURE_INSERTION))
+    if (type.equalsIgnoreCase(FEATURE_INSERTION))
     {
-      return new FeatureColourAdapter()
+      return new FeatureColour()
       {
 
         @Override
@@ -41,19 +44,19 @@ public class PDBFeatureSettings extends FeatureSettingsAdapter
   @Override
   public int compare(String feature1, String feature2)
   {
-    if (feature1.equalsIgnoreCase(Pdb.FEATURE_INSERTION))
+    if (feature1.equalsIgnoreCase(FEATURE_INSERTION))
     {
       return +1;
     }
-    if (feature2.equalsIgnoreCase(Pdb.FEATURE_INSERTION))
+    if (feature2.equalsIgnoreCase(FEATURE_INSERTION))
     {
       return -1;
     }
-    if (feature1.equalsIgnoreCase(Pdb.FEATURE_RES_NUM))
+    if (feature1.equalsIgnoreCase(FEATURE_RES_NUM))
     {
       return +1;
     }
-    if (feature2.equalsIgnoreCase(Pdb.FEATURE_RES_NUM))
+    if (feature2.equalsIgnoreCase(FEATURE_RES_NUM))
     {
       return -1;
     }