Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X 67e513926 -> 544cbaaad
Trivial refactoring: remove unnecessary boxing Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/a3b675a3 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/a3b675a3 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/a3b675a3 Branch: refs/heads/GROOVY_2_5_X Commit: a3b675a31219a5464ade225cc49a2dec9c3d3bf1 Parents: 67e5139 Author: Daniel Sun <[email protected]> Authored: Sat Sep 8 11:28:19 2018 +0800 Committer: Daniel Sun <[email protected]> Committed: Sat Sep 8 11:44:41 2018 +0800 ---------------------------------------------------------------------- .../src/main/groovy/groovy/ui/SystemOutputInterceptor.java | 4 ++-- .../src/main/groovy/groovy/ui/text/FindReplaceUtility.java | 8 ++++---- .../groovy/ui/text/StructuredSyntaxDocumentFilter.java | 6 +++--- .../src/main/java/groovy/inspect/swingui/TableSorter.java | 2 +- .../codehaus/groovy/binding/SwingTimerTriggerBinding.java | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/a3b675a3/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java index 3d2a65b..219c213 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/SystemOutputInterceptor.java @@ -35,7 +35,7 @@ public class SystemOutputInterceptor extends FilterOutputStream { private static final ThreadLocal<Integer> consoleId = new InheritableThreadLocal<Integer>() { @Override protected Integer initialValue() { - return Integer.valueOf(0); + return 0; } }; @@ -121,7 +121,7 @@ public class SystemOutputInterceptor extends FilterOutputStream { * @param consoleId id of the Console instance executing the script */ public void setConsoleId(int consoleId) { - this.consoleId.set(Integer.valueOf(consoleId)); + this.consoleId.set(consoleId); } /** http://git-wip-us.apache.org/repos/asf/groovy/blob/a3b675a3/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java index 1a6273f..4ac5b1e 100644 --- a/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java +++ b/subprojects/groovy-console/src/main/groovy/groovy/ui/text/FindReplaceUtility.java @@ -401,7 +401,7 @@ public final class FindReplaceUtility { public FindAction() { putValue(Action.NAME, FIND_ACTION_COMMAND); putValue(Action.ACTION_COMMAND_KEY, FIND_ACTION_COMMAND); - putValue(Action.MNEMONIC_KEY, Integer.valueOf(KeyEvent.VK_F)); + putValue(Action.MNEMONIC_KEY, KeyEvent.VK_F); } public void actionPerformed(ActionEvent ae) { @@ -436,7 +436,7 @@ public final class FindReplaceUtility { public ReplaceAction() { putValue(Action.NAME, REPLACE_ACTION_COMMAND); putValue(Action.ACTION_COMMAND_KEY, REPLACE_ACTION_COMMAND); - putValue(Action.MNEMONIC_KEY, Integer.valueOf(KeyEvent.VK_R)); + putValue(Action.MNEMONIC_KEY, KeyEvent.VK_R); } public void actionPerformed(ActionEvent ae) { @@ -483,7 +483,7 @@ public final class FindReplaceUtility { public ReplaceAllAction() { putValue(Action.NAME, REPLACE_ALL_ACTION_COMMAND); putValue(Action.ACTION_COMMAND_KEY, REPLACE_ALL_ACTION_COMMAND); - putValue(Action.MNEMONIC_KEY, Integer.valueOf(KeyEvent.VK_A)); + putValue(Action.MNEMONIC_KEY, KeyEvent.VK_A); } public void actionPerformed(ActionEvent ae) { @@ -531,7 +531,7 @@ public final class FindReplaceUtility { public CloseAction() { putValue(Action.NAME, CLOSE_ACTION_COMMAND); putValue(Action.ACTION_COMMAND_KEY, CLOSE_ACTION_COMMAND); - putValue(Action.MNEMONIC_KEY, Integer.valueOf(KeyEvent.VK_C)); + putValue(Action.MNEMONIC_KEY, KeyEvent.VK_C); putValue(Action.ACCELERATOR_KEY, KeyStroke.getKeyStroke("ESCAPE")); } http://git-wip-us.apache.org/repos/asf/groovy/blob/a3b675a3/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 b763cd0..9980a35 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 @@ -135,7 +135,7 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter { private MultiLineRun getMultiLineRun(int offset) { MultiLineRun ml = null; if (offset > 0) { - Integer os = Integer.valueOf(offset); + Integer os = offset; SortedSet set = mlTextRunSet.headSet(os); if (!set.isEmpty()) { @@ -208,8 +208,8 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter { // clean the tree by ensuring multi line styles are reset in area // of parsing - SortedSet set = mlTextRunSet.subSet(Integer.valueOf(offset), - Integer.valueOf(offset + length)); + SortedSet set = mlTextRunSet.subSet(offset, + offset + length); if (set != null) { set.clear(); } http://git-wip-us.apache.org/repos/asf/groovy/blob/a3b675a3/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 1f7b522..5fb1715 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 @@ -295,7 +295,7 @@ space and avoid unnecessary heap allocation. public void sortByColumn(int column, boolean ascending) { this.ascending = ascending; sortingColumns.removeAllElements(); - sortingColumns.addElement(Integer.valueOf(column)); + sortingColumns.addElement(column); sort(this); super.tableChanged(new TableModelEvent(this)); } http://git-wip-us.apache.org/repos/asf/groovy/blob/a3b675a3/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java ---------------------------------------------------------------------- diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java index 5d1774f..a289a06 100644 --- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java +++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/SwingTimerTriggerBinding.java @@ -103,14 +103,14 @@ class SwingTimerFullBinding extends AbstractFullBinding implements ActionListene // calculate if (reportSteps) { ((ClosureSourceBinding)sourceBinding).setClosureArgument( - Integer.valueOf((int) (elapsed / stepSize))); + (int) (elapsed / stepSize)); } else if (reportFraction) { ((ClosureSourceBinding)sourceBinding).setClosureArgument( - Float.valueOf((float) elapsed / (float) duration)); + (float) elapsed / (float) duration); //in Groovy2.0 use valueOf } else if (reportElapsed) { ((ClosureSourceBinding)sourceBinding).setClosureArgument( - Long.valueOf(elapsed)); + elapsed); //in Groovy2.0 use valueOf }
