Updates for issues #23/27 and made changes so that plugin will stay active when switching between files.

Author: Chris

dataTool/src/dataTool/AnnotationManager.java

@@ -61,9 +61,8 @@ public class AnnotationManager implements ISelectionChangedListener {
 	 * @param anEditor
 	 */
 	public AnnotationManager(AbstractDecoratedTextEditor anEditor) {
-
+		isActive = false;
 		parseCU(anEditor);
-
 		sourceViewer = EclipseHacks.getSourceViewer(anEditor);
 		painter = new ProgramNavigationPainter(sourceViewer);
 		painter.addSelectionChangedListener(this);
@@ -72,7 +71,6 @@ public AnnotationManager(AbstractDecoratedTextEditor anEditor) {
 	}
 
 	public void selectionChanged(ITextSelection selection) {
-		System.out.println("selectionChanged");
 		painter.removeAllAnnotations();
 		try {
 			DataNode one = getNode(selection.getOffset());
@@ -85,12 +83,10 @@ public void selectionChanged(ITextSelection selection) {
 				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;
+					upBreadcrumb.setText(null);
+					downBreadcrumb.setText(null);
 					ShowDataInBreadcrumbAction crumbs = new ShowDataInBreadcrumbAction(j, activePage);
 					crumbs.run();	
 				}

dataTool/src/dataTool/EnableNavigationAction.java

@@ -7,9 +7,8 @@
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.internal.ui.JavaPlugin;
 import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
-import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.IBreadcrumb;
-import org.eclipse.jdt.internal.ui.javaeditor.ShowInBreadcrumbAction;
 import org.eclipse.jdt.internal.ui.javaeditor.ToggleBreadcrumbAction;
+import org.eclipse.jdt.internal.ui.javaeditor.breadcrumb.IBreadcrumb;
 import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -47,7 +46,7 @@ public class EnableNavigationAction implements IWorkbenchWindowActionDelegate {
 
 	//whether the listener is currently enabled
 	private boolean isEnabled = false;
-	
+		
 	public void dispose() {
 		if(annotationManager!=null)
 			annotationManager.dispose();
@@ -76,7 +75,15 @@ public void partActivated(IWorkbenchPart arg0) {
 			@Override
 			public void partBroughtToTop(IWorkbenchPart arg0) {
 				// Auto-generated method stub
-
+				arg0.getSite().getPage().activate(arg0);
+				try {
+					dispose();
+					isEnabled = false;
+					reset(arg0.getSite().getPage());
+				} catch (JavaModelException e) {
+					// Auto-generated catch block
+					e.printStackTrace();
+				}
 			}
 
 			@Override
@@ -94,16 +101,7 @@ public void partDeactivated(IWorkbenchPart arg0) {
 			@Override
 			public void partOpened(IWorkbenchPart arg0) {
 				// Auto-generated method stub
-				System.out.println("file opened");
-				arg0.getSite().getPage().activate(arg0);
-				try {
-					dispose();
-					isEnabled = false;
-					reset(arg0.getSite().getPage());
-				} catch (JavaModelException e) {
-					// Auto-generated catch block
-					e.printStackTrace();
-				}
+				
 			}
 
 		});
@@ -147,12 +145,6 @@ public void reset(IWorkbenchPage workbench) throws JavaModelException {
 			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

@@ -39,8 +39,7 @@
 import dataTool.DataNode;
 import dataTool.EnableNavigationAction;
 import dataTool.Finder;
-import dataTool.ui.NavigationDownBox;
-import dataTool.ui.NavigationUpBox;
+
 import edu.pdx.cs.multiview.jdt.util.JDTUtils;
 import edu.pdx.cs.multiview.jface.annotation.ISelfDrawingAnnotation;
 
@@ -104,23 +103,14 @@ else if(linkNode.getDeclarationMethod() != null) {
 						try {
 							search = searchResultsUp.toArray();
 							im = (IMethod)search[0];
-							try {
-								if(im.getSource() == null) {
-									JOptionPane.showMessageDialog(null, INVALID, "Error",JOptionPane.ERROR_MESSAGE);
-								}
-							} catch (HeadlessException | JavaModelException e1) {
-								// Auto-generated catch block
-								e1.printStackTrace();
+							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);
+								load = true;
 							}
-								searchMethod = linkNode.getDeclarationMethod().getName().getIdentifier();
-								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();
@@ -131,31 +121,7 @@ else if(linkNode.getDeclarationMethod() != null) {
 		});
 	}
 
-	/**
-	 * Searches for line of where method is invoked in new file
-	 * @param source: char[] of code
-	 * @param method: IMethod we're searching for
-	 */
-<<<<<<< HEAD
-	public static void openLink(IMethod i) {
-		IEditorPart editor = null;
-		try {
-			editor = JavaUI.openInEditor(i, true, true);
-		} catch (JavaModelException | PartInitException e) {
-			// Auto-generated catch block
-			e.printStackTrace();
-		}
-		if(editor != null) {
-			String code = JDTUtils.getCUSource((AbstractTextEditor) editor);
-			lineSearch(code.toCharArray(), i);
-			goToLine(editor);
-		}
-	}
-	
-	private static void lineSearch(char[] source, IMethod method) {
-=======
 	private void lineSearch(char[] source, IMethod method) {
->>>>>>> 9e7430d02c6f5eb51c986bd85f19126c29bb5e91
 		ASTParser parser = ASTParser.newParser(AST.JLS3);
 		parser.setSource(source);
 		parser.setKind(ASTParser.K_COMPILATION_UNIT);

dataTool/src/dataTool/annotations/SuggestedSelectionAnnotation.java

@@ -6,7 +6,6 @@
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 
-import dataTool.ui.NavigationUpBox;
 import edu.pdx.cs.multiview.jface.annotation.ISelfDrawingAnnotation;
 
 /**