git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into bug/JAL-2346annotationChoice
[jalview.git]
/
src
/
jalview
/
datamodel
/
Sequence.java
diff --git
a/src/jalview/datamodel/Sequence.java
b/src/jalview/datamodel/Sequence.java
index
c8b94ce
..
b0faf21
100755
(executable)
--- a/
src/jalview/datamodel/Sequence.java
+++ b/
src/jalview/datamodel/Sequence.java
@@
-314,12
+314,11
@@
public class Sequence extends ASequence implements SequenceI
}
@Override
}
@Override
- public synchronized void addSequenceFeature(SequenceFeature sf)
+ public synchronized boolean addSequenceFeature(SequenceFeature sf)
{
if (sequenceFeatures == null && datasetSequence != null)
{
{
if (sequenceFeatures == null && datasetSequence != null)
{
- datasetSequence.addSequenceFeature(sf);
- return;
+ return datasetSequence.addSequenceFeature(sf);
}
if (sequenceFeatures == null)
{
}
if (sequenceFeatures == null)
{
@@
-330,7
+329,7
@@
public class Sequence extends ASequence implements SequenceI
{
if (sequenceFeatures[i].equals(sf))
{
{
if (sequenceFeatures[i].equals(sf))
{
- return;
+ return false;
}
}
}
}
@@
-339,6
+338,7
@@
public class Sequence extends ASequence implements SequenceI
temp[sequenceFeatures.length] = sf;
sequenceFeatures = temp;
temp[sequenceFeatures.length] = sf;
sequenceFeatures = temp;
+ return true;
}
@Override
}
@Override