July 2011 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r32930 - in trunk: jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2011-07-14 21:01:59 -0400 (Thu, 14 Jul 2011) New Revision: 32930 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java Log: https://issues.jboss.org/browse/JBIDE-9307 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/JavaMemberELSegmentImpl.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -16,6 +16,8 @@ import java.util.Set; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.common.el.core.ELCorePlugin; import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo; @@ -71,6 +73,11 @@ */ public void setElement(IJavaElement element) { this.element = element; + try { + setResource(element.getUnderlyingResource()); + } catch (JavaModelException e) { + ELCorePlugin.getDefault().logError(e); + } } /** Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegment.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; -import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IFile; import org.jboss.tools.common.text.ITextSourceReference; /** @@ -26,20 +26,20 @@ /** * @return resource of Message Bundle. */ - IResource getMessageBundleResource(); - + IFile getMessageBundleResource(); + /** * @return true if the segment presents message bundle. In this case isProperty() always returns false; */ boolean isBundle(); - + /** * @return true if the segment presents message property. */ boolean isProperty(); - + /** * @return source reference of message property. */ ITextSourceReference getMessagePropertySourceReference(); -} +} \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.el.core.resolver; +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.common.el.core.parser.LexicalToken; import org.jboss.tools.common.text.ITextSourceReference; @@ -20,7 +21,7 @@ public class MessagePropertyELSegmentImpl extends ELSegmentImpl implements MessagePropertyELSegment { - private IResource messageBundleResource = null; + private IFile messageBundleResource = null; private ITextSourceReference messagePropertySourceReference = null; private int propertyStart=0, propertyLength=0; private String baseName=null; @@ -30,12 +31,13 @@ super(token); } - public IResource getMessageBundleResource() { + public IFile getMessageBundleResource() { return messageBundleResource; } - public void setMessageBundleResource(IResource resource){ + public void setMessageBundleResource(IFile resource){ messageBundleResource = resource; + setResource(resource); } public void setBundleOnlySegment(boolean set) { @@ -79,4 +81,4 @@ public void setBaseName(String name){ baseName = name; } -} +} \ No newline at end of file Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 00:02:55 UTC (rev 32929) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-15 01:01:59 UTC (rev 32930) @@ -83,7 +83,7 @@ JSTExtensionsPlugin.getDefault().logError(e); } }else if(segment instanceof MessagePropertyELSegment){ - IFile file = (IFile)((MessagePropertyELSegment)segment).getMessageBundleResource(); + IFile file = ((MessagePropertyELSegment)segment).getMessageBundleResource(); if(file == null) file = (IFile)segment.getResource(); @@ -122,8 +122,9 @@ if ( error != null && error.length() > 0) { openFileFailed(); } - }else + } else { openFileFailed(); + } } private String getPageLocale(IRegion region) {

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32929 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-07-14 20:02:55 -0400 (Thu, 14 Jul 2011) New Revision: 32929 Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9307 Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-07-14 23:28:08 UTC (rev 32928) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2011-07-15 00:02:55 UTC (rev 32929) @@ -29,18 +29,18 @@ "org.jboss.tools.jsf.text.ext.test", new String[]{"projects/JSF2CompositeOpenOn"}, new String[]{"JSF2CompositeOpenOn"})); - suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2MessagesOpenOnTest.class), - "org.jboss.tools.jsf.text.ext.test", - new String[]{"projects/JSF2CompositeOpenOn"}, - new String[]{"JSF2CompositeOpenOn"})); +// suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2MessagesOpenOnTest.class), +// "org.jboss.tools.jsf.text.ext.test", +// new String[]{"projects/JSF2CompositeOpenOn"}, +// new String[]{"JSF2CompositeOpenOn"})); suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CSSStylesheetOpenOnTest.class), "org.jboss.tools.jsf.text.ext.test", new String[]{"projects/JSF2CompositeOpenOn"}, new String[]{"JSF2CompositeOpenOn"})); - suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CCAttrsOpenOnTest.class), - "org.jboss.tools.jsf.text.ext.test", - new String[]{"projects/JSF2CompositeOpenOn"}, - new String[]{"JSF2CompositeOpenOn"})); +// suite.addTest(new ProjectImportTestSetup(new TestSuite(JSF2CCAttrsOpenOnTest.class), +// "org.jboss.tools.jsf.text.ext.test", +// new String[]{"projects/JSF2CompositeOpenOn"}, +// new String[]{"JSF2CompositeOpenOn"})); return suite; } } \ No newline at end of file

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32928 - in trunk: jsf/plugins/org.jboss.tools.jsf.text.ext and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2011-07-14 19:28:08 -0400 (Thu, 14 Jul 2011) New Revision: 32928 Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java Log: https://issues.jboss.org/browse/JBIDE-9307 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/model/JSFMessageELCompletionEngine.java 2011-07-14 23:28:08 UTC (rev 32928) @@ -490,7 +490,15 @@ XModelObject[] properties = keyHelper.findBundles(model, variable.basename, null); if(properties == null) return; - + + for (XModelObject p : properties) { + IFile propFile = (IFile)p.getAdapter(IFile.class); + if(propFile == null) + continue; + segment.setMessageBundleResource(propFile); + + } + segment.setBaseName(variable.basename); segment.setBundleOnlySegment(true); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/plugin.xml 2011-07-14 23:28:08 UTC (rev 32928) @@ -797,7 +797,7 @@ </partitionType> </contentType> </hyperlinkPartitioner> - <hyperlinkPartitioner +  <hyperlinkPartitioner id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPLoadBundleHyperlinkPartitioner" @@ -872,13 +872,12 @@ </contentType> </hyperlinkPartitioner> - <hyperlinkPartitioner +  <contentType id="org.eclipse.wst.html.core.htmlsource"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> @@ -891,7 +890,7 @@ <contentType id="org.jboss.tools.jst.jsp.jspincludesource"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> - </hyperlinkPartitioner> + </hyperlinkPartitioner-->  - <hyperlinkPartitioner +  <contentType id="org.eclipse.wst.html.core.htmlsource"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> @@ -925,7 +923,7 @@ <contentType id="org.jboss.tools.jst.jsp.jspincludesource"> <partitionType id="org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION" /> </contentType> - </hyperlinkPartitioner> + </hyperlinkPartitioner--> <hyperlinkPartitioner id="org.jboss.tools.common.text.ext.jsf.hyperlink.JSPClassHyperlinkPartitioner" @@ -1221,7 +1219,7 @@ </contenttypeidentifier> </hyperlink> - <hyperlink +  - <hyperlink +   </extension> Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/plugin.xml 2011-07-14 23:28:08 UTC (rev 32928) @@ -7,7 +7,7 @@ id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlinkPartitioner" name="org.jboss.tools.common.text.ext.jsf.facelets.hyperlinkPartitioner"> - <hyperlinkPartitioner +  - <hyperlinkPartitioner +  <hyperlinkPartitioner id="org.jboss.tools.common.text.ext.jsf.facelets.hyperlink.FaceletsTemplateHyperlinkPartitioner" Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/plugin.xml 2011-07-14 23:28:08 UTC (rev 32928) @@ -614,5 +614,15 @@  </extension> + <extension + point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> + <hyperlinkDetector + activate="true" + class="org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector" + id="org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector" + name="EL Hyperlink Detector" + targetId="org.eclipse.ui.DefaultTextEditor"> + </hyperlinkDetector> + </extension> </plugin> Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java 2011-07-14 23:28:08 UTC (rev 32928) @@ -0,0 +1,231 @@ +/******************************************************************************* + * Copyright (c) 2011 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.text.ext.hyperlink; + +import java.text.MessageFormat; +import java.util.List; +import java.util.Properties; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.jboss.tools.common.el.core.ELReference; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment; +import org.jboss.tools.common.el.core.resolver.MessagePropertyELSegment; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.project.IPromptingProvider; +import org.jboss.tools.common.model.project.PromptingProviderFactory; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jst.text.ext.JSTExtensionsPlugin; +import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +public class ELHyperlink extends AbstractHyperlink{ + private static final String VIEW_TAGNAME = "view"; //$NON-NLS-1$ + private static final String LOCALE_ATTRNAME = "locale"; //$NON-NLS-1$ + private static final String PREFIX_SEPARATOR = ":"; //$NON-NLS-1$ + + private ELReference reference; + private ELSegment segment; + + public ELHyperlink(IDocument document, ELReference reference, ELSegment segment){ + this.reference = reference; + this.segment = segment; + setDocument(document); + } + + @Override + protected IRegion doGetHyperlinkRegion(int offset) { + + return new IRegion(){ + public int getLength() { + return segment.getSourceReference().getLength(); + } + + public int getOffset() { + return reference.getStartPosition()+segment.getSourceReference().getStartPosition(); + }}; + } + + @Override + protected void doHyperlink(IRegion region) { + if(segment instanceof JavaMemberELSegment){ + try { + IEditorPart part = JavaUI.openInEditor(((JavaMemberELSegment) segment).getJavaElement()); + if(part == null) + openFileFailed(); + } catch (PartInitException e) { + JSTExtensionsPlugin.getDefault().logError(e); + } catch (JavaModelException e) { + JSTExtensionsPlugin.getDefault().logError(e); + } + }else if(segment instanceof MessagePropertyELSegment){ + IFile file = (IFile)((MessagePropertyELSegment)segment).getMessageBundleResource(); + if(file == null) + file = (IFile)segment.getResource(); + + XModel xModel = getXModel(file); + if (xModel == null) { + openFileFailed(); + return; + } + String bundleBasename = ((MessagePropertyELSegment)segment).getBaseName(); + String property = ((MessagePropertyELSegment)segment).isBundle() ? null : trimQuotes(((MessagePropertyELSegment)segment).getToken().getText()); + String locale = getPageLocale(region); + + Properties p = new Properties(); + if (bundleBasename != null) { + p.put(WebPromptingProvider.BUNDLE, bundleBasename); + } + + if (property != null) { + p.put(WebPromptingProvider.KEY, property); + } + + if (locale != null) { + p.setProperty(WebPromptingProvider.LOCALE, locale); + } + + IPromptingProvider provider = PromptingProviderFactory.WEB; + + p.put(IPromptingProvider.FILE, file); + + List list = provider.getList(xModel, getRequestMethod(p), p.getProperty("prefix"), p); //$NON-NLS-1$ + if (list != null && list.size() >= 1) { + openFileInEditor((String)list.get(0)); + return; + } + String error = p.getProperty(IPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } + }else + openFileFailed(); + } + + private String getPageLocale(IRegion region) { + if(getDocument() == null || region == null) return null; + + StructuredModelWrapper smw = new StructuredModelWrapper(); + try { + smw.init(getDocument()); + Document xmlDocument = smw.getDocument(); + if (xmlDocument == null) return null; + + Node n = Utils.findNodeForOffset(xmlDocument, region.getOffset()); + if (!(n instanceof Attr) ) return null; + + Element el = ((Attr)n).getOwnerElement(); + + Element jsfCoreViewTag = null; + String nodeToFind = PREFIX_SEPARATOR + VIEW_TAGNAME; + + while (el != null) { + if (el.getNodeName() != null && el.getNodeName().endsWith(nodeToFind)) { + jsfCoreViewTag = el; + break; + } + Node parent = el.getParentNode(); + el = (parent instanceof Element ? (Element)parent : null); + } + + if (jsfCoreViewTag == null || !jsfCoreViewTag.hasAttribute(LOCALE_ATTRNAME)) return null; + + String locale = Utils.trimQuotes((jsfCoreViewTag.getAttributeNode(LOCALE_ATTRNAME)).getValue()); + if (locale == null || locale.length() == 0) return null; + return locale; + } finally { + smw.dispose(); + } + } + + private String trimQuotes(String value) { + if(value == null) + return null; + + if(value.startsWith("'") || value.startsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$ + value = value.substring(1); + } + + if(value.endsWith("'") || value.endsWith("\"")) { //$NON-NLS-1$ //$NON-NLS-2$ + value = value.substring(0, value.length() - 1); + } + return value; + } + + private String getRequestMethod(Properties prop) { + return prop != null && prop.getProperty(WebPromptingProvider.KEY) == null ? + WebPromptingProvider.JSF_OPEN_BUNDLE : WebPromptingProvider.JSF_OPEN_KEY; + } + + @Override + public String getHyperlinkText() { + if(segment instanceof JavaMemberELSegment){ + IJavaElement javaElement = ((JavaMemberELSegment) segment).getJavaElement(); + String name = ""; //$NON-NLS-1$ + IType type = null; + if(javaElement instanceof IType){ + name = javaElement.getElementName(); + type = (IType)javaElement; + + }else if(javaElement instanceof IMethod){ + type = ((IMethod) javaElement).getDeclaringType(); + name = type.getElementName()+"."+javaElement.getElementName()+"()"; //$NON-NLS-1$ //$NON-NLS-2$ + }else if(javaElement instanceof IField){ + type = ((IField) javaElement).getDeclaringType(); + name = type.getElementName()+"."+javaElement.getElementName(); //$NON-NLS-1$ + } + if(type != null) + name += " - "+type.getPackageFragment().getElementName(); //$NON-NLS-1$ + return MessageFormat.format(Messages.Open, name); + }else if(segment instanceof MessagePropertyELSegment){ + String baseName = ((MessagePropertyELSegment)segment).getBaseName(); + String propertyName = ((MessagePropertyELSegment)segment).isBundle() ? null : trimQuotes(((MessagePropertyELSegment)segment).getToken().getText()); + if (propertyName == null) + return MessageFormat.format(Messages.Open, baseName); + + return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName); + } + return ""; //$NON-NLS-1$ + } + + @Override + public IFile getReadyToOpenFile() { + IFile file = null; + if(segment instanceof JavaMemberELSegment){ + + try { + file = (IFile)((JavaMemberELSegment) segment).getJavaElement().getUnderlyingResource(); + } catch (JavaModelException e) { + JSTExtensionsPlugin.getDefault().logError(e); + } + }else if(segment instanceof MessagePropertyELSegment){ + file = (IFile)((MessagePropertyELSegment)segment).getMessageBundleResource(); + } + return file; + } + +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlink.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java 2011-07-14 23:28:08 UTC (rev 32928) @@ -0,0 +1,97 @@ +/******************************************************************************* + * Copyright (c) 2011 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: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jst.text.ext.hyperlink; + +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.jboss.tools.common.el.core.ELReference; +import org.jboss.tools.common.el.core.model.ELExpression; +import org.jboss.tools.common.el.core.model.ELInvocationExpression; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.el.core.resolver.ELResolution; +import org.jboss.tools.common.el.core.resolver.ELResolver; +import org.jboss.tools.common.el.core.resolver.ELSegment; +import org.jboss.tools.jst.web.kb.PageContextFactory; + +public class ELHyperlinkDetector extends AbstractHyperlinkDetector{ + + public IHyperlink[] detectHyperlinks(ITextViewer textViewer, + IRegion region, boolean canShowMultipleHyperlinks) { + + IFile file = getFile(); + if(file == null) + return null; + + ELContext context = PageContextFactory.createPageContext(file); + if(context == null) + return null; + + ELReference reference = context.getELReference(region.getOffset()); + if(reference != null){ + ELInvocationExpression expression = findInvocationExpressionByOffset(reference, region.getOffset()); + if(expression != null){ + ELResolver[] resolvers = context.getElResolvers(); + for(ELResolver resolver : resolvers){ + ELResolution resolution = resolver.resolve(context, expression, region.getOffset()); + if(resolution != null){ + ELSegment segment = resolution.findSegmentByOffset(region.getOffset()-reference.getStartPosition()); + + if(segment != null && segment.isResolved()) + return new IHyperlink[]{new ELHyperlink(textViewer.getDocument(), reference, segment)}; + + } + } + } + + } + return null; + } + + private ELInvocationExpression findInvocationExpressionByOffset(ELReference reference, int offset){ + ELExpression[] expressions = reference.getEl(); + for(ELExpression expression : expressions){ + if(reference.getStartPosition()+expression.getStartPosition() <= offset && reference.getStartPosition()+expression.getEndPosition() > offset){ + ELInvocationExpression invocation = findInvocationExpressionByOffset(reference, expression, offset); + if(invocation != null) + return invocation; + } + } + return null; + } + + private ELInvocationExpression findInvocationExpressionByOffset(ELReference reference, ELExpression expression, int offset){ + List<ELInvocationExpression> invocations = expression.getInvocations(); + for(ELInvocationExpression invocation : invocations){ + if(reference.getStartPosition()+invocation.getStartPosition() <= offset && reference.getStartPosition()+invocation.getEndPosition() > offset) + return invocation; + } + return null; + } + + private IFile getFile(){ + IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if(part != null){ + IEditorInput input = part.getEditorInput(); + if(input instanceof FileEditorInput) + return ((FileEditorInput)input).getFile(); + } + return null; + } +} Property changes on: trunk/jst/plugins/org.jboss.tools.jst.text.ext/src/org/jboss/tools/jst/text/ext/hyperlink/ELHyperlinkDetector.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF 2011-07-14 23:28:08 UTC (rev 32928) @@ -15,7 +15,10 @@ org.eclipse.jface.text, org.jboss.tools.common.model.ui, org.jboss.tools.jst.text.ext, - org.eclipse.jst.standard.schemas + org.eclipse.jst.standard.schemas, + org.eclipse.jdt.ui;bundle-version="3.7.0", + org.eclipse.wst.xml.ui;bundle-version="1.1.200", + org.jboss.tools.jst.web.ui;bundle-version="3.3.0" Export-Package: org.jboss.tools.jst.text.ext.test Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java 2011-07-14 23:28:08 UTC (rev 32928) @@ -0,0 +1,323 @@ +package org.jboss.tools.jst.text.ext.test; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; +import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; +import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.AxisUtil; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.web.ui.editors.WebCompoundEditor; + +public class HyperlinkTestUtil extends TestCase{ + + public static void checkRegions(IProject project, String fileName, List<TestRegion> regionList, AbstractHyperlinkDetector elDetector) throws Exception { + IFile file = project.getFile(fileName); + + assertNotNull("The file \"" + fileName + "\" is not found", file); + assertTrue("The file \"" + fileName + "\" is not found", file.isAccessible()); + + FileEditorInput editorInput = new FileEditorInput(file); + + IDocumentProvider documentProvider = null; + try { + documentProvider = DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput); + } catch (Exception x) { + x.printStackTrace(); + fail("An exception caught: " + x.getMessage()); + } + + assertNotNull("The document provider for the file \"" + fileName + "\" is not loaded", documentProvider); + + try { + documentProvider.connect(editorInput); + } catch (Exception x) { + x.printStackTrace(); + fail("The document provider is not able to be initialized with the editor input\nAn exception caught: "+x.getMessage()); + } + + IDocument document = documentProvider.getDocument(editorInput); + + assertNotNull("The document for the file \"" + fileName + "\" is not loaded", document); + + int expected = 0; + for(TestRegion testRegion : regionList) + expected += testRegion.region.getLength()+1; + + IEditorPart part = openFileInEditor(file); + ISourceViewer viewer = null; + if(part instanceof JavaEditor){ + viewer = ((JavaEditor)part).getViewer(); + elDetector.setContext(new TestContext((ITextEditor)part)); + }else if(part instanceof EditorPartWrapper){ + if(((EditorPartWrapper)part).getEditor() instanceof WebCompoundEditor){ + WebCompoundEditor wce = (WebCompoundEditor)((EditorPartWrapper)part).getEditor(); + viewer = wce.getSourceEditor().getTextViewer(); + elDetector.setContext(new TestContext(wce.getSourceEditor())); + }else if(((EditorPartWrapper)part).getEditor() instanceof XMLTextEditorStandAlone){ + XMLTextEditorStandAlone xtesa = (XMLTextEditorStandAlone)((EditorPartWrapper)part).getEditor(); + viewer = xtesa.getTextViewer(); + elDetector.setContext(new TestContext(xtesa)); + }else fail("unsupported editor type - "+((EditorPartWrapper)part).getEditor().getClass()); + }else if(part instanceof JSPMultiPageEditor){ + viewer = ((JSPMultiPageEditor)part).getJspEditor().getTextViewer(); + elDetector.setContext(new TestContext(((JSPMultiPageEditor)part).getJspEditor())); + }else fail("unsupported editor type - "+part.getClass()); + + + + int counter = 0; + for (int i = 0; i < document.getLength(); i++) { + TestData testData = new TestData(document, i); + IHyperlink[] links = elDetector.detectHyperlinks(viewer, testData.getHyperlinkRegion(), true); + + boolean recognized = links != null; +// if(recognized) +// System.out.println("Recognized - "+i); + + if (recognized) { + counter++; + TestRegion testRegion = findOffsetInRegions(i, regionList); + if(testRegion == null){ + fail("Wrong detection for offset - "+i); + }else{ + checkTestRegion(links, testRegion); + } + } + else { + for(TestRegion testRegion : regionList){ + if(i >= testRegion.region.getOffset() && i <= testRegion.region.getOffset()+testRegion.region.getLength()) { + int line = document.getLineOfOffset(testRegion.region.getOffset()); + fail("Wrong detection for region - "+testRegion.region.getOffset()+" : "+testRegion.region.getLength()+" region - "+i); + } + } + } + } + + assertEquals("Wrong recognized region count: ", expected, counter); + + documentProvider.disconnect(editorInput); + } + + private static void checkTestRegion(IHyperlink[] links, TestRegion testRegion){ + for(IHyperlink link : links){ + TestHyperlink testLink = findTestHyperlink(testRegion.hyperlinks, link); + assertNotNull("Unexpected hyperlink - "+link.getHyperlinkText(), testLink); + assertEquals("Unexpected hyperlink type", testLink.hyperlink, link.getClass()); + if(testLink.fileName != null){ + assertTrue("HyperLink must be inherited from AbstractHyperlink", link instanceof AbstractHyperlink); + + IFile f = ((AbstractHyperlink)link).getReadyToOpenFile(); + assertNotNull("HyperLink must return not null file", f); + assertEquals(testLink.fileName, f.getName()); + + } + } + + for(TestHyperlink testLink : testRegion.hyperlinks){ + IHyperlink link = findHyperlink(links, testLink); + assertNotNull("Hyperlink - "+testLink.name+" not found", link); + } + } + + private static TestHyperlink findTestHyperlink(List<TestHyperlink> testHyperlinks, IHyperlink link){ + for(TestHyperlink testLink : testHyperlinks){ + if(testLink.name.equals(link.getHyperlinkText())) + return testLink; + } + return null; + } + + private static IHyperlink findHyperlink(IHyperlink[] links, TestHyperlink testLink){ + for(IHyperlink link : links){ + if(testLink.name.equals(link.getHyperlinkText())) + return link; + } + return null; + } + + private static TestRegion findOffsetInRegions(int offset, List<TestRegion> regionList){ + for(TestRegion testRegion : regionList){ + if(offset >= testRegion.region.getOffset() && offset <= testRegion.region.getOffset()+testRegion.region.getLength()) + return testRegion; + } + return null; + } + + public static IEditorPart openFileInEditor(IFile input) { + return openFileInEditor(input, null); + } + + public static IEditorPart openFileInEditor(IFile input, String id) { + if (input != null && input.exists()) { + try { + if(id==null) { + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + return IDE.openEditor(page, input, true); + } else { + IWorkbenchPage page = PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + return IDE.openEditor(page, input, id, true); + } + } catch (PartInitException pie) { + pie.printStackTrace(); + fail(pie.getMessage()); + } + } + return null; + } + + static class TestData { + IDocument document; + int offset; + IRegion region; + String contentType; + private IHyperlinkRegion hyperlinkRegion = null; + + TestData (IDocument document, int offset) { + this.document = document; + this.offset = offset; + init(); + } + + private void init() { + this.region = getDocumentRegion(); + this.contentType = getContentType(); + this.hyperlinkRegion = getHyperlinkRegion(); + } + + private IRegion getDocumentRegion() { + IRegion region = null; + try { + region = JavaWordFinder.findWord(document, offset); + } catch (Exception x) { + x.printStackTrace(); + fail(x.getMessage()); + } + + return region; + } + + public IHyperlinkRegion getHyperlinkRegion() { + if (hyperlinkRegion != null) + return hyperlinkRegion; + + return new IHyperlinkRegion() { + public String getAxis() { + return AxisUtil.getAxis(document, region.getOffset()); + } + public String getContentType() { + return contentType; + } + public String getType() { + return region.toString(); + } + public int getLength() { + return region.getLength(); + } + public int getOffset() { + return region.getOffset(); + } + public String toString() { + return "[" + getOffset() + "-" + (getOffset() + getLength() - 1) + ":" + getType() + ":" + getContentType() + "]"; + } + }; + } + + /** + * Returns the content type of document + * + * @param document - + * assumes document is not null + * @return String content type of given document + */ + private String getContentType() { + String type = null; + + IModelManager mgr = StructuredModelManager.getModelManager(); + IStructuredModel model = null; + try { + model = mgr.getExistingModelForRead(document); + if (model != null) { + type = model.getContentTypeIdentifier(); + } + } finally { + if (model != null) { + model.releaseFromRead(); + } + } + return type; + } + } + + static class TestContext implements IAdaptable{ + ITextEditor editor; + + public TestContext(ITextEditor editor){ + this.editor = editor; + } + + public Object getAdapter(Class adapter) { + if(adapter.equals(ITextEditor.class)) + return editor; + return null; + } + } + + public static class TestRegion{ + Region region; + ArrayList<TestHyperlink> hyperlinks = new ArrayList<TestHyperlink>(); + + public TestRegion(int offset, int length, TestHyperlink[] testHyperlinks){ + region = new Region(offset, length); + for(TestHyperlink testHyperlink : testHyperlinks){ + hyperlinks.add(testHyperlink); + } + } + } + + public static class TestHyperlink{ + Class<? extends IHyperlink> hyperlink; + String name; + String fileName=null; + + public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name, String fileName){ + this(hyperlink, name); + this.fileName = fileName; + } + + public TestHyperlink(Class<? extends IHyperlink> hyperlink, String name){ + this.hyperlink = hyperlink; + this.name = name; + } + + } +} \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/HyperlinkTestUtil.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/plugin.xml 2011-07-14 23:28:08 UTC (rev 32928) @@ -135,7 +135,7 @@ </contentType> </hyperlinkPartitioner> - <hyperlinkPartitioner +  - <hyperlinkPartitioner +  <hyperlinkPartitioner id="org.jboss.tools.seam.text.ext.hyperlink.SeamViewHyperlinkPartitioner" @@ -340,7 +340,7 @@ id="org.jboss.tools.seam.text.ext.hyperlink" name="org.jboss.tools.seam.text.ext.hyperlink"> - <hyperlink +  <hyperlink class="org.jboss.tools.seam.text.ext.hyperlink.SeamViewHyperlink" @@ -425,12 +425,6 @@ <extension point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors"> <hyperlinkDetector - class="org.jboss.tools.seam.text.ext.hyperlink.SeamELInJavaStringHyperlinkDetector" - id="org.jboss.tools.seam.text.ext.hyperlink.SeamELInJavaStringHyperlinkDetector" - name="%SeamELInJavaStringHyperlinkDetector" - targetId="org.eclipse.jdt.ui.javaCode"> - </hyperlinkDetector> - <hyperlinkDetector class="org.jboss.tools.seam.text.ext.hyperlink.SeamComponentHyperlinkDetector" id="org.jboss.tools.seam.text.ext.hyperlink.SeamComponentHyperlinkDetector" name="Seam Component" Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/META-INF/MANIFEST.MF 2011-07-14 23:28:08 UTC (rev 32928) @@ -42,7 +42,8 @@ org.jboss.tools.jst.jsp.base.test;bundle-version="1.0.0", org.jboss.tools.tests;bundle-version="3.1.0", org.jboss.tools.jst.web;bundle-version="3.2.0", - org.eclipse.jst.jee.web + org.eclipse.jst.jee.web, + org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0" Export-Package: org.jboss.tools.seam.ui.test, org.jboss.tools.seam.ui.test.ca, org.jboss.tools.seam.ui.test.hyperlink, Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-14 17:59:26 UTC (rev 32927) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELExprPartitionerTest.java 2011-07-14 23:28:08 UTC (rev 32928) @@ -11,31 +11,17 @@ package org.jboss.tools.seam.ui.test.el; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IDocumentExtension3; -import org.eclipse.jface.text.ITypedRegion; -import org.eclipse.jface.text.Region; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.texteditor.DocumentProviderRegistry; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil; -import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.util.AxisUtil; -import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; -import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlink; +import org.jboss.tools.jst.text.ext.hyperlink.ELHyperlinkDetector; +import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil; +import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestHyperlink; +import org.jboss.tools.jst.text.ext.test.HyperlinkTestUtil.TestRegion; import org.jboss.tools.test.util.TestProjectProvider; public class ELExprPartitionerTest extends TestCase { @@ -55,6 +41,8 @@ Throwable exception = null; assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + + } protected void tearDown() throws Exception { @@ -63,251 +51,38 @@ } } - public void testELExprPartitioner() { - try { - JobUtils.waitForIdle(); - } catch (Exception e) { - assertNull("An exception caught: " + e.getMessage(), e); - } - assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null)); + public void testELExprPartitioner() throws Exception{ - IFile jspFile = project.getFile(PAGE_NAME); - - assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile != null)); - assertTrue("The file \"" + PAGE_NAME + "\" is not found", (jspFile.exists())); - - FileEditorInput editorInput = new FileEditorInput(jspFile); + ArrayList<TestRegion> regionList = new ArrayList<TestRegion>(); + regionList.add(new TestRegion(673, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(681, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - IDocumentProvider documentProvider = null; - Throwable exception = null; - try { - documentProvider = DocumentProviderRegistry.getDefault().getDocumentProvider(editorInput); - } catch (Exception x) { - exception = x; - x.printStackTrace(); - } - assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); - - assertNotNull("The document provider for the file \"" + PAGE_NAME + "\" is not loaded", documentProvider); - - try { - documentProvider.connect(editorInput); - } catch (Exception x) { - exception = x; - x.printStackTrace(); - assertTrue("The document provider is not able to be initialized with the editor input", false); - } - assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); + regionList.add(new TestRegion(756, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(764, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'question' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - IDocument document = documentProvider.getDocument(editorInput); - - assertNotNull("The document for the file \"" + PAGE_NAME + "\" is not loaded", document); + regionList.add(new TestRegion(863, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(871, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_start' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - IStructuredModel model = null; - if (document instanceof IStructuredDocument) { - // corresponding releaseFromEdit occurs in - // dispose() - model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document); - EditorModelUtil.addFactoriesTo(model); - } - - assertNotNull("The document model for the file \"" + PAGE_NAME + "\" is not loaded", model); - - JSPExprHyperlinkPartitioner elPartitioner = new JSPExprHyperlinkPartitioner(); - - HashMap<Object, ArrayList<Region>> recognitionTest = new HashMap<Object, ArrayList<Region>>(); + regionList.add(new TestRegion(909, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + regionList.add(new TestRegion(921, 15, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getRemainingGuesses() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - ArrayList<Region> regionList = new ArrayList<Region>(); - regionList.add(new Region(673, 7)); - regionList.add(new Region(680, 9)); - regionList.add(new Region(756, 7)); - regionList.add(new Region(763, 9)); - regionList.add(new Region(863, 7)); - regionList.add(new Region(870, 11)); - regionList.add(new Region(964, 19)); - regionList.add(new Region(1022, 18)); - regionList.add(new Region(1091, 17)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE", regionList); + regionList.add(new TestRegion(964, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(972, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'info_finish' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList = new ArrayList<Region>(); - regionList.add(new Region(920, 1)); - regionList.add(new Region(1168, 1)); - regionList.add(new Region(1251, 1)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION", regionList); + regionList.add(new TestRegion(1022, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(1030, 9, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_yes' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - regionList = new ArrayList<Region>(); - regionList.add(new Region(909, 11)); - regionList.add(new Region(921, 16)); - regionList.add(new Region(1157, 11)); - regionList.add(new Region(1169, 13)); - regionList.add(new Region(1237, 14)); - regionList.add(new Region(1252, 8)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", regionList); - - regionList = new ArrayList<Region>(); - regionList.add(new Region(680, 1)); - regionList.add(new Region(763, 1)); - regionList.add(new Region(870, 1)); - regionList.add(new Region(920, 1)); - regionList.add(new Region(971, 1)); - regionList.add(new Region(1029, 1)); - regionList.add(new Region(1098, 1)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION", regionList); + regionList.add(new TestRegion(1091, 6, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'demo.bundle.Messages'", "Messages.properties")})); + regionList.add(new TestRegion(1099, 8, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open property 'button_no' of bundle 'demo.bundle.Messages'", "Messages.properties")})); - int counter = 0; - for (int i = 0; i < document.getLength(); i++) { - TestData testData = new TestData(document, i); - boolean recognized = elPartitioner.recognize(testData.document, testData.getHyperlinkRegion()); - if (recognized) { - String childPartitionType = elPartitioner.getChildPartitionType(testData.document, testData.getHyperlinkRegion()); - //System.out.println("Type - "+childPartitionType+" offset - "+i); - if (childPartitionType != null) { - ArrayList<Region> test = (ArrayList<Region>)recognitionTest.get(childPartitionType); - assertNotNull("There are no regions for partition type - "+childPartitionType, test); - boolean testResult = false; - Iterator<Region> regions = test.iterator(); - Region r = null; - while (!testResult && regions.hasNext()) { - r = regions.next(); - if (r.getOffset() <= testData.offset && testData.offset < (r.getOffset() + r.getLength())) - testResult = true; - } - StringBuffer assertMessage = new StringBuffer(); - assertMessage.append("Wrong recognition for the region #") - .append(i) - .append(": ") - .append(testData.getHyperlinkRegion().toString()) - .append(" doesn't matches the regions for PARTITION_TYPE '") - .append(childPartitionType) - .append("' {"); - boolean first = true; - for (Region reg : test) { - if (!first) { - assertMessage.append(", "); - } else { - first = false; - } - assertMessage.append("[") - .append(reg.getOffset()) - .append("-") - .append(reg.getOffset() + reg.getLength()) - .append("]"); - } - assertMessage.append("}"); - - assertTrue(assertMessage.toString() , testResult); - counter++; - } else { - recognized = false; - } - } - if (!recognized) { - boolean testResult = false; - Iterator keys = recognitionTest.keySet().iterator(); - Region r = null; - while (keys != null && keys.hasNext()) { - Object key = keys.next(); - ArrayList test = (ArrayList)recognitionTest.get(key); - Iterator regions = test.iterator(); - while (!testResult && regions.hasNext()) { - r = (Region)regions.next(); - if (r.getOffset() <= testData.offset && testData.offset < (r.getOffset() + r.getLength())) - testResult = true; - } - } - assertFalse("Wrong recognition for the region: " + testData.getHyperlinkRegion().toString() - + " matches the wrong region [" + r.getOffset() + "-" + (r.getOffset() + r.getLength()) + "]" , testResult); - } - } - - assertEquals("Wrong recognized region count: ", 180, counter); + regionList.add(new TestRegion(1157, 10, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); + regionList.add(new TestRegion(1169, 12, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'NumberGuess.getPossibilities() - org.jboss.seam.example.numberguess'", "NumberGuess.java")})); - model.releaseFromEdit(); - - documentProvider.disconnect(editorInput); - } - - class TestData { - IDocument document; - int offset; - ITypedRegion region; - String contentType; - private IHyperlinkRegion hyperlinkRegion = null; - - TestData (IDocument document, int offset) { - this.document = document; - this.offset = offset; - init(); - } + regionList.add(new TestRegion(1237, 13, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Iterator.next() - java.util'")})); + regionList.add(new TestRegion(1252, 7, new TestHyperlink[]{new TestHyperlink(ELHyperlink.class, "Open 'Integer.intValue() - java.lang'")})); - private void init() { - this.region = getDocumentRegion(); - this.contentType = getContentType(); - this.hyperlinkRegion = getHyperlinkRegion(); - } + HyperlinkTestUtil.checkRegions(project, PAGE_NAME, regionList, new ELHyperlinkDetector()); - private ITypedRegion getDocumentRegion() { - ITypedRegion region = null; - try { - region = (document instanceof IDocumentExtension3 ? - ((IDocumentExtension3)document).getDocumentPartitioner("org.eclipse.wst.sse.core.default_structured_text_partitioning").getPartition(offset) : - document.getDocumentPartitioner().getPartition(offset)); - } catch (Exception x) {} - - return region; - } - - public IHyperlinkRegion getHyperlinkRegion() { - if (hyperlinkRegion != null) - return hyperlinkRegion; - - return new IHyperlinkRegion() { - public String getAxis() { - return AxisUtil.getAxis(document, region.getOffset()); - } - public String getContentType() { - return contentType; - } - public String getType() { - return region.getType(); - } - public int getLength() { - return region.getLength(); - } - public int getOffset() { - return region.getOffset(); - } - public String toString() { - return "[" + getOffset() + "-" + (getOffset() + getLength() - 1) + ":" + getType() + ":" + getContentType() + "]"; - } - }; - } - - - /** - * Returns the content type of document - * - * @param document - - * assumes document is not null - * @return String content type of given document - */ - private String getContentType() { - String type = null; - - IModelManager mgr = StructuredModelManager.getModelManager(); - IStructuredModel model = null; - try { - model = mgr.getExistingModelForRead(document); - if (model != null) { - type = model.getContentTypeIdentifier(); - } - } finally { - if (model != null) { - model.releaseFromRead(); - } - } - return type; - } } - + }

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32927 - in trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui: part and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-14 13:59:26 -0400 (Thu, 14 Jul 2011) New Revision: 32927 Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java Log: - make forge start with progress monitor - while starting the forge view shows a startup message Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-07-14 17:58:18 UTC (rev 32926) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/Console.java 2011-07-14 17:59:26 UTC (rev 32927) @@ -136,11 +136,12 @@ DebugPlugin.getDefault().addDebugEventListener(this); } } - + private int lastLineLength = 0; private int lastLinePosition = 0; private StringBuffer escapeSequence = new StringBuffer(); private boolean escapeSequenceStarted = false; + private boolean metaDataSequenceStarted = false; public void appendString(final String str) { Display.getDefault().asyncExec(new Runnable() { @@ -157,20 +158,31 @@ } if (escapeSequenceStarted) { int type = Character.getType(c); +// if (!metaDataSequenceStarted && (type == Character.LOWERCASE_LETTER || type == Character.UPPERCASE_LETTER)) { if (type == Character.LOWERCASE_LETTER || type == Character.UPPERCASE_LETTER) { if (c == 'G') { int columnNumber = Integer.valueOf(escapeSequence.toString()); + lastLineLength = columnNumber - 1; escapeSequence.setLength(0); - lastLineLength = columnNumber - 1; escapeSequenceStarted = false; } else if (c == 'K') { int doclength = getDocument().getLength(); int currentPosition = lastLinePosition + lastLineLength; getDocument().replace(currentPosition, doclength - currentPosition, ""); + escapeSequence.setLength(0); escapeSequenceStarted = false; // } else if (c == 'm') { // - } + } +// } else if (c == '%') { +// if (metaDataSequenceStarted) { +// metaDataSequenceStarted = false; +// escapeSequenceStarted = false; +// handleMetaData(escapeSequence.toString()); +// escapeSequence.setLength(0); +// } else { +// metaDataSequenceStarted = true; +// } } else { escapeSequence.append(c); } @@ -192,5 +204,9 @@ } }); } + + private void handleMetaData(String metaData) { + System.out.println("meta data detected: " + metaData); + } } Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-07-14 17:58:18 UTC (rev 32926) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/part/ConsoleView.java 2011-07-14 17:59:26 UTC (rev 32927) @@ -4,6 +4,9 @@ import java.beans.PropertyChangeListener; import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -15,18 +18,23 @@ import org.eclipse.ui.part.ViewPart; import org.jboss.tools.forge.core.preferences.ForgeRuntimesPreferences; import org.jboss.tools.forge.core.process.ForgeRuntime; +import org.jboss.tools.forge.ui.ForgeUIPlugin; import org.jboss.tools.forge.ui.console.Console; import org.jboss.tools.forge.ui.console.ConsolePage; public class ConsoleView extends ViewPart implements PropertyChangeListener { + private static final String NOT_RUNNING_MESSAGE = "Forge is not running."; + private static final String STARTING_MESSAGE = "Please wait while Forge is starting"; + public static ConsoleView INSTANCE; private PageBook pageBook = null; private Control notRunning; - private Control starting; private Control running; - private ConsolePage forgeIsRunningPage; + private ConsolePage runningPage; + private MessagePage notRunningPage; + private String notRunningMessage; private ForgeRuntime runtime; @@ -40,7 +48,6 @@ public void createPartControl(Composite parent) { pageBook = new PageBook(parent, SWT.NONE); createNotRunningPage(parent); - createStartingPage(parent); showPage(notRunning); } @@ -48,39 +55,41 @@ MessagePage page = new MessagePage(); page.createControl(pageBook); page.init(new PageSite(getViewSite())); - page.setMessage("Forge is not running."); + notRunningMessage = NOT_RUNNING_MESSAGE; + page.setMessage(notRunningMessage); notRunning = page.getControl(); + notRunningPage = page; } - private void createStartingPage(Composite parent) { - MessagePage page = new MessagePage(); - page.createControl(pageBook); - page.init(new PageSite(getViewSite())); - page.setMessage("Please wait while Forge is starting"); - starting = page.getControl(); - } - @Override public void setFocus() { if (runtime != null && ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { - forgeIsRunningPage.setFocus(); + runningPage.setFocus(); } } @Override public void propertyChange(PropertyChangeEvent evt) { - if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) { - handleStateStarting(); - } else if (ForgeRuntime.STATE_RUNNING.equals(evt.getNewValue())) { - handleStateRunning(); - } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { - handleStateNotRunning(); + if (ForgeRuntime.PROPERTY_STATE.equals(evt.getPropertyName())) { + if (ForgeRuntime.STATE_STARTING.equals(evt.getNewValue())) { + handleStateStarting(); + } else if (ForgeRuntime.STATE_RUNNING.equals(evt.getNewValue())) { + handleStateRunning(); + } else if (ForgeRuntime.STATE_NOT_RUNNING.equals(evt.getNewValue())) { + handleStateNotRunning(); + } } } private void handleStateStarting() { - showPage(starting); - createRunningPage(); + getDisplay().asyncExec(new Runnable() { + @Override + public void run() { + notRunningMessage = STARTING_MESSAGE; + notRunningPage.setMessage(notRunningMessage); + createRunningPage(); + } + }); } private void handleStateRunning() { @@ -92,11 +101,18 @@ runtime.removePropertyChangeListener(INSTANCE); runtime = null; } - showPage(notRunning); + getDisplay().asyncExec(new Runnable() { + @Override + public void run() { + notRunningMessage = NOT_RUNNING_MESSAGE; + notRunningPage.setMessage(notRunningMessage); + showPage(notRunning); + } + }); } private void showPage(final Control control) { - Display.getDefault().asyncExec(new Runnable() { + getDisplay().asyncExec(new Runnable() { @Override public void run() { pageBook.showPage(control); @@ -106,11 +122,11 @@ private void createRunningPage() { Control oldForgeIsRunning = running; - ConsolePage oldForgeIsRunningPage = forgeIsRunningPage; - forgeIsRunningPage = new ConsolePage(runtime.getProcess()); - forgeIsRunningPage.createControl(pageBook); - forgeIsRunningPage.init(new PageSite(getViewSite())); - running = forgeIsRunningPage.getControl(); + ConsolePage oldForgeIsRunningPage = runningPage; + runningPage = new ConsolePage(runtime.getProcess()); + runningPage.createControl(pageBook); + runningPage.init(new PageSite(getViewSite())); + running = runningPage.getControl(); if (oldForgeIsRunningPage != null) { Console oldConsole = oldForgeIsRunningPage.getConsole(); if (oldConsole != null) { @@ -136,22 +152,48 @@ if (runtime != null) return; runtime = ForgeRuntimesPreferences.INSTANCE.getDefault(); runtime.addPropertyChangeListener(INSTANCE); - final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); - Display.getDefault().asyncExec(new Runnable() { + Job job = new Job("Starting Forge") { @Override + protected IStatus run(IProgressMonitor monitor) { + runtime.start(monitor); + return Status.OK_STATUS; + } + }; + job.schedule(); + Thread waitThread = new Thread(new Runnable() { + @Override public void run() { - runtime.start(progressMonitor); - if (progressMonitor.isCanceled()) { - handleStateNotRunning(); + while (!ForgeRuntime.STATE_RUNNING.equals(runtime.getState())) { + try { + Thread.sleep(1000); + updateNonRunningPage(); + } catch (InterruptedException e) { + ForgeUIPlugin.log(e); + } } } }); + waitThread.start(); } + private void updateNonRunningPage() { + getDisplay().asyncExec(new Runnable() { + @Override + public void run() { + notRunningMessage += '.'; + notRunningPage.setMessage(notRunningMessage); + } + }); + } + public void stopForge() { if (runtime == null) return; final IProgressMonitor progressMonitor = getViewSite().getActionBars().getStatusLineManager().getProgressMonitor(); runtime.stop(progressMonitor); } + + private Display getDisplay() { + return getViewSite().getPage().getWorkbenchWindow().getShell().getDisplay(); + } }

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32926 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-14 13:58:18 -0400 (Thu, 14 Jul 2011) New Revision: 32926 Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ConsoleViewer.java Log: make output wrap again Modified: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ConsoleViewer.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ConsoleViewer.java 2011-07-14 17:52:58 UTC (rev 32925) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ConsoleViewer.java 2011-07-14 17:58:18 UTC (rev 32926) @@ -42,8 +42,12 @@ console.getInputStream().appendData(DOWN_ARROW); } + private void handleF1Down() { +// console.getInputStream().appendData((char)27 + "[%hidden blahblahblah %"); + } + protected StyledText createTextWidget(Composite parent, int styles) { - StyledText styledText = super.createTextWidget(parent, styles); + StyledText styledText = super.createTextWidget(parent, styles | SWT.WRAP); styledText.addKeyListener(new ConsoleKeyListener()); return styledText; } @@ -76,6 +80,8 @@ handleArrowUp(); } else if (e.keyCode == SWT.ARROW_DOWN) { handleArrowDown(); + } else if (e.keyCode == SWT.F1) { + handleF1Down(); } }

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32925 - trunk/download.jboss.org/jbosstools/updates/helios.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-07-14 13:52:58 -0400 (Thu, 14 Jul 2011) New Revision: 32925 Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml Log: remove m2eclipse-wtp-e36 site from helios composite reqs site Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-14 17:28:13 UTC (rev 32924) +++ trunk/download.jboss.org/jbosstools/updates/helios/compositeArtifacts.xml 2011-07-14 17:52:58 UTC (rev 32925) @@ -12,7 +12,7 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1308002202001'/> +<property name='p2.timestamp' value='1310665401000'/> </properties> <children size='12'> <child location='../requirements/helios/SR2/'/> @@ -22,10 +22,7 @@ <child location='../requirements/emf/2.6/'/> <child location='../requirements/gwt/201012211742/'/> - <child location='../requirements/m2eclipse/20110623-1035/'/> -<child location='../requirements/m2eclipse-wtp-e36/'/> - <child location='../requirements/orbit/R20100519200754/'/> <child location='../requirements/swtbot/2.0.3/'/> <child location='../requirements/tptp/4.7/'/> Modified: trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml =================================================================== --- trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-14 17:28:13 UTC (rev 32924) +++ trunk/download.jboss.org/jbosstools/updates/helios/compositeContent.xml 2011-07-14 17:52:58 UTC (rev 32925) @@ -12,7 +12,7 @@ endfun nnoremap <Leader>ts :call ReplaceTimestamp()<CR> --> -<property name='p2.timestamp' value='1308002202001'/> +<property name='p2.timestamp' value='1310665412000'/> </properties> <children size='12'> <child location='../requirements/helios/SR2/'/> @@ -22,10 +22,7 @@ <child location='../requirements/emf/2.6/'/> <child location='../requirements/gwt/201012211742/'/> - <child location='../requirements/m2eclipse/20110623-1035/'/> -<child location='../requirements/m2eclipse-wtp-e36/'/> - <child location='../requirements/orbit/R20100519200754/'/> <child location='../requirements/swtbot/2.0.3/'/> <child location='../requirements/tptp/4.7/'/>

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32924 - trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-14 13:28:13 -0400 (Thu, 14 Jul 2011) New Revision: 32924 Removed: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java Log: remove unused ForgeIntallationLabelProvider Deleted: trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java 2011-07-14 16:43:50 UTC (rev 32923) +++ trunk/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/preferences/ForgeIntallationLabelProvider.java 2011-07-14 17:28:13 UTC (rev 32924) @@ -1,27 +0,0 @@ -package org.jboss.tools.forge.ui.preferences; - -import org.eclipse.jface.viewers.ITableLabelProvider; -import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.swt.graphics.Image; -import org.jboss.tools.forge.core.process.ForgeRuntime; - -public class ForgeIntallationLabelProvider extends LabelProvider implements ITableLabelProvider { - - public String getColumnText(Object element, int columnIndex) { - if (element instanceof ForgeRuntime) { - ForgeRuntime forgeRuntime= (ForgeRuntime)element; - switch(columnIndex) { - case 0: - return forgeRuntime.getName(); - case 1: - return forgeRuntime.getLocation(); - } - } - return element.toString(); - } - - public Image getColumnImage(Object element, int columnIndex) { - return null; - } - -}

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32923 - trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-14 12:43:50 -0400 (Thu, 14 Jul 2011) New Revision: 32923 Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java Log: - poll for startup every second in ForgeAbstractRuntime - add state constant to ForgeRuntime Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-07-14 16:42:09 UTC (rev 32922) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntime.java 2011-07-14 16:43:50 UTC (rev 32923) @@ -17,8 +17,6 @@ public abstract class ForgeAbstractRuntime implements ForgeRuntime { - private static final String PROPERTY_STATE = "state"; - private IProcess process = null; private String state = STATE_NOT_RUNNING; private final TerminateListener terminateListener = new TerminateListener(); @@ -50,9 +48,14 @@ if (progressMonitor.isCanceled()) { terminate(); } else { + Thread.sleep(1000); progressMonitor.worked(1); } } + } catch (InterruptedException e) { + if (progressMonitor.isCanceled()) { + terminate(); + } } finally { if (process != null) { IStreamsProxy streamsProxy = process.getStreamsProxy(); @@ -81,7 +84,9 @@ private void terminate() { try { - process.terminate(); + if (process != null) { + process.terminate(); + } } catch (DebugException e) { ForgeCorePlugin.log(e); } @@ -104,6 +109,7 @@ private class StartupListener implements IStreamListener { @Override public void streamAppended(String text, IStreamMonitor monitor) { + process.getStreamsProxy().getOutputStreamMonitor().removeListener(this); setNewState(STATE_RUNNING); } } Modified: trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java =================================================================== --- trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-07-14 16:42:09 UTC (rev 32922) +++ trunk/forge/plugins/org.jboss.tools.forge.core/src/org/jboss/tools/forge/core/process/ForgeRuntime.java 2011-07-14 16:43:50 UTC (rev 32923) @@ -7,9 +7,11 @@ public interface ForgeRuntime { - String STATE_NOT_RUNNING = "org.jboss.tools.forge.notRunning"; - String STATE_RUNNING = "org.jboss.tools.forge.running"; - String STATE_STARTING = "org.jboss.tools.forge.starting"; + String STATE_NOT_RUNNING = "org.jboss.tools.forge.runtime.notRunning"; + String STATE_RUNNING = "org.jboss.tools.forge.runtime.running"; + String STATE_STARTING = "org.jboss.tools.forge.runtime.starting"; + + String PROPERTY_STATE = "org.jboss.tools.forge.runtime.state"; String getName(); String getLocation();

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32922 - trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process.

by jbosstools-commits＠lists.jboss.org

Author: koen.aers(a)jboss.com Date: 2011-07-14 12:42:09 -0400 (Thu, 14 Jul 2011) New Revision: 32922 Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java Log: remove unpredictable terminate test Modified: trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java =================================================================== --- trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-14 16:34:14 UTC (rev 32921) +++ trunk/forge/tests/org.jboss.tools.forge.core.test/src/org/jboss/tools/forge/core/process/ForgeAbstractRuntimeTest.java 2011-07-14 16:42:09 UTC (rev 32922) @@ -17,8 +17,6 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Platform; -import org.eclipse.debug.core.DebugEvent; -import org.eclipse.debug.core.DebugPlugin; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -131,21 +129,6 @@ } } - @Test - public void testTerminateProcess() { - runtime.start(null); - assertEquals(ForgeRuntime.STATE_RUNNING, runtime.getState()); - propertyChangeEvents.clear(); - DebugEvent debugEvent = new DebugEvent(runtime.getProcess(), DebugEvent.TERMINATE); - DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] { debugEvent }); - assertNull(runtime.getProcess()); - assertEquals(1, propertyChangeEvents.size()); - for (PropertyChangeEvent evt : propertyChangeEvents) { - assertEquals(ForgeRuntime.STATE_RUNNING, evt.getOldValue()); - assertEquals(ForgeRuntime.STATE_NOT_RUNNING, evt.getNewValue()); - } - } - private class TestPropertyChangeListener implements PropertyChangeListener { public void propertyChange(PropertyChangeEvent evt) { propertyChangeEvents.add(evt);

14 years, 9 months

1
0
0 / 0

JBoss Tools SVN: r32921 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.

by jbosstools-commits＠lists.jboss.org

Author: snjeza Date: 2011-07-14 12:34:14 -0400 (Thu, 14 Jul 2011) New Revision: 32921 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java Log: JBIDE-9344 the bpel example has a empty folder that should not be there Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java =================================================================== --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-07-14 16:26:25 UTC (rev 32920) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-07-14 16:34:14 UTC (rev 32921) @@ -647,13 +647,27 @@ ZipLeveledStructureProvider structureProvider = new ZipLeveledStructureProvider( sourceFile); + Enumeration<? extends ZipEntry> entries = sourceFile.entries(); + ZipEntry entry = null; + List<ZipEntry> filesToImport = new ArrayList<ZipEntry>(); + String prefix = projectName + "/"; //$NON-NLS-1$ + while (entries.hasMoreElements()) { + entry = entries.nextElement(); + if (entry.isDirectory()) { + continue; + } + if (entry.getName().startsWith(prefix)) { + filesToImport.add(entry); + } + } + structureProvider.setStrip(1); - ImportOperation operation = new ImportOperation(project - .getFullPath(), structureProvider.getRoot(), structureProvider, - OVERWRITE_ALL_QUERY); + ImportOperation operation = new ImportOperation(project.getFullPath(), structureProvider.getRoot(), + structureProvider, OVERWRITE_ALL_QUERY, filesToImport); operation.setContext(getActiveShell()); operation.run(monitor); reconfigure(project, monitor); + } public void init(IWorkbench workbench, IStructuredSelection selection) {

14 years, 9 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits July 2011