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 patch/JAL-3088_finalbracenotinrightplace
[jalview.git]
/
src
/
jalview
/
io
/
packed
/
ParsePackedSet.java
diff --git
a/src/jalview/io/packed/ParsePackedSet.java
b/src/jalview/io/packed/ParsePackedSet.java
index
d40446d
..
3ce774e
100644
(file)
--- a/
src/jalview/io/packed/ParsePackedSet.java
+++ b/
src/jalview/io/packed/ParsePackedSet.java
@@
-20,6
+20,8
@@
*/
package jalview.io.packed;
*/
package jalview.io.packed;
+import java.util.Locale;
+
import jalview.api.FeatureColourI;
import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
import jalview.api.FeatureColourI;
import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
@@
-235,7
+237,7
@@
public class ParsePackedSet
String type = args[i++];
final String file = args[i++];
final JvDataType jtype = DataProvider.JvDataType
String type = args[i++];
final String file = args[i++];
final JvDataType jtype = DataProvider.JvDataType
- .valueOf(type.toUpperCase());
+ .valueOf(type.toUpperCase(Locale.ROOT));
if (jtype != null)
{
final FileParse fp;
if (jtype != null)
{
final FileParse fp;
@@
-244,7
+246,7
@@
public class ParsePackedSet
fp = new FileParse(file, AppletFormatAdapter.checkProtocol(file));
} catch (Exception e)
{
fp = new FileParse(file, AppletFormatAdapter.checkProtocol(file));
} catch (Exception e)
{
- System.err.println("Couldn't handle datasource of type " + jtype
+ jalview.bin.Console.errPrintln("Couldn't handle datasource of type " + jtype
+ " using URI " + file);
e.printStackTrace();
return;
+ " using URI " + file);
e.printStackTrace();
return;
@@
-253,8
+255,8
@@
public class ParsePackedSet
}
else
{
}
else
{
- System.out.println("Couldn't parse source type token '"
- + type.toUpperCase() + "'");
+ jalview.bin.Console.outPrintln("Couldn't parse source type token '"
+ + type.toUpperCase(Locale.ROOT) + "'");
}
}
if (i < args.length)
}
}
if (i < args.length)
@@
-267,7
+269,7
@@
public class ParsePackedSet
System.out.print("\n");
}
System.out.print("\n");
}
- System.out.println("Now trying to parse set:");
+ jalview.bin.Console.outPrintln("Now trying to parse set:");
JalviewDataset context;
Object[] newdm;
ParsePackedSet pps;
JalviewDataset context;
Object[] newdm;
ParsePackedSet pps;
@@
-277,7
+279,7
@@
public class ParsePackedSet
.getAlignment(context = new JalviewDataset(), dp);
} catch (Exception e)
{
.getAlignment(context = new JalviewDataset(), dp);
} catch (Exception e)
{
- System.out.println("Test failed for these arguments.\n");
+ jalview.bin.Console.outPrintln("Test failed for these arguments.\n");
e.printStackTrace(System.out);
return;
}
e.printStackTrace(System.out);
return;
}
@@
-285,7
+287,7
@@
public class ParsePackedSet
{
for (Object o : newdm)
{
{
for (Object o : newdm)
{
- System.out.println("Will need to create an " + o.getClass());
+ jalview.bin.Console.outPrintln("Will need to create an " + o.getClass());
}
// now test uniquify/deuniquify stuff
}
// now test uniquify/deuniquify stuff
@@
-298,7
+300,7
@@
public class ParsePackedSet
{
if (context.getLastAlignmentSet().isModified())
{
{
if (context.getLastAlignmentSet().isModified())
{
- System.err.println(
+ jalview.bin.Console.errPrintln(
"Initial alignment set was modified and any associated views should be updated.");
}
}
"Initial alignment set was modified and any associated views should be updated.");
}
}