Author: sdzmitrovich Date: 2008-08-18 13:31:44 -0400 (Mon, 18 Aug 2008) New Revision: 9778 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-2581 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-18 17:11:56 UTC (rev 9777) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Constants.java 2008-08-18 17:31:44 UTC (rev 9778) @@ -17,4 +17,6 @@ public static final String FALSE = "false"; //$NON-NLS-1$ public static final String EMPTY = ""; //$NON-NLS-1$ public static final String YES_STRING = "yes"; //$NON-NLS-1$ + public static final String JSP_FILE_EXTENSION = "jsp"; //$NON-NLS-1$ + } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-08-18 17:11:56 UTC (rev 9777) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2008-08-18 17:31:44 UTC (rev 9778) @@ -143,5 +143,24 @@ } } + + /** + * + * @param input + * The editor input + * @return Path + */ + public static IPath getInputPath(IEditorInput input) { + IPath inputPath = null; + if (input instanceof ILocationProvider) { + inputPath = ((ILocationProvider) input).getPath(input); + } else if (input instanceof IFileEditorInput) { + IFile inputFile = ((IFileEditorInput) input).getFile(); + if (inputFile != null) { + inputPath = inputFile.getLocation(); + } + } + return inputPath; + } } 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-08-18 17:11:56 UTC (rev 9777) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/XmlUtil.java 2008-08-18 17:31:44 UTC (rev 9778) @@ -18,6 +18,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; +import org.eclipse.core.runtime.IPath; 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; @@ -111,29 +112,40 @@ * @param document * @return collection of taglibs */ - public static List<TaglibData> getTaglibsForNode(Node source,VpePageContext pageContext) { - + 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); - if(tldcmDocumentManager!=null) { - List<TaglibTracker> taglibs_JSP = tldcmDocumentManager.getTaglibTrackers(); + // Added by Sergey Dzmitrovich Fix for JBIDE-2581 + IPath path = FileUtil.getInputPath(pageContext.getEditPart() + .getEditorInput()); + + if (path != null + && path.getFileExtension().equals(Constants.JSP_FILE_EXTENSION)) { + IDocument document = pageContext.getSourceBuilder() + .getStructuredTextViewer().getDocument(); + + TLDCMDocumentManager tldcmDocumentManager = TaglibController + .getTLDCMDocumentManager(document); + if (tldcmDocumentManager != null) { + List<TaglibTracker> taglibs_JSP = tldcmDocumentManager + .getTaglibTrackers(); for (TaglibTracker taglibTracker : taglibs_JSP) { - addTaglib(taglibData, taglibTracker.getURI(), taglibTracker.getPrefix(), true); + addTaglib(taglibData, taglibTracker.getURI(), taglibTracker + .getPrefix(), true); } - } - - if(taglibData.size()==0) { - + } + } else { taglibData = getTaglibsForNode(source); + } - //add internal taglibs JBIDE-2065 + // add internal taglibs JBIDE-2065 List<TaglibData> includeTaglibs = pageContext.getIncludeTaglibs(); - for (TaglibData includedTaglib : includeTaglibs) { - addTaglib(taglibData, includedTaglib.getUri(), includedTaglib.getPrefix(), true); + for (TaglibData includedTaglib : includeTaglibs) { + addTaglib(taglibData, includedTaglib.getUri(), includedTaglib + .getPrefix(), true); } return taglibData; }