git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd7a7e0
)
JAL-1617 formatting and generics
author
Jim Procter
<jprocter@dundee.ac.uk>
Tue, 17 Mar 2015 15:56:55 +0000
(15:56 +0000)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Tue, 17 Mar 2015 15:56:55 +0000
(15:56 +0000)
src/jalview/util/DBRefUtils.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/DBRefUtils.java
b/src/jalview/util/DBRefUtils.java
index
9a4ffc8
..
8163f05
100755
(executable)
--- a/
src/jalview/util/DBRefUtils.java
+++ b/
src/jalview/util/DBRefUtils.java
@@
-20,9
+20,15
@@
*/
package jalview.util;
*/
package jalview.util;
-import java.util.*;
+import jalview.datamodel.DBRefEntry;
+import jalview.datamodel.PDBEntry;
+import jalview.datamodel.SequenceI;
-import jalview.datamodel.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Vector;
public class DBRefUtils
{
public class DBRefUtils
{
@@
-48,8
+54,8
@@
public class DBRefUtils
{
return dbrefs;
}
{
return dbrefs;
}
- Hashtable srcs = new Hashtable();
- Vector res = new Vector();
+ Map<String, Integer> srcs = new HashMap<String, Integer>();
+ ArrayList<DBRefEntry> res = new ArrayList<DBRefEntry>();
for (int i = 0; i < sources.length; i++)
{
for (int i = 0; i < sources.length; i++)
{
@@
-59,18
+65,14
@@
public class DBRefUtils
{
if (srcs.containsKey(dbrefs[i].getSource()))
{
{
if (srcs.containsKey(dbrefs[i].getSource()))
{
- res.addElement(dbrefs[i]);
+ res.add(dbrefs[i]);
}
}
if (res.size() > 0)
{
DBRefEntry[] reply = new DBRefEntry[res.size()];
}
}
if (res.size() > 0)
{
DBRefEntry[] reply = new DBRefEntry[res.size()];
- for (int i = 0; i < res.size(); i++)
- {
- reply[i] = (DBRefEntry) res.elementAt(i);
- }
- return reply;
+ return res.toArray(reply);
}
res = null;
// there are probable memory leaks in the hashtable!
}
res = null;
// there are probable memory leaks in the hashtable!
@@
-169,7
+171,9
@@
public class DBRefUtils
DbRefComp comparator)
{
if (ref == null || entry == null)
DbRefComp comparator)
{
if (ref == null || entry == null)
+ {
return null;
return null;
+ }
Vector rfs = new Vector();
for (int i = 0; i < ref.length; i++)
{
Vector rfs = new Vector();
for (int i = 0; i < ref.length; i++)
{
@@
-303,6
+307,7
@@
public class DBRefUtils
{
if ((refa.getMap() == null && refb.getMap() == null)
|| (refa.getMap() != null && refb.getMap() != null))
{
if ((refa.getMap() == null && refb.getMap() == null)
|| (refa.getMap() != null && refb.getMap() != null))
+ {
if ((refb.getMap().getMap() == null && refa.getMap().getMap() == null)
|| (refb.getMap().getMap() != null
&& refa.getMap().getMap() != null && refb
if ((refb.getMap().getMap() == null && refa.getMap().getMap() == null)
|| (refb.getMap().getMap() != null
&& refa.getMap().getMap() != null && refb
@@
-311,6
+316,7
@@
public class DBRefUtils
{
return true;
}
{
return true;
}
+ }
}
}
return false;
}
}
return false;