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-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[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
f8d86d5
..
dab840e
100644
(file)
--- a/
src/jalview/io/vamsas/Sequencefeature.java
+++ b/
src/jalview/io/vamsas/Sequencefeature.java
@@
-232,7
+232,7
@@
public class Sequencefeature extends Rangetype
if (feature.otherDetails != null)
{
Iterator<String> iter = feature.otherDetails.keySet().iterator();
if (feature.otherDetails != null)
{
Iterator<String> iter = feature.otherDetails.keySet().iterator();
- Vector props = dsa.getPropertyAsReference();
+ Vector<?> props = dsa.getPropertyAsReference();
while (iter.hasNext())
{
String key = iter.next();
while (iter.hasNext())
{
String key = iter.next();
@@
-290,10
+290,11
@@
public class Sequencefeature extends Rangetype
String featureType = dseta.getType();
if (dseta.getScoreCount() > 0)
{
String featureType = dseta.getType();
if (dseta.getScoreCount() > 0)
{
- Enumeration scr = dseta.enumerateScore();
+ @SuppressWarnings("unchecked")
+ Enumeration<Score> scr = dseta.enumerateScore();
while (scr.hasMoreElements())
{
while (scr.hasMoreElements())
{
- Score score = (Score) scr.nextElement();
+ Score score = scr.nextElement();
if (score.getName().equals(featureType))
{
theScore = score.getContent();
if (score.getName().equals(featureType))
{
theScore = score.getContent();
@@
-325,10
+326,11
@@
public class Sequencefeature extends Rangetype
}
if (dseta.getScoreCount() > 0)
{
}
if (dseta.getScoreCount() > 0)
{
- Enumeration scr = dseta.enumerateScore();
+ @SuppressWarnings("unchecked")
+ Enumeration<Score> scr = dseta.enumerateScore();
while (scr.hasMoreElements())
{
while (scr.hasMoreElements())
{
- Score score = (Score) scr.nextElement();
+ Score score = scr.nextElement();
if (!score.getName().equals(sf.getType()))
{
sf.setValue(score.getName(), "" + score.getContent());
if (!score.getName().equals(sf.getType()))
{
sf.setValue(score.getName(), "" + score.getContent());
@@
-336,10
+338,11
@@
public class Sequencefeature extends Rangetype
}
}
// other details
}
}
// other details
- Enumeration props = dseta.enumerateProperty();
+ @SuppressWarnings("unchecked")
+ Enumeration<Property> props = dseta.enumerateProperty();
while (props.hasMoreElements())
{
while (props.hasMoreElements())
{
- Property p = (Property) props.nextElement();
+ Property p = props.nextElement();
Object val = null;
if (Properties.isValid(p))
{
Object val = null;
if (Properties.isValid(p))
{
@@
-351,7
+354,7
@@
public class Sequencefeature extends Rangetype
{
try
{
{
try
{
- val = Boolean.valueOf(p.getContent());
+ val = new Boolean(p.getContent());
} catch (Exception e)
{
}
} catch (Exception e)
{
}
@@
-360,7
+363,7
@@
public class Sequencefeature extends Rangetype
{
try
{
{
try
{
- val = Float.valueOf(p.getContent());
+ val = new Float(p.getContent());
} catch (Exception e)
{
} catch (Exception e)
{
@@
-370,7
+373,7
@@
public class Sequencefeature extends Rangetype
{
try
{
{
try
{
- val = Integer.valueOf(p.getContent());
+ val = new Integer(p.getContent());
} catch (Exception e)
{
}
} catch (Exception e)
{
}