Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-08-22 13:26:09 +0000
committerMichael Valenta2003-08-22 13:26:09 +0000
commite70bdafeaa741413cebf981250f4515f05de577d (patch)
treefadd536aa8a284e21d443207a2e97dbfacca2302
parent94fd4694ceac07787a560152595b3afeb4784005 (diff)
downloadeclipse.platform.team-e70bdafeaa741413cebf981250f4515f05de577d.tar.gz
eclipse.platform.team-e70bdafeaa741413cebf981250f4515f05de577d.tar.xz
eclipse.platform.team-e70bdafeaa741413cebf981250f4515f05de577d.zip
Added specific job names for update, merge and commit
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties4
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java8
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java18
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java5
5 files changed, 33 insertions, 12 deletions
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 f42dbd092..cfd446186 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
@@ -1021,3 +1021,7 @@ Error.unableToShowSyncView=Error opening Synchronize View. Please ensure that th
ShowAnnotationAction.1=Unexpected response from CVS Server: {0}
CVSSubscriberAction.jobName=Performing CVS operation on {0} resources.
+UpdateAction.jobName=Performing CVS update on {0} resources.
+MergeUpdateAction.jobName=Performing CVS merge on {0} resources.
+MergeUpdateAction.invalidSubscriber=Invalid subscriber: {0}
+CommitAction.jobName=Performing CVS commit on {0} resources.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
index 4b398950d..716f429ed 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
@@ -54,7 +54,6 @@ public class MergeUpdateAction extends SafeUpdateAction {
*/
protected SyncInfoFilter getSyncInfoFilter() {
// Update works for all incoming and conflicting nodes
- // TODO: there should be an instance variable for the filter
return new OrSyncInfoFilter(new SyncInfoFilter[] {
new SyncInfoDirectionFilter(SyncInfo.INCOMING),
new SyncInfoDirectionFilter(SyncInfo.CONFLICTING)
@@ -95,7 +94,7 @@ public class MergeUpdateAction extends SafeUpdateAction {
if(nodes.length > 0) {
TeamSubscriber subscriber = nodes[0].getSubscriber();
if (!(subscriber instanceof CVSMergeSubscriber)) {
- throw new CVSException("Invalid subscriber: " + subscriber.getId());
+ throw new CVSException(Policy.bind("MergeUpdateAction.invalidSubscriber", subscriber.getId().toString())); //$NON-NLS-1$
}
CVSTag startTag = ((CVSMergeSubscriber)subscriber).getStartTag();
CVSTag endTag = ((CVSMergeSubscriber)subscriber).getEndTag();
@@ -206,4 +205,11 @@ public class MergeUpdateAction extends SafeUpdateAction {
cvsFolder.mkdir();
}
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
+ */
+ protected String getJobName(SyncInfoSet syncSet) {
+ return Policy.bind("MergeUpdateAction.jobName", new Integer(syncSet.size()).toString());
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
index 02b747705..d42e038b5 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
@@ -333,4 +333,12 @@ public abstract class SafeUpdateAction extends CVSSubscriberAction {
protected String getErrorTitle() {
return Policy.bind("UpdateAction.update"); //$NON-NLS-1$
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
+ */
+ protected String getJobName(SyncInfoSet syncSet) {
+ return Policy.bind("UpdateAction.jobName", new Integer(syncSet.size()).toString());
+ }
+
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
index 344eeb4a9..408539744 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitAction.java
@@ -103,12 +103,8 @@ public class SubscriberCommitAction extends CVSSubscriberAction {
return true;
}
- /**
- * @param syncSet
- * @return
- */
private IResource[] getUnaddedResources(SyncInfoSet syncSet) throws CVSException {
- // TODO: should only get outgoing additions (since conflicting additions
+ // TODO: Should only get outgoing additions (since conflicting additions
// could be considered to be under version control already)
IResource[] resources = syncSet.getResources();
List result = new ArrayList();
@@ -200,7 +196,6 @@ public class SubscriberCommitAction extends CVSSubscriberAction {
}
break;
case SyncInfo.CONFLICTING:
- // TODO: what about conflicting deletions
// Convert the conflicting change to an outgoing change
makeOutgoing.add(changedNode);
break;
@@ -228,9 +223,6 @@ public class SubscriberCommitAction extends CVSSubscriberAction {
if (makeOutgoing.size() > 0) {
makeOutgoing((SyncInfo[]) makeOutgoing.toArray(new SyncInfo[makeInSync.size()]), Policy.subMonitorFor(monitor, makeOutgoing.size() * 100));
}
-
- // TODO: There was special handling for undoing incoming deletions
- // This should be handled by makeOutgoing but we'll need to verify
RepositoryManager manager = CVSUIPlugin.getPlugin().getRepositoryManager();
if (additions.size() != 0) {
@@ -241,7 +233,6 @@ public class SubscriberCommitAction extends CVSSubscriberAction {
}
manager.commit((IResource[])commits.toArray(new IResource[commits.size()]), comment, Policy.subMonitorFor(monitor, commits.size() * 100));
- // TODO: are there any cases that need to have folders pruned?
} catch (TeamException e) {
throw CVSException.wrapException(e);
}
@@ -287,4 +278,11 @@ public class SubscriberCommitAction extends CVSSubscriberAction {
protected String getErrorTitle() {
return Policy.bind("CommitAction.commitFailed"); //$NON-NLS-1$
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.sync.SyncInfoSet)
+ */
+ protected String getJobName(SyncInfoSet syncSet) {
+ return Policy.bind("CommitAction.jobName", new Integer(syncSet.size()).toString());
+ }
}
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
index 1f07239f8..c8e06623a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
@@ -60,5 +60,10 @@ public class SubscriberConfirmMergedAction extends CVSSubscriberAction {
}
}
+ protected boolean canRunAsJob() {
+ // There's no sense doing this operation in the background since
+ // it does not contact the server
+ return false;
+ }
}

Back to the top