Author: scabanovich Date: 2009-11-27 09:19:13 -0500 (Fri, 27 Nov 2009) New Revision: 18880 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java Log: https://jira.jboss.org/jira/browse/JBIDE-5120 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-27 14:05:27 UTC (rev 18879) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2009-11-27 14:19:13 UTC (rev 18880) @@ -98,7 +98,7 @@ public static final String JSP_PAGE_CONTEXT_TYPE = "JSP_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$ public static final String FACELETS_PAGE_CONTEXT_TYPE = "FACELETS_PAGE_CONTEXT_TYPE"; //$NON-NLS-1$ - private static final PageContextFactory getInstance() { + public static final PageContextFactory getInstance() { if (fInstance != null) return fInstance; return (fInstance = new PageContextFactory()); Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-11-27 14:05:27 UTC (rev 18879) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/KbBuilder.java 2009-11-27 14:19:13 UTC (rev 18880) @@ -24,6 +24,7 @@ import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.jst.web.WebModelPlugin; import org.jboss.tools.jst.web.kb.KbProjectFactory; +import org.jboss.tools.jst.web.kb.PageContextFactory; import org.jboss.tools.jst.web.kb.WebKbPlugin; import org.jboss.tools.jst.web.kb.internal.scanner.IFileScanner; import org.jboss.tools.jst.web.kb.internal.scanner.LibraryScanner; @@ -132,6 +133,7 @@ protected void fullBuild(final IProgressMonitor monitor) throws CoreException { try { + PageContextFactory.getInstance().cleanUp(getProject()); getProject().accept(getResourceVisitor().getVisitor()); } catch (CoreException e) { WebModelPlugin.getPluginLog().logError(e); @@ -140,6 +142,7 @@ protected void incrementalBuild(IResourceDelta delta, IProgressMonitor monitor) throws CoreException { + PageContextFactory.getInstance().cleanUp(delta); // the visitor does the work. delta.accept(new SampleDeltaVisitor()); } @@ -163,6 +166,7 @@ protected void clean(IProgressMonitor monitor) throws CoreException { KbProject sp = getKbProject(); if(sp != null) sp.clean(); + PageContextFactory.getInstance().cleanUp(getProject()); } }