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:
42da789
)
JAL-3032 explicit Integer.intValue() conversion for safety
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 27 Jun 2018 14:05:02 +0000
(15:05 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 27 Jun 2018 14:05:02 +0000
(15:05 +0100)
src/jalview/util/QuickSort.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/QuickSort.java
b/src/jalview/util/QuickSort.java
index
0c0fabf
..
6901e24
100755
(executable)
--- a/
src/jalview/util/QuickSort.java
+++ b/
src/jalview/util/QuickSort.java
@@
-51,8
+51,9
@@
public class QuickSort
@Override
public int compare(Integer o1, Integer o2)
{
@Override
public int compare(Integer o1, Integer o2)
{
- return ascending ? Float.compare(values[o1], values[o2])
- : Float.compare(values[o2], values[o1]);
+ return ascending
+ ? Float.compare(values[o1.intValue()], values[o2.intValue()])
+ : Float.compare(values[o2.intValue()], values[o1.intValue()]);
}
}
}
}
@@
-77,11
+78,11
@@
public class QuickSort
{
if (ascending)
{
{
if (ascending)
{
- return Double.compare(values[o1], values[o2]);
+ return Double.compare(values[o1.intValue()], values[o2.intValue()]);
}
else
{
}
else
{
- return Double.compare(values[o2], values[o1]);
+ return Double.compare(values[o2.intValue()], values[o1.intValue()]);
}
}
}
}
}
}
@@
-105,8
+106,11
@@
public class QuickSort
@Override
public int compare(Integer o1, Integer o2)
{
@Override
public int compare(Integer o1, Integer o2)
{
- return ascending ? Integer.compare(values[o1], values[o2])
- : Integer.compare(values[o2], values[o1]);
+ return ascending
+ ? Integer.compare(values[o1.intValue()],
+ values[o2.intValue()])
+ : Integer.compare(values[o2.intValue()],
+ values[o1.intValue()]);
}
}
}
}
@@
-129,8
+133,9
@@
public class QuickSort
@Override
public int compare(Integer o1, Integer o2)
{
@Override
public int compare(Integer o1, Integer o2)
{
- return ascending ? values[o1].compareTo(values[o2])
- : values[o2].compareTo(values[o1]);
+ return ascending
+ ? values[o1.intValue()].compareTo(values[o2.intValue()])
+ : values[o2.intValue()].compareTo(values[o1.intValue()]);
}
}
}
}