Merge branch 'develop' into features/JAL-2609fastPaintWrapped

[jalview.git] / src / jalview / schemes / ColourSchemeProperty.java

diff --git a/src/jalview/schemes/ColourSchemeProperty.java b/src/jalview/schemes/ColourSchemeProperty.java
index 3e8e87a..fc92cd9 100755 (executable)
--- a/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@ -44,7 +44,8 @@ public class ColourSchemeProperty
    * Returns a colour scheme for the given name, with which the given data may
    * be coloured. The name is not case-sensitive, and may be one of
    * <ul>
-   * <li>any currently registered colour scheme; Jalview by default provides</li>
+   * <li>any currently registered colour scheme; Jalview by default
+   * provides</li>
    * <ul>
    * <li>Clustal</li>
    * <li>Blosum62</li>
@@ -61,9 +62,11 @@ public class ColourSchemeProperty
    * <li>T-Coffee Scores</li>
    * <li>RNA Helices</li>
    * </ul>
-   * <li>the name of a programmatically added colour scheme</li> <li>an AWT
-   * colour name e.g. red</li> <li>an AWT hex rgb colour e.g. ff2288</li> <li>
-   * residue colours list e.g. D,E=red;K,R,H=0022FF;c=yellow</li> </ul>
+   * <li>the name of a programmatically added colour scheme</li>
+   * <li>an AWT colour name e.g. red</li>
+   * <li>an AWT hex rgb colour e.g. ff2288</li>
+   * <li>residue colours list e.g. D,E=red;K,R,H=0022FF;c=yellow</li>
+   * </ul>
    * 
    * If none of these formats is matched, the string is converted to a colour
    * using a hashing algorithm. For name "None", returns null.
@@ -85,8 +88,8 @@ public class ColourSchemeProperty
      * if this is the name of a registered colour scheme, just
      * create a new instance of it
      */
-    ColourSchemeI scheme = ColourSchemes.getInstance().getColourScheme(
-            name, forData, null);
+    ColourSchemeI scheme = ColourSchemes.getInstance().getColourScheme(name,
+            forData, null);
     if (scheme != null)
     {
       return scheme;
@@ -146,8 +149,7 @@ public class ColourSchemeProperty
    */
   public static String getColourName(ColourSchemeI cs)
   {
-    return cs == null ? ResidueColourScheme.NONE : cs
-            .getSchemeName();
+    return cs == null ? ResidueColourScheme.NONE : cs.getSchemeName();
   }
 
 }