diff options
| author | Peter Nehrer | 2016-02-25 20:15:20 +0000 |
|---|---|---|
| committer | Dani Megert | 2016-02-25 20:41:40 +0000 |
| commit | 9701461a46fde816e76b206ba61346c3e4427167 (patch) | |
| tree | 2391fd276c2d57127f938c1beff094a1f0726e8d | |
| parent | d85b4b8df04e7f2bcc6df53fe00f67bb00b72eab (diff) | |
| download | eclipse.pde.ui-9701461a46fde816e76b206ba61346c3e4427167.tar.gz eclipse.pde.ui-9701461a46fde816e76b206ba61346c3e4427167.tar.xz eclipse.pde.ui-9701461a46fde816e76b206ba61346c3e4427167.zip | |
Bug 488440 - The DSAnnotationCompilationParticipant should be disabled
for binary PDE projects
Skip binary projects when determining whether the participant is active
for a given project.
Change-Id: Ic0da8497ac6f4d04e4feccf21f44bb67e447e216
Signed-off-by: Peter Nehrer <pnehrer@eclipticalsoftware.com>
| -rw-r--r-- | ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/DSAnnotationCompilationParticipant.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/DSAnnotationCompilationParticipant.java b/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/DSAnnotationCompilationParticipant.java index 6662e15042..985d01a798 100644 --- a/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/DSAnnotationCompilationParticipant.java +++ b/ds/org.eclipse.pde.ds.annotations/src/org/eclipse/pde/ds/internal/annotations/DSAnnotationCompilationParticipant.java @@ -54,6 +54,7 @@ import org.eclipse.pde.core.IBaseModel; import org.eclipse.pde.core.build.IBuildEntry; import org.eclipse.pde.core.build.IBuildModel; import org.eclipse.pde.core.build.IBuildModelFactory; +import org.eclipse.pde.internal.core.WorkspaceModelManager; import org.eclipse.pde.internal.core.ibundle.IBundleModel; import org.eclipse.pde.internal.core.ibundle.IBundlePluginModelBase; import org.eclipse.pde.internal.core.natures.PDE; @@ -94,6 +95,9 @@ public class DSAnnotationCompilationParticipant extends CompilationParticipant { if (!PDE.hasPluginNature(project.getProject())) return false; + if (WorkspaceModelManager.isBinaryProject(project.getProject())) + return false; + try { IType annotationType = project.findType(COMPONENT_ANNOTATION); return annotationType != null && annotationType.isAnnotation(); |