X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FSequenceFeature.java;h=1f2e639cc89408d90056c4c1298a083d406c5474;hb=14bfc6fb57f123b815f08dbf5b35544abd33b3af;hp=2110632457bf3f136b600662d1518ad4f3378897;hpb=14307f5cfcbc90c419c892434613a500ca550ecc;p=jalview.git

diff --git a/src/jalview/datamodel/SequenceFeature.java b/src/jalview/datamodel/SequenceFeature.java
index 2110632..1f2e639 100755
--- a/src/jalview/datamodel/SequenceFeature.java
+++ b/src/jalview/datamodel/SequenceFeature.java
@@ -27,9 +27,11 @@ import jalview.datamodel.features.FeatureSourceI;
 import jalview.datamodel.features.FeatureSources;
 import jalview.util.StringUtils;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.Vector;
 
@@ -59,18 +61,6 @@ public class SequenceFeature implements FeatureLocationI
   private static final String ROW_DATA = "<tr><td>%s</td><td>%s</td><td>%s</td></tr>";
 
   /*
-   * map of otherDetails special keys, and their value fields' delimiter
-   */
-  private static final Map<String, String> INFO_KEYS = new HashMap<>();
-
-  static
-  {
-    INFO_KEYS.put("CSQ", ",");
-    // todo capture second level metadata (CSQ FORMAT)
-    // and delimiter "|" so as to report in a table within a table?
-  }
-
-  /*
    * ATTRIBUTES is reserved for the GFF 'column 9' data, formatted as
    * name1=value1;name2=value2,value3;...etc
    */
