X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FUserColourScheme.java;h=89f3eed3a72e8ac78599640ec1897704e75fae7e;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=eb9f7b13221004863cee32dee36233285340994a;hpb=f2221ba0c23dccdb121fe32594f050d919b11d88;p=jalview.git diff --git a/src/jalview/schemes/UserColourScheme.java b/src/jalview/schemes/UserColourScheme.java index eb9f7b1..89f3eed 100755 --- a/src/jalview/schemes/UserColourScheme.java +++ b/src/jalview/schemes/UserColourScheme.java @@ -1,31 +1,33 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. + * as published by the Free Software Foundation, either version 3 + * of the License, or (at your option) any later version. * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.schemes; -import java.awt.Color; -import java.util.Map; -import java.util.StringTokenizer; - import jalview.datamodel.AnnotatedCollectionI; import jalview.datamodel.SequenceCollectionI; import jalview.datamodel.SequenceI; +import java.awt.Color; +import java.util.Map; +import java.util.StringTokenizer; + public class UserColourScheme extends ResidueColourScheme { Color[] lowerCaseColours; @@ -42,18 +44,22 @@ public class UserColourScheme extends ResidueColourScheme super(ResidueProperties.aaIndex); colors = newColors; } + @Override public ColourSchemeI applyTo(AnnotatedCollectionI sg, Map hiddenRepSequences) { UserColourScheme usc = new UserColourScheme(colors); - if (lowerCaseColours!=null) { + if (lowerCaseColours != null) + { usc.schemeName = new String(schemeName); usc.lowerCaseColours = new Color[lowerCaseColours.length]; - System.arraycopy(lowerCaseColours, 0, usc.lowerCaseColours, 0, lowerCaseColours.length); + System.arraycopy(lowerCaseColours, 0, usc.lowerCaseColours, 0, + lowerCaseColours.length); } return usc; } + public UserColourScheme(String colour) { super(ResidueProperties.aaIndex); @@ -158,7 +164,8 @@ public class UserColourScheme extends ResidueColourScheme public void parseAppletParameter(String paramValue) { - // TODO: need a function to generate appletParameter colour string from a UCS + // TODO: need a function to generate appletParameter colour string from a + // UCS StringTokenizer st = new StringTokenizer(paramValue, ";"); StringTokenizer st2; String token = null, colour, residues;