Latest version of the tool with new user interface for issue #8. This version does not work yet.

Author: Chris

dataTool/.classpath

@@ -8,5 +8,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src_tests"/>
+	<classpathentry kind="lib" path="C:/Users/Chris/Documents/Classes/NC State/research/org.eclipse.ui.articles.views/views.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dataTool/META-INF/MANIFEST.MF

@@ -17,6 +17,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.resources,
  org.eclipse.ui.workbench,
  org.eclipse.equinox.registry,
- org.eclipse.jdt.ui
+ org.eclipse.jdt.ui,
+ org.eclipse.ui.ide;bundle-version="3.11.0",
+ org.eclipse.ui.ide.application;bundle-version="1.1.0",
+ org.eclipse.text
 Eclipse-LazyStart: true
 Import-Package: org.eclipse.jdt.internal.ui.search

dataTool/plugin.xml

@@ -17,13 +17,12 @@
                icon="icons/data.gif"
                id="dataTool.action1"
                label="Find EOS"
-               style="toggle"
+               style="menu"
                toolbarPath="TempGroup"
                tooltip="Highlights flow of data within your code"/>
       </actionSet>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
    </extension>
-
 </plugin>

dataTool/src/dataTool/DataCallHierarchy.java

@@ -1,8 +1,10 @@
 package dataTool;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IWorkspaceRoot;
