[mule-scm] [mule] [15958] branches/mule-3.x: Merged revisions 15951-15953 via svnmerge from

View: New views

1 Messages — Rating Filter: Alert me

[mule-scm] [mule] [15958] branches/mule-3.x: Merged revisions 15951-15953 via svnmerge from

by dirk.olmes :: Rate this Message:

Reply to Author | View Threaded | Show Only this Message

Some parts of this message have been removed. Learn more about Nabble's security policy.

[mule] [15958] branches/mule-3.x: Merged revisions 15951-15953 via svnmerge from

Revision: 15958
Author: dirk.olmes
Date: 2009-11-03 19:51:22 -0600 (Tue, 03 Nov 2009)

Log Message

Merged revisions 15951-15953 via svnmerge from 
https://svn.codehaus.org/mule/branches/mule-2.2.x

........
  r15951 | dirk.olmes | 2009-11-03 18:23:30 +0100 (Tue, 03 Nov 2009) | 1 line
  
  Cleanup, simplify by using JDK5 for loops
........
  r15952 | dirk.olmes | 2009-11-03 18:24:09 +0100 (Tue, 03 Nov 2009) | 1 line
  
  generics
........
  r15953 | dirk.olmes | 2009-11-03 18:24:47 +0100 (Tue, 03 Nov 2009) | 1 line
  
  checkstyle
........

Modified Paths

branches/mule-3.x/modules/xml/src/main/java/org/mule/module/xml/util/XMLUtils.java
branches/mule-3.x/modules/xml/src/test/java/org/mule/module/xml/util/XMLTestUtils.java
branches/mule-3.x/modules/xml/src/test/java/org/mule/routing/filters/xml/IsXmlFilterTestCase.java

Property Changed

branches/mule-3.x/

Diff

Property changes: branches/mule-3.x

Name: svnmerge-integrated
   - /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-14644,14646-14647,14649-14761,14763-14
 838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938 /branches/mule-3.x-messaging:1-15430 /branches/mule-3.x-xmpp:1-15727
   + /branches/mule-3.x-messaging:1-15430 /branches/mule-2.2.x:1-14052,14055-14056,14058-14062,14064,14066-14073,14076-14084,14086-14088,14091-14095,14097-14098,14100-14101,14103-14104,14106-14109,14111-14115,14117-14121,14123-14132,14135-14140,14142-14149,14152-14154,14156-14162,14165-14171,14173-14180,14182,14184-14189,14191-14195,14197-14203,14205,14207-14208,14210-14211,14214-14215,14217-14227,14230,14232-14236,14239,14241,14244,14246-14248,14250,14252-14253,14255-14256,14258-14263,14266-14269,14271-14278,14281-14282,14284,14286-14288,14292-14295,14297-14299,14301-14303,14306-14308,14310-14311,14313-14319,14321-14325,14327-14329,14331,14333-14339,14341-14343,14345-14357,14364-14368,14370-14374,14376-14378,14380-14381,14383-14397,14399-14400,14402,14404-14405,14407-14408,14410-14411,14413-14418,14421-14434,14436,14438,14440-14444,14449-14457,14459,14461-14462,14464-14469,14471-14475,14478-14480,14482-14484,14486-14504,14508-14535,14537-14592,14594-14595,14597-14638,14640-1
 4644,14646-14647,14649-14761,14763-14838,14840-14869,14872-14881,14890,14897,14899,14904,14906-14908,14910-14911,14913,14916,14921,14943,14946-14948,14969,14991,15010,15012,15022,15027,15040,15044,15063,15066,15076,15088,15094,15098,15101,15107,15112,15126,15132,15143,15189,15192,15200,15204,15207,15215,15220,15229-15230,15241,15245,15271,15284,15291,15293-15294,15296,15298-15299,15302,15307,15311,15315,15317-15322,15324-15355,15357-15365,15367,15369-15372,15374,15377,15387,15418,15420-15430,15433,15440,15442-15443,15450,15452,15456-15462,15465,15467-15470,15489-15492,15513,15532,15554,15556-15561,15563-15586,15588-15589,15591-15596,15599-15665,15667-15688,15690-15721,15723-15745,15747-15753,15755-15756,15760-15765,15774-15777,15781-15794,15796-15800,15802-15804,15806-15828,15830-15833,15835-15858,15863,15865-15875,15881-15884,15889,15892-15902,15908-15910,15912-15913,15915-15921,15923,15935-15938,15951-15953 /branches/mule-3.x-xmpp:1-15727

