diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java index aa02ce7f0..8fcd1a53c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMergeHandler.java @@ -81,12 +81,12 @@ public class ResourceMergeHandler extends ResourceMergeActionHandler { if (overwrite) { if (diffs.length == 1) return TeamUIMessages.ResourceMergeHandler_0; - return NLS.bind(TeamUIMessages.ResourceMergeHandler_1, new Integer(diffs.length).toString()); + return NLS.bind(TeamUIMessages.ResourceMergeHandler_1, Integer.valueOf(diffs.length).toString()); } if (diffs.length == 1) return TeamUIMessages.ResourceMergeHandler_2; - return NLS.bind(TeamUIMessages.ResourceMergeHandler_3, new Integer(diffs.length).toString()); + return NLS.bind(TeamUIMessages.ResourceMergeHandler_3, Integer.valueOf(diffs.length).toString()); } }; } |