@@ -47,11 +49,19 @@ public class DataCallHierarchy {
 	private String className;
 	private String location;
 	private ICompilationUnit cUnit;
+	private HashMap<String, ArrayList<DataLink>> results;
+	
+	public String goTo = null;
+	public int goToOffset;
 
 	public DataCallHierarchy() {
 
 	}
 
+	public void setGoTo(int offset) {
+		goToOffset = offset;
+	}
+	
 	public HashSet<IMethod> getCalls(IMethod m) {
 		Finder f = Finder.getInstance();
 		if(f instanceof UpFinder) {
@@ -123,11 +133,17 @@ private IMethod getIMethodFromMethodWrapper(MethodWrapper m) {
 	 * @returns String of next method name
 	 * @throws CoreException
 	 */
-	public ArrayList<DataLink> searchProject(String method) throws CoreException {
-		ArrayList<DataLink> results = new ArrayList<DataLink>();
+	public HashMap<String, ArrayList<DataLink>> searchProject(String method) throws CoreException {
+		results = new HashMap<String, ArrayList<DataLink>>();
 		String projectName = EnableNavigationAction.project;
 		String path = EnableNavigationAction.path;
-		String projectPath = path.substring(path.indexOf("/src/")+5,path.lastIndexOf("/")).replace("/", ".");
+		String projectPath;
+		if(path.contains("/src/")) {
+			projectPath = path.substring(path.indexOf("/src/")+5,path.lastIndexOf("/")).replace("/", ".");
+		}
+		else {
+			projectPath = path;
+		}
 		String projectFile = EnableNavigationAction.file;
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
 	    IProject project = root.getProject(projectName);
@@ -139,46 +155,27 @@ public ArrayList<DataLink> searchProject(String method) throws CoreException {
 	    cUnit = frag.getCompilationUnit(projectFile);
 	    IType type = cUnit.getType(projectFile.replace(".java", ""));
 	    HashSet<IMethod> calls = null;
+		ArrayList<DataLink> links = new ArrayList<DataLink>();
 	    for(IMethod im: type.getMethods()){
 	    	if(im.getElementName().equals(method)) {
 	    		calls = getCalls(im);
 	    		for(IMethod mem: calls) {
-	    			//results += mem.getElementName() + "\n";
-	    			results.add(new DataLink(mem.getElementName(), mem.toString()));
+	    			links.add(new DataLink(mem, mem.getElementName(), mem.getPath().toString()));
 	    			searchMatch = mem.toString();
 	    		}
 	    	}
 	    }
+	    results.put(Finder.UP, links);
 	    if(calls == null) {
-	    	results.add(processRootDirectory(method));
+	    	results.put(Finder.DOWN, processRootDirectory(method));
 	    }
 	    return results;
 	}
 
-	/**
-	 * Function to parse the output from the search function above
-	 * @param s: String of search results
-	 */
-	private void parseSearchResults(String s) {
-		System.out.println(s);
-		method = s.substring(s.indexOf(" ")+1,s.indexOf("("));
-		parameters = s.substring(s.indexOf("("),s.indexOf(")")+1);
-		String temp[] = s.substring(s.indexOf("[")).split("\\[in ");
-		String tempLoc = "";
-		for(int i = 1; i < temp.length; i++) {
-			String str = temp[i].trim().replace("[Working copy] ","").replace("]","");
-			if(i==1) {
-				className = str;
-				continue;
-			}
-			tempLoc = str+"."+tempLoc;
-		}
-		location = tempLoc.substring(0,tempLoc.length()-1);
-	}
-	
-	private DataLink processRootDirectory(String method) throws JavaModelException,CoreException {
+	private ArrayList<DataLink> processRootDirectory(String method) throws JavaModelException,CoreException {
 		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();		
 		IProject[] projects = root.getProjects();
+		ArrayList<DataLink> links = new ArrayList<DataLink>();
 
 		// process each project
 		for (IProject project : projects) {
@@ -199,7 +196,7 @@ private DataLink processRootDirectory(String method) throws JavaModelException,C
 								for (IMethod imethod : methods) {
 									if(imethod.getElementName().equals(method)) {
 										searchMatch = method.toString();
-										return new DataLink(imethod.getElementName(), imethod.toString());
+										links.add(new DataLink(imethod, imethod.getElementName(),imethod.getPath().toString()));
 									}
 								}
 							}
@@ -209,6 +206,10 @@ private DataLink processRootDirectory(String method) throws JavaModelException,C
 			}
 
 		}
-		return new DataLink(DataLink.INVALID, DataLink.INVALID_DESC);
+		if(links.isEmpty())
+		{
+			links.add(new DataLink(null, DataLink.INVALID, DataLink.INVALID_DESC));
+		}
+		return links;
 	}
 }

dataTool/src/dataTool/DataNode.java

@@ -100,26 +100,23 @@ public String getType() {
 	 * @returns string method
 	 */
 	public String getMethod() {
-		if(isParameter()) {
+		if(isParameter(index)) {
 			return this.method;
 		}
 		return null;
 	}
 
 	/**
-	 * Checks to see if current node is a parameter or used as one. Used in call hierarchy search
-	 * for entire project.
+	 * Checks to see if current node is a parameter, only want to display box when actual
+	 * param is selected
 	 * @returns true if node is a parameter, else false
 	 */
-	public boolean isParameter() {
+	public boolean isParameter(int pos) {
 		Finder f = Finder.getInstance();
-		if(f.getFlowDirection().equals(Finder.UP)) {
-			return type.equals(PARAM_UP);
+		if(pos < index || pos > index+length) {
+			return false;
 		}
-		else if(f.getFlowDirection().equals(Finder.DOWN)) {
-			return type.equals(PARAM_DOWN);
-		}
-		return false;
+		return (type.equals(PARAM_UP) || (type.equals(PARAM_DOWN)));
 	}
 
 }

dataTool/src/dataTool/DownFinder.java

@@ -154,14 +154,4 @@ public boolean isUp(String var, int start) {
 		}
 		return false;
 	}
-
-	public static String searchProjectDown(String project, String method) {
-		//TODO
-		/*
-		 * http://stackoverflow.com/questions/13980726/using-search-engine-to-implement-call-hierarchy-getting-all-the-methods-that-in
-		 */
-		IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();
-	    IProject iProject= root.getProject(project);
-	    return "";
-	}
 }

dataTool/src/dataTool/EnableNavigationAction.java

@@ -1,4 +1,5 @@
 package dataTool;
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IEditorPart;
@@ -8,6 +9,8 @@
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditor;
 
+import dataTool.ui.NavigationBox;
+
 /**
  * An action that enables the statement helper
  * 
@@ -46,8 +49,9 @@ private void enable(IEditorPart activeEditor) {
 		project = path[0];
 		file = activeEditor.getTitle();
 		this.path = activeEditor.getEditorInput().toString().replace("org.eclipse.ui.part.FileEditorInput(", "").replace(")","");
-		if(page.getActiveEditor()!=null)
+		if(page.getActiveEditor()!=null) {
 			annotationManager = new AnnotationManager((AbstractDecoratedTextEditor)activeEditor);
+		}
 	}
 
 	public void init(IWorkbenchWindow window) {
@@ -91,6 +95,10 @@ public void run(IAction action) {
 		}
 	}
 
+	public boolean isEnabled() {
+		return isEnabled;
+	}
+	
 	public void selectionChanged(IAction action, ISelection selection) {
 		//do nothing
 	}

dataTool/src/dataTool/Finder.java

@@ -19,14 +19,34 @@ public class Finder {
 	private static String findDirection = UP; //default direction is up
 	private static Finder currentFinder;
 	private static Color currentColor;
+	private String goToName = null;
+	private int goToOffset = -1;
 
 	public Finder () {
 		//Do nothing
 	}
 
-	public Finder (String s) {
-		if (s.equals(UP) || s.equals(DOWN))
-			setFlowDirection(s);
+	public void setGoToIndex(int offset) {
+		System.out.println(offset + " off");
+		goToOffset = offset;
+	}
+	
+	public void setGoToFunc(String name) {
+		goToName = name;
+	}
+	
+	public int getGoToIndex() {
+		if(goToOffset > 0) {
+			return goToOffset;
+		}
+		return -1;
+	}
+		
+	public String getGoToFunc() {
+		if(goToName != null) {
+			return goToName;
+		}
+		return null;
 	}
 
 	public ArrayList<DataNode> getOccurrences(String data) {
@@ -45,7 +65,7 @@ else if(findDirection.equals(DOWN)) {
 	 * Controls which flow the tool will navigate to show data flow
 	 * @param s: Direction for flow display, required to be UP or DOWN
 	 */
-	public void setFlowDirection(String s) {
+	/*public void setFlowDirection(String s) {
 		if(s.equals(UP)) {
 			findDirection = s;
 			currentFinder = UpFinder.getInstance();
@@ -60,7 +80,7 @@ else if(s.equals(DOWN)) {
 			//something went very wrong...
 			findDirection = null;
 		}
-	}
+	}*/
 
 	/**
 	 * Function to return the current direction of the flow navigation.

dataTool/src/dataTool/Visitor.java

@@ -115,6 +115,7 @@ public static void parseData() {
 		char[] code = source.toCharArray();
 		upFinder = UpFinder.getInstance();
 		downFinder = DownFinder.getInstance();
+		Finder finder = Finder.getInstance();
 		ASTParser parser = ASTParser.newParser(AST.JLS3);
 		parser.setSource(code);
 		parser.setKind(ASTParser.K_COMPILATION_UNIT);
@@ -131,13 +132,12 @@ public boolean visit(VariableDeclarationFragment vdf) {
 		        return true;
 		    }
 
-		    public boolean visit(ConstructorInvocation ci) {
-		    	System.out.println(ci.toString());
-		    	return true;
-		    }
 		    public boolean visit(MethodDeclaration md) {
 		    	if (!seenMethod.contains(md.getName())) {
 		    		seenMethod.add(md.getName());
+		    		if(md.getName().getIdentifier().equals(finder.getGoToFunc())) {
+	            		finder.setGoToIndex(md.getStartPosition());
+	            	}
 		    		String param = "";
 		    		String[] array = new String[md.parameters().size()];
 		    		int i = 0;
@@ -147,7 +147,6 @@ public boolean visit(MethodDeclaration md) {
 		    			param = ((SingleVariableDeclaration) o).getName().getIdentifier();
 		    			data.add(param);
 		    			upFinder.add(param, (SingleVariableDeclaration) o, DataNode.PARAM_UP);
-		    			findOccurrences(param);
 		    		}
 
 		    		md.accept(new ASTVisitor() {
@@ -214,6 +213,9 @@ public boolean visit(TryStatement ts) {
 
 			            public boolean visit(MethodInvocation mi) {
 			            	List<ASTNode> args = mi.arguments();
+			            	if(finder.getFlowDirection().equals(Finder.UP) && mi.getName().getIdentifier().equals(finder.getGoToFunc())) {
+			            		finder.setGoToIndex(mi.getStartPosition());
+			            	}
 			            	for(ASTNode arg: args) {
 			            		if(data.contains(arg.toString())) {
 			            			downFinder.add(arg.toString(), arg.getStartPosition(), DataNode.PARAM_DOWN, mi.getName().getIdentifier());