Fixed bug with editor links

Author: Chris

dataTool/src/dataTool/Visitor.java

@@ -177,7 +177,7 @@ public boolean visit( SimpleName sn ) {
 						addedNode = getNodeFromName(sn);
 						if( addedNode != null ) {
 							for( DataNode dn : params ) {
-								if( addedNode.getKey().equals(dn.getKey() ) ) {
+								if( addedNode.getKey().equals(dn.getKey() )) {
 									addedNode.setDeclarationMethod(methodDeclaration);
 									addedNode.setParameterIndex(dn.getParameterIndex());
 								}
@@ -202,7 +202,8 @@ public boolean visit(MethodInvocation mi) {
 								SimpleName n = (SimpleName) e;
 								addedNode = getNodeFromName(n);
 								// TODO shouldn't need a check here
-								if( addedNode != null ) {
+								if( addedNode != null) {
+									addedNode.setDeclarationMethod(null);
 									addedNode.setInvocationMethod(methodInvocation);
 									addedNode.setParameterIndex(i);
 									nodeArgs.add( addedNode );

dataTool/src/dataTool/annotations/LinkAnnotation.java

@@ -35,6 +35,7 @@
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.MethodInvocation;
+import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.ui.JavaUI;
 
 import dataTool.DataCallHierarchy;
@@ -51,7 +52,7 @@ public class LinkAnnotation extends Annotation implements ISelfDrawingAnnotation
 	private static ASTNode searchResult;
 	public static Set<IMethod> searchResultsUp;
 	public static Set<IMethod> searchResultsDown;
-	public IMethod searchMethod = null;
+	public String searchMethod = null;
 	private IEditorPart editor = null;
 	private boolean load = true;
 
@@ -84,6 +85,8 @@ public void mouseDown(MouseEvent arg0) {
 			public void mouseUp(MouseEvent arg0) {
 				int click = textWidget.getOffsetAtLocation(new Point(arg0.x,arg0.y));
 				if(click >= style.start && click <= style.start+style.length && load){
+					load = false;
+					boolean up = false;
 					if(linkNode == null) {
 						return;
 					}
@@ -140,30 +143,34 @@ else if(linkNode.getDeclarationMethod() != null) {
 						}
 					}*/
 					IMethod i = null;
-					for(IMethod im: search) {
-						if(linkNode.getInvocationMethod() != null) {
+					if(linkNode.getInvocationMethod() != null && linkNode.getDeclarationMethod() == null) {
+						for(IMethod im: search) {
 							if (im.getElementName().equals(linkNode.getInvocationMethod().getName().getIdentifier())) {
 								i = im;
 								break;
 							}
 						}
 
 					}
-					if (i == null) {
-						if(linkNode.getDeclarationMethod() != null && searchResultsUp != null) {
-							i = search.get(0);
+					if (i == null || linkNode.getDeclarationMethod() != null) {
+						if(searchResultsUp != null) {
+							i = (IMethod) searchResultsUp.toArray()[0];
+							searchMethod = linkNode.getDeclarationMethod().getName().getIdentifier();
+							up = true;
 						}
-						else {
+						else if (i == null){
 							return;
 						}
 					}
 						IEditorPart editor = null;
 						try {
-							if(i.getParameters().length > 0 && linkNode.getParameterIndex() >= 0) {
+							if(i.getParameters().length > 0 && linkNode.getParameterIndex() >= 0 && !up) {
 								editor = JavaUI.openInEditor(i.getParameters()[linkNode.getParameterIndex()], true, true);
+								load = true;
 							}
 							else {
 								editor = JavaUI.openInEditor(i, true, true);
+								load = true;
 								if(searchMethod != null && editor != null) {
 									String code = ((AbstractTextEditor)editor).getDocumentProvider().getDocument(editor.getEditorInput()).get();
 									lineSearch(code.toCharArray(), i);
@@ -194,7 +201,7 @@ public boolean visit(MethodDeclaration md) {
 				public boolean visit(MethodInvocation m) {
 					if(method.getElementName().equals(methodName)) {
 						if(m.getName().getIdentifier().equals(searchMethod)) {
-							searchResult = m;
+							searchResult = (SimpleName) m.arguments().get(linkNode.getParameterIndex());
 						}
 					}
 					return true;
@@ -246,7 +253,7 @@ public void setDataNode(DataNode node) {
 	}
 
 	public void setSearchMethod(IMethod currentMethod) {
-		searchMethod = currentMethod;		
+		searchMethod = currentMethod.getElementName();		
 	}
 
 }