[jbosstools-commits] JBoss Tools SVN: r12284 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.
Author: scabanovich
Date: 2008-12-04 12:03:03 -0500 (Thu, 04 Dec 2008)
New Revision: 12284
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
Log:
JBIDE-3351
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-04
16:00:25 UTC (rev 12283)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/ExtendedJSPContentAssistProcessor.java 2008-12-04
17:03:03 UTC (rev 12284)
@@ -93,6 +93,9 @@
JspEditorPlugin.getPluginLog().logError(e);
}
+ if(this.document != viewer.getDocument()) {
+ wtpKbConnector = null;
+ }
document = viewer.getDocument();
//added by Max Areshkau JBIDE-788
updateActiveContentAssistProcessor(document);
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java
===================================================================
---
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-04
16:00:25 UTC (rev 12283)
+++
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/FaceletsHtmlContentAssistProcessor.java 2008-12-04
17:03:03 UTC (rev 12284)
@@ -98,7 +98,12 @@
//Added by Max Areshkau JBIDE-788
public static final KbTldResource faceletHtmlResource = new
KbTldResource(faceletHtmlUri, "", faceletHtmlPrefix, null);
+ public FaceletsHtmlContentAssistProcessor() {}
+
public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int
documentPosition) {
+ if(this.document != textViewer.getDocument()) {
+ wtpKbConnector = null;
+ }
document = textViewer.getDocument();
editorInput =
JspEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
//added by Max Areshkau JBIDE-788
@@ -778,4 +783,8 @@
return sdRegion;
}
+ public void release() {
+ super.release();
+ wtpKbConnector = null;
+ }
}
\ No newline at end of file