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 develop to Release_2_8_3_Branch
[jalview.git]
/
src
/
jalview
/
datamodel
/
SequenceFeature.java
diff --git
a/src/jalview/datamodel/SequenceFeature.java
b/src/jalview/datamodel/SequenceFeature.java
index
48b7f88
..
28ab82c
100755
(executable)
--- a/
src/jalview/datamodel/SequenceFeature.java
+++ b/
src/jalview/datamodel/SequenceFeature.java
@@
-20,7
+20,8
@@
*/
package jalview.datamodel;
*/
package jalview.datamodel;
-import java.util.*;
+import java.util.Hashtable;
+import java.util.Vector;
/**
* DOCUMENT ME!
/**
* DOCUMENT ME!
@@
-42,7
+43,7
@@
public class SequenceFeature
public Hashtable otherDetails;
public Hashtable otherDetails;
- public java.util.Vector links;
+ public Vector<String> links;
// Feature group can be set from a features file
// as a group of features between STARTGROUP and ENDGROUP markers
// Feature group can be set from a features file
// as a group of features between STARTGROUP and ENDGROUP markers
@@
-90,7
+91,7
@@
public class SequenceFeature
}
if (cpy.links != null && cpy.links.size() > 0)
{
}
if (cpy.links != null && cpy.links.size() > 0)
{
- links = new Vector();
+ links = new Vector<String>();
for (int i = 0, iSize = cpy.links.size(); i < iSize; i++)
{
links.addElement(cpy.links.elementAt(i));
for (int i = 0, iSize = cpy.links.size(); i < iSize; i++)
{
links.addElement(cpy.links.elementAt(i));
@@
-211,7
+212,7
@@
public class SequenceFeature
{
if (links == null)
{
{
if (links == null)
{
- links = new java.util.Vector();
+ links = new Vector<String>();
}
links.insertElementAt(labelLink, 0);
}
links.insertElementAt(labelLink, 0);
@@
-283,7
+284,9
@@
public class SequenceFeature
{
String stat = (String) otherDetails.get("status");
if (stat != null)
{
String stat = (String) otherDetails.get("status");
if (stat != null)
+ {
return new String(stat);
return new String(stat);
+ }
}
return null;
}
}
return null;
}