Fix for issue found in down search. Still having problems with down links

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -100,7 +100,7 @@ public void selectionChanged(ITextSelection selection) {
 				//Adds all occurrences of data node off screen
 				linkAnnotation.searchResultsDown = searchDown;
 				linkAnnotation.searchResultsUp = searchUp;
-				
+				linkAnnotation.setDataNode(one);
 				ArrayList<Object> textUp = new ArrayList<Object>();
 				ArrayList<Object> textDown = new ArrayList<Object>();
 				for(DataNode dn: finder.getOccurrences(one.getPosition())) {
@@ -116,12 +116,10 @@ else if(dn.getStartPosition() > sourceViewer.getBottomIndexEndOffset()) {
 						textDown.add(offScreen);
 					}
 					if(dn.getDeclarationMethod() != null) {
-						linkAnnotation.setDataNode(dn);
 						linkAnnotation.draw(null, sourceViewer.getTextWidget(), 
 								dn.getDeclarationMethod().getName().getStartPosition(), dn.getDeclarationMethod().getName().getLength());
 					}
 					if(dn.getInvocationMethod() != null) {
-						linkAnnotation.setDataNode(dn);
 						linkAnnotation.draw(null, sourceViewer.getTextWidget(), dn.getInvocationMethod().getName().getStartPosition(), 
 								dn.getInvocationMethod().getName().getLength());
 					}

dataTool/src/dataTool/DataCallHierarchy.java

@@ -5,6 +5,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.TreeSet;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
@@ -78,7 +79,8 @@ public DataCallHierarchy() {
 	 * @throws JavaModelException
 	 */
 	public Set<IMethod> searchProject(DataNode node, String direction) throws JavaModelException {
-		Set<IMethod> results = null;
+		Set<IMethod> results = new HashSet<IMethod>();
+		//inClass = false;
 		if (direction.equals(Finder.UP)) {
 			Method up = node.getDeclarationMethod();
 			if(up != null) {
@@ -87,24 +89,22 @@ public Set<IMethod> searchProject(DataNode node, String direction) throws JavaMo
 		}
 		else if (direction.equals(Finder.DOWN)) {
 			ArrayList<String> down = new ArrayList<String>();
+			Set<IMethod> searchDown = new HashSet<IMethod>();
 			for(DataNode dn: Finder.getInstance().getOccurrences(node.getPosition())) {
 				if(dn.getInvocationMethod() != null) {
 					down.add(dn.getInvocationMethod().getName().getIdentifier());
+					searchDown.addAll(search(dn, dn.getInvocationMethod(), Finder.DOWN));
 				}
 			}
-			if(down != null && !down.isEmpty()) {
-				if( node.getInvocationMethod() != null ) {
-					Set<IMethod> searchDown = new HashSet<IMethod>();
-					Set<IMethod> temp = search(node, node.getInvocationMethod(), Finder.DOWN);
-					for(IMethod i: temp) {
-						if(down.contains(i.getElementName())) {
-							searchDown.add(i);
-						}
-					}
-					results = searchDown;
+			for(IMethod s: searchDown) {
+				if(down.contains(s.getElementName())) {
+					results.add(s);
 				}
 			}
 		}
+		if(results.isEmpty()) {
+			return null;
+		}
 		return results;
 	}
 	/**
@@ -151,15 +151,11 @@ public Set<IMethod> search(DataNode node, Method methodName, String direction) t
 		    methods = callGen.getCallersOf(m);
 	    }
 	    else {
-	    	if(!inClass) {
-			    Set<IMethod> temp = callGen.getCalleesOf(m);
-			    for(IMethod i: temp) {
-			    	methods.add(i);
-			    }
-	    	}
-	    	else {
-	    		methods.add(m);
-	    	}
+	    	Set<IMethod> temp = callGen.getCalleesOf(m);
+			for(IMethod i: temp) {
+			  	methods.add(i);
+			}
+	    	methods.add(m);
 	    }
 	    return methods;
 	}
@@ -180,7 +176,7 @@ private IMethod findMethod(IType type, String methodName) throws JavaModelExcept
 	    {
 	        IMethod imethod = methods[i];
 	        if (imethod.getElementName().equals(methodName)) {
-	        	inClass = true;
+	        	//inClass = true;
 	            theMethod = imethod;
 	        }
 	    }

dataTool/src/dataTool/annotations/LinkAnnotation.java

@@ -47,6 +47,7 @@
 public class LinkAnnotation extends Annotation implements ISelfDrawingAnnotation {
 
 	private DataNode linkNode;
+	private static DataNode previousNode = null;
 	private static ASTNode searchResult;
 	public static Set<IMethod> searchResultsUp;
 	public static Set<IMethod> searchResultsDown;
@@ -60,7 +61,7 @@ public class LinkAnnotation extends Annotation implements ISelfDrawingAnnotation
 	 * Function to add link annotations to methods of parameters
 	 */
 	public void draw(GC gc, StyledText textWidget, int offset, int length) {		
-		StyleRange style = new StyleRange();
+		final StyleRange style = new StyleRange();
 		style.start = offset;
 		style.length = length;
 		style.underline = true;
@@ -80,6 +81,11 @@ public void mouseDown(MouseEvent arg0) {
 
 			@Override
 			public void mouseUp(MouseEvent arg0) {
+				if(linkNode == previousNode) {
+					//Occasionally click registers twice and messes up direction the link
+					return;
+				}
+				previousNode = linkNode;
 				int click = textWidget.getOffsetAtLocation(new Point(arg0.x,arg0.y));
 				if(click >= style.start && click <= style.start+style.length && load){
 					load = false;
@@ -106,7 +112,7 @@ public void mouseUp(MouseEvent arg0) {
 							}
 						}
 					}
-					else if(linkNode.getDeclarationMethod() != null) {
+					else if(linkNode.getDeclarationMethod() != null && searchResultsUp != null) {
 						try {
 							search = searchResultsUp.toArray();
 							im = (IMethod)search[0];