Fixed issue #30- whenever a variable is clicked all declared and invoked methods using the data are displayed as linked.

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -96,15 +96,14 @@ public void selectionChanged(ITextSelection selection) {
 				DataCallHierarchy call = new DataCallHierarchy();
 				Set<IMethod> searchUp = null;
 				Set<IMethod> searchDown = null;
-				if((finder.upSearch(one) != null || finder.downSearch(one) != null || one.getInvocationMethod() != null) && currentSearch != null) {
+				if((finder.upSearch(one) != null || finder.downSearch(one) != null || 
+						one.getInvocationMethod() != null || one.getDeclarationMethod() != null) && currentSearch != null) {
 					searchUp = call.searchProject(one, Finder.UP);
 					searchDown = call.searchProject(one, Finder.DOWN);
-					if(one.isParameterSelected(selection.getOffset())) {
-						linkAnnotation.searchResultsDown = searchDown;
-						linkAnnotation.searchResultsUp = searchUp;
-						linkAnnotation.setDataNode(one);
-						addLinkAnnotation(one);
-					}
+					linkAnnotation.searchResultsDown = searchDown;
+					linkAnnotation.searchResultsUp = searchUp;
+					linkAnnotation.setDataNode(one);
+					addLinkAnnotation(one);
 				}
 
 				//Adds all occurrences of data node off screen

dataTool/src/dataTool/annotations/LinkAnnotation.java

@@ -197,6 +197,10 @@ public static StyleRange removeAnnotation(StyleRange old) {
 		return clear;
 	}
 
+	/**
+	 * Sets the data node to be the current selected text
+	 * @param node: Current DataNode selected by user
+	 */
 	public void setDataNode(DataNode node) {
 		linkNode = node;
 	}

dataTool/src/dataTool/annotations/ProgramNavigationPainter.java

@@ -62,6 +62,7 @@ public class ProgramNavigationPainter extends AnnotationPainter {
 	private Map<ISelfDrawingAnnotation, Position> anns = new HashMap<ISelfDrawingAnnotation, Position>();
 	private boolean isActive = false;
 	private boolean painted = false;
+	private LinkAnnotation linkAnnotation = new LinkAnnotation();
 
 
 	public ProgramNavigationPainter(SourceViewer v) {
@@ -228,6 +229,14 @@ public void paintControl(PaintEvent e) {
 				// Highlight all instances in class
 				for (DataNode node : finder.getOccurrences(word, p)) {
 					ann.draw(e.gc, viewer.getTextWidget(), node.getStartPosition(), node.getLength());
+					if(node.getInvocationMethod() != null) {
+						linkAnnotation.draw(e.gc, viewer.getTextWidget(), 
+								node.getInvocationMethod().getName().getStartPosition(), node.getInvocationMethod().getName().getLength());
+					}
+					if(node.getDeclarationMethod() != null) {
+						linkAnnotation.draw(e.gc, viewer.getTextWidget(), 
+								node.getDeclarationMethod().getName().getStartPosition(), node.getDeclarationMethod().getName().getLength());
+					}
 				}
 			}
 		}