diff options
author | Alexander Kurtakov | 2019-07-01 19:41:13 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2019-07-01 19:41:13 +0000 |
commit | 4ce33e921d6ef97182b02df49fa808f401d23588 (patch) | |
tree | 2f6a8c528f8b9111980b5e15f6600ca65e2aa336 | |
parent | e406046830f2071903990f9dff73403c7864e268 (diff) | |
download | eclipse.platform.team-4ce33e921d6ef97182b02df49fa808f401d23588.tar.gz eclipse.platform.team-4ce33e921d6ef97182b02df49fa808f401d23588.tar.xz eclipse.platform.team-4ce33e921d6ef97182b02df49fa808f401d23588.zip |
Bug 488215 - Support varargs in the Viewer APIY20190722-0900Y20190718-0905Y20190718-0450Y20190715-2335Y20190715-0900Y20190711-2335Y20190711-0900Y20190708-0900Y20190705-0620Y20190704-0900S4_13_0_M1I20190723-1800I20190722-1800I20190721-1800I20190720-1800I20190719-1800I20190718-1800I20190717-1800I20190716-1800I20190715-1800I20190714-1800I20190713-1800I20190713-1105I20190713-0230I20190712-1800I20190712-0625I20190711-1805I20190711-1120I20190711-0825I20190710-1800I20190710-0610I20190709-1800I20190709-0610I20190708-1800I20190708-1035I20190708-0800I20190707-1800I20190707-0110I20190706-1800I20190705-1800I20190704-1800I20190704-0245I20190703-1800I20190703-0640I20190702-1800I20190702-0930I20190702-0610I20190701-1805
Fix warnings in team repo.
Change-Id: I0637a6e9a888b760f87b05647c8b5fed83bda9d3
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java index 5d5cf9f73..4b478f4b5 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java @@ -157,9 +157,9 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple @Override public void changeSetChanges(final CollectorChangeEvent event, IProgressMonitor monitor) { ChangeSet[] addedSets = event.getAddedSets(); - final ChangeSet[] visibleAddedSets = getVisibleSets(addedSets); + final Object[] visibleAddedSets = getVisibleSets(addedSets); ChangeSet[] removedSets = event.getRemovedSets(); - final ChangeSet[] visibleRemovedSets = getVisibleSets(removedSets); + final Object[] visibleRemovedSets = getVisibleSets(removedSets); ChangeSet[] changedSets = event.getChangedSets(); final ChangeSet[] visibleChangedSets = getVisibleSets(changedSets); if (visibleAddedSets.length > 0 || visibleRemovedSets.length > 0 || visibleChangedSets.length > 0) { diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java index 2fb028413..12d68ac5d 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2019 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -953,7 +953,7 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo protected void doRemove(ISynchronizeModelElement[] elements) { AbstractTreeViewer viewer = (AbstractTreeViewer)getViewer(); try { - viewer.remove(elements); + viewer.remove((Object[]) elements); } catch (SWTException e) { // The remove failed due to an SWT exception. Log it and continue TeamUIPlugin.log(IStatus.ERROR, "An error occurred removing elements from the synchronize view", e); //$NON-NLS-1$ |