1 files changed, 18 insertions, 16 deletions
diff --git a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
index 511bced0e8..5d4a40fcfb 100755
--- a/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
+++ b/collaboration/GSoC-2011-Nirmal/CompositeDiagramGeneratorUsingBatik/src/main/java/org/apache/tuscany/sca/diagram/generator/DiagramGenerator.java
@@ -139,10 +139,11 @@ public class DiagramGenerator {
 
     private void addReferencePromotion() {
 
-        for (Iterator it = comp.getPromoteAReference().entrySet().iterator(); it.hasNext();) {
-            Entry entry = (Entry)it.next();
-            String compositeRef = (String)entry.getKey();
-            ArrayList<String> componentRef = (ArrayList<String>)entry.getValue();
+        for (Iterator<Entry<String, ArrayList<String>>> it = comp.getPromoteAReference().entrySet().iterator(); it
+            .hasNext();) {
+            Entry<String, ArrayList<String>> entry = it.next();
+            String compositeRef = entry.getKey();
+            ArrayList<String> componentRef = entry.getValue();
 
             ReferenceArtifact r1 = getRef(compositeRef);
 
@@ -160,10 +161,10 @@ public class DiagramGenerator {
 
     private void addServicePromotion() {
 
-        for (Iterator it = comp.getPromoteAService().entrySet().iterator(); it.hasNext();) {
-            Entry entry = (Entry)it.next();
-            String compositeSer = (String)entry.getKey();
-            String componentSer = (String)entry.getValue();
+        for (Iterator<Entry<String, String>> it = comp.getPromoteAService().entrySet().iterator(); it.hasNext();) {
+            Entry<String, String> entry = it.next();
+            String compositeSer = entry.getKey();
+            String componentSer = entry.getValue();
 
             ServiceArtifact s1 = getSer(compositeSer);
             ServiceArtifact s2 = getSer(componentSer);
@@ -222,10 +223,11 @@ public class DiagramGenerator {
         for (Entity ent : comp.getComponentList()) {
             //if(ent instanceof ComponentEntity){
 
-            for (Iterator it = ((ComponentEntity)ent).getReferenceToServiceMap().entrySet().iterator(); it.hasNext();) {
-                Entry entry = (Entry)it.next();
-                String ref = (String)entry.getKey();
-                String ser = (String)entry.getValue();
+            for (Iterator<Entry<String, String>> it =
+                ((ComponentEntity)ent).getReferenceToServiceMap().entrySet().iterator(); it.hasNext();) {
+                Entry<String, String> entry = it.next();
+                String ref = entry.getKey();
+                String ser = entry.getValue();
 
                 ReferenceArtifact r = getRef(ref);
                 ServiceArtifact s = getSer(ser);
@@ -415,11 +417,11 @@ public class DiagramGenerator {
             sers.add(i, "");
         }
 
-        for (Iterator it = e.getReferenceToServiceMap().entrySet().iterator(); it.hasNext();) {
+        for (Iterator<Entry<String, String>> it = e.getReferenceToServiceMap().entrySet().iterator(); it.hasNext();) {
 
-            Entry entry = (Entry)it.next();
-            String ref = (String)entry.getKey();
-            String ser = (String)entry.getValue();
+            Entry<String, String> entry = it.next();
+            String ref = entry.getKey();
+            String ser = entry.getValue();
             //System.out.println("---------"+ref);
             int idx = refs.indexOf(ref);
             //System.out.println("---------"+sers.get(idx));