X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FStringUtils.java;h=6044655b80c327eb3a237d82d72a6e46156284da;hb=99d5f1d805e530f23a53dad4484d44ecd0fbfdf3;hp=ad1c0f7b7ab33bd658c70e3511bb3a72b87b9929;hpb=26ba864a6c290121fe6cf616794d2d0bea65fb7d;p=jalview.git diff --git a/src/jalview/util/StringUtils.java b/src/jalview/util/StringUtils.java index ad1c0f7..6044655 100644 --- a/src/jalview/util/StringUtils.java +++ b/src/jalview/util/StringUtils.java @@ -21,9 +21,7 @@ package jalview.util; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.regex.Pattern; public class StringUtils @@ -252,72 +250,6 @@ public class StringUtils } /** - * Parses the input line to a map of name / value(s) pairs. For example the - * line
- * Notes=Fe-S;Method=manual curation; source = Pfam; Notes = Metal
- * if parsed with delimiter=";" and separators {' ', '='}
- * would return a map with { Notes={Fe=S, Metal}, Method={manual curation}, - * source={Pfam}}
- * Note the name/value strings are trimmed of leading / trailing spaces; the - * first separator encountered is used - * - * @param line - * @param delimiter - * the major delimiter between name-value pairs - * @param separators - * one or more separators used between name and value - * @return the name-values map (which may be empty but never null) - */ - public static Map> parseNameValuePairs(String line, - String delimiter, char[] separators) - { - Map> map = new HashMap>(); - if (line == null || line.trim().length() == 0) - { - return map; - } - - for (String pair : line.trim().split(delimiter)) - { - pair = pair.trim(); - if (pair.length() == 0) - { - continue; - } - - int sepPos = -1; - for (char sep : separators) - { - int pos = pair.indexOf(sep); - if (pos > -1 && (sepPos == -1 || pos < sepPos)) - { - sepPos = pos; - } - } - - if (sepPos == -1) - { - // no name=value detected - continue; - } - - String key = pair.substring(0, sepPos).trim(); - String value = pair.substring(sepPos + 1).trim(); - if (value.length() > 0) - { - List vals = map.get(key); - if (vals == null) - { - vals = new ArrayList(); - map.put(key, vals); - } - vals.add(value); - } - } - return map; - } - - /** * Converts a list to a string with a delimiter before each term except the * first. Returns an empty string given a null or zero-length argument. This * can be replaced with StringJoiner in Java 8.