diff options
| author | Michael Valenta | 2006-05-12 21:08:15 +0000 |
|---|---|---|
| committer | Michael Valenta | 2006-05-12 21:08:15 +0000 |
| commit | bdb667cfbe9ef8fa054556dec9b0207685bd075a (patch) | |
| tree | 0c30a10650837ef613059a286a6ca79ded54243c /examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples | |
| parent | d9c982419d71f29d654a52924ef65fa4c1675160 (diff) | |
| download | eclipse.platform.team-bdb667cfbe9ef8fa054556dec9b0207685bd075a.tar.gz eclipse.platform.team-bdb667cfbe9ef8fa054556dec9b0207685bd075a.tar.xz eclipse.platform.team-bdb667cfbe9ef8fa054556dec9b0207685bd075a.zip | |
Fixed SWT invalid thread access
Diffstat (limited to 'examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples')
2 files changed, 4 insertions, 4 deletions
diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java index 76efd577f..0a2e4f397 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/GetOperation.java @@ -13,7 +13,7 @@ package org.eclipse.team.examples.filesystem.ui; import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.team.core.TeamException; import org.eclipse.team.core.diff.*; import org.eclipse.team.core.subscribers.SubscriberScopeManager; import org.eclipse.team.examples.filesystem.FileSystemProvider; @@ -40,7 +40,7 @@ public class GetOperation extends FileSystemOperation { throws CoreException { provider.getOperations().get(traversals, isOverwriteOutgoing(), monitor); if (!isOverwriteOutgoing() && hasIncomingChanges(traversals)) { - MessageDialog.openInformation(getShell(), "Conflicts", "Could not get all changes due to conflicts."); + throw new TeamException("Could not get all changes due to conflicts."); } } diff --git a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java index 032c4d1be..1e35eec16 100644 --- a/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java +++ b/examples/org.eclipse.team.examples.filesystem/src/org/eclipse/team/examples/filesystem/ui/PutOperation.java @@ -13,7 +13,7 @@ package org.eclipse.team.examples.filesystem.ui; import org.eclipse.core.resources.mapping.ResourceTraversal; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.team.core.TeamException; import org.eclipse.team.core.diff.*; import org.eclipse.team.core.subscribers.SubscriberScopeManager; import org.eclipse.team.examples.filesystem.FileSystemProvider; @@ -45,7 +45,7 @@ public class PutOperation extends FileSystemOperation { throws CoreException { provider.getOperations().checkin(traversals, isOverwriteIncoming(), monitor); if (!isOverwriteIncoming() && hasOutgoingChanges(traversals)) { - MessageDialog.openInformation(getShell(), "Conflicts", "Could not put all changes due to conflicts."); + throw new TeamException("Could not put all changes due to conflicts."); } } |