X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFeaturesFile.java;h=a8a3746af0940f1fb3f1f934214878dbde37f8d7;hb=b19bd11f40441f651012d161f2e61ee7d45a5208;hp=9a4dc0e023ee79e8ee79b2c37324d855bb8e6dd0;hpb=3b3c59cfa50e942d2fa5b367b7117cade9459ce7;p=jalview.git diff --git a/src/jalview/io/FeaturesFile.java b/src/jalview/io/FeaturesFile.java index 9a4dc0e..a8a3746 100755 --- a/src/jalview/io/FeaturesFile.java +++ b/src/jalview/io/FeaturesFile.java @@ -74,11 +74,7 @@ import java.util.TreeMap; */ public class FeaturesFile extends AlignFile implements FeaturesSourceI { - /* - * map-valued attributes are prefixed with this for output to GFF3; - * the prefix is removed if found on reading - */ - public static final String MAP_ATTRIBUTE_PREFIX = "jvmap_"; + private static final String EQUALS = "="; private static final String TAB_REGEX = "\\t"; @@ -92,8 +88,6 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI private static final String ID_NOT_SPECIFIED = "ID_NOT_SPECIFIED"; - private static final String NOTE = "Note"; - protected static final String GFF_VERSION = "##gff-version"; private AlignmentI lastmatchedAl = null; @@ -1192,7 +1186,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI { String formatted = StringUtils.urlEncode(value.toString(), GffHelperI.GFF_ENCODABLE); - sb.append(key).append("=").append(formatted); + sb.append(key).append(EQUALS).append(formatted); } } } @@ -1201,7 +1195,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI * Formats the map entries as * *
-   * jvmap_key={key1=value1,key2=value2,...}
+   * key=key1=value1,key2=value2,...
    * 
* * and appends this to the string buffer @@ -1222,7 +1216,7 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI * AbstractMap.toString would be a shortcut here, but more reliable * to code the required format in case toString changes in future */ - sb.append(MAP_ATTRIBUTE_PREFIX).append(key).append("={"); + sb.append(key).append(EQUALS); boolean first = true; for (Entry entry : map.entrySet()) { @@ -1231,12 +1225,11 @@ public class FeaturesFile extends AlignFile implements FeaturesSourceI sb.append(","); } first = false; - sb.append(entry.getKey().toString()).append("="); + sb.append(entry.getKey().toString()).append(EQUALS); String formatted = StringUtils.urlEncode(entry.getValue().toString(), GffHelperI.GFF_ENCODABLE); sb.append(formatted); } - sb.append("}"); } /**