svn commit: r13006 - trunk/src_new/org/argouml/util

Author: tfmorris
Date: 2007-07-09 13:11:02-0700
New Revision: 13006

Added:
   trunk/src_new/org/argouml/util/EnumerationIterator.java   (contents, props changed)
   trunk/src_new/org/argouml/util/IteratorEnumeration.java   (contents, props changed)

Log:
Adapter classes to convert between Iterator and Enumeration for backward compatibility with legacy GEF interfaces.

Added: trunk/src_new/org/argouml/util/EnumerationIterator.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/EnumerationIterator.java?view=auto&rev=13006
==============================================================================
--- (empty file)
+++ trunk/src_new/org/argouml/util/EnumerationIterator.java	2007-07-09 13:11:02-0700
@@ -0,0 +1,55 @@
+// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.util;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * Iterator which wraps an Enumeration for transitional purposes.
+ * Does not support the remove() method. 
+ * @author Tom Morris <[email protected]>
+ */
+public class EnumerationIterator implements Iterator {
+
+    private Enumeration enumeration;
+    
+    public EnumerationIterator(Enumeration e) {
+        enumeration = e;
+    }
+    
+    public boolean hasNext() {
+        return enumeration.hasMoreElements();
+    }
+
+    public Object next() {
+        return enumeration.nextElement();
+    }
+
+    public void remove() {
+        throw new UnsupportedOperationException();
+    }
+
+}

Added: trunk/src_new/org/argouml/util/IteratorEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/util/IteratorEnumeration.java?view=auto&rev=13006
==============================================================================
--- (empty file)
+++ trunk/src_new/org/argouml/util/IteratorEnumeration.java	2007-07-09 13:11:02-0700
@@ -0,0 +1,54 @@
+// $Id$
+// Copyright (c) 2007 The Regents of the University of California. All
+// Rights Reserved. Permission to use, copy, modify, and distribute this
+// software and its documentation without fee, and without a written
+// agreement is hereby granted, provided that the above copyright notice
+// and this paragraph appear in all copies. This software program and
+// documentation are copyrighted by The Regents of the University of
+// California. The software program and documentation are supplied "AS
+// IS", without any accompanying services from The Regents. The Regents
+// does not warrant that the operation of the program will be
+// uninterrupted or error-free. The end-user understands that the program
+// was developed for research purposes and is advised not to rely
+// exclusively on the program for any reason. IN NO EVENT SHALL THE
+// UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+// SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS,
+// ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
+// THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF
+// SUCH DAMAGE. THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE
+// PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF
+// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
+// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+
+package org.argouml.util;
+
+import java.util.Enumeration;
+import java.util.Iterator;
+
+/**
+ * Adapter class to provide legacy Enumeration interface for more modern
+ * Iterator. For use with GEF or other legacy API implementations.
+ * 
+ * @param <T> type of object in Enumeration
+ * @author Tom Morris <[email protected]>
+ */
+public class IteratorEnumeration<T> implements Enumeration<T> {
+
+    private Iterator<T> it;
+    
+    public IteratorEnumeration(Iterator<T> iterator) {
+        it = iterator;
+    }
+    
+    public boolean hasMoreElements() {
+        return it.hasNext();
+    }
+
+    public T nextElement() {
+        return it.next();
+    }
+
+
+}