X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignment.java;h=5e757250a1cda38b5250adc44259e7e828f23268;hb=276594c533ac5346dab8b49d14efae9b49aac5c9;hp=7f035b4b3234092abfcd507feb04a47872e7a64a;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git diff --git a/src/jalview/datamodel/Alignment.java b/src/jalview/datamodel/Alignment.java index 7f035b4..5e75725 100755 --- a/src/jalview/datamodel/Alignment.java +++ b/src/jalview/datamodel/Alignment.java @@ -6,18 +6,22 @@ * * 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; +import jalview.util.MessageManager; + import java.util.*; /** @@ -110,7 +114,7 @@ public class Alignment implements AlignmentI */ public static AlignmentI createAlignment(CigarArray compactAlignment) { - throw new Error("Alignment(CigarArray) not yet implemented"); + throw new Error(MessageManager.getString("error.alignment_cigararray_not_implemented")); // this(compactAlignment.refCigars); } @@ -446,7 +450,8 @@ public class Alignment implements AlignmentI { removeAnnotationForGroup(null); } - for (SequenceGroup sg:groups) { + for (SequenceGroup sg : groups) + { sg.setContext(null); } groups.clear(); @@ -1484,32 +1489,38 @@ public class Alignment implements AlignmentI } } - @Override - public void validateAnnotation(AlignmentAnnotation alignmentAnnotation) - { - alignmentAnnotation.validateRangeAndDisplay(); - if (isNucleotide() && alignmentAnnotation.isValidStruc()) - { - hasRNAStructure = true; - } - } - @Override -public int getEndRes() -{ - return getWidth()-1; -}@Override -public int getStartRes() -{ - return 0; -} -/* In the case of AlignmentI - returns the dataset for the alignment, if set - * (non-Javadoc) - * @see jalview.datamodel.AnnotatedCollectionI#getContext() - */ -@Override -public AnnotatedCollectionI getContext() -{ - return dataset; -} + @Override + public void validateAnnotation(AlignmentAnnotation alignmentAnnotation) + { + alignmentAnnotation.validateRangeAndDisplay(); + if (isNucleotide() && alignmentAnnotation.isValidStruc()) + { + hasRNAStructure = true; + } + } + + @Override + public int getEndRes() + { + return getWidth() - 1; + } + + @Override + public int getStartRes() + { + return 0; + } + + /* + * In the case of AlignmentI - returns the dataset for the alignment, if set + * (non-Javadoc) + * + * @see jalview.datamodel.AnnotatedCollectionI#getContext() + */ + @Override + public AnnotatedCollectionI getContext() + { + return dataset; + } }