May 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r31081 - trunk/forge/plugins/org.jboss.tools.seam.forge/lib.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-05-05 03:09:14 -0400 (Thu, 05 May 2011) New Revision: 31081 Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-impl.jar Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-dev-plugins.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-git-tools.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-javaee-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-javaee-impl.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-maven-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-xml.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-project-model-maven.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-reference-guide.war trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold-plugins.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell-api.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/metawidget-forge.jar trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-api.jar Log: update of the forge embedded runtime to latest from head Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-dev-plugins.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-git-tools.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-javaee-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-javaee-impl.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-maven-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-java.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-parser-xml.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-project-model-maven.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-reference-guide.war =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-scaffold-plugins.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell-api.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/forge-shell.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/metawidget-forge.jar =================================================================== (Binary files differ) Modified: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-api.jar =================================================================== (Binary files differ) Added: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-impl.jar =================================================================== (Binary files differ) Property changes on: trunk/forge/plugins/org.jboss.tools.seam.forge/lib/shrinkwrap-descriptors-impl.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31080 - trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2011-05-05 01:02:10 -0400 (Thu, 05 May 2011) New Revision: 31080 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7/ Log: adding 'target' to svn ignore Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.management.as7 ___________________________________________________________________ Added: svn:ignore + target

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31079 - trunk/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-04 23:01:54 -0400 (Wed, 04 May 2011) New Revision: 31079 Modified: trunk/build/aggregate/site/site.xml Log: bump up from 3.2 -> 3.3 Modified: trunk/build/aggregate/site/site.xml =================================================================== --- trunk/build/aggregate/site/site.xml 2011-05-05 03:01:06 UTC (rev 31078) +++ trunk/build/aggregate/site/site.xml 2011-05-05 03:01:54 UTC (rev 31079) @@ -3,7 +3,7 @@  <description> - JBoss Tools 3.2 Updates + JBoss Tools 3.3 Updates </description>  @@ -179,7 +179,7 @@ </description> </category-def> - <category-def name="AllTools" label="All JBoss Tools 3.2.0"> + <category-def name="AllTools" label="All JBoss Tools 3.3"> <description> Contains ALL the plugins that are available from JBoss Tools except those

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31078 - branches/jbosstools-3.2.x/build/aggregate/site.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-04 23:01:06 -0400 (Wed, 04 May 2011) New Revision: 31078 Modified: branches/jbosstools-3.2.x/build/aggregate/site/site.xml Log: add .x suffix to site desc/catg Modified: branches/jbosstools-3.2.x/build/aggregate/site/site.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/site.xml 2011-05-05 01:21:53 UTC (rev 31077) +++ branches/jbosstools-3.2.x/build/aggregate/site/site.xml 2011-05-05 03:01:06 UTC (rev 31078) @@ -3,7 +3,7 @@  <description> - JBoss Tools 3.2 Updates + JBoss Tools 3.2.x Updates </description>  @@ -178,7 +178,7 @@ </description> </category-def> - <category-def name="AllTools" label="All JBoss Tools 3.2.0"> + <category-def name="AllTools" label="All JBoss Tools 3.2.x"> <description> Contains ALL the plugins that are available from JBoss Tools except those

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31077 - tags/jbosstools-3.2.0.Final.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-05-04 21:21:53 -0400 (Wed, 04 May 2011) New Revision: 31077 Removed: tags/jbosstools-3.2.0.Final/jbosstools-3.2.x/ Log: delete obsolete nested branch under a tag

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31076 - in trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test: projects/HiperlinksTestProject/WebContent/WEB-INF and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-05-04 19:27:11 -0400 (Wed, 04 May 2011) New Revision: 31076 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/OpenOnsTest.java Log: JBIDE-8845 https://issues.jboss.org/browse/JBIDE-8845 Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld 2011-05-04 23:27:11 UTC (rev 31076) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<taglib version="2.1" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"> + <tlib-version>1.0</tlib-version> + <short-name>myLibrary</short-name> + <uri>myLibrary</uri> + <tag> + <name>myTag</name> + <tag-class>String</tag-class> + <body-content>empty</body-content> + <attribute> + <name>myattr</name> + <rtexprvalue>false</rtexprvalue> + <type>String</type> + </attribute> + </tag> +</taglib> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/WEB-INF/myLibrary.tld ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp 2011-05-04 23:27:11 UTC (rev 31076) @@ -0,0 +1,19 @@ +<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> +<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%> +<%@ taglib uri="myLibrary" prefix="m"%> + +<html> +<head> +<title></title> +</head> +<body> +<f:view> + <h:form> + <h:outputText value="#{bean1.property3.property1}" /> + <h:commandButton action="page2" value="Go to page2" /> + <h:commandButton action="page3" value="Go to page3" /> + <m:myTag myattr=""/> + </h:form> +</f:view> +</body> +</html> Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/HiperlinksTestProject/WebContent/tldTagsHyperlinkTests.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/OpenOnsTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/OpenOnsTest.java 2011-05-04 23:26:11 UTC (rev 31075) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/OpenOnsTest.java 2011-05-04 23:27:11 UTC (rev 31076) @@ -20,6 +20,7 @@ import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageEditor; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; import org.jboss.tools.jsf.text.ext.hyperlink.JsfJSPTagNameHyperlinkDetector; +import org.jboss.tools.jsf.text.ext.hyperlink.TLDTagHyperlink; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.WorkbenchUtils; @@ -571,4 +572,120 @@ String fileName = editor.getEditorInput().getName(); assertTrue("style1.css".equals(fileName)); } + + public static final String TAGLIB_TAGS_TEST_FILE = OPENON_TEST_PROJECT + "/WebContent/tldTagsHyperlinkTests.jsp"; + + public void testTaglibAttributeFromJarOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "value", true, true, false, false); + IHyperlink[] links = new JsfJSPTagNameHyperlinkDetector().detectHyperlinks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("html_basic.tld".equals(fileName)); + + assertModelObjectSelection(links[0], "value"); + } + + public void testTaglibTagsFromJarOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "h:outputText", true, true, false, false); + IHyperlink[] links = new JsfJSPTagNameHyperlinkDetector().detectHyperlinks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("html_basic.tld".equals(fileName)); + + try { + assertModelObjectSelection(links[0], "outputText"); + } finally { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().closeEditor(editor, false); + } + } + + public void testTaglibTagsInWebInfOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "m:myTag", true, true, false, false); + IHyperlink[] links = new JsfJSPTagNameHyperlinkDetector().detectHyperlinks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("myLibrary.tld".equals(fileName)); + + assertModelObjectSelection(links[0], "myTag"); + } + + public void testTaglibAttributeInWebInfOpenOn() throws BadLocationException { + IEditorPart editor = WorkbenchUtils.openEditor(TAGLIB_TAGS_TEST_FILE); + assertTrue(editor instanceof JSPMultiPageEditor); + JobUtils.waitForIdle(); + JSPMultiPageEditor jspMultyPageEditor = (JSPMultiPageEditor) editor; + ISourceViewer viewer = jspMultyPageEditor.getSourceEditor().getTextViewer(); + IDocument document = jspMultyPageEditor.getSourceEditor().getTextViewer().getDocument(); + IRegion reg = new FindReplaceDocumentAdapter(document).find(0, + "myattr", true, true, false, false); + IHyperlink[] links = new JsfJSPTagNameHyperlinkDetector().detectHyperlinks(viewer, reg, true); + assertNotNull(links); + assertTrue(links.length!=0); + //assertNotNull(links[0].getHyperlinkText()); + assertNotNull(links[0].toString()); + links[0].open(); + JobUtils.waitForIdle(); + + editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + + String fileName = editor.getEditorInput().getName(); + assertTrue("myLibrary.tld".equals(fileName)); + + assertModelObjectSelection(links[0], "myattr"); + } + + void assertModelObjectSelection(IHyperlink link, String name) { + assertTrue(link instanceof TLDTagHyperlink); + TLDTagHyperlink tagLink = (TLDTagHyperlink)link; + String objectName = tagLink.getObjectName(); + int i = objectName.lastIndexOf(":"); + if(i > 0) objectName = objectName.substring(i + 1).trim(); + assertEquals(name, objectName); + } + }

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31075 - trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-05-04 19:26:11 -0400 (Wed, 04 May 2011) New Revision: 31075 Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDAttributeHyperlink.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java Log: JBIDE-8845 https://issues.jboss.org/browse/JBIDE-8845 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-05-04 20:39:50 UTC (rev 31074) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlinkDetector.java 2011-05-04 23:26:11 UTC (rev 31075) @@ -19,7 +19,9 @@ import org.eclipse.jface.text.Region; import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; import org.jboss.tools.common.core.resources.XModelObjectEditorInput; import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.common.model.XModelObject; @@ -27,15 +29,20 @@ import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor.JSPStructuredTextViewer; +import org.jboss.tools.jst.text.ext.util.TaglibManagerWrapper; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; import org.jboss.tools.jst.web.kb.PageContextFactory; import org.jboss.tools.jst.web.kb.PageProcessor; +import org.jboss.tools.jst.web.kb.internal.taglib.AbstractAttribute; import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent; import org.jboss.tools.jst.web.kb.internal.taglib.FaceletTag; import org.jboss.tools.jst.web.kb.internal.taglib.TLDTag; +import org.jboss.tools.jst.web.kb.taglib.IAttribute; import org.jboss.tools.jst.web.kb.taglib.IComponent; +import org.w3c.dom.Attr; import org.w3c.dom.Document; +import org.w3c.dom.Element; import org.w3c.dom.Node; public class JsfJSPTagNameHyperlinkDetector extends AbstractHyperlinkDetector { @@ -65,12 +72,15 @@ IRegion reg = getRegion(n, region.getOffset()); - if(reg != null){ + if(reg != null && n instanceof IDOMElement) { + String tagName = n.getNodeName(); + int i = tagName.indexOf(":"); KbQuery query = new KbQuery(); query.setType(KbQuery.Type.TAG_NAME); - + if(i > 0) query.setPrefix(tagName.substring(0, i)); query.setOffset(reg.getOffset()); - query.setValue(n.getNodeName()); + query.setValue(tagName); + query.setUri(getURI(region, textViewer.getDocument())); query.setMask(false); ELContext context = PageContextFactory.createPageContext(file); @@ -89,6 +99,35 @@ if(hyperlinks.size() > 0) return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[hyperlinks.size()]); } + } else if(reg != null && n instanceof IDOMAttr) { + String tagName = ((IDOMAttr)n).getOwnerElement().getNodeName(); + int i = tagName.indexOf(":"); + KbQuery query = new KbQuery(); + query.setType(KbQuery.Type.ATTRIBUTE_NAME); + if(i > 0) query.setPrefix(tagName.substring(0, i)); + query.setUri(getURI(region, textViewer.getDocument())); + query.setParentTags(new String[]{tagName}); + query.setParent(tagName); + query.setOffset(reg.getOffset()); + query.setValue(n.getNodeName()); + query.setMask(false); + + ELContext context = PageContextFactory.createPageContext(file); + + if(context instanceof IPageContext){ + IAttribute[] components = PageProcessor.getInstance().getAttributes(query, (IPageContext)context); + ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>(); + for(IAttribute attribute : components){ + if(validateComponent(attribute.getComponent())){ + TLDAttributeHyperlink link = new TLDAttributeHyperlink((AbstractAttribute)attribute, reg); + link.setDocument(textViewer.getDocument()); + hyperlinks.add(link); + } + } + sortHyperlinks(hyperlinks); + if(hyperlinks.size() > 0) + return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[hyperlinks.size()]); + } } return parse(textViewer.getDocument(), xmlDocument, region); @@ -136,23 +175,68 @@ } private IRegion getRegion(Node n, int offset) { - if (n == null || !(n instanceof IDOMElement)) return null; + if (n == null || !(n instanceof IDOMNode)) return null; - IDOMElement elem = (IDOMElement)n; - - String tagName = elem.getTagName(); - - int start = elem.getStartOffset(); - int nameStart = start + "<".length(); //$NON-NLS-1$ - int nameEnd = nameStart + tagName.length(); + int start = 0; + int nameStart; + int nameEnd; - if(offset > nameEnd){ - start = elem.getEndStartOffset(); - nameStart = start + "</".length(); //$NON-NLS-1$ + if(n instanceof IDOMAttr) { + IDOMAttr attr = (IDOMAttr)n; + String attrName = attr.getName(); + start = attr.getStartOffset(); + nameStart = start; + nameEnd = nameStart + attrName.length(); + } else if(n instanceof IDOMElement) { + IDOMElement elem = (IDOMElement)n; + String tagName = elem.getTagName(); + start = elem.getStartOffset(); + nameStart = start + "<".length(); //$NON-NLS-1$ nameEnd = nameStart + tagName.length(); + if(offset > nameEnd) { + start = elem.getEndStartOffset(); + nameStart = start + "</".length(); //$NON-NLS-1$ + nameEnd = nameStart + tagName.length(); + } + } else { + return null; } return new Region(nameStart,nameEnd - nameStart); } + private String getURI(IRegion region, IDocument document) { + StructuredModelWrapper smw = new StructuredModelWrapper(); + smw.init(document); + try { + Document xmlDocument = smw.getDocument(); + if (xmlDocument == null) return null; + + Node n = Utils.findNodeForOffset(xmlDocument, region.getOffset()); + + Node node = null; + if (n instanceof Attr) { + node = ((Attr)n).getOwnerElement(); + } else { + node = n; + } + if (!(node instanceof Element)) return null; + + String nodeName = node.getNodeName(); + if (nodeName.indexOf(':') == -1) return null; + + String nodePrefix = nodeName.substring(0, nodeName.indexOf(":")); //$NON-NLS-1$ + if (nodePrefix == null || nodePrefix.length() == 0) return null; + + TaglibManagerWrapper tmw = new TaglibManagerWrapper(); + tmw.init(document, region.getOffset()); + + if (!tmw.exists()) return null; + + return tmw.getUri(nodePrefix); + } finally { + smw.dispose(); + } + } + } Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDAttributeHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDAttributeHyperlink.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDAttributeHyperlink.java 2011-05-04 23:26:11 UTC (rev 31075) @@ -0,0 +1,47 @@ +/******************************************************************************* + * Copyright (c) 2011 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.text.ext.hyperlink; + +import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.XModelObjectConstants; +import org.jboss.tools.jst.web.kb.internal.taglib.AbstractAttribute; +import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent; + +public class TLDAttributeHyperlink extends TLDTagHyperlink { + protected AbstractAttribute attr; + + public TLDAttributeHyperlink(AbstractAttribute attr, IRegion region) { + super((AbstractComponent)attr.getComponent(), region); + this.attr = attr; + + XModelObject attrObject = TLDTagHyperlink.getXModelObject(attr); + if(attrObject != null) { + xmodelObject = attrObject; + if(xmodelObject != null && file != null) { + String fileName = file.getName(); + String libraryName = getFileName(xmodelObject); + String objectName = xmodelObject.getAttributeValue(XModelObjectConstants.ATTR_NAME); + if(objectName == null) { + objectName = xmodelObject.getAttributeValue("attribute-name"); + } + xmodelObjectName = fileName; + if(libraryName != null && !libraryName.equals(fileName)) { + xmodelObjectName += " : " + libraryName; + } + if(objectName != null && !objectName.equals(libraryName)) { + xmodelObjectName += " : " + objectName; + } + } + } + } + +} Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDAttributeHyperlink.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-05-04 20:39:50 UTC (rev 31074) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/TLDTagHyperlink.java 2011-05-04 23:26:11 UTC (rev 31075) @@ -16,32 +16,49 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IEditorPart; import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl; import org.jboss.tools.common.model.util.FindObjectHelper; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; +import org.jboss.tools.jst.web.kb.internal.KbObject; import org.jboss.tools.jst.web.kb.internal.taglib.AbstractComponent; import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; public class TLDTagHyperlink extends AbstractHyperlink { - private AbstractComponent tag; - private XModelObject xmodelObject; - private String xmodelObjectName = null; - private IFile file = null; - private IRegion region; + protected AbstractComponent tag; + protected XModelObject xmodelObject; + protected String xmodelObjectName = null; + protected IFile file = null; + protected IRegion region; public TLDTagHyperlink(AbstractComponent tag, IRegion region){ this.tag = tag; this.region = region; - IFile file = getFile(tag); + file = getFile(tag); - if(file != null && file.getFullPath() != null && file.getFullPath().toString().endsWith(".jar")) { - xmodelObject = getXModelObject(tag); - if(xmodelObject != null) - xmodelObjectName = file.getName()+" : "+getFileName(xmodelObject); + xmodelObject = getXModelObject(tag); + if(xmodelObject != null && file != null) { + String fileName = file.getName(); + String libraryName = getFileName(xmodelObject); + String objectName = xmodelObject.getAttributeValue(XModelObjectConstants.ATTR_NAME); + if(objectName == null) { + objectName = xmodelObject.getAttributeValue("tag-name"); + } + xmodelObjectName = fileName; + if(libraryName != null && !libraryName.equals(fileName)) { + xmodelObjectName += " : " + libraryName; + } + if(objectName != null && !objectName.equals(libraryName)) { + xmodelObjectName += " : " + objectName; + } } } + + public String getObjectName() { + return xmodelObjectName; + } public static IFile getFile(AbstractComponent tag){ ITagLibrary tagLib = tag.getTagLib(); @@ -52,7 +69,7 @@ return null; } - public static XModelObject getXModelObject(AbstractComponent tag){ + public static XModelObject getXModelObject(KbObject tag){ Object id = tag.getId(); if(id instanceof XModelObject) return (XModelObject)id;

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31074 - trunk/site.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-05-04 16:39:50 -0400 (Wed, 04 May 2011) New Revision: 31074 Modified: trunk/site/pom.xml trunk/site/site.xml Log: fix to restore update site for plug-ins from jbosstools repo Modified: trunk/site/pom.xml =================================================================== --- trunk/site/pom.xml 2011-05-04 18:50:03 UTC (rev 31073) +++ trunk/site/pom.xml 2011-05-04 20:39:50 UTC (rev 31074) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.parent.pom</artifactId> - <version>0.0.1-SNAPSHOT</version> + <version>0.0.2-SNAPSHOT</version> </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.site</artifactId> Modified: trunk/site/site.xml =================================================================== --- trunk/site/site.xml 2011-05-04 18:50:03 UTC (rev 31073) +++ trunk/site/site.xml 2011-05-04 20:39:50 UTC (rev 31074) @@ -6,7 +6,169 @@ JBoss Tools 3.2.0 Update Site / p2 Repo </description> -  +  +  + <feature url="features/org.jboss.tools.richfaces.feature_0.0.0.jar" id="org.jboss.tools.richfaces.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.tools.seam.feature_0.0.0.jar" id="org.jboss.tools.seam.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.tools.cdi.feature_0.0.0.jar" id="org.jboss.tools.cdi.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.tools.jmx.feature_0.0.0.jar" id="org.jboss.tools.jmx.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.ide.eclipse.as.feature_0.0.0.jar" id="org.jboss.ide.eclipse.as.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.ide.eclipse.archives.feature_0.0.0.jar" id="org.jboss.ide.eclipse.archives.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.hibernate.eclipse.feature_0.0.0.jar" id="org.hibernate.eclipse.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + <category name="DataTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.ide.eclipse.freemarker.feature_0.0.0.jar" id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.tools.struts.feature_0.0.0.jar" id="org.jboss.tools.struts.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.tools.esb.feature_0.0.0.jar" id="org.jboss.tools.esb.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.ws.feature_0.0.0.jar" id="org.jboss.tools.ws.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.portlet.feature_0.0.0.jar" id="org.jboss.tools.portlet.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.tools.smooks.feature_0.0.0.jar" id="org.jboss.tools.smooks.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + <category name="DataTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.drools.eclipse.task.feature_0.0.0.jar" id="org.drools.eclipse.task.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.guvnor.tools.feature_0.0.0.jar" id="org.guvnor.tools.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.project.examples.feature_0.0.0.jar" id="org.jboss.tools.project.examples.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + +  +  + +  + <feature url="features/org.jboss.tools.community.project.examples.feature_0.0.0.jar" + id="org.jboss.tools.community.project.examples.feature" + version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.tools.birt.feature_0.0.0.jar" id="org.jboss.tools.birt.feature" version="0.0.0"> + <category name="ReportTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.feature_0.0.0.jar" id="org.jboss.tools.maven.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.seam.feature_0.0.0.jar" id="org.jboss.tools.maven.seam.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.jsf.feature_0.0.0.jar" id="org.jboss.tools.maven.jsf.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.cdi.feature_0.0.0.jar" id="org.jboss.tools.maven.cdi.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.hibernate.feature_0.0.0.jar" id="org.jboss.tools.maven.hibernate.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.maven.portlet.feature_0.0.0.jar" id="org.jboss.tools.maven.portlet.feature" version="0.0.0"> + <category name="MavenTools" /> + </feature> + <feature url="features/org.jboss.tools.xulrunner.feature_0.0.0.jar" id="org.jboss.tools.xulrunner.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="WebTools" /> + </feature> + <feature url="features/org.jboss.tools.jbpm.convert.feature_0.0.0.jar" id="org.jboss.tools.jbpm.convert.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.jbpm.common.feature_0.0.0.jar" id="org.jboss.tools.jbpm.common.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.jbpm3.feature_0.0.0.jar" id="org.jboss.tools.jbpm3.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.jbpm4.feature_0.0.0.jar" id="org.jboss.tools.jbpm4.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.bpel.feature_0.0.0.jar" id="org.jboss.tools.bpel.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="SOATools" /> + </feature> + <feature url="features/org.jboss.tools.modeshape.rest.feature_0.0.0.jar" id="org.jboss.tools.modeshape.rest.feature" version="0.0.0"> + <category name="AllTools" /> + <category name="GeneralTools" /> + </feature> + <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0"> + <category name="AllTools" /> + </feature> + + <feature url="features/org.jboss.tools.deltacloud.feature_0.0.0.jar" id="org.jboss.tools.deltacloud.feature" version="0.0.0"> + <category name="CloudTools" /> + <category name="AllTools" /> + </feature> + + <feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0"> + <category name="AllTools" /> + </feature> + <category-def name="SDKTools" label="JBoss Tools SDK"> <description>JBoss Tools SDK contains plugins where an SDK package exists. These contain both source and runtimes. Use these if you want

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31073 - trunk/site.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-05-04 14:50:03 -0400 (Wed, 04 May 2011) New Revision: 31073 Added: trunk/site/pom.xml Log: restore site/pom.xml Copied: trunk/site/pom.xml (from rev 31072, branches/jbosstools-3.2.x/site/pom.xml) =================================================================== --- trunk/site/pom.xml (rev 0) +++ trunk/site/pom.xml 2011-05-04 18:50:03 UTC (rev 31073) @@ -0,0 +1,14 @@ +<project +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.site</artifactId> + <name>org.jboss.tools.site</name> + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-update-site</packaging> +</project>

13 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r31072 - trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-05-04 14:48:29 -0400 (Wed, 04 May 2011) New Revision: 31072 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigTagNameHyperlinkTest.java Log: JBIDE-8841 https://issues.jboss.org/browse/JBIDE-8841 Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigTagNameHyperlinkTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigTagNameHyperlinkTest.java 2011-05-04 18:47:46 UTC (rev 31071) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/SeamConfigTagNameHyperlinkTest.java 2011-05-04 18:48:29 UTC (rev 31072) @@ -50,7 +50,6 @@ IFile f = input.getFile(); assertEquals("OtherQualifier.java", f.getName()); ISelection selection = editor.getEditorSite().getSelectionProvider().getSelection(); - System.out.println(selection); assertTrue(selection instanceof TextSelection); TextSelection textSelection = (TextSelection)selection; assertEquals("value1", textSelection.getText());

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2011