You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/09/08 03:45:54 UTC

[2/4] groovy git commit: Trivial refactoring: remove unnecessary unboxing

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/8ce9b63a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8ce9b63a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8ce9b63a

Branch: refs/heads/master
Commit: 8ce9b63a70838189303c465e9260a3767e2e3acb
Parents: d9215f5
Author: Daniel Sun <su...@apache.org>
Authored: Sat Sep 8 11:29:06 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Sat Sep 8 11:29:06 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/8ce9b63a/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/8ce9b63a/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;
         }