Index: /trunk/t3d/src/org/etsi/t3d/visitor/VisitorCommonFunctions.java
===================================================================
--- /trunk/t3d/src/org/etsi/t3d/visitor/VisitorCommonFunctions.java	(revision 7)
+++ /trunk/t3d/src/org/etsi/t3d/visitor/VisitorCommonFunctions.java	(revision 8)
@@ -1,6 +1,5 @@
 package org.etsi.t3d.visitor;
 
-import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -17,5 +16,4 @@
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.LocationAST;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3FormatterTreeParser;
-import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3Lexer;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.TTCN3ParserTokenTypes;
 import de.ugoe.cs.swe.trex.core.analyzer.rfparser.symboltable.Scope;
@@ -149,19 +147,17 @@
 		Map<String, List<ReferenceWithContext>> result = referenceFinder.findReferences(symb);
 
-		Iterator<List<ReferenceWithContext>> refIt = result.values().iterator();
-		if(refIt != null)
-			while(refIt.hasNext()){
-				
-				ArrayList<ReferenceWithContext> refList = (ArrayList<ReferenceWithContext>)refIt.next();
-				for(ReferenceWithContext ref : refList){
-					linkedRefList.add(ref.getReferenceNode());
-				}
+		Collection<List<ReferenceWithContext>> values = result.values();
+		
+		for (List<ReferenceWithContext> referenceList : values) {
+			for (ReferenceWithContext reference : referenceList) {
+				linkedRefList.add(reference.getReferenceNode());
 			}
-		if(linkedRefList.isEmpty())
-			return null;
+		}
+		if (linkedRefList.isEmpty()) {
+			return null;
+		}
 		return linkedRefList;
 	}
-	
-	
+		
 	//returns the location of an html file that would represent node
 	public static String getLocationFromIdentifier(LocationAST node){