diff options
author | Michael Valenta | 2007-04-18 20:27:08 +0000 |
---|---|---|
committer | Michael Valenta | 2007-04-18 20:27:08 +0000 |
commit | a58ffff0266c229efe9f6c11308a44f303d6699a (patch) | |
tree | 245530782d87eb7b906ad0ec311b3a5c49c0b57e /bundles/org.eclipse.team.cvs.ui | |
parent | 1a5aa227f0f7b4c1d1a0073f859e514708cae72f (diff) | |
download | eclipse.platform.team-a58ffff0266c229efe9f6c11308a44f303d6699a.tar.gz eclipse.platform.team-a58ffff0266c229efe9f6c11308a44f303d6699a.tar.xz eclipse.platform.team-a58ffff0266c229efe9f6c11308a44f303d6699a.zip |
Bug 163078 [Sync View] Synchronize view commits/updates wrong resource
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
4 files changed, 12 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java index 6eaf1ad24..35b424f86 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSUIMessages.java @@ -42,6 +42,7 @@ public class CVSUIMessages extends NLS { public static String CheckoutAsMainPage_WorkingSetMultiple; public static String CheckoutAsMainPage_WorkingSetSingle; public static String CommitAction_0; + public static String CommitAction_3; public static String CommitAction_1; public static String CommitAction_2; public static String CommitWizard_10; diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java index 8e5e33a3e..ce7deccd8 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/AbstractCommitAction.java @@ -43,8 +43,8 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { */ public void execute() { final List resources = new ArrayList(); - final IStructuredSelection selection = getActualSelection(); try { + final IStructuredSelection selection = getActualSelection(); PlatformUI.getWorkbench().getProgressService().busyCursorWhile(new IRunnableWithProgress() { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { @@ -59,6 +59,8 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { Utils.handleError(getConfiguration().getSite().getShell(), e, null, null); } catch (InterruptedException e) { // Ignore + } catch (CVSException e) { + Utils.handleError(getConfiguration().getSite().getShell(), e, null, null); } if (!resources.isEmpty() && ((IResource[])resources.get(0)).length > 0) { Shell shell= getConfiguration().getSite().getShell(); @@ -70,7 +72,7 @@ public abstract class AbstractCommitAction extends CVSModelProviderAction { } } - protected IStructuredSelection getActualSelection() { + protected IStructuredSelection getActualSelection() throws CVSException { return getStructuredSelection(); } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java index f27d3339f..d2a249154 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CommitAction.java @@ -11,11 +11,13 @@ package org.eclipse.team.internal.ccvs.ui.mappings; import org.eclipse.core.resources.mapping.ResourceTraversal; -import org.eclipse.core.runtime.*; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.jface.viewers.*; -import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; +import org.eclipse.team.internal.ccvs.core.CVSException; +import org.eclipse.team.internal.ccvs.ui.CVSUIMessages; import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants; import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration; @@ -62,12 +64,11 @@ public class CommitAction extends AbstractCommitAction implements IPropertyChang return getResourceTraversals(selection, monitor); } - protected IStructuredSelection getActualSelection() { + protected IStructuredSelection getActualSelection() throws CVSException { IStructuredSelection selection = getStructuredSelection(); IStructuredSelection actualSelection = internalGetActualSelection(); if (!equal(selection, actualSelection)) { - CVSUIPlugin.log(IStatus.ERROR, "Commit action selection did not match actual selection", null); - return actualSelection; + throw new CVSException(CVSUIMessages.CommitAction_3); } return selection; } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties index 9d505d6bc..40ab9f0c2 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties @@ -901,6 +901,7 @@ MergeUpdateAction_jobName=CVS Merge MergeUpdateAction_invalidSubscriber=Invalid subscriber: {0} CommitAction_jobName=CVS Commit CommitAction_0=Preparing to Commit +CommitAction_3=An inconsistency in the selection state of the Synchronize view was detected. Please try committing again. CommitAction_1=Consult Change Sets CommitAction_2=Should change sets be consulted in order to determine which resources should be included in the commit? |