Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Leherbauer2007-10-24 11:05:19 -0400
committerAnton Leherbauer2007-10-24 11:05:19 -0400
commit834cbe8ce2967263f46e73cb79fbf780b107642d (patch)
tree391b4ee593e0dabd0cf5dad123709acc056724b7
parent50fd24cadc229bd66fa664a1b0e56051f8517856 (diff)
downloadorg.eclipse.cdt-834cbe8ce2967263f46e73cb79fbf780b107642d.tar.gz
org.eclipse.cdt-834cbe8ce2967263f46e73cb79fbf780b107642d.tar.xz
org.eclipse.cdt-834cbe8ce2967263f46e73cb79fbf780b107642d.zip
Follow up fix for 205231
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/plugin.xml18
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java10
2 files changed, 20 insertions, 8 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index 644c7b0866b..b81de5e6d05 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -182,14 +182,16 @@
type="new"
wizardId="org.eclipse.cdt.ui.wizards.ConvertToMakeWizard">
<enablement>
- <and>
- <adapt type="org.eclipse.core.resources.IProject"/>
- <not>
- <test
- property="org.eclipse.core.resources.projectNature"
- value="org.eclipse.cdt.core.cnature"/>
- </not>
- </and>
+ <and>
+ <adapt type="org.eclipse.core.resources.IProject" />
+ <not>
+ <adapt type="org.eclipse.core.resources.IProject" >
+ <test
+ property="org.eclipse.core.resources.projectNature"
+ value="org.eclipse.cdt.core.cnature"/>
+ </adapt>
+ </not>
+ </and>
</enablement>
</commonWizard>
</extension>
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
index 1d90f2764c4..03b9a3e352d 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorContentProvider.java
@@ -440,6 +440,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
super.postRefresh(((ICProject)element).getProject());
} else if (element instanceof ICElement) {
super.postRefresh(element);
+ } else if (element instanceof IResource) {
+ IProject project= ((IResource)element).getProject();
+ if (CoreModel.hasCNature(project)) {
+ super.postRefresh(element);
+ }
}
}
@@ -456,6 +461,11 @@ public class CNavigatorContentProvider extends CViewContentProvider implements I
super.postAdd(((ICProject)parent).getProject(), element);
} else if (parent instanceof ICElement) {
super.postAdd(parent, element);
+ } else if (element instanceof IResource) {
+ IProject project= ((IResource)element).getProject();
+ if (CoreModel.hasCNature(project)) {
+ super.postAdd(parent, element);
+ }
}
}

Back to the top