Skip to main content

This CGIT instance is deprecated, and repositories have been moved to Gitlab or Github. See the repository descriptions for specific locations.

aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java4
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$

Back to the top