@@ -184,7 +174,7 @@ public class SequenceFeature implements FeatureLocationI
 
     if (sf.otherDetails != null)
     {
-      otherDetails = new HashMap<String, Object>();
+      otherDetails = new HashMap<>();
       for (Entry<String, Object> entry : sf.otherDetails.entrySet())
       {
         otherDetails.put(entry.getKey(), entry.getValue());
@@ -192,7 +182,7 @@ public class SequenceFeature implements FeatureLocationI
     }
     if (sf.links != null && sf.links.size() > 0)
     {
-      links = new Vector<String>();
+      links = new Vector<>();
       for (int i = 0, iSize = sf.links.size(); i < iSize; i++)
       {
         links.addElement(sf.links.elementAt(i));
@@ -227,7 +217,8 @@ public class SequenceFeature implements FeatureLocationI
   @Override
   public boolean equals(Object o)
   {
-    return equals(o, false);
+    return (o instanceof SequenceFeature
+            && equals((SequenceFeature) o, false));
   }
 
   /**
@@ -240,47 +231,19 @@ public class SequenceFeature implements FeatureLocationI
    * @param ignoreParent
    * @return
    */
-  public boolean equals(Object o, boolean ignoreParent)
+  public boolean equals(SequenceFeature sf, boolean ignoreParent)
   {
-    if (o == null || !(o instanceof SequenceFeature))
-    {
-      return false;
-    }
-
-    SequenceFeature sf = (SequenceFeature) o;
-    boolean sameScore = Float.isNaN(score) ? Float.isNaN(sf.score)
-            : score == sf.score;
-    if (begin != sf.begin || end != sf.end || !sameScore)
-    {
-      return false;
-    }
-
-    if (getStrand() != sf.getStrand())
-    {
-      return false;
-    }
-
-    if (!(type + description + featureGroup + getPhase()).equals(
-            sf.type + sf.description + sf.featureGroup + sf.getPhase()))
-    {
-      return false;
-    }
-    if (!equalAttribute(getValue("ID"), sf.getValue("ID")))
-    {
-      return false;
-    }
-    if (!equalAttribute(getValue("Name"), sf.getValue("Name")))
-    {
-      return false;
-    }
-    if (!ignoreParent)
-    {
-      if (!equalAttribute(getValue("Parent"), sf.getValue("Parent")))
-      {
-        return false;
-      }
-    }
-    return true;
+    return (begin == sf.begin && end == sf.end
+            && getStrand() == sf.getStrand()
+            && (Float.isNaN(score) ? Float.isNaN(sf.score)
+                    : score == sf.score)
+            && (type + description + featureGroup + getPhase())
+                    .equals(sf.type + sf.description + sf.featureGroup
+                            + sf.getPhase())
+            && equalAttribute(getValue("ID"), sf.getValue("ID"))
+            && equalAttribute(getValue("Name"), sf.getValue("Name"))
+            && (ignoreParent || equalAttribute(getValue("Parent"),
+                    sf.getValue("Parent"))));
   }
 
   /**
@@ -359,7 +322,7 @@ public class SequenceFeature implements FeatureLocationI
   {
     if (links == null)
     {
-      links = new Vector<String>();
+      links = new Vector<>();
     }
 
     if (!links.contains(labelLink))
@@ -394,18 +357,25 @@ public class SequenceFeature implements FeatureLocationI
 
   /**
    * Answers the value of the specified attribute as string, or null if no such
-   * value
+   * value. If more than one attribute name is provided, tries to resolve as keys
+   * to nested maps. For example, if attribute "CSQ" holds a map of key-value
+   * pairs, then getValueAsString("CSQ", "Allele") returns the value of "Allele"
+   * in that map.
    * 
    * @param key
    * @return
    */
-  public String getValueAsString(String key)
+  public String getValueAsString(String... key)
   {
     if (otherDetails == null)
     {
       return null;
     }
-    Object value = otherDetails.get(key);
+    Object value = otherDetails.get(key[0]);
+    if (key.length > 1 && value instanceof Map<?, ?>)
+    {
+      value = ((Map) value).get(key[1]);
+    }
     return value == null ? null : value.toString();
   }
 
@@ -438,7 +408,7 @@ public class SequenceFeature implements FeatureLocationI
     {
       if (otherDetails == null)
       {
-        otherDetails = new HashMap<String, Object>();
+        otherDetails = new HashMap<>();
       }
 
       otherDetails.put(key, value);
@@ -463,8 +433,8 @@ public class SequenceFeature implements FeatureLocationI
               .getAttributeName(key);
     }
 
-    FeatureAttributes.getInstance().addAttribute(this.type, key, attDesc,
-            value.toString());
+    FeatureAttributes.getInstance().addAttribute(this.type, attDesc, value,
+            key);
   }
 
   /*
@@ -642,30 +612,37 @@ public class SequenceFeature implements FeatureLocationI
         {
           continue; // to avoid double reporting
         }
-        if (INFO_KEYS.containsKey(key))
+
+        Object value = entry.getValue();
+        if (value instanceof Map<?, ?>)
         {
           /*
-           * split selected INFO data by delimiter over multiple lines
+           * expand values in a Map attribute across separate lines
+           * copy to a TreeMap for alphabetical ordering
            */
-          String delimiter = INFO_KEYS.get(key);
-          String[] values = entry.getValue().toString().split(delimiter);
-          for (String value : values)
+          Map<String, Object> values = (Map<String, Object>) value;
+          SortedMap<String, Object> sm = new TreeMap<>(
+                  String.CASE_INSENSITIVE_ORDER);
+          sm.putAll(values);
+          for (Entry<?, ?> e : sm.entrySet())
           {
-            sb.append(String.format(ROW_DATA, key, "", value));
+            sb.append(String.format(ROW_DATA, key, e.getKey().toString(), e
+                    .getValue().toString()));
           }
         }
         else
-        { // tried <td title="key"> but it failed to provide a tooltip :-(
+        {
+          // tried <td title="key"> but it failed to provide a tooltip :-(
           String attDesc = null;
           if (metadata != null)
           {
             attDesc = metadata.getAttributeName(key);
           }
-          String value = entry.getValue().toString();
-          if (isValueInteresting(key, value, metadata))
+          String s = entry.getValue().toString();
+          if (isValueInteresting(key, s, metadata))
           {
             sb.append(String.format(ROW_DATA, key, attDesc == null ? ""
-                    : attDesc, value));
+                    : attDesc, s));
           }
         }
       }
@@ -732,4 +709,24 @@ public class SequenceFeature implements FeatureLocationI
   {
     source = theSource;
   }
+
+ 
+}
+
+class SFSortByEnd implements Comparator<SequenceFeature>
+{
+  @Override
+  public int compare(SequenceFeature a, SequenceFeature b)
+  {
+    return a.getEnd() - b.getEnd();
+  }
+}
+
+class SFSortByBegin implements Comparator<SequenceFeature>
+{
+  @Override
+  public int compare(SequenceFeature a, SequenceFeature b)
+  {
+    return a.getBegin() - b.getBegin();
+  }
 }