More updates to fix switching between files and fixed a bug in down search when method is invoked in the same class.

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -61,7 +61,6 @@ public class AnnotationManager implements ISelectionChangedListener {
 	 * @param anEditor
 	 */
 	public AnnotationManager(AbstractDecoratedTextEditor anEditor) {
-		isActive = false;
 		parseCU(anEditor);
 		sourceViewer = EclipseHacks.getSourceViewer(anEditor);
 		painter = new ProgramNavigationPainter(sourceViewer);
@@ -90,8 +89,6 @@ public void selectionChanged(ITextSelection selection) {
 					ShowDataInBreadcrumbAction crumbs = new ShowDataInBreadcrumbAction(j, activePage);
 					crumbs.run();	
 				}
-				upBreadcrumb.setText(null);
-				downBreadcrumb.setText(null);
 				DataCallHierarchy call = new DataCallHierarchy();
 				Set<IMethod> searchUp = null;
 				Set<IMethod> searchDown = null;
@@ -105,8 +102,7 @@ public void selectionChanged(ITextSelection selection) {
 						addLinkAnnotation(one);
 					}
 				}
-				Set<String> test = new HashSet<String>();
-				test.add(one.getValue());
+
 				//Adds all occurrences of data node off screen
 				ArrayList<Object> textUp = new ArrayList<Object>();
 				ArrayList<Object> textDown = new ArrayList<Object>();
@@ -242,6 +238,12 @@ public void dispose() {
 		painter.dispose();
 		currentSearch = null;
 	}
+	
+	public void deactivate() {
+		isActive = false;
+		upBreadcrumb.dispose();
+		downBreadcrumb.dispose();
+	}
 
 	public void selectionChanged(SelectionChangedEvent event) {
 		selectionChanged((ITextSelection) event.getSelection());

dataTool/src/dataTool/DataCallHierarchy.java

@@ -64,6 +64,7 @@ public class DataCallHierarchy {
 	private String className;
 	private String location;
 	private ICompilationUnit cUnit;
+	private boolean inClass = false;
 
 	public DataCallHierarchy() {
 
@@ -95,7 +96,9 @@ 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);
 						}
@@ -150,10 +153,15 @@ public Set<IMethod> search(DataNode node, Method methodName, String direction) t
 		    methods = callGen.getCallersOf(m);
 	    }
 	    else {
-		    Set<IMethod> temp = callGen.getCalleesOf(m);
-		    for(IMethod i: temp) {
-		    	methods.add(i);
-		    }
+	    	if(!inClass) {
+			    Set<IMethod> temp = callGen.getCalleesOf(m);
+			    for(IMethod i: temp) {
+			    	methods.add(i);
+			    }
+	    	}
+	    	else {
+	    		methods.add(m);
+	    	}
 	    }
 	    return methods;
 	}
@@ -174,6 +182,7 @@ private IMethod findMethod(IType type, String methodName) throws JavaModelExcept
 	    {
 	        IMethod imethod = methods[i];
 	        if (imethod.getElementName().equals(methodName)) {
+	        	inClass = true;
 	            theMethod = imethod;
 	        }
 	    }
@@ -200,7 +209,7 @@ public IMethod getCurrentMethod(int offset) {
 			try {
 				selected = ((ICompilationUnit) elem).getElementAt(offset);
 			} catch (JavaModelException e) {
-				// TODO Auto-generated catch block
+				// Auto-generated catch block
 				e.printStackTrace();
 			}
 		    if (selected != null && selected.getElementType() == IJavaElement.METHOD) {