Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-09-30 19:59:27 +0000
committerMichael Valenta2004-09-30 19:59:27 +0000
commit2c1cf9c2d78be3223260ef440f70418b670eb0ce (patch)
treeb528a393d693e2337f3531a2dea89bcac9180f46
parent06bfc3503f6bd4bb3a378aafb02ef4f7aca71e24 (diff)
downloadeclipse.platform.team-2c1cf9c2d78be3223260ef440f70418b670eb0ce.tar.gz
eclipse.platform.team-2c1cf9c2d78be3223260ef440f70418b670eb0ce.tar.xz
eclipse.platform.team-2c1cf9c2d78be3223260ef440f70418b670eb0ce.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetActionGroup.java16
2 files changed, 6 insertions, 12 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
index 23842d2c3..3da52fd7f 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
@@ -198,6 +198,7 @@ public class ActiveChangeSetCollector implements ISyncInfoSetChangeListener {
if (targetSet != null) {
targetSet.clear();
targetSet.addAll(select(set.getSyncInfos()));
+ rootSet.removeAll(set.getResources());
}
}
}
@@ -217,6 +218,7 @@ public class ActiveChangeSetCollector implements ISyncInfoSetChangeListener {
targetSet.removeAll(event.getRemovedResources());
targetSet.addAll(select(event.getChangedResources()));
targetSet.addAll(select(event.getAddedResources()));
+ rootSet.removeAll(event.getSet().getResources());
}
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetActionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetActionGroup.java
index 80f897a78..1966ccff4 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetActionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetActionGroup.java
@@ -13,7 +13,6 @@ package org.eclipse.team.internal.ui.synchronize;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.action.*;
import org.eclipse.jface.dialogs.IDialogSettings;
@@ -22,7 +21,6 @@ import org.eclipse.swt.widgets.Control;
import org.eclipse.team.core.subscribers.*;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter;
import org.eclipse.team.core.synchronize.SyncInfo;
-import org.eclipse.team.core.synchronize.FastSyncInfoFilter.AndSyncInfoFilter;
import org.eclipse.team.core.synchronize.FastSyncInfoFilter.SyncInfoDirectionFilter;
import org.eclipse.team.internal.ui.Policy;
import org.eclipse.team.internal.ui.TeamUIPlugin;
@@ -44,14 +42,8 @@ public final class ChangeSetActionGroup extends SynchronizePageActionGroup {
// Constants for persisting sorting options
private static final String P_LAST_COMMENTSORT = TeamUIPlugin.ID + ".P_LAST_COMMENT_SORT"; //$NON-NLS-1$
- public static final AndSyncInfoFilter OUTGOING_FILE_FILTER = new AndSyncInfoFilter(new FastSyncInfoFilter[] {
- new FastSyncInfoFilter() {
- public boolean select(SyncInfo info) {
- return info.getLocal().getType() == IResource.FILE;
- }
- },
- new SyncInfoDirectionFilter(new int[] { SyncInfo.OUTGOING, SyncInfo.CONFLICTING })
- });
+ public static final FastSyncInfoFilter OUTGOING_RESOURCE_FILTER = new SyncInfoDirectionFilter(
+ new int[] { SyncInfo.OUTGOING, SyncInfo.CONFLICTING });
private class CreateChangeSetAction extends SynchronizeModelAction {
@@ -70,7 +62,7 @@ public final class ChangeSetActionGroup extends SynchronizePageActionGroup {
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSyncInfoFilter()
*/
protected FastSyncInfoFilter getSyncInfoFilter() {
- return OUTGOING_FILE_FILTER;
+ return OUTGOING_RESOURCE_FILTER;
}
/* (non-Javadoc)
@@ -155,7 +147,7 @@ public final class ChangeSetActionGroup extends SynchronizePageActionGroup {
* @see org.eclipse.team.ui.synchronize.SynchronizeModelAction#getSyncInfoFilter()
*/
protected FastSyncInfoFilter getSyncInfoFilter() {
- return OUTGOING_FILE_FILTER;
+ return OUTGOING_RESOURCE_FILTER;
}
protected boolean needsToSaveDirtyEditors() {

Back to the top