svn commit: r697431 - in /synapse/trunk/java/modules/core/src/main/java/org/apache/synapse: config/xml/SwitchMediatorSerializer.java mediators/filters/SwitchMediator.java

[veithen]

Author: veithen
Date: Sat Sep 20 15:57:53 2008
New Revision: 697431

URL: http://svn.apache.org/viewvc?rev=697431&view=rev
Log:
Use of Java 5 generics (no functional changes).

Modified:
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java?rev=697431&r1=697430&r2=697431&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SwitchMediatorSerializer.java
 Sat Sep 20 15:57:53 2008
@@ -23,8 +23,6 @@
 import org.apache.synapse.Mediator;
 import org.apache.synapse.mediators.filters.SwitchMediator;
 
-import java.util.Iterator;
-
 /**
  * Factory for [EMAIL PROTECTED] SwitchMediator} instances.
  * 
@@ -49,10 +47,8 @@
             handleException("Invalid switch mediator. Source required");
         }
 
-        Iterator iter = mediator.getCases().iterator();
-        while (iter.hasNext()) {
+        for (SwitchCase aCase : mediator.getCases()) {
             OMElement caseElem = fac.createOMElement("case", synNS);
-            SwitchCase aCase = ((SwitchCase) iter.next());
             if (aCase.getRegex() != null) {
                 caseElem.addAttribute(fac.createOMAttribute(
                         "regex", nullNS, aCase.getRegex().pattern()));

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java?rev=697431&r1=697430&r2=697431&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/filters/SwitchMediator.java
 Sat Sep 20 15:57:53 2008
@@ -25,7 +25,6 @@
 import org.apache.synapse.util.xpath.SynapseXPath;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -39,7 +38,7 @@
     /** The XPath expression specifying the source element to apply the switch 
case expressions against   */
     private SynapseXPath source = null;
     /** The list of switch cases    */
-    private List cases = new ArrayList();
+    private List<SwitchCase> cases = new ArrayList<SwitchCase>();
     /** The default switch case, if any */
     private SwitchCase defaultCase = null;
 
@@ -83,9 +82,7 @@
                 return defaultCase.mediate(synCtx);
 
             } else {
-                for (Iterator iter = cases.iterator(); iter.hasNext();) {
-                    SwitchCase swCase = (SwitchCase) iter.next();
-
+                for (SwitchCase swCase : cases) {
                     if (swCase != null) {
                         if (swCase.matches(sourceText)) {
                             if (traceOrDebugOn) {
@@ -134,7 +131,7 @@
      *
      * @return the cases list
      */
-    public List getCases() {
+    public List<SwitchCase> getCases() {
         return cases;
     }