Version of tool used for test run of study with Tyler

Author: Chris

dataTool/.classpath

@@ -8,6 +8,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="src" path="src_tests"/>
-	<classpathentry exported="true" kind="lib" path="org.eclipse.jdt.internal.ui.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

dataTool/.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+resolve.requirebundle=false

dataTool/META-INF/MANIFEST.MF

@@ -28,5 +28,3 @@ Import-Package: org.eclipse.jdt.internal.ui.search
 Export-Package: dataTool,
  dataTool.annotations,
  dataTool.ui
-Bundle-ClassPath: org.eclipse.jdt.internal.ui.jar,
- .

dataTool/build.properties

@@ -3,5 +3,4 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               icons/,\
-               org.eclipse.jdt.internal.ui.jar
+               icons/

dataTool/src/dataTool/AnnotationManager.java

@@ -68,19 +68,15 @@ 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 {
 			DataNode one = getNode(selection.getOffset());
 			Finder finder = Finder.getInstance();
 			if(one != null) {
 				addAnnotation(one);
-				currentSearch = one.getBinding();
+				currentSearch = one.getKey();
 				IWorkbenchPage activePage = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
 				IEditorPart activeEditor = activePage.getActiveEditor();
 				JavaEditor j = (JavaEditor) activeEditor;
@@ -96,20 +92,18 @@ public void selectionChanged(ITextSelection selection) {
 				DataCallHierarchy call = new DataCallHierarchy();
 				Set<IMethod> searchUp = null;
 				Set<IMethod> searchDown = null;
-				if((finder.upSearch(one) != null || finder.downSearch(one) != null || 
-						one.getInvocationMethod() != null || one.getDeclarationMethod() != null) && currentSearch != null) {
+				if((finder.upSearch(one) != null || finder.downSearch(one) != null || one.getInvocationMethod() != null) && currentSearch != null) {
 					searchUp = call.searchProject(one, Finder.UP);
 					searchDown = call.searchProject(one, Finder.DOWN);
-					linkAnnotation.searchResultsDown = searchDown;
-					linkAnnotation.searchResultsUp = searchUp;
-					linkAnnotation.setDataNode(one);
-					addLinkAnnotation(one);
 				}
 
 				//Adds all occurrences of data node off screen
+				linkAnnotation.searchResultsDown = searchDown;
+				linkAnnotation.searchResultsUp = searchUp;
+				
 				ArrayList<Object> textUp = new ArrayList<Object>();
 				ArrayList<Object> textDown = new ArrayList<Object>();
-				for(DataNode dn: finder.getOccurrences(one.getValue(), new Position(one.getStartPosition(), one.getLength()))) {
+				for(DataNode dn: finder.getOccurrences(one.getPosition())) {
 					int[] offScreen = new int[3];
 					int line = sourceViewer.widgetLineOfWidgetOffset(dn.getStartPosition())+1;
 					offScreen[0] = line;
@@ -121,15 +115,25 @@ public void selectionChanged(ITextSelection selection) {
 					else if(dn.getStartPosition() > sourceViewer.getBottomIndexEndOffset()) {
 						textDown.add(offScreen);
 					}
+					if(dn.getDeclarationMethod() != null) {
+						linkAnnotation.setDataNode(dn);
+						linkAnnotation.draw(null, sourceViewer.getTextWidget(), 
+								dn.getDeclarationMethod().getName().getStartPosition(), dn.getDeclarationMethod().getName().getLength());
+					}
+					if(dn.getInvocationMethod() != null) {
+						linkAnnotation.setDataNode(dn);
+						linkAnnotation.draw(null, sourceViewer.getTextWidget(), dn.getInvocationMethod().getName().getStartPosition(), 
+								dn.getInvocationMethod().getName().getLength());
+					}
 				}
 				if(searchUp != null) {
 					textUp.addAll(searchUp);
-					((EditorBreadcrumb)upBreadcrumb).setSearchMethod(call.getCurrentMethod(one.getStartPosition()));
 					((EditorBreadcrumb)upBreadcrumb).setSearchIndex(one.getParameterIndex());
+					((EditorBreadcrumb)upBreadcrumb).setSearchMethod(call.getCurrentMethod(one.getStartPosition()));
 				}
 				if(searchDown != null) {
-					textDown.addAll(searchDown);
 					((EditorBreadcrumb)downBreadcrumb).setSearchIndex(one.getParameterIndex());
+					textDown.addAll(searchDown);
 				}
 				upBreadcrumb.setText(textUp);
 				downBreadcrumb.setText(textDown);
@@ -185,7 +189,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;
 
@@ -232,7 +236,7 @@ private void addAnnotationsAt(int statementStart, int length, boolean isHighligh
 
 	public void removeAnnotations() {
 		try {
-			if (highlightAnnotation != null || linkAnnotation != null) {
+			if (highlightAnnotation != null) {
 				painter.removeAllAnnotations();
 			}
 		} catch (Exception ignore) {

dataTool/src/dataTool/DataCallHierarchy.java

@@ -87,7 +87,7 @@ public Set<IMethod> searchProject(DataNode node, String direction) throws JavaMo
 		}
 		else if (direction.equals(Finder.DOWN)) {
 			ArrayList<String> down = new ArrayList<String>();
-			for(DataNode dn: Finder.getInstance().getOccurrences(node.getValue(), new Position(node.getStartPosition(),node.getLength()))) {
+			for(DataNode dn: Finder.getInstance().getOccurrences(node.getPosition())) {
 				if(dn.getInvocationMethod() != null) {
 					down.add(dn.getInvocationMethod().getName().getIdentifier());
 				}
@@ -96,6 +96,11 @@ 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);
+					for(IMethod i: temp) {
+						if(down.contains(i.getElementName())) {
+							searchDown.add(i);
+						}
+					}
 					results = searchDown;
 				}
 			}

dataTool/src/dataTool/DataNode.java

@@ -6,6 +6,9 @@
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 import org.eclipse.jdt.core.dom.VariableDeclaration;
+import org.eclipse.jface.text.Position;
+
+import jdk.internal.org.objectweb.asm.tree.analysis.Value;
 
 /**
  * DataNode class that creates objects for the data we find and want to highlight.
@@ -22,71 +25,44 @@ public class DataNode implements Comparable {
 	final public static String FOR_VAR = "variableFor";
 	final public static String VAR = "variable";
 
-	private String binding;
 	private String key;
-	private String value;
-	private int index;
+	private String name;
+	private int startPosition;
 	private int length;
 	private int parameterIndex;
 	private SimpleName sn;
 	private String type;
-	private String signature;
 	private Method declarationMethod;
 	private Method invocationMethod;
-	private boolean isHighlighted;
+	private Position position;
 
-//	/**
-//	 * Constructor to create DataNodes with just values, mainly for DownFinder
-//	 * @param val= Current variable name
-//	 * @param start= start position of the current variable
-//	 */
-//	public DataNode (String val, int start, String nodeType, Method call) {
-//		
-//		
-//		value = val;
-//		index = start;
-//		length = val.length();
-//		type = nodeType;
-//		method = call;
-//		if( method != null ) {
-//			signature = method.getSignature() + "." + value;
-//		} else {
-//			signature = "null";
-//		}
-//	}
-	
 	public DataNode( SimpleName sn ) {
 		this.sn = sn;
-		value = sn.getFullyQualifiedName();
-		index = sn.getStartPosition();
-		length = value.length();
-		isHighlighted = false;
+		name = sn.getFullyQualifiedName();
+		startPosition = sn.getStartPosition();
+		length = name.length();
+		position = new Position( startPosition, length );
 		parameterIndex = -1;
 		this.key = sn.resolveBinding().getKey();
-		this.binding = sn.resolveBinding().toString();
 	}
 	public void setStartPosition( int i ) {
-		index = i;
+		startPosition = i;
 	}
 
 	/**
 	 * Gets the value of the data
 	 * @returns variable name
 	 */
 	public String getValue() {
-		return this.value;
-	}
-	
-	public String getBinding() {
-		return binding;
+		return this.name;
 	}
 
 	/**
 	 * Gets the start position of current data in the source code
 	 * @returns variable start position
 	 */
 	public int getStartPosition() {
-		return this.index;
+		return this.startPosition;
 	}
 
 	/**
@@ -115,16 +91,13 @@ public Method getInvocationMethod() {
 	public void setInvocationMethod( Method m ) {
 		invocationMethod = m;
 	}
-	public String getSignature() {
-		return this.signature;
-	}
 	/**
 	 * 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 isParameterSelected(int pos) {
-		if(pos < index || pos > index+length) {
+		if(pos < startPosition || pos > startPosition+length) {
 			return false;
 		}
 		return true;
@@ -137,11 +110,14 @@ public int compareTo(Object o) {
 		if( o == null || !( o instanceof DataNode ) ) {
 			return 1;
 		}
-		return index - ((DataNode)o).getStartPosition();
+		return startPosition - ((DataNode)o).getStartPosition();
 	}
 	@Override
 	public String toString() {
-		return binding;
+		return key;
+	}
+	public Position getPosition() {
+		return position;
 	}
 
-}
+}