Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-02-11 20:52:20 +0000
committerjames2002-02-11 20:52:20 +0000
commit2932f97ab7aab89bc6aa12430d28acb43f29299a (patch)
treed6c16b73a187212e365bbbcc1cd8c3171309eb33
parenta0137367991f2f92ef7e6afaf4cb3a0f9f13bdb1 (diff)
downloadeclipse.platform.team-2932f97ab7aab89bc6aa12430d28acb43f29299a.tar.gz
eclipse.platform.team-2932f97ab7aab89bc6aa12430d28acb43f29299a.tar.xz
eclipse.platform.team-2932f97ab7aab89bc6aa12430d28acb43f29299a.zip
9426: RepositoryManager.commit() signature out of date
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java2
3 files changed, 3 insertions, 7 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
index 3f6c1ce15..c929c56d8 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/RepositoryManager.java
@@ -470,14 +470,10 @@ public class RepositoryManager {
/**
* Commit the given resources to their associated providers.
*
- * What should happen with errors?
- * Should this do a workspace operation?
- *
* @param resources the resources to commit
- * @param shell the shell that will be the parent of the release comment dialog
* @param monitor the progress monitor
*/
- public void commit(IResource[] resources, String comment, final Shell shell, IProgressMonitor monitor) throws TeamException {
+ public void commit(IResource[] resources, String comment, IProgressMonitor monitor) throws TeamException {
Hashtable table = getProviderMapping(resources);
Set keySet = table.keySet();
monitor.beginTask("", keySet.size() * 1000);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
index d0eaf867d..ee609c6a4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
@@ -36,7 +36,7 @@ public class CommitAction extends TeamAction {
RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager();
String comment = manager.promptForComment(getShell());
if (comment != null) {
- manager.commit(getSelectedResources(), comment, getShell(), monitor);
+ manager.commit(getSelectedResources(), comment, monitor);
}
} catch (TeamException e) {
throw new InvocationTargetException(e);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
index 947de1a68..baf0eaeb2 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/sync/CommitSyncAction.java
@@ -174,7 +174,7 @@ public class CommitSyncAction extends MergeAction {
if (toMerge.size() != 0) {
manager.merged((IRemoteSyncElement[])toMerge.toArray(new IRemoteSyncElement[0]));
}
- manager.commit(changedResources, comment, getShell(), monitor);
+ manager.commit(changedResources, comment, monitor);
it = incoming.iterator();
while (it.hasNext()) {

Back to the top