Trivial refactoring: remove unnecessary unboxing
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8c4c8cb3 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8c4c8cb3 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8c4c8cb3 Branch: refs/heads/GROOVY_2_5_X Commit: 8c4c8cb372a9b9d0fa7bd24b1427153616a15a09 Parents: a3b675a Author: Daniel Sun <[email protected]> Authored: Sat Sep 8 11:29:06 2018 +0800 Committer: Daniel Sun <[email protected]> Committed: Sat Sep 8 11:44:50 2018 +0800 ---------------------------------------------------------------------- .../groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java | 4 ++-- .../src/main/java/groovy/inspect/swingui/TableSorter.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/8c4c8cb3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java index 9980a35..796aeb3 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/StructuredSyntaxDocumentFilter.java @@ -567,8 +567,8 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter { } private int valueOf(Object obj) { - return obj instanceof Integer ? - ((Integer)obj).intValue() : + return obj instanceof Integer ? + (Integer) obj : (obj instanceof MultiLineRun) ? ((MultiLineRun)obj).start() : ((Position)obj).getOffset(); http://git-wip-us.apache.org/repos/asf/groovy/blob/8c4c8cb3/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java index 5fb1715..468db34 100644 --- a/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java +++ b/subprojects/groovy-swing/src/main/java/groovy/inspect/swingui/TableSorter.java @@ -122,9 +122,9 @@ space and avoid unnecessary heap allocation. private static int compareBooleans(TableModel data, int row1, int column, int row2) { Boolean bool1 = (Boolean) data.getValueAt(row1, column); - boolean b1 = bool1.booleanValue(); + boolean b1 = bool1; Boolean bool2 = (Boolean) data.getValueAt(row2, column); - boolean b2 = bool2.booleanValue(); + boolean b2 = bool2; if (b1 == b2) return 0; @@ -174,7 +174,7 @@ space and avoid unnecessary heap allocation. public int compare(int row1, int row2) { for (int level = 0; level < sortingColumns.size(); level++) { Integer column = (Integer) sortingColumns.elementAt(level); - int result = compareRowsByColumn(row1, row2, column.intValue()); + int result = compareRowsByColumn(row1, row2, column); if (result != 0) return ascending ? result : -result; }
