Author: dazarov Date: 2011-07-07 15:27:26 -0400 (Thu, 07 Jul 2011) New Revision: 32725 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java Log: https://issues.jboss.org/browse/JBIDE-8202 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 18:59:42 UTC (rev 32724) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlink.java 2011-07-07 19:27:26 UTC (rev 32725) @@ -39,10 +39,15 @@ protected IRegion doGetHyperlinkRegion(int offset) { return region; } + + @Override + public IFile getReadyToOpenFile(){ + return getFileFromProject(path); + } @Override protected void doHyperlink(IRegion region) { - IFile file = getFileFromProject(path); + IFile file = getReadyToOpenFile(); IEditorPart part = openFileInEditor(file); if(part == null) openFileFailed(); Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 18:59:42 UTC (rev 32724) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-07-07 19:27:26 UTC (rev 32725) @@ -37,6 +37,7 @@ import org.jboss.tools.common.editor.ObjectMultiPageEditor; import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorStandAlone; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; @@ -136,12 +137,12 @@ assertEquals("Unexpected hyperlink type", testLink.hyperlink, link.getClass()); assertTrue("Validation fails for hyperlink - "+link.getHyperlinkText(), testLink.validateHyperlink(link)); if(testLink.fileName != null){ - link.open(); - IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - IFileEditorInput input = (IFileEditorInput)editor.getEditorInput(); - IFile f = input.getFile(); + assertTrue("HyperLink must be inherited from AbstractHyperlink", link instanceof AbstractHyperlink); + + IFile f = ((AbstractHyperlink)link).getReadyToOpenFile(); + assertNotNull("HyperLink must return not null file", f); assertEquals(testLink.fileName, f.getName()); - editor.dispose(); + } } Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-07-07 18:59:42 UTC (rev 32724) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2011-07-07 19:27:26 UTC (rev 32725) @@ -327,5 +327,13 @@ }; return jarEditorInput; } + + /** + * for test purpose + * @return + */ + public IFile getReadyToOpenFile(){ + return null; + } }