diff options
author | Karsten Thoms | 2017-11-08 21:36:10 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2017-11-09 10:54:30 +0000 |
commit | cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a (patch) | |
tree | b3c87a33363f74d6ea2b5a48ff3aa8f558ae091e /bundles/org.eclipse.team.ui/src/org/eclipse | |
parent | 5685ec90433f9182cb664c38b014b848da8a5495 (diff) | |
download | eclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.tar.gz eclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.tar.xz eclipse.platform.team-cb39d43edc678e2eac00bb0f93f55a4e0b25dc4a.zip |
Bug 527018 - [refactoring] Replace use of Number constructors by valueOfI20171113-2000I20171112-2000I20171111-1500I20171111-0410I20171111-0155I20171110-2000I20171109-2000
Bump micro version for 4.8
Change-Id: Ib0bee17c6905c38cab7d4701f6339bfd63d9c45e
Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse')
11 files changed, 21 insertions, 21 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java index 7910f13fd..37d901843 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/Utils.java @@ -987,7 +987,7 @@ public class Utils { String desc = convertSelection(mappings); if (desc.length() > 0) return shortenText(30, desc); - return NLS.bind(TeamUIMessages.Utils_18, new Integer(mappings.length)); + return NLS.bind(TeamUIMessages.Utils_18, Integer.valueOf(mappings.length)); } public static String convertSelection(ResourceMapping[] mappings) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java index 69bb4498a..4febb3e20 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/DiffTreeChangesSection.java @@ -318,7 +318,7 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements if (changesCount == 1) { message = TeamUIMessages.DiffTreeChangesSection_8; } else { - message = NLS.bind(TeamUIMessages.DiffTreeChangesSection_9, new Integer(changesCount)); + message = NLS.bind(TeamUIMessages.DiffTreeChangesSection_9, Integer.valueOf(changesCount)); } final ITeamContentProviderDescriptor[] descriptors = getEnabledContentDescriptors(); if (descriptors.length == 0) diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/FuzzFactorDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/FuzzFactorDialog.java index fe8c0e1b3..99135863a 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/FuzzFactorDialog.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/FuzzFactorDialog.java @@ -69,7 +69,7 @@ public class FuzzFactorDialog extends Dialog { valueText.addModifyListener(e -> validateInput()); fuzzFactor = patcher.getFuzz(); if (fuzzFactor >= 0) - valueText.setText(new Integer(fuzzFactor).toString()); + valueText.setText(Integer.valueOf(fuzzFactor).toString()); Button guessButton = new Button(composite, SWT.NONE); guessButton.setText(TeamUIMessages.FuzzFactorDialog_guess); @@ -84,7 +84,7 @@ public class FuzzFactorDialog extends Dialog { patcher.setFuzz(-1); int fuzz = guessFuzzFactor(); if (fuzz >= 0) { - String value = new Integer(fuzz).toString(); + String value = Integer.valueOf(fuzz).toString(); valueText.setText(value); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/IgnoreLeadingPathSegmentsAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/IgnoreLeadingPathSegmentsAction.java index d5bda6837..f1865ad4e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/IgnoreLeadingPathSegmentsAction.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/IgnoreLeadingPathSegmentsAction.java @@ -53,7 +53,7 @@ public class IgnoreLeadingPathSegmentsAction extends Action { Display.getCurrent().getActiveShell(), TeamUIMessages.IgnoreLeadingPathSegmentsDialog_title, NLS.bind( TeamUIMessages.IgnoreLeadingPathSegmentsDialog_message, - new Integer(maxValue)), new Integer(oldValue) + Integer.valueOf(maxValue)), new Integer(oldValue) .toString(), new IInputValidator() { @Override public String isValid(String input) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java index 577b92b90..6c1e197af 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/ResourceMarkAsMergedHandler.java @@ -97,7 +97,7 @@ public class ResourceMarkAsMergedHandler extends ResourceMergeActionHandler { IDiff[] diffs = getTargetDiffs(); if (diffs.length == 1) return TeamUIMessages.ResourceMarkAsMergedHandler_0; - return NLS.bind(TeamUIMessages.ResourceMarkAsMergedHandler_1, new Integer(diffs.length).toString()); + return NLS.bind(TeamUIMessages.ResourceMarkAsMergedHandler_1, Integer.valueOf(diffs.length).toString()); } }; } 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()); } }; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java index 06aea99e8..0eef4dd9b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/FileTypeTable.java @@ -177,13 +177,13 @@ public class FileTypeTable implements ICellModifier, IStructuredContentProvider, if (PROPERTY_MODE.equals(property)) { if (item.mode == Team.BINARY) - return new Integer(COMBO_INDEX_BINARY); + return Integer.valueOf(COMBO_INDEX_BINARY); if (item.mode == Team.TEXT) - return new Integer(COMBO_INDEX_TEXT); + return Integer.valueOf(COMBO_INDEX_TEXT); } if (fShowSaveColumn && PROPERTY_SAVE.equals(property)) { - return new Integer(item.save ? COMBO_INDEX_SAVE : COMBO_INDEX_DONT_SAVE); + return Integer.valueOf(item.save ? COMBO_INDEX_SAVE : COMBO_INDEX_DONT_SAVE); } return null; } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java index 9f5146707..26dcceae2 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/preferences/TextPreferencePage.java @@ -232,10 +232,10 @@ public class TextPreferencePage extends PreferencePage implements IWorkbenchPref if (item instanceof FileTypeTable.Extension) { extensionsList.add(item.name); - extensionsModesList.add(new Integer(item.mode)); + extensionsModesList.add(Integer.valueOf(item.mode)); } else if (item instanceof FileTypeTable.Name) { namesList.add(item.name); - namesModesList.add(new Integer(item.mode)); + namesModesList.add(Integer.valueOf(item.mode)); } } diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java index 46eccec10..ad38e107e 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshParticipantJob.java @@ -423,9 +423,9 @@ public abstract class RefreshParticipantJob extends Job { } else { // Refreshed resources contain changes if (numChanges == 1) { - text.append(NLS.bind(TeamUIMessages.RefreshCompleteDialog_changesSingular, (new Object[]{getName(), new Integer(numChanges), numIncomingChanges, sep, numOutgoingChanges}))); + text.append(NLS.bind(TeamUIMessages.RefreshCompleteDialog_changesSingular, (new Object[]{getName(), Integer.valueOf(numChanges), numIncomingChanges, sep, numOutgoingChanges}))); } else { - text.append(NLS.bind(TeamUIMessages.RefreshCompleteDialog_changesPlural, (new Object[]{getName(), new Integer(numChanges), numIncomingChanges, sep, numOutgoingChanges}))); + text.append(NLS.bind(TeamUIMessages.RefreshCompleteDialog_changesPlural, (new Object[]{getName(), Integer.valueOf(numChanges), numIncomingChanges, sep, numOutgoingChanges}))); } } } else { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java index bc2d8b810..b21e1d22c 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizePageConfiguration.java @@ -486,7 +486,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp @Override public void setMode(int mode) { if (isModeSupported(mode)) - setProperty(P_MODE, new Integer(mode)); + setProperty(P_MODE, Integer.valueOf(mode)); } public boolean isModeSupported(int mode) { @@ -504,7 +504,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp @Override public void setSupportedModes(int modes) { - setProperty(P_SUPPORTED_MODES, new Integer(modes)); + setProperty(P_SUPPORTED_MODES, Integer.valueOf(modes)); } /** @@ -537,7 +537,7 @@ public class SynchronizePageConfiguration extends SynchronizePageActionGroup imp * @param style */ public void setViewerStyle(int style) { - setProperty(P_VIEWER_STYLE, new Integer(style)); + setProperty(P_VIEWER_STYLE, Integer.valueOf(style)); } @Override diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java index 43dadfbec..5e13a578f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java @@ -83,9 +83,9 @@ public abstract class StatusLineContributionGroup extends ActionGroup { TeamUIPlugin.getStandardDisplay().asyncExec(() -> { if (isThreeWay()) { - conflicting.setText(new Integer(workspaceConflicting).toString()); - incoming.setText(new Integer(workspaceIncoming).toString()); - outgoing.setText(new Integer(workspaceOutgoing).toString()); + conflicting.setText(Integer.valueOf(workspaceConflicting).toString()); + incoming.setText(Integer.valueOf(workspaceIncoming).toString()); + outgoing.setText(Integer.valueOf(workspaceOutgoing).toString()); conflicting.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_conflicting })); outgoing.setTooltip(NLS.bind(TeamUIMessages.StatisticsPanel_numbersTooltip, new String[] { TeamUIMessages.StatisticsPanel_outgoing })); |