Author: scabanovich
Date: 2011-05-03 20:14:18 -0400 (Tue, 03 May 2011)
New Revision: 31054
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
Log:
JBIDE-8841
https://issues.jboss.org/browse/JBIDE-8841
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-05-04
00:11:24 UTC (rev 31053)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-05-04
00:14:18 UTC (rev 31054)
@@ -8,6 +8,7 @@
org.eclipse.jface.text;bundle-version="3.5.0",
org.eclipse.ui.ide;bundle-version="3.5.0",
org.jboss.tools.common.text.ext;bundle-version="2.0.0",
+ org.jboss.tools.common.model.ui,
org.eclipse.core.runtime;bundle-version="3.5.0",
org.jboss.tools.cdi.text.ext;bundle-version="1.0.0",
org.eclipse.jdt.ui;bundle-version="3.5.0",
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-05-04
00:11:24 UTC (rev 31053)
+++
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java 2011-05-04
00:14:18 UTC (rev 31054)
@@ -3,6 +3,7 @@
import java.util.List;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
import org.eclipse.jdt.internal.ui.text.JavaWordFinder;
@@ -27,6 +28,8 @@
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
+import org.jboss.tools.common.editor.ObjectMultiPageEditor;
+import org.jboss.tools.common.model.ui.editor.EditorPartWrapper;
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;
@@ -101,8 +104,12 @@
}
protected void checkHyperLinkInXml(String fileName, int offset, String
hyperlinkClassName) throws Exception {
+ checkHyperLinkInXml(fileName, tckProject, offset, hyperlinkClassName);
+ }
+
+ public static IHyperlink checkHyperLinkInXml(String fileName, IProject project, int
offset, String hyperlinkClassName) throws Exception {
Region region = new Region(offset, 0);
- IFile file = tckProject.getFile(fileName);
+ IFile file = project.getFile(fileName);
assertNotNull("The file \"" + fileName + "\" is not
found", file);
assertTrue("The file \"" + fileName + "\" is not found",
file.isAccessible());
@@ -110,23 +117,29 @@
FileEditorInput editorInput = new FileEditorInput(file);
IEditorPart part = openFileInEditor(file);
+ if(part instanceof EditorPartWrapper) part = ((EditorPartWrapper)part).getEditor();
ISourceViewer viewer = null;
if (part instanceof XMLMultiPageEditorPart) {
IEditorPart[] parts = ((XMLMultiPageEditorPart)part).findEditors(editorInput);
if(parts.length>0) {
viewer = ((StructuredTextEditor)parts[0]).getTextViewer();
}
+ } else if(part instanceof ObjectMultiPageEditor) {
+ viewer = ((ObjectMultiPageEditor)part).getSourceEditor().getTextViewer();
+ } else if(part instanceof StructuredTextEditor) {
+ viewer = ((StructuredTextEditor)part).getTextViewer();
}
IHyperlink[] links = HyperlinkDetector.getInstance().detectHyperlinks(viewer, region,
true);
if(links!=null) {
for (IHyperlink hyperlink : links) {
if(hyperlink.getClass().getName().equals(hyperlinkClassName)) {
- return;
+ return hyperlink;
}
}
}
fail("Can't find HyperLink");
+ return null;
}
protected boolean findOffsetInRegions(int offset, List<Region> regionList){
@@ -137,11 +150,11 @@
return false;
}
- protected IEditorPart openFileInEditor(IFile input) {
+ public static IEditorPart openFileInEditor(IFile input) {
return openFileInEditor(input, null);
}
- protected IEditorPart openFileInEditor(IFile input, String id) {
+ public static IEditorPart openFileInEditor(IFile input, String id) {
if (input != null && input.exists()) {
try {
if(id==null) {