ogsa-dai-svn-commits

[<amy...@us...>]

Revision: 2135
          http://ogsa-dai.svn.sourceforge.net/ogsa-dai/?rev=2135&view=rev
Author:   amykrause
Date:     2012-11-08 15:30:40 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
Added generics.

Modified Paths:
--------------
    ogsa-dai/trunk/core/client/src/main/java/uk/org/ogsadai/client/toolkit/PipelineWorkflow.java

Modified: ogsa-dai/trunk/core/client/src/main/java/uk/org/ogsadai/client/toolkit/PipelineWorkflow.java
===================================================================
--- ogsa-dai/trunk/core/client/src/main/java/uk/org/ogsadai/client/toolkit/PipelineWorkflow.java	2012-11-08 14:05:15 UTC (rev 2134)
+++ ogsa-dai/trunk/core/client/src/main/java/uk/org/ogsadai/client/toolkit/PipelineWorkflow.java	2012-11-08 15:30:40 UTC (rev 2135)
@@ -17,7 +17,6 @@
 
 package uk.org.ogsadai.client.toolkit;
 
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -40,14 +39,14 @@
         "Copyright (c) The University of Edinburgh, 2007.";
 
     /** List of child activities. */
-    private List/*<Activity>*/ mActivities;
+    private List<Activity> mActivities;
 
     /**
      * Constructor.
      */
     public PipelineWorkflow()
     {
-        mActivities = new LinkedList/*<Activity>*/();
+        mActivities = new LinkedList<Activity>();
     }
     
     /**
@@ -91,9 +90,9 @@
      * @return list of activities in the pipeline.  This list gives access to
      *         objects of type <code>Activity</code>.
      */
-    public List/*<Activity>*/ getActivities()
+    public List<Activity> getActivities()
     {
-        return new LinkedList(mActivities);
+        return new LinkedList<Activity>(mActivities);
     }
     
     // Interface implementation
@@ -108,10 +107,8 @@
     {
         requestBuilder.startPipeline();
         
-        Iterator/*<Activities>*/ it = mActivities.iterator();
-        while (it.hasNext())
+        for (Activity activity : mActivities)
         {
-            Activity activity = (Activity) it.next();
             activity.getRequestAndStatusHandler().buildRequest(
                 requestBuilder);
         }
@@ -122,10 +119,8 @@
     // Interface implementation
     public void processRequestStatus(final RequestStatus requestStatus)
     {
-        Iterator/*<Activities>*/ it = mActivities.iterator();
-        while (it.hasNext())
+        for (Activity activity : mActivities)
         {
-            Activity activity = (Activity) it.next();
             activity.getRequestAndStatusHandler().processRequestStatus(
                 requestStatus);
         }
@@ -134,10 +129,8 @@
     // Interface implementation
     public void setServer(final Server server)
     {
-        Iterator/*<Activity>*/ it = mActivities.iterator();
-        while (it.hasNext())
+        for (Activity activity : mActivities)
         {
-            Activity activity = (Activity) it.next();
             activity.getRequestAndStatusHandler().setServer(server);
         }
     }
@@ -149,10 +142,8 @@
 
         buffer.append("PipelineWorkflow {\n");
         
-        Iterator/*<Activity>*/ it = mActivities.iterator();
-        while( it.hasNext())
+        for (Activity activity : mActivities)
         {
-            Activity activity = (Activity) it.next();
             String activityString = activity.toString();
             // This needs to happen in MULTILINE MODE - so I need to create
             // a pattern and use it.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.