Author: vrubezhny Date: 2008-09-05 10:53:39 -0400 (Fri, 05 Sep 2008) New Revision: 10103 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/ClassMethodHyperlink.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/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/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/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/ConverterHyperlink.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/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/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/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/StrutsLogicPropertyHyperlink.java trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java Log: https://jira.jboss.org/jira/browse/JBIDE-2472 Clean-up HyperLinks (OpenOns) component. 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -61,14 +61,18 @@ protected void doHyperlink(IRegion region) { try { + IJavaElement element = null; + IEditorPart part = null; String className = getClassName(region); - IJavaElement element = searchForClass(className); + + if (className != null && className.trim().length() > 0) + element = searchForClass(className); - IEditorPart part = JavaUI.openInEditor(element); - if (part != null) { - if (element != null) + if (element != null) + part = JavaUI.openInEditor(element); + + if (part != null && element != null) JavaUI.revealInEditor(part, element); - } else { // could not open editor openFileFailed(); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/ClassMethodHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -68,8 +68,7 @@ if (classMethod != null) { IEditorPart part = JavaUI.openInEditor(classMethod); if (part != null) { - if (classMethod != null) - JavaUI.revealInEditor(part, classMethod); + JavaUI.revealInEditor(part, classMethod); } else { // could not open editor 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/RelativeLinkHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -40,7 +40,7 @@ try { String fileName = getFilePath(region); IFile fileToOpen = getFileFromProject(fileName); - if (fileToOpen.exists()) { + if ( fileToOpen!= null && fileToOpen.exists()) { IWorkbenchPage workbenchPage = ExtensionsPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage(); IDE.openEditor(workbenchPage,fileToOpen,true); } else { @@ -66,10 +66,12 @@ } protected IFile getFileFromProject(String fileName) { + if (fileName == null || fileName.trim().length() == 0) + return null; + IFile documentFile = getFile(); - - IProject project = documentFile.getProject(); - return super.getFileFromProject(updateFilenameForModel(fileName, project)); + IProject project = documentFile.getProject(); + return super.getFileFromProject(updateFilenameForModel(fileName, project)); } IRegion fLastRegion = null; 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/XModelBasedHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -37,22 +37,25 @@ protected void doHyperlink(IRegion region) { IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } - IPromptingProvider provider = PromptingProviderFactory.WEB; + IPromptingProvider provider = PromptingProviderFactory.WEB; - Properties p = getRequestProperties(region); - p.put(IPromptingProvider.FILE, documentFile); + Properties p = getRequestProperties(region); + p.put(IPromptingProvider.FILE, documentFile); - List list = provider.getList(xModel, getRequestMethod(), p.getProperty("prefix"), p); - if (list != null && list.size() >= 1) { - openFileInEditor((String)list.get(0)); - return; - } - String error = p.getProperty(IPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } + List list = provider.getList(xModel, getRequestMethod(), p.getProperty("prefix"), p); + if (list != null && list.size() >= 1) { + openFileInEditor((String)list.get(0)); + return; + } + String error = p.getProperty(IPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } } protected abstract String getRequestMethod(); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPBeanGetPropertyHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -82,8 +82,7 @@ if (beanMethod != null) { IEditorPart part = JavaUI.openInEditor(beanMethod); if (part != null) { - if (beanMethod != null) - JavaUI.revealInEditor(part, beanMethod); + JavaUI.revealInEditor(part, beanMethod); } else { // could not open editor 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPElementNameHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -38,12 +38,12 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - XModelObject object = getFilename(region); if(object != null) { FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); + } else { + openFileFailed(); } - } protected final String JAR_FILE_PROTOCOL = "jar:file:/";//$NON-NLS-1$ 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPForBeanIdHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -38,14 +38,13 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - - String forID = getForId(region); - IRegion elementByID = findElementByIDBackward(forID, region.getOffset(), USEBEAN_TAGNAME); - if (elementByID != null) { - StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(elementByID); - } else { - openFileFailed(); - } + String forID = getForId(region); + IRegion elementByID = findElementByIDBackward(forID, region.getOffset(), USEBEAN_TAGNAME); + if (elementByID != null) { + StructuredSelectionHelper.setSelectionAndRevealInActiveEditor(elementByID); + } else { + openFileFailed(); + } } private IRegion findElementByIDBackward (String id, int endOffset, String tagname) { 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPTaglibHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -45,7 +45,12 @@ */ protected void doHyperlink(IRegion region) { XModelObject object = getFilename(region); - if(object != null) FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); + if(object != null) + FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); + else { + openFileFailed(); + } + } protected final String JAR_FILE_PROTOCOL = "jar:file:/";//$NON-NLS-1$ 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/jsp/JSPXmlNsHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -41,8 +41,11 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - XModelObject object = getFilename(region); - if(object != null) FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); + XModelObject object = getFilename(region); + if(object != null) FindObjectHelper.findModelObject(object, FindObjectHelper.IN_EDITOR_ONLY); + else { + openFileFailed(); + } } protected final String JAR_FILE_PROTOCOL = "jar:file:/";//$NON-NLS-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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/BeanHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -30,16 +30,26 @@ */ protected void doHyperlink(IRegion region) { XModel xModel = getXModel(); - if (xModel == null || region == null) return; + if (xModel == null || region == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); region = JSPBeanHyperlinkPartitioner.getRegionPart(getDocument(), region.getOffset()); + if(region == null) { + openFileFailed(); + return; + } try { - if(region == null) return; String beanName = getDocument().get(region.getOffset(), region.getLength()); - if(beanName == null) return; + if(beanName == null) { + openFileFailed(); + return; + } provider.getList(xModel, WebPromptingProvider.JSF_BEAN_OPEN, beanName, null); } catch (BadLocationException x) { JSFExtensionsPlugin.log("", x); + openFileFailed(); } } 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ConverterHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -40,7 +40,10 @@ */ protected void doHyperlink(IRegion region) { XModel xModel = getXModel(); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); Properties p = new Properties(); String converterID = getConverterID(region); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagAttributeHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -42,7 +42,10 @@ protected void doHyperlink(IRegion region) { IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); Properties p = getRequestProperties(region); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JsfJSPTagNameHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -40,7 +40,10 @@ protected void doHyperlink(IRegion region) { IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); Properties p = getRequestProperties(region); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/NavigationCaseHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -32,15 +32,24 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - if(region == null) return; + if(region == null) { + openFileFailed(); + return; + } IFile file = getFile(); XModel xModel = getXModel(file); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } try { WebPromptingProvider provider = WebPromptingProvider.getInstance(); region = JSPNavigationCaseHyperlinkPartitioner.getRegion(getDocument(), region.getOffset()); - if(region == null) return; + if(region == null) { + openFileFailed(); + return; + } String beanName = getDocument().get(region.getOffset(), region.getLength()); Properties p = new Properties(); p.put(WebPromptingProvider.FILE, 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/PropertyHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -40,7 +40,10 @@ */ protected void doHyperlink(IRegion region) { XModel xModel = getXModel(); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } String propertyName = getPropertyName(region); String beanClassName = getBeanClassName(region); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/RenderKitHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -37,9 +37,15 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - if(getDocument() == null || region == null) return; + if(getDocument() == null || region == null) { + openFileFailed(); + return; + } XModel xModel = getXModel(); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); String beanName = getBeanName(getRegion(region.getOffset())); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ValidatorHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -38,10 +38,16 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - if(region == null) return; + if(region == null) { + openFileFailed(); + return; + } IFile file = getFile(); XModel xModel = getXModel(file); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } WebPromptingProvider provider = WebPromptingProvider.getInstance(); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsBeanNameHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -55,7 +55,10 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - if(region == null) return; + if(region == null) { + openFileFailed(); + return; + } String forID = getForId(region); String prefix = getPrefix(region); 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagAttributeHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -43,23 +43,24 @@ protected void doHyperlink(IRegion region) { IFile file = getFile(); XModel xModel = getXModel(file); - if (xModel == null) return; - { - WebPromptingProvider provider = WebPromptingProvider.getInstance(); + if (xModel == null){ + openFileFailed(); + return; + } + WebPromptingProvider provider = WebPromptingProvider.getInstance(); - Properties p = getRequestProperties(region); - p.put(WebPromptingProvider.FILE, file); + Properties p = getRequestProperties(region); + p.put(WebPromptingProvider.FILE, file); - List<Object> list = provider.getList(xModel, WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY, p.getProperty("prefix"), p); - if (list != null && list.size() >= 1) { - openFileInEditor((String)list.get(0)); - return; - } - String error = p.getProperty(WebPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } + List<Object> list = provider.getList(xModel, WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY, p.getProperty("prefix"), p); + if (list != null && list.size() >= 1) { + openFileInEditor((String)list.get(0)); + return; } + String error = p.getProperty(WebPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } } 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsJSPTagNameHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -43,22 +43,25 @@ protected void doHyperlink(IRegion region) { IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } - WebPromptingProvider provider = WebPromptingProvider.getInstance(); + WebPromptingProvider provider = WebPromptingProvider.getInstance(); - Properties p = getRequestProperties(region); - p.put(WebPromptingProvider.FILE, documentFile); + Properties p = getRequestProperties(region); + p.put(WebPromptingProvider.FILE, documentFile); - List<Object> list = provider.getList(xModel, WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY, p.getProperty("prefix"), p); - if (list != null && list.size() >= 1) { - openFileInEditor((String)list.get(0)); - return; - } - String error = p.getProperty(WebPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } + List<Object> list = provider.getList(xModel, WebPromptingProvider.STRUTS_OPEN_TAG_LIBRARY, p.getProperty("prefix"), p); + if (list != null && list.size() >= 1) { + openFileInEditor((String)list.get(0)); + return; + } + String error = p.getProperty(WebPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } } 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsLogicPropertyHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -57,7 +57,10 @@ * @see com.ibm.sse.editor.AbstractHyperlink#doHyperlink(org.eclipse.jface.text.IRegion) */ protected void doHyperlink(IRegion region) { - if(region == null) return; + if(region == null) { + openFileFailed(); + return; + } IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); if (xModel == null) { 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-09-05 14:07:25 UTC (rev 10102) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/src/org/jboss/tools/struts/text/ext/hyperlink/StrutsXModelBasedHyperlink.java 2008-09-05 14:53:39 UTC (rev 10103) @@ -39,22 +39,25 @@ protected void doHyperlink(IRegion region) { IFile documentFile = getFile(); XModel xModel = getXModel(documentFile); - if (xModel == null) return; + if (xModel == null) { + openFileFailed(); + return; + } - WebPromptingProvider provider = WebPromptingProvider.getInstance(); + WebPromptingProvider provider = WebPromptingProvider.getInstance(); - Properties p = getRequestProperties(region); - p.put(WebPromptingProvider.FILE, documentFile); + Properties p = getRequestProperties(region); + p.put(WebPromptingProvider.FILE, documentFile); - List<Object> list = provider.getList(xModel, getRequestMethod(), p.getProperty("prefix"), p); - if (list != null && list.size() >= 1) { - openFileInEditor((String)list.get(0)); - return; - } - String error = p.getProperty(WebPromptingProvider.ERROR); - if ( error != null && error.length() > 0) { - openFileFailed(); - } + List<Object> list = provider.getList(xModel, getRequestMethod(), p.getProperty("prefix"), p); + if (list != null && list.size() >= 1) { + openFileInEditor((String)list.get(0)); + return; + } + String error = p.getProperty(WebPromptingProvider.ERROR); + if ( error != null && error.length() > 0) { + openFileFailed(); + } } protected abstract String getRequestMethod();