Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcvs2svn2003-08-19 19:30:59 +0000
committercvs2svn2003-08-19 19:30:59 +0000
commit8c6c83b49791b3bc89970a600294d52c85a2688a (patch)
tree0ec9797a63d9f73a3c22748c8074a040a8809400
parentee17311d6c675dd799029fc64ba311c1a94b6d4c (diff)
downloadeclipse.platform.team-8c6c83b49791b3bc89970a600294d52c85a2688a.tar.gz
eclipse.platform.team-8c6c83b49791b3bc89970a600294d52c85a2688a.tar.xz
eclipse.platform.team-8c6c83b49791b3bc89970a600294d52c85a2688a.zip
This commit was manufactured by cvs2svn to create branch
'ConcurrentCommandsBranch'. Cherrypick from master 2003-08-19 19:30:58 UTC Jean Michel-Lemieux <jlemieux> 'Fixed enablement.': bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java36
1 files changed, 36 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
new file mode 100644
index 000000000..10db9ebda
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.team.internal.ccvs.ui.subscriber;
+
+import org.eclipse.team.core.subscribers.SyncInfo;
+import org.eclipse.team.ui.sync.SyncInfoDirectionFilter;
+import org.eclipse.team.ui.sync.SyncInfoFilter;
+
+/**
+ * Runs an update command that will prompt the user for overwritting local
+ * changes to files that have non-mergeable conflicts. All the prompting logic
+ * is in the super class.
+ */
+public class OverrideAndUpdateAction extends WorkspaceUpdateAction {
+ /* (non-Javadoc)
+ * @see org.eclipse.team.internal.ccvs.ui.subscriber.SafeUpdateAction#getOverwriteLocalChanges()
+ */
+ protected boolean getOverwriteLocalChanges() {
+ // allow overriding of local changes with this update
+ return true;
+ }
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
+ */
+ protected SyncInfoFilter getSyncInfoFilter() {
+ return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING});
+ }
+}

Back to the top