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
JAL-2416 allow space in score matrix name
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemes.java
diff --git
a/src/jalview/schemes/ColourSchemes.java
b/src/jalview/schemes/ColourSchemes.java
index
5707876
..
817fb01
100644
(file)
--- a/
src/jalview/schemes/ColourSchemes.java
+++ b/
src/jalview/schemes/ColourSchemes.java
@@
-6,6
+6,7
@@
import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
import java.awt.Color;
import jalview.datamodel.SequenceI;
import java.awt.Color;
+import java.io.File;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.LinkedHashMap;
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.util.LinkedHashMap;
@@
-182,14
+183,15
@@
public class ColourSchemes
* definition of residue colours in XML format as defined in
* JalviewUserColours.xsd.
*
* definition of residue colours in XML format as defined in
* JalviewUserColours.xsd.
*
- * @param file
+ * @param filePath
*
* @return
*/
*
* @return
*/
- public static UserColourScheme loadColourScheme(String file)
+ public static UserColourScheme loadColourScheme(String filePath)
{
UserColourScheme ucs = null;
Color[] newColours = null;
{
UserColourScheme ucs = null;
Color[] newColours = null;
+ File file = new File(filePath);
try
{
InputStreamReader in = new InputStreamReader(
try
{
InputStreamReader in = new InputStreamReader(