You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2010/07/30 20:42:39 UTC
svn commit: r980916 - in
/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta:
InheritanceOrderedMetaDataList.java MetaDataRepository.java
Author: curtisr7
Date: Fri Jul 30 18:42:38 2010
New Revision: 980916
URL: http://svn.apache.org/viewvc?rev=980916&view=rev
Log:
Refactor MetaDataRepository to use for each loop.
Modified:
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java?rev=980916&r1=980915&r2=980916&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InheritanceOrderedMetaDataList.java Fri Jul 30 18:42:38 2010
@@ -23,9 +23,13 @@ import java.util.LinkedList;
import java.util.ListIterator;
import java.io.Serializable;
-public class InheritanceOrderedMetaDataList
- implements Serializable {
+public class InheritanceOrderedMetaDataList implements Serializable, Iterable<ClassMetaData> {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4821243307083324894L;
+
private MetaDataInheritanceComparator _comp
= new MetaDataInheritanceComparator();
private LinkedList<ClassMetaData> buffer = new LinkedList<ClassMetaData>();
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?rev=980916&r1=980915&r2=980916&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Fri Jul 30 18:42:38 2010
@@ -27,7 +27,6 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -506,10 +505,10 @@ public class MetaDataRepository implemen
private final Collection<String> getAliasNamesInternal() {
Collection<String> aliases = new HashSet<String>();
- for (Iterator<Map.Entry<String, List<Class<?>>>> iter = _aliases.entrySet().iterator(); iter.hasNext();) {
- Map.Entry<String, List<Class<?>>> e = iter.next();
- if (e.getValue() != null)
- aliases.add(e.getKey());
+ for(Map.Entry<String, List<Class<?>>> e : _aliases.entrySet()){
+ if (e.getValue() != null) {
+ aliases.add(e.getKey());
+ }
}
return aliases;
}
@@ -813,11 +812,10 @@ public class MetaDataRepository implemen
// resolve any of the related types, so clear buffer. this also
// ensures that if two types relate to each other and one
// dies, we don't get into infinite cycles
- for (Iterator<ClassMetaData> itr = buffer.iterator(); itr.hasNext();) {
- meta = itr.next();
- removeMetaData(meta);
- if (meta != buffered) {
- _errs.add(new MetaDataException(_loc.get("prev-errs", meta, buffered)));
+ for (ClassMetaData cmd : buffer) {
+ removeMetaData(cmd);
+ if (cmd != buffered) {
+ _errs.add(new MetaDataException(_loc.get("prev-errs", cmd, buffered)));
}
}
buffer.clear();