X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAnnotation.java;h=dae81ef4940663b226b9d91ab30c074f42cfb425;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=93b6ff69bfd57b10bd2d3b0d7926a9e9bf9396e4;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/datamodel/Annotation.java b/src/jalview/datamodel/Annotation.java index 93b6ff6..dae81ef 100755 --- a/src/jalview/datamodel/Annotation.java +++ b/src/jalview/datamodel/Annotation.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ 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.datamodel; @@ -67,6 +69,7 @@ public class Annotation description = desc; secondaryStructure = ss; value = val; + } /** @@ -110,6 +113,7 @@ public class Annotation secondaryStructure = that.secondaryStructure; value = that.value; colour = that.colour; + } /** @@ -120,15 +124,15 @@ public class Annotation */ public Annotation(float val) { - this(null, null, ' ', val); + this(null, null, ' ', val, null); } /** * human readable representation of an annotation row element. - * + * * Format is 'display Char','secondary Structure * Char',"description",score,[colourstring] - * + * * fields may be missing if they are null, whitespace, or equivalent to * Float.NaN */