X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FAlignmentI.java;h=975f9facf8100307be69035eb9986ab74ca132c1;hb=066a11f5ce0580b9d7bf0f855432c341aa279bd4;hp=3d6103719e91ad10cb4005169008ffd04d2630f5;hpb=6357db6c20614a666b7b446aeb3260c5379637eb;p=jalview.git
diff --git a/src/jalview/datamodel/AlignmentI.java b/src/jalview/datamodel/AlignmentI.java
index 3d61037..975f9fa 100755
--- a/src/jalview/datamodel/AlignmentI.java
+++ b/src/jalview/datamodel/AlignmentI.java
@@ -1,19 +1,20 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 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.
- *
+ *
* 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
@@ -36,6 +37,7 @@ public interface AlignmentI extends AnnotatedCollectionI
*
* @return Greatest sequence length within alignment.
*/
+ @Override
public int getWidth();
/**
@@ -57,7 +59,7 @@ public interface AlignmentI extends AnnotatedCollectionI
/**
* Gets sequences as a Synchronized collection
- *
+ *
* @return All sequences in alignment.
*/
@Override
@@ -237,6 +239,7 @@ public interface AlignmentI extends AnnotatedCollectionI
*
* @return array of AlignmentAnnotation objects
*/
+ @Override
public AlignmentAnnotation[] getAlignmentAnnotation();
/**
@@ -435,19 +438,31 @@ public interface AlignmentI extends AnnotatedCollectionI
/**
* search for or create a specific annotation row on the alignment
- *
- * @param method - CalcId for the annotation (must match)
- * @param autoCalc - value of autocalc flag for the annotation
- * @param seqRef - null or specific sequence reference
- * @param groupRef - null or specific group reference
- * @return existing annotation matching the given attributes
+ *
+ * @param name
+ * name for annotation (must match)
+ * @param calcId
+ * calcId for the annotation (null or must match)
+ * @param autoCalc
+ * - value of autocalc flag for the annotation
+ * @param seqRef
+ * - null or specific sequence reference
+ * @param groupRef
+ * - null or specific group reference
+ * @param method
+ * - CalcId for the annotation (must match)
+ *
+ * @return existing annotation matching the given attributes
*/
- public AlignmentAnnotation findOrCreateAnnotation(String name, boolean autoCalc,
- SequenceI seqRef, SequenceGroup groupRef);
+ public AlignmentAnnotation findOrCreateAnnotation(String name,
+ String calcId, boolean autoCalc, SequenceI seqRef,
+ SequenceGroup groupRef);
/**
- * move the given group up or down in the alignment by the given number of rows.
- * Implementor assumes given group is already present on alignment - no recalculations are triggered.
+ * move the given group up or down in the alignment by the given number of
+ * rows. Implementor assumes given group is already present on alignment - no
+ * recalculations are triggered.
+ *
* @param sg
* @param map
* @param up
@@ -455,4 +470,10 @@ public interface AlignmentI extends AnnotatedCollectionI
*/
public void moveSelectedSequencesByOne(SequenceGroup sg,
Map map, boolean up);
+
+ /**
+ * validate annotation after an edit and update any alignment state flags accordingly
+ * @param alignmentAnnotation
+ */
+ public void validateAnnotation(AlignmentAnnotation alignmentAnnotation);
}