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-3148 further bug fix to state of 'colourBy'
[jalview.git]
/
src
/
jalview
/
schemes
/
UserColourScheme.java
diff --git
a/src/jalview/schemes/UserColourScheme.java
b/src/jalview/schemes/UserColourScheme.java
index
d83e9c2
..
bf62e45
100755
(executable)
--- a/
src/jalview/schemes/UserColourScheme.java
+++ b/
src/jalview/schemes/UserColourScheme.java
@@
-222,7
+222,8
@@
public class UserColourScheme extends ResidueColourScheme
{
lowerCaseColours = new Color[colors.length];
}
{
lowerCaseColours = new Color[colors.length];
}
- lowerCaseColours[colIndex] = ColorUtils.parseColourString(colour);
+ lowerCaseColours[colIndex] = ColorUtils
+ .parseColourString(colour);
}
else
{
}
else
{
@@
-232,8
+233,8
@@
public class UserColourScheme extends ResidueColourScheme
}
} catch (Exception ex)
{
}
} catch (Exception ex)
{
- System.out.println("Error parsing userDefinedColours:\n" + token
- + "\n" + ex);
+ System.out.println(
+ "Error parsing userDefinedColours:\n" + token + "\n" + ex);
}
}
}
}
@@
-263,8
+264,8
@@
public class UserColourScheme extends ResidueColourScheme
}
/**
}
/**
- * Answers the customised name of the colour scheme, if it has one, else
- * "User Defined"
+ * Answers the customised name of the colour scheme, if it has one, else "User
+ * Defined"
*/
@Override
public String getSchemeName()
*/
@Override
public String getSchemeName()
@@
-273,7
+274,7
@@
public class UserColourScheme extends ResidueColourScheme
{
return schemeName;
}
{
return schemeName;
}
- return "User Defined";
+ return ResidueColourScheme.USER_DEFINED;
}
/**
}
/**