Updates for issue #29

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -68,7 +68,11 @@ public AnnotationManager(AbstractDecoratedTextEditor anEditor) {
 		sourceViewer.addPainter(painter);
 		selectionChanged((ITextSelection) painter.getSelection());
 	}
-
+	
+	/**
+	 * Handles updating the annotations and searching when user clicks a variable
+	 * @param selection: current text selected
+	 */
 	public void selectionChanged(ITextSelection selection) {
 		painter.removeAllAnnotations();
 		try {
@@ -122,9 +126,11 @@ else if(dn.getStartPosition() > sourceViewer.getBottomIndexEndOffset()) {
 				if(searchUp != null) {
 					textUp.addAll(searchUp);
 					((EditorBreadcrumb)upBreadcrumb).setSearchMethod(call.getCurrentMethod(one.getStartPosition()));
+					((EditorBreadcrumb)upBreadcrumb).setSearchIndex(one.getParameterIndex());
 				}
 				if(searchDown != null) {
 					textDown.addAll(searchDown);
+					((EditorBreadcrumb)downBreadcrumb).setSearchIndex(one.getParameterIndex());
 				}
 				upBreadcrumb.setText(textUp);
 				downBreadcrumb.setText(textDown);
@@ -180,7 +186,7 @@ private ASTNode meet(ASTNode from, ASTNode to) {
 	private boolean isAlreadyAnnotated(int start, int end) {
 
 		Position headPosition = painter.getPosition(highlightAnnotation);
-
+		
 		if (headPosition != null)
 			return headPosition.getOffset() == start && headPosition.getOffset() + headPosition.getLength() == end;
 
@@ -227,7 +233,7 @@ private void addAnnotationsAt(int statementStart, int length, boolean isHighligh
 
 	public void removeAnnotations() {
 		try {
-			if (highlightAnnotation != null) {
+			if (highlightAnnotation != null || linkAnnotation != null) {
 				painter.removeAllAnnotations();
 			}
 		} catch (Exception ignore) {

dataTool/src/dataTool/DataCallHierarchy.java

@@ -96,13 +96,6 @@ else if (direction.equals(Finder.DOWN)) {
 				if( node.getInvocationMethod() != null ) {
 					Set<IMethod> searchDown = new HashSet<IMethod>();
 					Set<IMethod> temp = search(node, node.getInvocationMethod(), Finder.DOWN);
-					System.out.println(down);
-					for(IMethod i: temp) {
-						System.out.println("  "+i.getElementName());
-						if(down.contains(i.getElementName())) {
-							searchDown.add(i);
-						}
-					}
 					results = searchDown;
 				}
 			}

dataTool/src/dataTool/Visitor.java

@@ -194,15 +194,17 @@ public boolean visit(MethodInvocation mi) {
 						}
 						List<Expression> args = mi.arguments();
 						Method methodInvocation = new Method( mi.getName());
-						
 						List<DataNode> nodeArgs = new ArrayList<DataNode>();
+						int i = -1;
 						for( Expression e : args ) {
 							if( e.getNodeType() == ASTNode.SIMPLE_NAME ) {
+								i++;
 								SimpleName n = (SimpleName) e;
 								addedNode = getNodeFromName(n);
 								// TODO shouldn't need a check here
 								if( addedNode != null ) {
 									addedNode.setInvocationMethod(methodInvocation);
+									addedNode.setParameterIndex(i);
 									nodeArgs.add( addedNode );
 								}
 							} else {

dataTool/src/dataTool/annotations/LinkAnnotation.java

@@ -23,6 +23,8 @@
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 import org.eclipse.ui.texteditor.ITextEditor;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.ILocalVariable;
 import org.eclipse.jdt.core.IMethod;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.AST;
@@ -51,7 +53,7 @@ public class LinkAnnotation extends Annotation implements ISelfDrawingAnnotation
 	public static Set<IMethod> searchResultsDown;
 	public String searchMethod = "";
 	private IEditorPart editor = null;
-	private boolean load = true;
+	private static boolean load = true;
 
 	public static final String INVALID = "Method not in scope of project.";
 
@@ -90,8 +92,14 @@ public void mouseUp(MouseEvent arg0) {
 							im = (IMethod) o;
 							if(im.getElementName().equals(linkNode.getInvocationMethod().getName().getIdentifier())) {
 								try {
-									JavaUI.openInEditor(im, true, true);
-									load = true;
+									if(im.getParameters().length > 0) {
+										editor = JavaUI.openInEditor(im.getParameters()[linkNode.getParameterIndex()], true, true);
+										load = true;
+									}
+									else {
+										JavaUI.openInEditor(im, true, true);
+										load = true;
+									}
 								} catch (PartInitException | JavaModelException e) {
 									// Auto-generated catch block
 									e.printStackTrace();
@@ -104,13 +112,20 @@ else if(linkNode.getDeclarationMethod() != null) {
 							search = searchResultsUp.toArray();
 							im = (IMethod)search[0];
 							searchMethod = linkNode.getDeclarationMethod().getName().getIdentifier();
-							editor = JavaUI.openInEditor(im, true, true);
-							if(editor != null) {
-								String code = JDTUtils.getCUSource((AbstractTextEditor) editor);
-								lineSearch(code.toCharArray(), im);
-								goToLine(editor);
+							if(im.getParameters().length > 0) {
+								editor = JavaUI.openInEditor(im.getParameters()[linkNode.getParameterIndex()], true, true);
 								load = true;
 							}
+							else {
+								editor = JavaUI.openInEditor(im, true, true);
+								if(editor != null) {
+									String code = JDTUtils.getCUSource((AbstractTextEditor) editor);
+									lineSearch(code.toCharArray(), im);
+									goToLine(editor);
+									load = true;
+								}
+							}
+							
 						} catch (Exception e) {
 							// Auto-generated catch block
 							e.printStackTrace();
@@ -138,12 +153,13 @@ public boolean visit(MethodInvocation m) {
 					}
 					return true;
 				}
-				public boolean visit(ClassInstanceCreation c) {
+				//TODO if we need it
+				/*public boolean visit(ClassInstanceCreation c) {
 					if(c.getType().toString().equals(searchMethod)) {
 						searchResult = c;
 					}
 					return true;
-				}
+				}*/
 			});
 				return true;
 		}
@@ -163,6 +179,7 @@ private static void goToLine(IEditorPart editorPart) {
 		  ITextEditor editor = (ITextEditor) editorPart;
 		  IDocument document = editor.getDocumentProvider().getDocument(editor.getEditorInput());
 		  if (document != null && searchResult != null) {
+			  //searchResult.
 		    	editor.selectAndReveal(searchResult.getStartPosition(), searchResult.getLength());
 		  }
 		}

dataTool/src/dataTool/annotations/ProgramNavigationPainter.java

@@ -60,7 +60,6 @@ public class ProgramNavigationPainter extends AnnotationPainter {
 	private Set<ISelectionChangedListener> listeners = new HashSet<ISelectionChangedListener>();
 	private SourceViewer viewer;
 	private Map<ISelfDrawingAnnotation, Position> anns = new HashMap<ISelfDrawingAnnotation, Position>();
-	private Map<ISelfDrawingAnnotation, Position> linkAnns = new HashMap<ISelfDrawingAnnotation, Position>();
 	private boolean isActive = false;
 	private boolean painted = false;
 
@@ -151,9 +150,7 @@ public void removeAnnotation(ISelfDrawingAnnotation ann) {
 
 	public void removeAllAnnotations() {
 		Collection<Position> positions = new ArrayList<Position>(anns.values());
-		positions.addAll(linkAnns.values());
 		anns.clear();
-		linkAnns.clear();
 		fireAnnotationChangedEvent(positions);
 	}