Author: akazakov Date: 2007-08-01 11:17:47 -0400 (Wed, 01 Aug 2007) New Revision: 2805 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/TLDRegisterHelper.java trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java Log: http://jira.jboss.com/jira/browse/JBIDE-546 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatHtmlContentAssistProcessor.java 2007-08-01 15:17:47 UTC (rev 2805) @@ -44,15 +44,6 @@ import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper; -import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper; -import org.w3c.dom.Attr; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; - -import org.jboss.tools.common.model.plugin.ModelPlugin; -import org.jboss.tools.common.model.util.ELParser; -import org.jboss.tools.common.reporting.ProblemReportingHelper; import org.jboss.tools.common.kb.AttributeDescriptor; import org.jboss.tools.common.kb.KbConnectorFactory; import org.jboss.tools.common.kb.KbConnectorType; @@ -62,17 +53,23 @@ import org.jboss.tools.common.kb.wtp.JspWtpKbConnector; import org.jboss.tools.common.kb.wtp.TLDVersionHelper; import org.jboss.tools.common.kb.wtp.WtpKbConnector; +import org.jboss.tools.common.model.util.ELParser; +import org.jboss.tools.common.reporting.ProblemReportingHelper; import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper; import org.jboss.tools.jst.jsp.outline.ValueHelper; import org.jboss.tools.jst.jsp.support.kb.FaceletsJsfCResource; import org.jboss.tools.jst.jsp.support.kb.WTPKbdBeanMethodResource; import org.jboss.tools.jst.jsp.support.kb.WTPKbdBeanPropertyResource; import org.jboss.tools.jst.jsp.support.kb.WTPKbdBundlePropertyResource; import org.jboss.tools.jst.web.tld.TaglibData; -import org.jboss.tools.jst.web.tld.TaglibMapping; import org.jboss.tools.jst.web.tld.VpeTaglibListener; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; /** * @author Igels @@ -82,6 +79,7 @@ private JSPActiveContentAssistProcessor jspActiveCAP; private WtpKbConnector wtpKbConnector; private IDocument document; + private IEditorInput editorInput; private VpeTaglibManager tldManager; private boolean isFacelets = false; public static final String faceletUri = "http://java.sun.com/jsf/facelets"; @@ -93,6 +91,7 @@ public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int documentPosition) { document = textViewer.getDocument(); + editorInput = JspEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput(); registerToTldManager(textViewer); ICompletionProposal[] proposals = super.computeCompletionProposals(textViewer, documentPosition); @@ -477,8 +476,8 @@ public void removeTaglib(String uri, String prefix) { } - public static void registerTld(TaglibData data, JspWtpKbConnector wtpKbConnector, IDocument document) { - TLDRegisterHelper.registerTld(data, wtpKbConnector, document); + public static void registerTld(TaglibData data, JspWtpKbConnector wtpKbConnector, IDocument document, IEditorInput input) { + TLDRegisterHelper.registerTld(data, wtpKbConnector, document, input); } public void updateActiveContentAssistProcessor(IDocument document) { @@ -502,7 +501,7 @@ isFacelets = false; for(int i=0; i<list.size(); i++) { TaglibData data = (TaglibData)list.get(i); - registerTld(data, (JspWtpKbConnector)getWtpKbConnector(), document); + registerTld(data, (JspWtpKbConnector)getWtpKbConnector(), document, editorInput); isFacelets = isFacelets || data.getUri().equals(faceletUri); } if(isFacelets) { Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/RedHatJSPContentAssistProcessor.java 2007-08-01 15:17:47 UTC (rev 2805) @@ -52,10 +52,6 @@ import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper; import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages; import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.kb.KbConnectorFactory; import org.jboss.tools.common.kb.KbConnectorType; import org.jboss.tools.common.kb.KbException; @@ -64,12 +60,15 @@ import org.jboss.tools.common.kb.TagDescriptor; import org.jboss.tools.common.kb.wtp.TLDVersionHelper; import org.jboss.tools.common.kb.wtp.WtpKbConnector; -import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.jst.web.tld.VpeTaglibListener; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Igels @@ -80,7 +79,6 @@ private WtpKbConnector wtpKbConnector; private IDocument document; private boolean dontOpenTag = false; -// private Map trackers = new HashMap(); private List registeredTagsForActiveCAP = new ArrayList(); private VpeTaglibManager tldManager; @@ -190,7 +188,7 @@ public void addTaglib(String uri, String prefix) { } - + public void removeTaglib(String uri, String prefix) { } @@ -213,7 +211,7 @@ List list = tldManager.getTagLibs(); for(int i=0; i<list.size(); i++) { TaglibData data = (TaglibData)list.get(i); - String version = TLDVersionHelper.getTldVersion(data.getUri(), data.getPrefix(), document); + String version = WebProject.getTldVersion(data.getUri(), data.getPrefix(), document, null); KbTldResource resource = new KbTldResource(data.getUri(), "", data.getPrefix(), version); getWtpKbConnector().registerResource(resource); addActiveContentAssistProcessorToProcessorMap(data.getUri(), data.getPrefix(), version); Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/TLDRegisterHelper.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/TLDRegisterHelper.java 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/editor/TLDRegisterHelper.java 2007-08-01 15:17:47 UTC (rev 2805) @@ -10,21 +10,36 @@ ******************************************************************************/ package org.jboss.tools.jst.jsp.editor; +import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.IDocument; import org.eclipse.ui.IEditorInput; - +import org.eclipse.ui.IFileEditorInput; import org.jboss.tools.common.kb.KbTldResource; import org.jboss.tools.common.kb.wtp.JspWtpKbConnector; -import org.jboss.tools.common.kb.wtp.TLDVersionHelper; -import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.project.IModelNature; import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.jst.jsp.JspEditorPlugin; +import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibData; public class TLDRegisterHelper { - public static void registerTld(TaglibData data, JspWtpKbConnector wtpKbConnector, IDocument document) { - String version = TLDVersionHelper.getTldVersion(data.getUri(), data.getPrefix(), document); + public static void registerTld(TaglibData data, JspWtpKbConnector wtpKbConnector, IDocument document, IEditorInput input) { + XModel xm = null; + if(input!=null && input instanceof IFileEditorInput) { + IProject project = ((IFileEditorInput)input).getFile().getProject(); + IModelNature mn = EclipseResourceUtil.getModelNature(project); + if(mn!=null) { + xm = mn.getModel(); + } + } + registerTld(data, wtpKbConnector, document, xm); + } + + public static void registerTld(TaglibData data, JspWtpKbConnector wtpKbConnector, IDocument document, XModel xm) { + String version = WebProject.getTldVersion(data.getUri(), data.getPrefix(), document, xm); KbTldResource resource = new KbTldResource(data.getUri(), "", data.getPrefix(), version); if(data.isNs()) { resource.setJsfResource(true); @@ -47,5 +62,4 @@ wtpKbConnector.registerResource(resource); } } - -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/jst/plugins/org.jboss.tools.jst.web/META-INF/MANIFEST.MF 2007-08-01 15:17:47 UTC (rev 2805) @@ -63,6 +63,7 @@ org.eclipse.pde.ui, org.eclipse.core.runtime, org.eclipse.ant.ui, - org.eclipse.ui.externaltools + org.eclipse.ui.externaltools, + org.jboss.tools.common.kb Bundle-Version: 2.0.0 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/WebProject.java 2007-08-01 15:17:47 UTC (rev 2805) @@ -11,12 +11,15 @@ package org.jboss.tools.jst.web.project; import org.eclipse.core.resources.IResource; - -import org.jboss.tools.common.model.*; +import org.eclipse.jface.text.IDocument; +import org.jboss.tools.common.kb.wtp.TLDVersionHelper; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.filesystems.FileSystemsHelper; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.filesystems.impl.FileSystemImpl; -import org.jboss.tools.jst.web.tld.*; +import org.jboss.tools.jst.web.tld.IWebProject; +import org.jboss.tools.jst.web.tld.TaglibMapping; public class WebProject implements IWebProject { @@ -116,4 +119,14 @@ return path.substring(webRoot.length() - 1); } -} + public static String getTldVersion(String uri, String prefix, IDocument document, XModel xm) { + String version = TLDVersionHelper.getTldVersion(uri, prefix, document); + if(version == null && xm!=null) { + XModelObject xmo = WebProject.getInstance(xm).getTaglibMapping().getTaglibObject(uri); + if(xmo!=null) { + version = xmo.getAttributeValue("tlibversion"); + } + } + return version; + } +} \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2007-08-01 15:13:09 UTC (rev 2804) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2007-08-01 15:17:47 UTC (rev 2805) @@ -19,6 +19,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.IDocument; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager; @@ -28,19 +29,21 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.jboss.tools.jst.jsp.editor.IVisualContext; -import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper; -import org.jboss.tools.jst.jsp.preferences.VpePreference; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.kb.KbConnectorFactory; import org.jboss.tools.common.kb.KbConnectorType; import org.jboss.tools.common.kb.KbTldResource; import org.jboss.tools.common.kb.wtp.JspWtpKbConnector; import org.jboss.tools.common.kb.wtp.TLDVersionHelper; import org.jboss.tools.common.kb.wtp.WtpKbConnector; -import org.jboss.tools.common.model.ui.editors.dnd.DropUtils; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.project.IModelNature; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.jsp.editor.IVisualContext; +import org.jboss.tools.jst.jsp.editor.TLDRegisterHelper; +import org.jboss.tools.jst.jsp.preferences.VpePreference; +import org.jboss.tools.jst.web.tld.TaglibData; +import org.jboss.tools.jst.web.tld.VpeTaglibListener; +import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeEditorPart; @@ -55,9 +58,8 @@ import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.FileUtil; -import org.jboss.tools.jst.web.tld.TaglibData; -import org.jboss.tools.jst.web.tld.VpeTaglibListener; -import org.jboss.tools.jst.web.tld.VpeTaglibManager; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * Contains the information on edited page. @@ -409,7 +411,8 @@ Iterator it = list.iterator(); while(it.hasNext()) { TaglibData data = (TaglibData)it.next(); - TLDRegisterHelper.registerTld(data, (JspWtpKbConnector)wtpKbConnector, document); + IEditorInput ei = editPart.getEditorInput(); + TLDRegisterHelper.registerTld(data, (JspWtpKbConnector)wtpKbConnector, document, ei); } return true; }