Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-06-16 20:05:22 +0000
committerMichael Valenta2004-06-16 20:05:22 +0000
commit95bc31e2d19b60305c79247e2c7f83fecb48f0cf (patch)
tree6cef849691f3c4423c8efb391b178cbdce5c0513 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
parent904630b1bdf0d262f723b2f806681bfd2318fd6d (diff)
downloadeclipse.platform.team-95bc31e2d19b60305c79247e2c7f83fecb48f0cf.tar.gz
eclipse.platform.team-95bc31e2d19b60305c79247e2c7f83fecb48f0cf.tar.xz
eclipse.platform.team-95bc31e2d19b60305c79247e2c7f83fecb48f0cf.zip
Bug 67464 NPE in CVS Sync action
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
index 41219d0b2..02f3a512e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/SyncAction.java
@@ -71,6 +71,7 @@ public class SyncAction extends WorkspaceAction {
}
});
final SyncInfo info = subscriber.getSyncInfo(resource);
+ if (info == null) return;
shell.getDisplay().syncExec(new Runnable() {
public void run() {
if (info.getKind() == SyncInfo.IN_SYNC) {
@@ -104,6 +105,6 @@ public class SyncAction extends WorkspaceAction {
* @see org.eclipse.team.internal.ccvs.ui.actions.WorkspaceAction#isEnabledForCVSResource(org.eclipse.team.internal.ccvs.core.ICVSResource)
*/
protected boolean isEnabledForCVSResource(ICVSResource cvsResource) throws CVSException {
- return super.isEnabledForCVSResource(cvsResource) || cvsResource.getParent().isCVSFolder();
+ return (super.isEnabledForCVSResource(cvsResource) || (cvsResource.getParent().isCVSFolder() && !cvsResource.isIgnored()));
}
} \ No newline at end of file

Back to the top