Resolved issue #18 again. Switching over to a key-based system.

Author: tralber2

dataTool/src/dataTool/DataNode.java

@@ -23,6 +23,7 @@ public class DataNode implements Comparable {
 	final public static String VAR = "variable";
 
 	private String binding;
+	private String key;
 	private String value;
 	private int index;
 	private int length;
@@ -61,6 +62,7 @@ public DataNode( SimpleName sn ) {
 		length = value.length();
 		isHighlighted = false;
 		parameterIndex = -1;
+		this.key = sn.resolveBinding().getKey();
 		this.binding = sn.resolveBinding().toString();
 	}
 	public void setStartPosition( int i ) {
@@ -127,7 +129,9 @@ public boolean isParameterSelected(int pos) {
 		}
 		return true;
 	}
-
+	public String getKey() {
+		return key;
+	}
 	@Override
 	public int compareTo(Object o) {
 		if( o == null || !( o instanceof DataNode ) ) {

dataTool/src/dataTool/Finder.java

@@ -179,6 +179,7 @@ private boolean isComment(String var, int index, String sourceCode) {
 	public TreeSet<DataNode> getOccurrences(String s, Position p) {
 		TreeSet<DataNode> returnList = new TreeSet<DataNode>();
 		String binding = null;
+		String bindingKey = null;
 		String key = null;
 
 		for (Entry<String, TreeSet<DataNode>> entry : map.entrySet()) {
@@ -193,14 +194,15 @@ public TreeSet<DataNode> getOccurrences(String s, Position p) {
 					if (dn.getStartPosition() == p.offset) {
 						foundNode = dn;
 						binding = dn.getBinding();
+						bindingKey = dn.getKey();
 						break;
 					}
 				}
 				list = entry.getValue();
 				for (DataNode dn : list) {
 					// TODO distinguish between class and local variables of
 					// same name
-					if (dn.getBinding().equals(binding)) {
+					if (dn.getKey().equals(bindingKey)) {
 						returnList.add(dn);
 					}
 				}
@@ -210,14 +212,15 @@ public TreeSet<DataNode> getOccurrences(String s, Position p) {
 				for (DataNode dn : list) {
 					if (dn.getStartPosition() == p.offset) {
 						binding = dn.getBinding();
+						bindingKey = dn.getKey();
 						break;
 					}
 				}
 				list = entry.getValue();
 				for (DataNode dn : list) {
 					// TODO distinguish between class and local variables of
 					// same name
-					if (dn.getBinding().equals(binding)) {
+					if (dn.getKey().equals(bindingKey)) {
 						returnList.add(dn);
 					}
 				}

dataTool/src/dataTool/Visitor.java

@@ -143,7 +143,10 @@ public void parseData() {
 			public boolean visit( SimpleName sn ) {
 				if( sn.resolveTypeBinding() != null ) {
 					// Add the node to the list
-					getNodeFromName( sn );
+					String binding = sn.resolveBinding().toString();
+					if( !binding.contains("(") && !binding.contains("class") && !binding.contains("interface")){
+						getNodeFromName( sn );
+					}
 				}
 				return true;
 			}