Author: scabanovich Date: 2009-07-21 11:03:37 -0400 (Tue, 21 Jul 2009) New Revision: 16694 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java Log: https://jira.jboss.org/jira/browse/JBIDE-1826 Dependency on old KbConnector removed from visual page editor. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java 2009-07-21 13:56:21 UTC (rev 16693) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/IVisualContext.java 2009-07-21 15:03:37 UTC (rev 16694) @@ -12,12 +12,10 @@ import java.util.List; -import org.jboss.tools.common.kb.wtp.WtpKbConnector; import org.jboss.tools.jst.web.tld.TaglibData; public interface IVisualContext { public void refreshBundleValues(); - public WtpKbConnector getConnector(); public List<TaglibData> getIncludeTaglibs(); } Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2009-07-21 13:56:21 UTC (rev 16693) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2009-07-21 15:03:37 UTC (rev 16694) @@ -16,11 +16,6 @@ import java.util.List; import org.eclipse.jface.text.IDocument; -import org.jboss.tools.common.kb.KbConnectorFactory; -import org.jboss.tools.common.kb.KbConnectorType; -import org.jboss.tools.common.kb.KbException; -import org.jboss.tools.common.kb.wtp.WtpKbConnector; -import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.editor.IVisualContext; import org.jboss.tools.jst.jsp.util.XmlUtil; import org.jboss.tools.jst.web.tld.TaglibData; @@ -43,10 +38,6 @@ private IDocument iDocument; /** - * Kb connector - */ - private WtpKbConnector connector = null; - /** * references node */ private Node referenceNode = null; @@ -69,7 +60,6 @@ public void dispose() { clearAll(); - setConnector(null); setReferenceNode(null); setPageContext(null); iDocument = null; @@ -107,11 +97,6 @@ setTaglibs(taglibs); } } - try { - connector = (WtpKbConnector)KbConnectorFactory.getIntstance().createConnector(KbConnectorType.JSP_WTP_KB_CONNECTOR, iDocument); - } catch (KbException e) { - JspEditorPlugin.getPluginLog().logError(e); - } } public void collectRefNodeTagLibs() { @@ -140,11 +125,6 @@ } // implements IVisualContext - public WtpKbConnector getConnector() { - return connector; - } - - // implements IVisualContext public void refreshBundleValues() { updateTagLibs(); } @@ -201,13 +181,6 @@ } /** - * @param connector the connector to set - */ - public void setConnector(WtpKbConnector connector) { - this.connector = connector; - } - - /** * @return the pageContext */ private IVisualContext getPageContext() { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-21 13:56:21 UTC (rev 16693) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/JSPTreeDialog.java 2009-07-21 15:03:37 UTC (rev 16694) @@ -82,9 +82,7 @@ //ValueHelper valueHelper = (ValueHelper)context.get("valueHelper"); IPageContext pageContext = (IPageContext)context.get("pageContext"); //$NON-NLS-1$ KbQuery kbQuery = (KbQuery)context.get("kbQuery"); //$NON-NLS-1$ - IAttribute[] attrs = PageProcessor.getInstance().getAttributes(kbQuery, pageContext); - ValueHelper valueHelper = new ValueHelper(); root = valueHelper.getInitalInput(pageContext, kbQuery); treeViewer.setInput(root);