[jbosstools-commits] JBoss Tools SVN: r35745 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Oct 17 21:30:32 EDT 2011
Author: dazarov
Date: 2011-10-17 21:30:32 -0400 (Mon, 17 Oct 2011)
New Revision: 35745
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
Log:
Updated in order to work with binary files https://issues.jboss.org/browse/JBIDE-9764
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -19,6 +19,7 @@
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMemberValuePair;
import org.eclipse.jdt.core.ISourceRange;
+import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
@@ -42,18 +43,15 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset = region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, false);
+ ITypeRoot input = EditorUtility.getEditorInputJavaElement(textEditor, false);
if (input == null)
return null;
- if (input.getResource() == null)
- return null;
-
IDocument document= textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
IFile file = null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -24,6 +24,7 @@
import org.eclipse.jdt.core.ILocalVariable;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.ITypeRoot;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
@@ -62,7 +63,7 @@
int offset= region.getOffset();
- IJavaElement input = EditorUtility.getEditorInputJavaElement(textEditor, false);
+ ITypeRoot input = EditorUtility.getEditorInputJavaElement(textEditor, false);
if (input == null)
return null;
@@ -85,7 +86,7 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
if(elements.length != 1)
@@ -94,8 +95,7 @@
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
if(elements[0] instanceof IType){
- ICompilationUnit cUnit = (ICompilationUnit)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
+ elements[0] = input.getElementAt(wordRegion.getOffset());
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.ISourceRange;
@@ -48,12 +47,12 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -76,19 +75,20 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+
if (elements == null)
return null;
+
if(elements.length != 1)
return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
+
if(elements[0] instanceof IType){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -49,12 +48,12 @@
this.viewer = textViewer;
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -77,19 +76,18 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
if (elements == null)
return null;
+
if(elements.length != 1)
return null;
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
int position = 0;
if(elements[0] instanceof IType){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-10-18 01:30:13 UTC (rev 35744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-10-18 01:30:32 UTC (rev 35745)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICodeAssist;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
@@ -47,12 +46,12 @@
public IHyperlink[] detectHyperlinks(ITextViewer textViewer,
IRegion region, boolean canShowMultipleHyperlinks) {
ITextEditor textEditor= (ITextEditor)getAdapter(ITextEditor.class);
- if (region == null || !canShowMultipleHyperlinks || !(textEditor instanceof JavaEditor))
+ if (region == null || !(textEditor instanceof JavaEditor))
return null;
int offset= region.getOffset();
- IJavaElement input= EditorUtility.getEditorInputJavaElement(textEditor, true);
+ ITypeRoot input= EditorUtility.getEditorInputJavaElement(textEditor, true);
if (input == null)
return null;
@@ -76,7 +75,8 @@
IJavaElement[] elements = null;
try {
- elements = ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+ elements = input.codeSelect(wordRegion.getOffset(), wordRegion.getLength());
+
if (elements == null)
return null;
if(elements.length != 1)
@@ -85,10 +85,8 @@
ArrayList<IHyperlink> hyperlinks = new ArrayList<IHyperlink>();
if(elements[0] instanceof IType){
if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(((IType) elements[0]).getFullyQualifiedName())){
- if(input instanceof ITypeRoot){
- ITypeRoot cUnit = (ITypeRoot)input;
- elements[0] = cUnit.getElementAt(wordRegion.getOffset());
- }
+ elements[0] = input.getElementAt(wordRegion.getOffset());
+
if(elements[0] == null)
return null;
}
More information about the jbosstools-commits
mailing list