Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-04-23 14:12:37 -0400
committerMichael Valenta2004-04-23 14:12:37 -0400
commit21aa3f3328f09cbcc7e065960f784ec02fb8891a (patch)
treeb54ca6a1d09d5d1af37a04a699d626f8819a28a4
parentda9d9c8a24abea267f0cbf45f598b0fb341f83f8 (diff)
downloadeclipse.platform.team-21aa3f3328f09cbcc7e065960f784ec02fb8891a.tar.gz
eclipse.platform.team-21aa3f3328f09cbcc7e065960f784ec02fb8891a.tar.xz
eclipse.platform.team-21aa3f3328f09cbcc7e065960f784ec02fb8891a.zip
59710: Override and Update prompt is hidden by progress dialog
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java8
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java2
2 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
index 8718a7c45..2a322460d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberCommitOperation.java
@@ -64,6 +64,14 @@ public class SubscriberCommitOperation extends CVSSubscriberOperation {
}
/* (non-Javadoc)
+ * @see org.eclipse.team.ui.TeamOperation#shouldRun()
+ */
+ public boolean shouldRun() {
+ SyncInfoSet set = getSyncInfoSet();
+ return !set.isEmpty();
+ }
+
+ /* (non-Javadoc)
* @see org.eclipse.team.internal.ui.actions.SubscriberOperation#getSyncInfoSet()
*/
protected SyncInfoSet getSyncInfoSet() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
index f55e6573e..cbd7646ec 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/TeamOperation.java
@@ -80,7 +80,7 @@ public abstract class TeamOperation extends JobChangeAdapter implements IRunnabl
* should run. This may include prompting the user for information, etc.
* @return whether the operation should be run.
*/
- public boolean shouldRun() {
+ protected boolean shouldRun() {
return true;
}

Back to the top