git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-2446NCList
[jalview.git]
/
src
/
jalview
/
util
/
StringUtils.java
diff --git
a/src/jalview/util/StringUtils.java
b/src/jalview/util/StringUtils.java
index
b5ab40d
..
b3456aa
100644
(file)
--- a/
src/jalview/util/StringUtils.java
+++ b/
src/jalview/util/StringUtils.java
@@
-138,7
+138,8
@@
public class StringUtils
* @param delimiter
* @return elements separated by separator
*/
* @param delimiter
* @return elements separated by separator
*/
- public static String[] separatorListToArray(String input, String delimiter)
+ public static String[] separatorListToArray(String input,
+ String delimiter)
{
int seplen = delimiter.length();
if (input == null || input.equals("") || input.equals(delimiter))
{
int seplen = delimiter.length();
if (input == null || input.equals("") || input.equals(delimiter))
@@
-155,9
+156,8
@@
public class StringUtils
if (wasescaped || wasquoted)
{
// append to previous pos
if (wasescaped || wasquoted)
{
// append to previous pos
- jv.set(jv.size() - 1,
- lstitem = lstitem + delimiter
- + input.substring(cp, pos + escape));
+ jv.set(jv.size() - 1, lstitem = lstitem + delimiter
+ + input.substring(cp, pos + escape));
}
else
{
}
else
{
@@
-201,8
+201,8
@@
public class StringUtils
}
if (DEBUG)
{
}
if (DEBUG)
{
- System.err.println("Empty Array from '" + delimiter
- + "' separated List");
+ System.err.println(
+ "Empty Array from '" + delimiter + "' separated List");
}
return null;
}
}
return null;
}
@@
-235,16
+235,16
@@
public class StringUtils
}
if (DEBUG)
{
}
if (DEBUG)
{
- System.err.println("Returning '" + separator
- + "' separated List:\n");
+ System.err
+ .println("Returning '" + separator + "' separated List:\n");
System.err.println(v);
}
return v.toString();
}
if (DEBUG)
{
System.err.println(v);
}
return v.toString();
}
if (DEBUG)
{
- System.err.println("Returning empty '" + separator
- + "' separated List\n");
+ System.err.println(
+ "Returning empty '" + separator + "' separated List\n");
}
return "" + separator;
}
}
return "" + separator;
}
@@
-364,8
+364,8
@@
public class StringUtils
}
} catch (NumberFormatException e)
{
}
} catch (NumberFormatException e)
{
- System.err.println("Invalid version format found: "
- + e.getMessage());
+ System.err
+ .println("Invalid version format found: " + e.getMessage());
return 0;
}
}
return 0;
}
}