Modified: branches/mule-3.x/modules/xml/src/main/java/org/mule/module/xml/util/XMLUtils.java (15957 => 15958)

--- branches/mule-3.x/modules/xml/src/main/java/org/mule/module/xml/util/XMLUtils.java	2009-11-03 20:52:43 UTC (rev 15957)
+++ branches/mule-3.x/modules/xml/src/main/java/org/mule/module/xml/util/XMLUtils.java	2009-11-04 01:51:22 UTC (rev 15958)
@@ -214,8 +214,9 @@
             final InputStream is = (java.io.InputStream) obj;
             
             XMLStreamReader xsr = factory.createXMLStreamReader(is);
-            return new DelegateXMLStreamReader(xsr) {
-
+            return new DelegateXMLStreamReader(xsr) 
+            {
+                @Override
                 public void close() throws XMLStreamException
                 {
                     super.close();

Modified: branches/mule-3.x/modules/xml/src/test/java/org/mule/module/xml/util/XMLTestUtils.java (15957 => 15958)

--- branches/mule-3.x/modules/xml/src/test/java/org/mule/module/xml/util/XMLTestUtils.java	2009-11-03 20:52:43 UTC (rev 15957)
+++ branches/mule-3.x/modules/xml/src/test/java/org/mule/module/xml/util/XMLTestUtils.java	2009-11-04 01:51:22 UTC (rev 15958)
@@ -26,11 +26,11 @@
 
 public class XMLTestUtils
 {
-    public static List getXmlMessageVariants(String resource) throws Exception
+    public static List<?> getXmlMessageVariants(String resource) throws Exception
     {
         XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
         
-        List list = new ArrayList();
+        List<Object> list = new ArrayList<Object>();
         InputStream is;
 
         // java.io.InputStream
@@ -64,5 +64,3 @@
         return list;
     }
 }
-
-

Modified: branches/mule-3.x/modules/xml/src/test/java/org/mule/routing/filters/xml/IsXmlFilterTestCase.java (15957 => 15958)

--- branches/mule-3.x/modules/xml/src/test/java/org/mule/routing/filters/xml/IsXmlFilterTestCase.java	2009-11-03 20:52:43 UTC (rev 15957)
+++ branches/mule-3.x/modules/xml/src/test/java/org/mule/routing/filters/xml/IsXmlFilterTestCase.java	2009-11-04 01:51:22 UTC (rev 15958)
@@ -17,14 +17,13 @@
 import org.mule.util.IOUtils;
 
 import java.io.InputStream;
-import java.util.Iterator;
 import java.util.List;
 
 public class IsXmlFilterTestCase extends AbstractMuleTestCase
 {
-
     private IsXmlFilter filter;
 
+    @Override
     protected void doSetUp() throws Exception
     {
         filter = new IsXmlFilter();
@@ -75,14 +74,10 @@
 
     public void testFilterXmlMessageVariants() throws Exception
     {
-        List list = XMLTestUtils.getXmlMessageVariants("cdcatalog.xml");
-        Iterator it = list.iterator();
-        
-        Object msg;
-        while (it.hasNext())
+        List<?> list = XMLTestUtils.getXmlMessageVariants("cdcatalog.xml");
+        for (Object message : list)
         {
-            msg = it.next();
-            assertTrue(filter.accept(new DefaultMuleMessage(msg, muleContext)));
+            assertTrue(filter.accept(new DefaultMuleMessage(message, muleContext)));
         }
     }
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email