[jbosstools-commits] JBoss Tools SVN: r9077 - in trunk: common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp and 7 other directories.

Author: vrubezhny Date: 2008-07-04 10:16:57 -0400 (Fri, 04 Jul 2008) New Revision: 9077 Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java Log: http://jira.jboss.com/jira/browse/JBIDE-2391 Popups for elements contains strange names during the OpenOn calling The issue is fixed. Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/CSSClassHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -12,6 +12,7 @@ import java.io.InputStream; import java.io.StringReader; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -24,7 +25,6 @@ import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; - import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.rules.IToken; import org.eclipse.ui.IEditorPart; @@ -32,22 +32,19 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - - import org.jboss.tools.common.text.ext.ExtensionsPlugin; - -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.CSSTextScanner; import org.jboss.tools.common.text.ext.util.RegionHolder; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; import org.jboss.tools.common.text.ext.util.TextScanner; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /* * Created on 26.01.2005 @@ -130,16 +127,14 @@ } + IRegion fLastRegion = null; + /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - try { - return getRegion(offset); - } catch (Exception x) { - //ignore - return null; - } + fLastRegion = getRegion(offset); + return fLastRegion; } private RegionHolder getStyleHolder (String styleName) { @@ -432,4 +427,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String styleName = getStyleName(fLastRegion); + if (styleName == null) + return MessageFormat.format(Messages.OpenA, Messages.CSSStyle); + + return MessageFormat.format(Messages.OpenCSSStyle, styleName); + } + } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -18,7 +19,6 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; - import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; @@ -29,7 +29,10 @@ import org.eclipse.jdt.core.search.SearchParticipant; import org.eclipse.jdt.core.search.SearchPattern; import org.eclipse.jdt.core.search.SearchRequestor; -import org.eclipse.jdt.internal.core.*; +import org.eclipse.jdt.internal.core.BinaryType; +import org.eclipse.jdt.internal.core.PackageFragment; +import org.eclipse.jdt.internal.core.PackageFragmentRoot; +import org.eclipse.jdt.internal.core.SourceType; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorInput; @@ -37,17 +40,15 @@ import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +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.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy */ @@ -173,14 +174,15 @@ } } + IRegion fLastRegion = null; /* * (non-Javadoc) * * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } public IRegion getRegion (int offset) { @@ -275,4 +277,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String className = getClassName(fLastRegion); + if (className == null) + return MessageFormat.format(Messages.OpenA, Messages.Class); + + return MessageFormat.format(Messages.OpenClass, className); + } + } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -34,17 +34,14 @@ import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IStorageEditorInput; import org.eclipse.ui.IWorkbenchPage; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.common.text.ext.util.Utils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy */ @@ -85,12 +82,13 @@ } } + protected IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/FilterNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,7 +10,7 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; /** * @author Jeremy * @@ -21,4 +21,14 @@ protected String getDestinationAxis() { return "/web-app/filter/filter-name/"; } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToFilterNameDefinition; + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/JumpToHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -17,24 +17,22 @@ import org.eclipse.jface.text.Region; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; - import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xml.XMLRootHyperlinkPartitioner; import org.jboss.tools.common.text.ext.util.RegionHolder; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.xml.XMLRootHyperlinkPartitioner; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; /** * @author Jeremy * */ -public class JumpToHyperlink extends AbstractHyperlink { +abstract public class JumpToHyperlink extends AbstractHyperlink { /** * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) @@ -249,4 +247,11 @@ } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + abstract public String getHyperlinkText(); + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/LinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -11,23 +11,22 @@ package org.jboss.tools.common.text.ext.hyperlink; import java.io.FileNotFoundException; +import java.text.MessageFormat; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +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.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy */ @@ -67,12 +66,13 @@ return filename; } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion(int offset) { @@ -137,4 +137,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String filePath = getFilePath(fLastRegion); + if (filePath == null) + return MessageFormat.format(Messages.OpenA, Messages.File); + + return MessageFormat.format(Messages.OpenFile, filePath); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -11,22 +11,22 @@ package org.jboss.tools.common.text.ext.hyperlink; import java.io.FileNotFoundException; +import java.text.MessageFormat; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +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.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy */ @@ -78,11 +78,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion(int offset) { @@ -159,4 +161,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String filePath = getFilePath(fLastRegion); + if (filePath == null) + return MessageFormat.format(Messages.OpenA, Messages.File); + + return MessageFormat.format(Messages.OpenFile, filePath); + } + } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RoleNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + /** * @author Jeremy * @@ -21,4 +23,14 @@ protected String getDestinationAxis() { return "/web-app/security-role/role-name/"; } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToRoleNameDefinition; + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ServletNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + /** * @author Jeremy * @@ -21,4 +23,14 @@ protected String getDestinationAxis() { return "/web-app/servlet/servlet-name/"; } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToServletNameDefinition; + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/TLDAttributeNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -15,14 +15,14 @@ import java.util.StringTokenizer; import org.eclipse.jface.text.IRegion; +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.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy * @@ -86,4 +86,13 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return Messages.BrowseToTLDAttributeNameDeclaration; + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -15,17 +15,15 @@ import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - 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.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -64,15 +62,13 @@ protected abstract Properties getRequestProperties(IRegion region); + protected IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - try { - return getRegion(offset); - } catch (Exception x) { - return null; - } + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion (int offset) { Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,21 +10,23 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; +import java.text.MessageFormat; + import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorPart; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; +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.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; - /** * @author Jeremy * @@ -193,4 +195,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getPropertyName(fLastRegion); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.Getter); + + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Getter, propertyName); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,10 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; +import java.text.MessageFormat; + +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; + /** * @author Jeremy * @@ -22,4 +26,17 @@ return SET_METHOD_PREFIX; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getPropertyName(fLastRegion); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.Setter); + + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,18 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; -import org.eclipse.core.runtime.Platform; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; +import java.text.MessageFormat; + +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.FindObjectHelper; import org.jboss.tools.common.text.ext.ExtensionsPlugin; 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.TaglibManagerWrapper; import org.jboss.tools.jst.web.tld.ITaglibMapping; @@ -77,12 +77,10 @@ Document xmlDocument = smw.getDocument(); if (xmlDocument == null) return null; - String nodeName = getDocument().get(region.getOffset(), region.getLength()); - if (nodeName.indexOf(":") == -1) return null; - String nodePrefix = nodeName.substring(0, nodeName.indexOf(":")); - if (nodePrefix == null || nodePrefix.length() == 0) return null; + String nodePrefix = getTagPrefix(region); + if (nodePrefix == null) + return null; - TaglibManagerWrapper tmw = new TaglibManagerWrapper(); tmw.init(getDocument(), region.getOffset()); if(!tmw.exists()) return null; @@ -109,12 +107,45 @@ } } + private String getTagPrefix(IRegion region) { + if (region == null) + return null; + + String nodeName; + try { + nodeName = getDocument().get(region.getOffset(), region.getLength()); + } catch (BadLocationException e) { + ExtensionsPlugin.getPluginLog().logError(e); + return null; + } + if (nodeName.indexOf(":") != -1) { + String nodePrefix = nodeName.substring(0, nodeName.indexOf(":")); + if (nodePrefix != null && nodePrefix.length() > 0) + return nodePrefix; + } + return null; + } + + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = JSPElementNameHyperlinkPartitioner.getRegion(getDocument(), offset); - return region; + fLastRegion = JSPElementNameHyperlinkPartitioner.getRegion(getDocument(), offset); + return fLastRegion; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagPrefix = getTagPrefix(fLastRegion); + if (tagPrefix == null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + + return MessageFormat.format(Messages.OpenTagLibraryForPrefix, tagPrefix); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,8 +10,16 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; +import java.text.MessageFormat; + import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.jboss.tools.common.text.ext.ExtensionsPlugin; +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.StructuredSelectionHelper; +import org.jboss.tools.common.text.ext.util.Utils; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -19,12 +27,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; -import org.jboss.tools.common.text.ext.util.Utils; - /** * @author Jeremy */ @@ -156,14 +158,15 @@ } } + IRegion fLastRegion = null; /* * (non-Javadoc) * * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -237,4 +240,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forId = getForId(fLastRegion); + if (forId == null) + return MessageFormat.format(Messages.BrowseFor, Messages.BeanId); + + return MessageFormat.format(Messages.BrowseForBeanId, forId); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,9 +10,9 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; +import java.text.MessageFormat; + import org.eclipse.core.resources.IFile; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jdt.internal.ui.javaeditor.JarEntryEditorInput; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; @@ -21,20 +21,19 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.FindObjectHelper; -import org.jboss.tools.common.text.ext.ExtensionsPlugin; 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.web.tld.ITaglibMapping; import org.jboss.tools.jst.web.tld.IWebProject; import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -69,6 +68,20 @@ IFile file = getFile(); XModel xModel = getXModel(file); if (xModel == null) return null; + + String uri = getTaglibUri(region); + if (uri == null) return null; + + IWebProject wp = WebProjectFactory.instance.getWebProject(xModel); + if (wp == null) return null; + + ITaglibMapping tm = wp.getTaglibMapping(); + if (tm == null) return null; + + return tm.getTaglibObject(uri); + } + + private String getTaglibUri(IRegion region) { IStructuredModel model = null; try { model = getModelManager().getExistingModelForRead(getDocument()); @@ -85,26 +98,21 @@ String uri = taglib.getAttribute("uri"); if (uri == null || uri.trim().length() == 0) return null; - IWebProject wp = WebProjectFactory.instance.getWebProject(xModel); - if (wp == null) return null; - - ITaglibMapping tm = wp.getTaglibMapping(); - if (tm == null) return null; - return tm.getTaglibObject(uri); + return uri; } finally { if (model != null) model.releaseFromRead(); } } - + IRegion fLastRegion = null; /* * (non-Javadoc) * * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -147,6 +155,19 @@ } finally { smw.dispose(); } + } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getTaglibUri(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + + return MessageFormat.format(Messages.OpenTagLibraryForUri, uri); + } - } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,26 +10,28 @@ ******************************************************************************/ package org.jboss.tools.common.text.ext.hyperlink.jsp; +import java.text.MessageFormat; + import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.FindObjectHelper; import org.jboss.tools.common.text.ext.ExtensionsPlugin; 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.web.tld.ITaglibMapping; import org.jboss.tools.jst.web.tld.IWebProject; import org.jboss.tools.jst.web.tld.WebProjectFactory; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Jeremy @@ -104,14 +106,45 @@ smw.dispose(); } } - + private String getUri(IRegion region) { + IFile file = getFile(); + XModel xModel = getXModel(file); + if (xModel == 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 IDOMAttr)) return null; + Attr xmlnsAttr = (Attr)n; + if (xmlnsAttr.getName() == null || !xmlnsAttr.getName().startsWith("xmlns:")) return null; + Element rootElem = (Element)xmlnsAttr.getOwnerElement(); + if (!(rootElem.getNodeName().equals("jsp:root") || rootElem.getNodeName().equalsIgnoreCase("html"))) return null; + + String uri = xmlnsAttr.getValue(); + if (uri == null || uri.trim().length() == 0) return null; + + return uri; + } catch (Exception x) { + ExtensionsPlugin.getPluginLog().logError("Error in obtaining file name from region", x); + return null; + } finally { + smw.dispose(); + } + } + + + IRegion fLastRegion = null; /** * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -160,4 +193,17 @@ } } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getUri(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.NotFound, "URI"); + + return MessageFormat.format(Messages.Open, uri); + } } \ No newline at end of file Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLElementAttributeValueHyperlinkPartitioner.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -11,10 +11,6 @@ package org.jboss.tools.common.text.ext.hyperlink.xml; import org.eclipse.jface.text.IDocument; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlinkPartitioner; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; import org.jboss.tools.common.text.ext.hyperlink.IExclusiblePartitionerRecognition; @@ -22,6 +18,9 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** @@ -57,9 +56,6 @@ IHyperlinkRegion region = new HyperlinkRegion(offset, length, axis, contentType, type); return region; - } catch (Exception x) { - //ignore - return null; } finally { smw.dispose(); } @@ -83,9 +79,6 @@ return false; return true; - } catch (Exception x) { - //ignore - return false; } finally { smw.dispose(); } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xml/XMLXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -15,6 +15,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.URL; +import java.text.MessageFormat; import java.util.StringTokenizer; import java.util.zip.ZipFile; @@ -41,6 +42,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.common.text.ext.ExtensionsPlugin; 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.w3c.dom.Document; @@ -127,9 +129,7 @@ return null; } } - - /* * (non-Javadoc) * @@ -314,12 +314,13 @@ return fileName; } + IRegion fLastRegion = null; /** - * @seecom.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) + * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion(int offset) { @@ -394,4 +395,18 @@ } } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getURI(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.NotFound, "URI"); + + return MessageFormat.format(Messages.Open, uri); + } + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/AbstractBaseHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -19,7 +19,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -300,9 +299,11 @@ * * @see IHyperlink#getHyperlinkText() */ - public String getHyperlinkText() { - return null; - } +// public String getHyperlinkText() { +// return null; +// } + + abstract public String getHyperlinkText(); /* * (non-Javadoc) Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -26,5 +26,40 @@ Messages.class); } - public static String cannotOpenLink; + public static String cannotOpenLink; + + public static String NotFound; + public static String Open; + public static String OpenA; + public static String OpenAn; + public static String BrowseFor; + public static String OpenFile; + public static String OpenGetterOrSetterForProperty; + public static String OpenValidationMethod; + public static String OpenBean; + public static String OpenClass; + public static String OpenBundle; + public static String OpenBundleProperty; + public static String OpenCSSStyle; + public static String OpenTagLibraryForPrefix; + public static String OpenTagLibraryForUri; + public static String TagLibrary; + public static String File; + public static String Getter; + public static String Setter; + public static String Bean; + public static String Class; + public static String Bundle; + public static String BundleProperty; + public static String CSSStyle; + public static String ValidationMethod; + public static String BrowseToFilterNameDefinition; + public static String BrowseToRoleNameDefinition; + public static String BrowseToServletNameDefinition; + public static String BrowseToTLDAttributeNameDeclaration; + public static String BrowseForId; + public static String Id; + public static String BrowseForBeanId; + public static String BeanId; + } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/xpl/Messages.properties 2008-07-04 14:16:57 UTC (rev 9077) @@ -12,4 +12,38 @@ # Red Hat, Inc. # ****************************************************************************** -cannotOpenLink=Current text selection does not resolve to a file \ No newline at end of file +cannotOpenLink=Current text selection does not resolve to a file + +BrowseToFilterNameDefinition=Browse to ''filter-name'' definition +BrowseToRoleNameDefinition=Browse to ''role-name'' definition +BrowseToServletNameDefinition=Browse to ''servlet-name'' definition +BrowseToFilterNameDefinition=Browse to TLD Attribute Name declaration +Open=Open ''{0}'' +OpenA=Open a {0} +OpenAn=Open an {0} +BrowseFor=Browse for {0} +OpenGetterOrSetterForProperty=Open a {0} for the property ''{1}'' +OpenValidationMethod=Open Validation Method ''{0}'' +OpenClass=Open class ''{0}'' +OpenBean=Open Bean ''{0}'' +OpenBundle=Open bundle for base name ''{0}'' +OpenBundleProperty=Open property ''{0}'' of bundle ''{1}'' +OpenCSSStyle=Open CSS style definition ''{0}'' +OpenFile=Open file ''{0}'' +Getter=getter +Setter=setter +Bean=bean +Class=class +Bundle=bundle +BundleProperty=bundle property +CSSStyle=CSS style +ValidationMethod=Validation Method +NotFound=''{0}'' not found +File=file +TagLibrary=Tag Library +OpenTagLibraryForPrefix=Open a Tag Library for prefix ''{0}'' +OpenTagLibraryForUri=Open a Tag Library for URI ''{0}'' +BrowseForId=Browse for ID ''{0}'' +Id=ID +BrowseForBeanId=Browse for Bean ID ''{0}'' +BeanId=Bean ID Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -0,0 +1,45 @@ +/******************************************************************************* + * Copyright (c) 2007 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; + +import org.eclipse.osgi.util.NLS; + +/** + * @author Jeremy + * + */ + +public class JSFTextExtMessages { + + + private JSFTextExtMessages() { } + + static { + NLS.initializeMessages( + "org.jboss.tools.jsf.text.ext.JSFTextExtMessages", + JSFTextExtMessages.class); + } + + public static String Converter; + public static String OpenConverterForId; + public static String OpenTagLibrary; + public static String Tag; + public static String TagAttribute; + public static String ForTag; + public static String ForTagAttribute; + public static String NavigationRule; + public static String OpenBeanProperty; + public static String BeanProperty; + public static String RenderKit; + public static String OpenRenderKit; + public static String Validator; + public static String OpenValidatorForId; +} Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/JSFTextExtMessages.properties 2008-07-04 14:16:57 UTC (rev 9077) @@ -0,0 +1,25 @@ +# ****************************************************************************** +# Copyright (c) 2007 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 +# ****************************************************************************** + +Converter=Converter +OpenConverterForId=Open converter definition for ID ''{0}'' +OpenTagLibrary=Open a Tag Library for {0} +Tag=a tag +TagAttribute=an attribute +ForTag=tag ''{0}'' +ForTagAttribute=attribute ''{0}'' of tag ''{1}'' +NavigationRule=Navigation Rule +OpenBeanProperty=Open bean ''{0}'' for the property ''{1}'' +BeanProperty=Bean Property +RenderKit=Render Kit +OpenRenderKit=Open Render Kit ''{0}'' +Validator=validator +OpenValidatorForId=Open a validator for ID ''{1}'' Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,10 +10,13 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; @@ -40,12 +43,41 @@ } } + private String getBeanName(IRegion region) { + if (region == null) + return null; + IRegion regionPart = JSPBeanHyperlinkPartitioner.getRegionPart(getDocument(), region.getOffset()); + if(regionPart == null) + return null; + try { + String beanName = getDocument().get(region.getOffset(), region.getLength()); + return beanName; + } catch (BadLocationException x) { + JSFExtensionsPlugin.log("", x); + return null; + } + } + + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = JSPBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset); - return region; + fLastRegion = JSPBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset); + return fLastRegion; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String beanName = getBeanName(fLastRegion); + if (beanName == null) + return MessageFormat.format(Messages.OpenA, Messages.Bean); + + return MessageFormat.format(Messages.OpenBean, beanName); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleBasenameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashSet; @@ -28,6 +29,7 @@ import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.model.util.XModelObjectLoaderUtil; 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.jsf.model.pv.JSFProjectsRoot; @@ -268,11 +270,13 @@ } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -345,4 +349,18 @@ smw.dispose(); } } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundleBasename(fLastRegion); + if (baseName == null) + return MessageFormat.format(Messages.OpenA, Messages.Bundle); + + return MessageFormat.format(Messages.OpenBundle, baseName); + } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,27 +10,31 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; -import java.util.*; +import java.text.MessageFormat; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorPart; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - import org.jboss.tools.common.model.XModel; -import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +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.TaglibManagerWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.jst.web.tld.VpeTaglibManager; import org.jboss.tools.jst.web.tld.VpeTaglibManagerProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; /** * @author Jeremy @@ -195,12 +199,14 @@ } } + IRegion fLastRegion = null; + /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = JSPBundleHyperlinkPartitioner.getRegion(getDocument(), offset); - return region; + fLastRegion = JSPBundleHyperlinkPartitioner.getRegion(getDocument(), offset); + return fLastRegion; } protected String getRequestMethod() { @@ -227,4 +233,18 @@ return p; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundleBasename(fLastRegion); + String propertyName = getBundleProperty(fLastRegion); + if (baseName == null || propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.BundleProperty); + + return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,23 +10,25 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; 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.jsf.JSFModelPlugin; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -41,29 +43,36 @@ if (xModel == null) return; WebPromptingProvider provider = WebPromptingProvider.getInstance(); Properties p = new Properties(); - region = getRegion(region.getOffset()); - String converterID = null; - String error = null; - if(getDocument() != null && region != null) try { - converterID = getDocument().get(region.getOffset(), region.getLength()); - } catch (BadLocationException x) { - JSFModelPlugin.getPluginLog().logError("Cannot get convertor id", x); - } + String converterID = getConverterID(region); IFile file = getFile(); if(file != null) p.put(WebPromptingProvider.FILE, file); provider.getList(xModel, WebPromptingProvider.JSF_OPEN_CONVERTOR, converterID, p); - error = p.getProperty(WebPromptingProvider.ERROR); + String error = p.getProperty(WebPromptingProvider.ERROR); if ( error != null && error.length() > 0) { openFileFailed(); } } + + private String getConverterID (IRegion region) { + IRegion localRegion = getRegion(region.getOffset()); + String converterID = null; + if(getDocument() != null && region != null) { + try { + converterID = getDocument().get(region.getOffset(), region.getLength()); + } catch (BadLocationException x) { + JSFModelPlugin.getPluginLog().logError("Cannot get convertor id", x); + } + } + return converterID; + } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -137,4 +146,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String converterId = getConverterID(fLastRegion); + if (converterId == null) + return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.Converter); + + return MessageFormat.format(JSFTextExtMessages.OpenConverterForId, converterId); + } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForIDHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,23 +10,24 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; - +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.StructuredSelectionHelper; +import org.jboss.tools.common.text.ext.util.Utils; +import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.StructuredSelectionHelper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; - /** * @author Jeremy */ @@ -142,12 +143,13 @@ return sb.substring(bStart, bEnd); } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -221,4 +223,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forId = getForId(fLastRegion); + if (forId == null) + return MessageFormat.format(Messages.BrowseFor, Messages.Id); + + return MessageFormat.format(Messages.BrowseForId, forId); + } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ForwardHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import org.eclipse.core.resources.IFile; @@ -18,9 +19,9 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.ide.IDE; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; @@ -74,13 +75,26 @@ return super.getFileFromProject(fileName); } - + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = JSPForwardHyperlinkPartitioner.getRegion(getDocument(), offset); - return region; + fLastRegion = JSPForwardHyperlinkPartitioner.getRegion(getDocument(), offset); + return fLastRegion; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String filePath = getFilePath(fLastRegion); + if (filePath == null) + return MessageFormat.format(Messages.OpenA, Messages.File); + + return MessageFormat.format(Messages.OpenFile, filePath); + } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,25 +10,26 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import java.util.Properties; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; 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; +import org.w3c.dom.Text; /** * @author Jeremy @@ -136,11 +137,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } private String getTagAttributeName(IRegion region) { @@ -225,4 +228,20 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagName = getTagName(fLastRegion); + String attrName = getTagAttributeName(fLastRegion); + if (tagName == null || attrName == null) + return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.TagAttribute); + + String tagAttr = MessageFormat.format(JSFTextExtMessages.ForTagAttribute, attrName, tagName); + + return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tagAttr); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,27 +10,24 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import java.util.Map; import java.util.Properties; import org.eclipse.core.resources.IFile; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; -import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Jeremy @@ -126,11 +123,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion (int offset) { @@ -182,4 +181,19 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagName = getTagName(fLastRegion); + if (tagName == null) + return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, JSFTextExtMessages.Tag); + + String tag = MessageFormat.format(JSFTextExtMessages.ForTag, tagName); + + return MessageFormat.format(JSFTextExtMessages.OpenTagLibrary, tag); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPXmlNsHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,25 +10,24 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +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.common.text.ext.hyperlink.XModelBasedHyperlink; -import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.jst.web.tld.TaglibMapping; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; public class JsfJSPXmlNsHyperlink extends XModelBasedHyperlink { @@ -36,8 +35,7 @@ return WebPromptingProvider.JSF_OPEN_TAG_LIBRARY; } - protected Properties getRequestProperties(IRegion region) { - Properties p = new Properties(); + private String getUri(IRegion region) { StructuredModelWrapper smw = new StructuredModelWrapper(); smw.init(getDocument()); try { @@ -62,8 +60,7 @@ String prefix = name.substring(name.indexOf(':') + 1); String uri = Utils.trimQuotes(attr.getValue()); if (prefix != null && prefix.trim().length() > 0) { - p.setProperty("prefix", tm.resolveURI(uri)); - + return tm.resolveURI(uri); } } } @@ -71,6 +68,17 @@ smw.dispose(); } + return null; + } + + protected Properties getRequestProperties(IRegion region) { + Properties p = new Properties(); + + String uri = getUri(region); + if (uri != null && uri.trim().length() > 0) { + p.setProperty("prefix", uri); + } + return p; } @@ -118,4 +126,16 @@ } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getUri(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.NotFound, "URI"); + + return MessageFormat.format(Messages.Open, uri); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfTaglibDirectiveHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +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.web.project.list.WebPromptingProvider; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; - /** * @author Jeremy * @@ -32,8 +33,7 @@ return WebPromptingProvider.JSF_OPEN_TAG_LIBRARY; } - protected Properties getRequestProperties(IRegion region) { - Properties p = new Properties(); + private String getTaglibUri(IRegion region) { StructuredModelWrapper smw = new StructuredModelWrapper(); smw.init(getDocument()); try { @@ -49,12 +49,22 @@ String uri = Utils.getAttributeValue(getDocument(), node, "uri"); if (uri != null) { - p.setProperty("prefix", uri); + return uri; } } finally { smw.dispose(); } + return null; + } + + protected Properties getRequestProperties(IRegion region) { + Properties p = new Properties(); + + String uri = getTaglibUri(region); + if (uri != null) { + p.setProperty("prefix", uri); + } return p; } @@ -104,4 +114,17 @@ } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getTaglibUri(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + + return MessageFormat.format(Messages.OpenTagLibraryForUri, uri); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/LoadBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,20 +10,21 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +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.TaglibManagerWrapper; +import org.jboss.tools.common.text.ext.util.Utils; +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; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.TaglibManagerWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; - /** * @author Jeremy * @@ -120,4 +121,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundleBasename(fLastRegion); + if (baseName == null) + return MessageFormat.format(Messages.OpenA, Messages.Bundle); + + return MessageFormat.format(Messages.OpenBundle, baseName); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.core.resources.IFile; @@ -17,7 +18,9 @@ import org.eclipse.jface.text.IRegion; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; /** @@ -46,13 +49,23 @@ JSFExtensionsPlugin.log("", x); } } - + + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = JSPNavigationCaseHyperlinkPartitioner.getRegion(getDocument(), offset); - return region; + fLastRegion = JSPNavigationCaseHyperlinkPartitioner.getRegion(getDocument(), offset); + return fLastRegion; } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + return MessageFormat.format(Messages.BrowseFor, JSFTextExtMessages.NavigationRule); + } + } \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,10 +10,19 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.model.XModel; +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.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; +import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -21,13 +30,6 @@ import org.w3c.dom.NodeList; import org.w3c.dom.Text; -import org.jboss.tools.common.model.XModel; -import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; - /** * @author Jeremy */ @@ -56,11 +58,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } private String getPropertyName(IRegion region) { @@ -213,4 +217,18 @@ return sb.substring(bStart, bEnd); } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String beanClassName = getBeanClassName(fLastRegion); + String propertyName = getPropertyName(fLastRegion); + if (beanClassName == null || propertyName == null) + return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.BeanProperty); + + return MessageFormat.format(JSFTextExtMessages.OpenBeanProperty, beanClassName, propertyName); + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,21 +10,23 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; 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.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -38,29 +40,35 @@ if(getDocument() == null || region == null) return; XModel xModel = getXModel(); if (xModel == null) return; - try { - WebPromptingProvider provider = WebPromptingProvider.getInstance(); + WebPromptingProvider provider = WebPromptingProvider.getInstance(); - IRegion r = getRegion(region.getOffset()); - String beanName = trimQuotes(getDocument().get(r.getOffset(), r.getLength())); + String beanName = getBeanName(getRegion(region.getOffset())); - Properties p = new Properties(); - provider.getList(xModel, WebPromptingProvider.JSF_OPEN_RENDER_KIT, beanName, p); - String error = p.getProperty(WebPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } - - } catch (BadLocationException x) { + Properties p = new Properties(); + provider.getList(xModel, WebPromptingProvider.JSF_OPEN_RENDER_KIT, beanName, p); + String error = p.getProperty(WebPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { openFileFailed(); } } + + private String getBeanName(IRegion region) { + if(getDocument() == null || region == null) return null; + try { + return trimQuotes(getDocument().get(region.getOffset(), region.getLength())); + } catch (BadLocationException x) { + JSFExtensionsPlugin.log("", x); + return null; + } + } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion (int offset) { @@ -153,5 +161,18 @@ bEnd++; return sb.substring(bStart, bEnd); } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String renderKitName = getBeanName(fLastRegion); + if (renderKitName == null) + return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.RenderKit); + + return MessageFormat.format(JSFTextExtMessages.OpenRenderKit, renderKitName); + } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,22 +10,24 @@ ******************************************************************************/ package org.jboss.tools.jsf.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.core.resources.IFile; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; 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.jsf.text.ext.JSFExtensionsPlugin; +import org.jboss.tools.jsf.text.ext.JSFTextExtMessages; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -42,28 +44,39 @@ if (xModel == null) return; WebPromptingProvider provider = WebPromptingProvider.getInstance(); - try { - region = getRegion(region.getOffset()); - if(region == null) return; - String validatorID = getDocument().get(region.getOffset(), region.getLength()); - Properties p = new Properties(); - p.put(WebPromptingProvider.FILE, file); - provider.getList(xModel, WebPromptingProvider.JSF_OPEN_VALIDATOR, validatorID, p); - String error = p.getProperty(WebPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } + + String validatorID = getValidatorId(getRegion(region.getOffset())); + if (validatorID == null) { + openFileFailed(); + return; + } + Properties p = new Properties(); + p.put(WebPromptingProvider.FILE, file); + provider.getList(xModel, WebPromptingProvider.JSF_OPEN_VALIDATOR, validatorID, p); + String error = p.getProperty(WebPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } + } + + private String getValidatorId(IRegion region) { + if(getDocument() == null || region == null) return null; + try { + return getDocument().get(region.getOffset(), region.getLength()); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); + return null; } } + + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -137,4 +150,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String validatorId = getValidatorId(fLastRegion); + if (validatorId == null) + return MessageFormat.format(Messages.OpenA, JSFTextExtMessages.Validator); + + return MessageFormat.format(JSFTextExtMessages.OpenValidatorForId, validatorId); + } + } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.seam.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.ui.IEditorPart; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; -import org.jboss.tools.seam.text.ext.SeamExtPlugin; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; /** * @author Jeremy @@ -53,12 +55,32 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = SeamBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset); - return region; + fLastRegion = SeamBeanHyperlinkPartitioner.getWordRegion(getDocument(), offset); + return fLastRegion; } - + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + + String beanName; + try { + beanName = getDocument().get(fLastRegion.getOffset(), fLastRegion.getLength()); + } catch (BadLocationException e) { + beanName = null; + } + + if (beanName == null) + return MessageFormat.format(Messages.NotFound, Messages.Bean); + + return MessageFormat.format(Messages.OpenBean, beanName); + } } \ No newline at end of file Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamELInJavaStringHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -11,6 +11,8 @@ package org.jboss.tools.seam.text.ext.hyperlink; +import java.text.MessageFormat; + import org.eclipse.core.runtime.Assert; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.JavaModelException; @@ -19,6 +21,7 @@ import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.PartInitException; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.seam.text.ext.SeamExtPlugin; public class SeamELInJavaStringHyperlink implements IHyperlink { @@ -77,10 +80,16 @@ } /* - * @see org.eclipse.jdt.internal.ui.javaeditor.IHyperlink#getHyperlinkText() - * @since 3.1 + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() */ public String getHyperlinkText() { - return null; + if (fElements == null || fElements.length == 0) + return MessageFormat.format(Messages.OpenA, Messages.Bean); + + return MessageFormat.format(Messages.Open, fElements[0].getElementName()); } + + } Added: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -0,0 +1,62 @@ +/******************************************************************************* + * Copyright (c) 2007 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.struts.text.ext; + +import org.eclipse.osgi.util.NLS; + +/** + * @author Jeremy + * + */ + +public class StrutsTextExtMessages { + + + private StrutsTextExtMessages() { } + + static { + NLS.initializeMessages( + "org.jboss.tools.struts.text.ext.StrutsTextExtMessages", + StrutsTextExtMessages.class); + } + + public static String OpenTagLibrary; + public static String Tag; + public static String TagAttribute; + public static String ForTag; + public static String ForTagAttribute; + public static String OpenAction; + public static String Action; + public static String OpenActionMapping; + public static String ActionMapping; + public static String OpenFormBean; + public static String FormBean; + public static String OpenFormProperty; + public static String FormProperty; + public static String OpenForwardPath; + public static String ForwardPath; + public static String OpenPage; + public static String Page; + public static String OpenValidationBundle; + public static String ValidationBundle; + public static String OpenValidationBundleProperty; + public static String OpenValidationBundlePropertyForBundle; + public static String ValidationBundleProperty; + public static String OpenForward; + public static String Forward; + public static String OpenValidationProperty; + public static String ValidationProperty; + public static String OpenProperty; + public static String Property; + public static String OpenPropertyForFormAction; + public static String OpenValidator; + public static String Validator; +} Added: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/StrutsTextExtMessages.properties 2008-07-04 14:16:57 UTC (rev 9077) @@ -0,0 +1,42 @@ +# ****************************************************************************** +# Copyright (c) 2007 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 +# ****************************************************************************** + +OpenTagLibrary=Open a Tag Library for {0} +Tag=a tag +TagAttribute=an attribute +ForTag=tag ''{0}'' +ForTagAttribute=attribute ''{0}'' of tag ''{1}'' +OpenAction=Open Action ''{0}'' +Action=Action +OpenActionMapping=Open Action Mapping ''{0}'' +ActionMapping=Action Mapping +OpenFormBean=Open Form Bean ''{0}'' +FormBean=Form Bean +OpenFormProperty=Open Form Property ''{0}'' +FormProperty=Form Property +OpenForwardPath=Open Forward Path ''{0}'' +ForwardPath=Forward Path +OpenPage=Open Page ''{0}'' +Page=Page +OpenValidationBundle=Open Validation Bundle ''{0}'' +ValidationBundle=Validation Bundle +OpenValidationBundleProperty=Open Validation Bundle Property ''{0}'' +OpenValidationBundlePropertyForBundle=Open Property ''{0}'' of Validation Bundle ''{1}'' +ValidationBundleProperty=Validation Bundle Property +OpenForward=Open Forward ''{0}'' +Forward=Forward +OpenValidationProperty=Open Validation Property ''{0}'' for the form ''{1}'' +ValidationProperty=Validation Property +OpenProperty=Open Property ''{0}'' +Property=Property +OpenPropertyForFormAction=Open Property ''{0}'' for the form action ''{1}'' +OpenValidator=Open Validator ''{0}'' +Validator=Validator Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,20 +10,22 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +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.web.project.list.WebPromptingProvider; +import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; -import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; - /** * @author Jeremy * @@ -73,4 +75,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String actionName = getAction(fLastRegion); + if (actionName == null) + return MessageFormat.format(Messages.OpenAn, StrutsTextExtMessages.Action); + + return MessageFormat.format(StrutsTextExtMessages.OpenAction, actionName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsActionMappingHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -46,4 +48,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String actionName = getAction(fLastRegion); + if (actionName == null) + return MessageFormat.format(Messages.OpenAn, StrutsTextExtMessages.ActionMapping); + + return MessageFormat.format(StrutsTextExtMessages.OpenActionMapping, actionName); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,28 +10,29 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Iterator; import java.util.Map; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; +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.StructuredSelectionHelper; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.tld.TaglibMapping; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; /** * @author Jeremy @@ -184,12 +185,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -283,4 +285,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forId = getForId(fLastRegion); + if (forId == null) + return MessageFormat.format(Messages.BrowseFor, Messages.BeanId); + + return MessageFormat.format(Messages.BrowseForBeanId, forId); + } + } \ No newline at end of file Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,11 +10,12 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; @@ -49,4 +50,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundle(fLastRegion); + if (baseName == null) + return MessageFormat.format(Messages.OpenA, Messages.Bundle); + + return MessageFormat.format(Messages.OpenBundle, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,19 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -79,4 +80,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundle(fLastRegion); + String propertyName = getKey(fLastRegion); + if (baseName == null || propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.BundleProperty); + + return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,11 +10,12 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; @@ -51,4 +52,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundle(fLastRegion); + if (baseName == null) + return MessageFormat.format(Messages.OpenA, Messages.Bundle); + + return MessageFormat.format(Messages.OpenBundle, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,19 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -78,4 +79,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundle(fLastRegion); + String propertyName = getKey(fLastRegion); + if (baseName == null || propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.BundleProperty); + + return MessageFormat.format(Messages.OpenBundleProperty, propertyName, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -53,4 +55,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String formBeanName = getAttributeValue(fLastRegion); + if (formBeanName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormBean); + + return MessageFormat.format(StrutsTextExtMessages.OpenFormBean, formBeanName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigFormPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -77,4 +79,16 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String formPropertyName = getName(fLastRegion); + if (formPropertyName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormProperty); + + return MessageFormat.format(StrutsTextExtMessages.OpenFormProperty, formPropertyName); + } } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigForwardPathHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -130,4 +132,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String path = getPath(fLastRegion); + if (path == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ForwardPath); + + return MessageFormat.format(StrutsTextExtMessages.OpenForwardPath, path); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPageHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -48,4 +50,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String page = getPage(fLastRegion); + if (page == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Page); + + return MessageFormat.format(StrutsTextExtMessages.OpenPage, page); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigPluginSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,19 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - import org.jboss.tools.common.text.ext.hyperlink.HyperlinkRegion; +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -115,4 +116,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getAttributeValue(fLastRegion); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.Setter); + + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsConfigSetPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,15 +10,17 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; + import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; +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.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; -import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; - public class StrutsConfigSetPropertyHyperlink extends ClassMethodHyperlink { private static final String CLASSNAME_ATTRNAME = "className"; private static final String PROPERTY_ATTRNAME = "property"; @@ -53,4 +55,18 @@ protected String getMethodParams(IRegion region) { return null; } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getAttributeValue(fLastRegion, PROPERTY_ATTRNAME); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, Messages.Setter); + + return MessageFormat.format(Messages.OpenGetterOrSetterForProperty, Messages.Setter, propertyName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormBeanHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -48,4 +50,16 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String formBeanName = getFormBean(fLastRegion); + if (formBeanName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.FormBean); + + return MessageFormat.format(StrutsTextExtMessages.OpenFormBean, formBeanName); + } } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsFormValidationBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,17 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** @@ -54,4 +57,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getKey(fLastRegion); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundleProperty); + + return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundleProperty, propertyName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsForwardHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -48,4 +50,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forward = getForward(fLastRegion); + if (forward == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Forward); + + return MessageFormat.format(StrutsTextExtMessages.OpenForward, forward); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import java.util.Properties; @@ -17,12 +18,6 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; @@ -30,6 +25,12 @@ import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -130,11 +131,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } private String getTagAttributeName(IRegion region) { @@ -229,4 +232,20 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagName = getTagName(fLastRegion); + String attrName = getTagAttributeName(fLastRegion); + if (tagName == null || attrName == null) + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.TagAttribute); + + String tagAttr = MessageFormat.format(StrutsTextExtMessages.ForTagAttribute, attrName, tagName); + + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tagAttr); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.List; import java.util.Properties; @@ -18,12 +19,6 @@ import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; - -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; @@ -31,6 +26,11 @@ import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; /** * @author Jeremy @@ -128,11 +128,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion (int offset) { @@ -194,5 +196,20 @@ return null; } } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String tagName = getTagName(fLastRegion); + if (tagName == null) + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, StrutsTextExtMessages.Tag); + + String tag = MessageFormat.format(StrutsTextExtMessages.ForTag, tagName); + + return MessageFormat.format(StrutsTextExtMessages.OpenTagLibrary, tag); + } } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLinkHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -13,7 +13,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.jboss.tools.common.text.ext.hyperlink.LinkHyperlink; -import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; /** * @author Jeremy Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -19,22 +20,22 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; +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.common.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; import org.jboss.tools.jst.web.project.WebProject; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.jst.web.tld.TaglibMapping; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.w3c.dom.Text; /** * @author Jeremy @@ -251,12 +252,13 @@ } } + IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - IRegion region = getRegion(offset); - return region; + fLastRegion = getRegion(offset); + return fLastRegion; } private IRegion getRegion(int offset) { @@ -351,4 +353,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String forId = getForId(fLastRegion); + if (forId == null) + return MessageFormat.format(Messages.BrowseFor, Messages.BeanId); + + return MessageFormat.format(Messages.BrowseForBeanId, forId); + } + } \ No newline at end of file Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPageHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -48,4 +50,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String page = getPage(fLastRegion); + if (page == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Page); + + return MessageFormat.format(StrutsTextExtMessages.OpenPage, page); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertiesFileHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,13 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -46,4 +49,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getProperty(fLastRegion); + if (propertyName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Property); + + return MessageFormat.format(StrutsTextExtMessages.OpenProperty, propertyName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -137,4 +139,19 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getProperty(fLastRegion); + String actionName = getFormAction(fLastRegion); + if (propertyName == null || actionName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Property); + + return MessageFormat.format(StrutsTextExtMessages.OpenPropertyForFormAction, propertyName, actionName); + } + + } \ No newline at end of file Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsTaglibDirectiveHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,21 +10,22 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +import org.jboss.tools.common.text.ext.hyperlink.XModelBasedHyperlink; +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.common.text.ext.hyperlink.XModelBasedHyperlink; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -36,8 +37,7 @@ return WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY; } - protected Properties getRequestProperties(IRegion region) { - Properties p = new Properties(); + private String getTaglibUri(IRegion region) { StructuredModelWrapper smw = new StructuredModelWrapper(); smw.init(getDocument()); try { @@ -53,12 +53,23 @@ String uri = getAttributeValue(getDocument(), node, "uri"); if (uri != null) { - p.setProperty("prefix", uri); + return uri; } } finally { smw.dispose(); } + return null; + } + + protected Properties getRequestProperties(IRegion region) { + Properties p = new Properties(); + + String uri = getTaglibUri(region); + if (uri != null) { + p.setProperty("prefix", uri); + } + return p; } @@ -120,4 +131,17 @@ } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String uri = getTaglibUri(fLastRegion); + if (uri == null) + return MessageFormat.format(Messages.OpenA, Messages.TagLibrary); + + return MessageFormat.format(Messages.OpenTagLibraryForUri, uri); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,14 +10,16 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; /** * @author Jeremy @@ -51,4 +53,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String baseName = getBundle(fLastRegion); + if (baseName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundle); + + return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundle, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationBundleKeyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -79,4 +81,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getKey(fLastRegion); + String baseName = getBundle(fLastRegion); + if (propertyName == null || baseName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationBundleProperty); + + return MessageFormat.format(StrutsTextExtMessages.OpenValidationBundlePropertyForBundle, propertyName, baseName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,11 +10,13 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; - +import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; +import org.jboss.tools.common.text.ext.hyperlink.xpl.Messages; import org.jboss.tools.common.text.ext.util.Utils; -import org.jboss.tools.common.text.ext.hyperlink.ClassMethodHyperlink; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; /** @@ -45,4 +47,19 @@ protected String getMethodParams(IRegion region) { return getAttributeValue(region, METHODPARAMS_ATTRNAME); } + + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String methodName = getMethodName(fLastRegion); + if (methodName == null) + return MessageFormat.format(Messages.OpenA, Messages.ValidationMethod); + + return MessageFormat.format(Messages.OpenValidationMethod, methodName); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationMethodHyperlink0.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,19 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -95,4 +96,17 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String methodName = getMethodName(fLastRegion); + if (methodName == null) + return MessageFormat.format(Messages.OpenA, Messages.ValidationMethod); + + return MessageFormat.format(Messages.OpenValidationMethod, methodName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationPropertyHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -80,4 +82,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String propertyName = getProperty(fLastRegion); + String formName = getFormName(fLastRegion); + if (propertyName == null || formName == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.ValidationProperty); + + return MessageFormat.format(StrutsTextExtMessages.OpenValidationProperty, propertyName, formName); + } + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsValidationValidatorHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -10,18 +10,20 @@ ******************************************************************************/ package org.jboss.tools.struts.text.ext.hyperlink; +import java.text.MessageFormat; import java.util.Properties; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; - +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.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.jboss.tools.struts.text.ext.StrutsTextExtMessages; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; /** * @author Jeremy @@ -127,4 +129,18 @@ } } + /* + * (non-Javadoc) + * + * @see IHyperlink#getHyperlinkText() + */ + public String getHyperlinkText() { + String validator = getAttributeValue(fLastRegion); + if (validator == null) + return MessageFormat.format(Messages.OpenA, StrutsTextExtMessages.Validator); + + return MessageFormat.format(StrutsTextExtMessages.OpenValidator, validator); + } + + } Modified: trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java =================================================================== --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java 2008-07-04 12:19:57 UTC (rev 9076) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java 2008-07-04 14:16:57 UTC (rev 9077) @@ -17,17 +17,16 @@ import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.w3c.dom.Attr; -import org.w3c.dom.Document; -import org.w3c.dom.Node; -import org.w3c.dom.Text; - import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; import org.jboss.tools.common.text.ext.util.Utils; import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.struts.text.ext.StrutsExtensionsPlugin; +import org.w3c.dom.Attr; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.Text; /** * @author Jeremy @@ -62,11 +61,13 @@ protected abstract Properties getRequestProperties(IRegion region); + protected IRegion fLastRegion = null; /** * @see com.ibm.sse.editor.AbstractHyperlink#doGetHyperlinkRegion(int) */ protected IRegion doGetHyperlinkRegion(int offset) { - return getRegion(offset); + fLastRegion = getRegion(offset); + return fLastRegion; } protected IRegion getRegion (int offset) {