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
JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git]
/
src
/
jalview
/
io
/
vamsas
/
Sequencefeature.java
diff --git
a/src/jalview/io/vamsas/Sequencefeature.java
b/src/jalview/io/vamsas/Sequencefeature.java
index
d1af2cf
..
0f9a664
100644
(file)
--- a/
src/jalview/io/vamsas/Sequencefeature.java
+++ b/
src/jalview/io/vamsas/Sequencefeature.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
- * Copyright (C) $$Year-Rel$$ 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.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,12
@@
*/
package jalview.io.vamsas;
*/
package jalview.io.vamsas;
+import jalview.bin.Cache;
+import jalview.datamodel.SequenceFeature;
+import jalview.datamodel.SequenceI;
+import jalview.io.VamsasAppDatastore;
+import jalview.util.UrlLink;
+
import java.util.Enumeration;
import java.util.Vector;
import java.util.Enumeration;
import java.util.Vector;
@@
-31,11
+37,6
@@
import uk.ac.vamsas.objects.core.RangeAnnotation;
import uk.ac.vamsas.objects.core.Score;
import uk.ac.vamsas.objects.core.Seg;
import uk.ac.vamsas.objects.utils.Properties;
import uk.ac.vamsas.objects.core.Score;
import uk.ac.vamsas.objects.core.Seg;
import uk.ac.vamsas.objects.utils.Properties;
-import jalview.bin.Cache;
-import jalview.datamodel.SequenceFeature;
-import jalview.datamodel.SequenceI;
-import jalview.io.VamsasAppDatastore;
-import jalview.util.UrlLink;
/**
* @author JimP
/**
* @author JimP
@@
-199,15
+200,14
@@
public class Sequencefeature extends Rangetype
.debug("About to destroy complex annotation in vamsas document mapped to sequence feature ("
+ dsa.getVorbaId() + ")");
}
.debug("About to destroy complex annotation in vamsas document mapped to sequence feature ("
+ dsa.getVorbaId() + ")");
}
- dsa.setSeg(new Seg[]
- { vSeg });
+ dsa.setSeg(new Seg[] { vSeg });
dsa.setDescription(feature.getDescription());
dsa.setStatus(feature.getStatus());
if (feature.links != null && feature.links.size() > 0)
{
for (int i = 0, iSize = feature.links.size(); i < iSize; i++)
{
dsa.setDescription(feature.getDescription());
dsa.setStatus(feature.getStatus());
if (feature.links != null && feature.links.size() > 0)
{
for (int i = 0, iSize = feature.links.size(); i < iSize; i++)
{
- String link = (String) feature.links.elementAt(i);
+ String link = feature.links.elementAt(i);
UrlLink ulink = new UrlLink(link);
if (ulink.isValid())
{
UrlLink ulink = new UrlLink(link);
if (ulink.isValid())
{
@@
-223,8
+223,7
@@
public class Sequencefeature extends Rangetype
if (!Float.isNaN(feature.getScore()))
{
Score fscore = new Score();
if (!Float.isNaN(feature.getScore()))
{
Score fscore = new Score();
- dsa.setScore(new Score[]
- { fscore });
+ dsa.setScore(new Score[] { fscore });
fscore.setContent(feature.getScore());
fscore.setName(feature.getType());
}
fscore.setContent(feature.getScore());
fscore.setName(feature.getType());
}