Author: mareshkau Date: 2008-04-17 07:20:58 -0400 (Thu, 17 Apr 2008) New Revision: 7570 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/template/VpeTemplateManager.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java Log: JBIDE-2065 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 2008-04-17 10:24:21 UTC (rev 7569) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-04-17 11:20:58 UTC (rev 7570) @@ -10,17 +10,16 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.context; +import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; + import org.eclipse.core.resources.IFile; 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; -import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IFileEditorInput; import org.eclipse.ui.IWorkbenchPage; @@ -33,7 +32,6 @@ 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.VpePlugin; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.VpeSourceDomBuilder; @@ -45,7 +43,6 @@ import org.jboss.tools.vpe.editor.css.ResourceReference; import org.jboss.tools.vpe.editor.css.TaglibReferenceList; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; -import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.template.VpeCreationData; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.FileUtil; @@ -171,7 +168,7 @@ if (sourcePrefix == null || ((ElementImpl)sourceNode).isJSPTag()) { return true; } - List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,this.getSourceBuilder().getStructuredTextViewer().getDocument()); + List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,this); TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourcePrefix, taglibs); @@ -195,8 +192,7 @@ } List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode, - this.getSourceBuilder() - .getStructuredTextViewer().getDocument()); + this); TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourcePrefix, taglibs); @@ -227,7 +223,7 @@ } } - public ResourceReference[] getIncludeTaglibs() { + public List<TaglibData> getIncludeTaglibs() { IEditorInput input = getEditPart().getEditorInput(); IFile file = null; if (input instanceof IFileEditorInput) { @@ -237,7 +233,12 @@ if (file != null) { resourceReferences = TaglibReferenceList.getInstance().getAllResources(file); } - return resourceReferences; + //added by Max Areshkau Fix for JBIDE-2065 + List<TaglibData> taglibData = new ArrayList<TaglibData>(); + for (ResourceReference resourceReference : resourceReferences) { + taglibData.add(new TaglibData(0,resourceReference.getLocation(), resourceReference.getProperties())); + } + return taglibData; } public ResourceReference[] getIncludeCss() { @@ -254,13 +255,13 @@ } public void installIncludeElements() { - ResourceReference[] list = getIncludeTaglibs(); - for (int i = 0; i < list.length; i++) { - ResourceReference reference = list[i]; -// setTaglib(i, reference.getLocation(), reference.getProperties(), false); - } +// ResourceReference[] list = getIncludeTaglibs(); +// for (int i = 0; i < list.length; i++) { +// ResourceReference reference = list[i]; +//// setTaglib(i, reference.getLocation(), reference.getProperties(), false); +// } - list = getIncludeCss(); + ResourceReference[] list = getIncludeCss(); for (int i = 0; i < list.length; i++) { visualBuilder.addLinkNodeToHead(list[i].getLocation(), "yes"); } @@ -307,7 +308,7 @@ public List<TaglibData> getTagLibs(Node sourceNode) { - return XmlUtil.getTaglibsForNode(sourceNode, this.getSourceBuilder().getStructuredTextViewer().getDocument()); + return XmlUtil.getTaglibsForNode(sourceNode, this); } public void removeTaglibListener(VpeTaglibListener listener) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-17 10:24:21 UTC (rev 7569) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2008-04-17 11:20:58 UTC (rev 7570) @@ -29,6 +29,7 @@ import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.css.ResourceReference; import org.jboss.tools.vpe.editor.template.textformating.TextFormatingData; import org.jboss.tools.vpe.editor.util.HTML; import org.jboss.tools.vpe.editor.util.XmlUtil; @@ -307,7 +308,8 @@ return sourceNode.getNodeName(); } - List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext.getSourceBuilder().getStructuredTextViewer().getDocument()); + List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext); + TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourcePrefix, taglibs); if(sourceNodeTaglib == null) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-04-17 10:24:21 UTC (rev 7569) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionTldVersionCheck.java 2008-04-17 11:20:58 UTC (rev 7570) @@ -84,7 +84,7 @@ return new VpeValue(false); } - List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext.getSourceBuilder().getStructuredTextViewer().getDocument()); + List<TaglibData> taglibs = XmlUtil.getTaglibsForNode(sourceNode,pageContext); TaglibData sourceNodeTaglib = XmlUtil.getTaglibForPrefix(sourceNode.getPrefix(), taglibs); //this function works only for jsp files Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2008-04-17 10:24:21 UTC (rev 7569) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2008-04-17 11:20:58 UTC (rev 7570) @@ -13,17 +13,18 @@ import java.io.FileInputStream; import java.util.ArrayList; import java.util.List; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; + 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; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.jboss.tools.jst.web.tld.TaglibData; -import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.xulrunner.browser.util.DOMTreeDumper; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.css.ResourceReference; import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -109,9 +110,11 @@ * @param document * @return collection of taglibs */ - public static List<TaglibData> getTaglibsForNode(Node source,IDocument document) { + public static List<TaglibData> getTaglibsForNode(Node source,VpePageContext pageContext) { List<TaglibData> taglibData = new ArrayList<TaglibData>(); + + IDocument document = pageContext.getSourceBuilder().getStructuredTextViewer().getDocument(); //TODO Max Areshkau Looks like exist possability to check is it jsp document //node.getOwnerDocument return null for jsp apply it for CA TLDCMDocumentManager tldcmDocumentManager= TaglibController.getTLDCMDocumentManager(document); @@ -126,7 +129,11 @@ taglibData = getTaglibsForNode(source); } - + //add internal taglibs JBIDE-2065 + List<TaglibData> includeTaglibs = pageContext.getIncludeTaglibs(); + for (TaglibData includedTaglib : includeTaglibs) { + addTaglib(taglibData, includedTaglib.getUri(), includedTaglib.getPrefix(), true); + } return taglibData; } /** @@ -137,7 +144,7 @@ */ private static void processAttribute(List<TaglibData> taglibs, Attr attr) { - String startStr = "xmlns:"; + String startStr = "xmlns:"; //$NON-NLS-1$ String name = attr.getName(); if (!name.startsWith(startStr)) { return;