Latest version of the tool, few minor issues to fix

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -14,6 +14,7 @@
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditorBreadcrumb;
 import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.EditorBreadcrumb;
 import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.IBreadcrumb;
 import org.eclipse.jface.action.Action;
@@ -71,24 +72,30 @@ public AnnotationManager(AbstractDecoratedTextEditor anEditor) {
 	}
 
 	public void selectionChanged(ITextSelection selection) {
+		System.out.println("selectionChanged");
 		painter.removeAllAnnotations();
 		try {
 			DataNode one = getNode(selection.getOffset());
 			Finder finder = Finder.getInstance();
 			if(one != null) {
 				addAnnotation(one);
-				currentSearch = one.getValue();
+				currentSearch = one.getBinding();
 				IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 				IEditorPart activeEditor = activePage.getActiveEditor();
-				System.out.println("down "+ one.getDeclarationMethod());
 				JavaEditor j = (JavaEditor) activeEditor;
 				upBreadcrumb = j.getBreadcrumb();
 				downBreadcrumb = j.getBreadcrumb2();
+				System.out.println(isActive+ " is active");
+				System.out.println(upBreadcrumb.isActive());
+				System.out.println(downBreadcrumb.isActive());
+				System.out.println(j.areBreadcrumbsActive());
 				if(!isActive) {
 					isActive = true;
 					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;
@@ -129,7 +136,6 @@ else if(dn.getStartPosition() > sourceViewer.getBottomIndexEndOffset()) {
 				}
 				upBreadcrumb.setText(textUp);
 				downBreadcrumb.setText(textDown);
-
 			}
 			else {
 				removeAnnotations();
@@ -230,7 +236,6 @@ private void addAnnotationsAt(int statementStart, int length, boolean isHighligh
 	public void removeAnnotations() {
 		try {
 			if (highlightAnnotation != null) {
-				// painter.removeAnnotation(highlightAnnotation);
 				painter.removeAllAnnotations();
 			}
 		} catch (Exception ignore) {
@@ -239,13 +244,10 @@ public void removeAnnotations() {
 
 	public void dispose() {
 		painter.dispose();
-		//dataBreadcrumb.dispose();
-		//isActive = false;
 		currentSearch = null;
 	}
 
 	public void selectionChanged(SelectionChangedEvent event) {
-		painter.removeAllAnnotations();
 		selectionChanged((ITextSelection) event.getSelection());
 	}
 }

dataTool/src/dataTool/EnableNavigationAction.java

@@ -93,7 +93,8 @@ public void partDeactivated(IWorkbenchPart arg0) {
 
 			@Override
 			public void partOpened(IWorkbenchPart arg0) {
-				// TODO Auto-generated method stub
+				// Auto-generated method stub
+				System.out.println("file opened");
 				arg0.getSite().getPage().activate(arg0);
 				try {
 					dispose();
@@ -132,6 +133,11 @@ public void selectionChanged(IAction action, ISelection selection) {
 		//do nothing
 	}
 
+	/**
+	 * Resets the plugin when user opens a new page
+	 * @param workbench
+	 * @throws JavaModelException
+	 */
 	public void reset(IWorkbenchPage workbench) throws JavaModelException {
 		IWorkbenchPage newPage;
 		if(workbench == null) {
@@ -140,6 +146,13 @@ public void reset(IWorkbenchPage workbench) throws JavaModelException {
 		else {
 			newPage = workbench;
 		}
+		JavaEditor editor = (JavaEditor)newPage.getActiveEditor();
+		IBreadcrumb top = editor.getBreadcrumb();
+		IBreadcrumb bottom = editor.getBreadcrumb2();
+		editor.showBreadcrumbs();
+		System.out.println(editor.getTitle());
+		top.setText(null);
+		bottom.setText(null);
         init(newPage.getWorkbenchWindow());
         run(null);
 	}

dataTool/src/dataTool/annotations/LinkAnnotation.java

@@ -51,6 +51,8 @@ public class LinkAnnotation extends Annotation implements ISelfDrawingAnnotation
 	public static Set<IMethod> searchResultsUp;
 	public static Set<IMethod> searchResultsDown;
 	public String searchMethod = "";
+	private IEditorPart editor = null;
+	private boolean load = true;
 
 	public static final String INVALID = "Method not in scope of project.";
 
@@ -68,33 +70,29 @@ public void draw(GC gc, StyledText textWidget, int offset, int length) {
 
 			@Override
 			public void mouseDoubleClick(MouseEvent arg0) {
-				mouseDown(arg0);
+				//mouseDown(arg0);
 			}
 
 			@Override
 			public void mouseDown(MouseEvent arg0) {
+				
+			}
+
+			@Override
+			public void mouseUp(MouseEvent arg0) {
 				int click = textWidget.getOffsetAtLocation(new Point(arg0.x,arg0.y));
-				boolean load = true;
-				if(click >= style.start && click <= style.start+style.length){
+				if(click >= style.start && click <= style.start+style.length && load){
+					load = false;
 					Object[] search;
 					IMethod im;
-					System.out.println("clicked");
 					if(linkNode.getInvocationMethod() != null) {
 						search = searchResultsDown.toArray();
 						for(Object o: search) {
 							im = (IMethod) o;
-							try {
-								if(im.getSource() == null) {
-									load = false;
-									JOptionPane.showMessageDialog(null, INVALID, "Error",JOptionPane.ERROR_MESSAGE);
-								}
-							} catch (HeadlessException | JavaModelException e1) {
-								// Auto-generated catch block
-								e1.printStackTrace();
-							}
-							if(load && im.getElementName().equals(linkNode.getInvocationMethod().getName().getIdentifier())) {
+							if(im.getElementName().equals(linkNode.getInvocationMethod().getName().getIdentifier())) {
 								try {
 									JavaUI.openInEditor(im, true, true);
+									load = true;
 								} catch (PartInitException | JavaModelException e) {
 									// Auto-generated catch block
 									e.printStackTrace();
@@ -108,36 +106,28 @@ else if(linkNode.getDeclarationMethod() != null) {
 							im = (IMethod)search[0];
 							try {
 								if(im.getSource() == null) {
-									load = false;
 									JOptionPane.showMessageDialog(null, INVALID, "Error",JOptionPane.ERROR_MESSAGE);
 								}
 							} catch (HeadlessException | JavaModelException e1) {
 								// Auto-generated catch block
 								e1.printStackTrace();
 							}
-							if(load) {
 								searchMethod = linkNode.getDeclarationMethod().getName().getIdentifier();
-								IEditorPart editor = JavaUI.openInEditor(im, true, true);
+								load = false;
+								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();
 						}
 					}
 				}
 			}
-
-			@Override
-			public void mouseUp(MouseEvent arg0) {
-				// Do nothing
-				
-			}
-			
 		});
 	}
 

dataTool/src/dataTool/ui/ShowDataInBreadcrumbAction.java

@@ -59,12 +59,11 @@ public ShowDataInBreadcrumbAction(JavaEditor editor, IWorkbenchPage wbpage) {
 	public void run() {
 		IBreadcrumb breadcrumb = fEditor.getBreadcrumb();
 		JavaEditorBreadcrumb j = (JavaEditorBreadcrumb)breadcrumb;
-		if (breadcrumb == null)
-			return;
 		IBreadcrumb breadcrumb2 = fEditor.getBreadcrumb2();
 		JavaEditorBreadcrumb j2 = (JavaEditorBreadcrumb)breadcrumb2;
-		if (breadcrumb2 == null)
+		if (breadcrumb2 == null || breadcrumb2 == null) {
 			return;
+		}
 
 		IPreferenceStore store= JavaPlugin.getDefault().getPreferenceStore();
 		store.setValue(getPreferenceKey(), true);