svn commit: r14262 - trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui

Author: mvw
Date: 2008-03-30 06:43:31-0700
New Revision: 14262

Modified:
   trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
   trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java

Log:
Java 5 loops

Modified: trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&rev=14262&p1=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&p2=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&r1=14261&r2=14262
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java	(original)
+++ trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java	2008-03-30 06:43:31-0700
@@ -166,9 +166,7 @@
             Collection c = new ArrayList(
                     Model.getFacade().getStereotypes(newOwner));
             // and its features
-            Iterator it = Model.getFacade().getFeatures(newOwner).iterator();
-            while (it.hasNext()) {
-                Object feat = it.next();
+            for (Object feat : Model.getFacade().getFeatures(newOwner)) {
                 c.add(feat);
                 // and the stereotypes of its features
                 c.addAll(new ArrayList(Model.getFacade().getStereotypes(feat)));
@@ -176,9 +174,8 @@
             // and its enumerationLiterals
             c.addAll(Model.getFacade().getEnumerationLiterals(newOwner));
             // And now add listeners to them all:
-            Iterator it2 = c.iterator();
-            while (it2.hasNext()) {
-                addElementListener(it2.next());
+            for (Object obj : c) {
+                addElementListener(obj);
             }
         }
     }

Modified: trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java?view=diff&rev=14262&p1=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&p2=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&r1=14261&r2=14262
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java	(original)
+++ trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java	2008-03-30 06:43:31-0700
@@ -185,9 +185,8 @@
             Collection c = new ArrayList(
                     Model.getFacade().getStereotypes(newOwner));
             // And now add listeners to them all:
-            Iterator it2 = c.iterator();
-            while (it2.hasNext()) {
-                addElementListener(it2.next());
+            for (Object obj : c) {
+                addElementListener(obj);
             }
         }
     }