Author: scabanovich
Date: 2012-07-25 17:45:26 -0400 (Wed, 25 Jul 2012)
New Revision: 42724
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
Log:
JBIDE-12366
https://issues.jboss.org/browse/JBIDE-12366
jsfnature is not necessary.
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-07-25
21:28:04 UTC (rev 42723)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreBuilder.java 2012-07-25
21:45:26 UTC (rev 42724)
@@ -167,12 +167,14 @@
}
n.cleanTypeFactory();
+
+ if(kind == FULL_BUILD) n.getClassPath().reset();
//1. Check class path.
boolean isClassPathUpdated = n.getClassPath().update();
JarSet newJars = new JarSet();
- if(isClassPathUpdated) {
+ if(isClassPathUpdated || kind == FULL_BUILD) {
//2. Update class path. Removed paths will be cached to be applied to working copy of
context.
n.getClassPath().setSrcs(getResourceVisitor().srcs);
newJars = n.getClassPath().process();
@@ -204,7 +206,7 @@
for (IBuildParticipantFeature p: buildParticipants) p.beginVisiting();
//5.2 Discover sources and build definitions.
- if(isClassPathUpdated) {
+ if(isClassPathUpdated || kind == FULL_BUILD) {
buildJars(newJars);
n.getClassPath().validateProjectDependencies();
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-07-25
21:28:04 UTC (rev 42723)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2012-07-25
21:45:26 UTC (rev 42724)
@@ -330,7 +330,7 @@
}
public void newWorkingCopy(boolean forFullBuild) {
- if(original != null) return;
+ if(original != null || workingCopy != null) return;
workingCopy = copy(forFullBuild);
workingCopy.original = this;
}