openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r828103 - in /openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence: AnnotationPersistenceMetaDataParser.java XMLPersistenceMetaDataParser.java
Date Wed, 21 Oct 2009 16:58:23 GMT
Author: allee8285
Date: Wed Oct 21 16:58:23 2009
New Revision: 828103

URL: http://svn.apache.org/viewvc?rev=828103&view=rev
Log:
Removed/re-factored unneeded trailing spaces.

Modified:
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=828103&r1=828102&r2=828103&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Wed Oct 21 16:58:23 2009
@@ -14,7 +14,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.openjpa.persistence;
 
@@ -143,7 +143,7 @@
 
     private static final Map<Class<?>, MetaDataTag> _tags =
         new HashMap<Class<?>, MetaDataTag>();
-    
+
     // The following is needed for input into the delimitString() method
     protected static enum DBIdentifiers {
         SEQUENCE_GEN_SEQ_NAME,
@@ -617,8 +617,8 @@
                     if (isMetaDataMode())
                         parseAccess(meta, (Access)anno);
                     break;
-                case CACHEABLE: 
-                    if (isMetaDataMode()) { 
+                case CACHEABLE:
+                    if (isMetaDataMode()) {
                         parseCache(meta, (Cacheable) anno);
                     }
                     break;
@@ -671,11 +671,11 @@
 
     /**
      * Set the explicit access type, if specified.
-     */    
+     */
     private void parseAccess(ClassMetaData meta, Access access) {
     	if (access != null) {
-    		meta.setAccessType(AccessCode.EXPLICIT 
-            | (access.value() == AccessType.FIELD ? 
+    		meta.setAccessType(AccessCode.EXPLICIT
+            | (access.value() == AccessType.FIELD ?
             	AccessCode.FIELD : AccessCode.PROPERTY));
     	}
     }
@@ -720,7 +720,7 @@
 
     /**
      * Gets the explicit access for the class, if any.
-     * Explicit access type specification does not affect the access type of 
+     * Explicit access type specification does not affect the access type of
      * other entity classes or mapped super classes in the entity hierarchy.
      */
     private int getAccessCode(Class<?> cls) {
@@ -728,8 +728,8 @@
         Access access = AccessController.doPrivileged(
             J2DoPrivHelper.getAnnotationAction(cls, Access.class));
         if (access != null) {
-            accessCode |=  AccessCode.EXPLICIT | 
-                (access.value() == AccessType.FIELD ? 
+            accessCode |=  AccessCode.EXPLICIT |
+                (access.value() == AccessType.FIELD ?
                 AccessCode.FIELD : AccessCode.PROPERTY);
         }
         return accessCode;
@@ -748,17 +748,17 @@
 
         String rsrc = StringUtils.replace(cls.getName(), ".", "/");
         ClassLoader loader = AccessController.doPrivileged(
-            J2DoPrivHelper.getClassLoaderAction(cls)); 
+            J2DoPrivHelper.getClassLoaderAction(cls));
         if (loader == null)
             loader = AccessController.doPrivileged(
-                J2DoPrivHelper.getSystemClassLoaderAction()); 
+                J2DoPrivHelper.getSystemClassLoaderAction());
         if (loader == null)
             return null;
         URL url = AccessController.doPrivileged(
-            J2DoPrivHelper.getResourceAction(loader, rsrc + ".java")); 
+            J2DoPrivHelper.getResourceAction(loader, rsrc + ".java"));
         if (url == null) {
             url = AccessController.doPrivileged(
-                J2DoPrivHelper.getResourceAction(loader, rsrc + ".class")); 
+                J2DoPrivHelper.getResourceAction(loader, rsrc + ".class"));
             if (url == null)
                 return null;
         }
@@ -847,7 +847,7 @@
         } else {
             Field[] fields = (Field[]) AccessController.doPrivileged(
                 J2DoPrivHelper.getDeclaredFieldsAction(
-                    meta.getDescribedType())); 
+                    meta.getDescribedType()));
             for (int i = 0; i < fields.length; i++)
                 if ((AccessController.doPrivileged(J2DoPrivHelper
                     .isAnnotationPresentAction(fields[i], DetachedState.class)))
@@ -864,7 +864,7 @@
         Class<?>[] classes = listeners.value();
         Collection<LifecycleCallbacks>[] parsed = null;
         for (Class<?> cls : classes)
-            parsed = parseCallbackMethods(cls, parsed, true, true, 
+            parsed = parseCallbackMethods(cls, parsed, true, true,
                 getRepository());
         return parsed;
     }
@@ -929,7 +929,7 @@
                     int e = events[i];
                     if (callbacks[e] == null)
                         callbacks[e] = new ArrayList<LifecycleCallbacks>(3);
-                    MetaDataParsers.validateMethodsForSameCallback(cls, 
+                    MetaDataParsers.validateMethodsForSameCallback(cls,
                         callbacks[e], m, tag, conf, repos.getLog());
                     if (listener) {
                         callbacks[e].add(new BeanLifecycleCallbacks(cls, m,
@@ -943,7 +943,7 @@
         }
         return callbacks;
     }
-    
+
     /**
      * Store lifecycle metadata.
      */
@@ -973,13 +973,13 @@
     /**
      * Create fetch groups.
      * If FetchGroup A includes FetchGroup B, then a bi-link is set between
-     * A and B. Both A and B must be declared in the same Class. 
+     * A and B. Both A and B must be declared in the same Class.
      * <br>
-     * Call {@link #parseFetchAttribute(ClassMetaData, 
+     * Call {@link #parseFetchAttribute(ClassMetaData,
      * org.apache.openjpa.meta.FetchGroup, FetchAttribute) only after the
      * bi-links have been established, because a field f will not only add the
-     * fetch group A which explictly includes f to its custom fetch groups but 
-     * also will also add any fetch group B that includes A.  
+     * fetch group A which explictly includes f to its custom fetch groups but
+     * also will also add any fetch group B that includes A.
      */
     private void parseFetchGroups(ClassMetaData meta, FetchGroup... groups) {
         org.apache.openjpa.meta.FetchGroup fg;
@@ -989,39 +989,39 @@
 
             fg = meta.addDeclaredFetchGroup(group.name());
             if (group.postLoad())
-                fg.setPostLoad(true); 
+                fg.setPostLoad(true);
             for (String s : group.fetchGroups()) {
                 fg.addDeclaredInclude(s);
             }
         }
-        // Add the parent-child style bi-links between fetch groups in a 
-        // separate pass. 
+        // Add the parent-child style bi-links between fetch groups in a
+        // separate pass.
         for (FetchGroup group:groups) {
         	fg = meta.getFetchGroup(group.name());
         	String[] includedFetchGropNames = fg.getDeclaredIncludes();
         	for (String includedFectchGroupName:includedFetchGropNames) {
         		org.apache.openjpa.meta.FetchGroup child =
         	    meta.getFetchGroup(includedFectchGroupName);
-        		if (child == null) 
-                    throw new UserException(_loc.get("missing-included-fg", 
+        		if (child == null)
+                    throw new UserException(_loc.get("missing-included-fg",
                             meta.getDescribedType().getName(), fg.getName(),
                             includedFectchGroupName));
         		child.addContainedBy(fg);
         	}
         }
-        
+
         for (FetchGroup group : groups) {
             fg = meta.getFetchGroup(group.name());
             for (FetchAttribute attr : group.attributes())
                 parseFetchAttribute(meta, fg, attr);
         }
     }
-    
+
 
     /**
      * Set a field's fetch group.
      */
-    private void parseFetchAttribute(ClassMetaData meta, 
+    private void parseFetchAttribute(ClassMetaData meta,
         org.apache.openjpa.meta.FetchGroup fg, FetchAttribute attr) {
         FieldMetaData field = meta.getDeclaredField(attr.name());
         if (field == null
@@ -1221,7 +1221,7 @@
      */
     protected void parseMemberMappingAnnotations(FieldMetaData fmd) {
     }
-    
+
     /**
      * Parse @Cache.
      */
@@ -1422,7 +1422,7 @@
 
         fmd.setInDefaultFetchGroup(true);
         fmd.setEmbedded(true);
-        
+
         if (fmd.getEmbeddedMetaData() == null)
             fmd.addEmbeddedMetaData(getAccessCode(fmd.getDeclaredType()));
     }
@@ -1510,7 +1510,7 @@
         else
             fmd.setMappedByIdValue("");
     }
-    
+
     /**
      * Setup the field as a LOB mapping.
      */
@@ -1527,13 +1527,13 @@
                 if (dec.length() == 0 || dec.equals("ASC") ||
                     dec.equals("DESC"))
                     throw new MetaDataException(_loc.get(
-                        "invalid-orderBy", fmd)); 
+                        "invalid-orderBy", fmd));
         }
         if (dec.length() == 0 || dec.equals("ASC"))
             dec = Order.ELEMENT + " asc";
         else if (dec.equals("DESC"))
             dec = Order.ELEMENT + " desc";
-            
+
         fmd.setOrderDeclaration(dec);
     }
 
@@ -1606,7 +1606,7 @@
     private void parseElementCollection(FieldMetaData fmd,
         ElementCollection anno) {
         // TODO: throw exception if the runtime env is OpenJpa 1.x
-            
+
         if (fmd.getDeclaredTypeCode() != JavaTypes.COLLECTION &&
             fmd.getDeclaredTypeCode() != JavaTypes.MAP)
             throw new MetaDataException(_loc.get("bad-meta-anno", fmd,
@@ -1624,7 +1624,7 @@
                 elem.addEmbeddedMetaData(getAccessCode(elem.getDeclaredType()));
         }
     }
-    
+
     /**
      * Parse @PersistentMap.
      */
@@ -1678,9 +1678,9 @@
                 vmd.setCascadeRefresh(ValueMetaData.CASCADE_IMMEDIATE);
         }
     }
-    
+
     private void setOrphanRemoval(ValueMetaData vmd, boolean orphanRemoval) {
-        if (orphanRemoval) 
+        if (orphanRemoval)
             vmd.setCascadeDelete(ValueMetaData.CASCADE_AUTO);
     }
 
@@ -1758,9 +1758,9 @@
             meta = getRepository().searchQueryMetaDataByName(query.name());
             if (meta != null) {
             	Class<?> definingType = meta.getDefiningType();
-                if ((definingType == null || definingType != _cls) 
+                if ((definingType == null || definingType != _cls)
                   && _log.isWarnEnabled()) {
-                    _log.warn(_loc.get("dup-query", query.name(), el, 
+                    _log.warn(_loc.get("dup-query", query.name(), el,
                     		definingType));
                 }
                 continue;
@@ -1832,14 +1832,14 @@
                 meta.setSourceMode(MODE_QUERY);
         }
     }
-    
+
     /**
      * Set the explicit access type, if specified.
-     */    
+     */
     private void parseAccess(FieldMetaData meta, Access access) {
     	if (access != null) {
-    		meta.setAccessType(AccessCode.EXPLICIT 
-            | (access.value() == AccessType.FIELD ? 
+    		meta.setAccessType(AccessCode.EXPLICIT
+            | (access.value() == AccessType.FIELD ?
             		AccessCode.FIELD : AccessCode.PROPERTY));
     	}
     }
@@ -1895,7 +1895,7 @@
 			return compare;
 		}
 	}
-    
+
     protected String delimitString(String name, DBIdentifiers type) {
         return name;
     }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java?rev=828103&r1=828102&r2=828103&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
(original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
Wed Oct 21 16:58:23 2009
@@ -14,7 +14,7 @@
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.openjpa.persistence;
 
@@ -77,9 +77,9 @@
 import serp.util.Numbers;
 
 /**
- * Custom SAX parser used by the system to quickly parse persistence 
- * metadata files. This parser may invoke 
- * {@linkplain AnnotationPersistenceMetaDataParser another parser} to scan 
+ * Custom SAX parser used by the system to quickly parse persistence
+ * metadata files. This parser may invoke
+ * {@linkplain AnnotationPersistenceMetaDataParser another parser} to scan
  * source code annotation.
  *
  * @author Steve Kim
@@ -112,9 +112,9 @@
 
     // Map for storing deferred metadata which needs to be populated
     // after embeddables are loaded.
-    private static final Map<Class<?>, ArrayList<MetaDataContext>> 
+    private static final Map<Class<?>, ArrayList<MetaDataContext>>
         _embeddables = new HashMap<Class<?>, ArrayList<MetaDataContext>>();
-    private static final Map<Class<?>, Integer> 
+    private static final Map<Class<?>, Integer>
         _embeddableAccess = new HashMap<Class<?>, Integer>();
 
     static {
@@ -206,10 +206,10 @@
 
     private String _ormVersion;
     private String _schemaLocation;
-    
+
     private static final String ORM_XSD_1_0 = "orm_1_0.xsd";
     private static final String ORM_XSD_2_0 = "orm_2_0.xsd";
-    
+
     /**
      * Constructor; supply configuration.
      */
@@ -349,13 +349,13 @@
         } catch (Throwable t) {
                 Log log = getLog();
                 if (log.isInfoEnabled())
-                    log.trace(_loc.get("version-check-error", 
+                    log.trace(_loc.get("version-check-error",
                         url.toString()));
-        }       
+        }
         super.parse(url);
     }
 
-    public void parse(File file) throws IOException {        
+    public void parse(File file) throws IOException {
         // peek at the doc to determine the version
         XMLVersionParser vp = new XMLVersionParser("entity-mappings");
         try {
@@ -365,9 +365,9 @@
         } catch (Throwable t) {
                 Log log = getLog();
                 if (log.isInfoEnabled())
-                    log.trace(_loc.get("version-check-error", 
+                    log.trace(_loc.get("version-check-error",
                         file.toString()));
-        }       
+        }
         super.parse(file);
     }
     /**
@@ -423,7 +423,7 @@
     protected Object peekElement() {
         return _elements.peek();
     }
-    
+
     /**
      * Return the current element being parsed. May be a class metadata,
      * field metadata, query metadata, etc.
@@ -459,18 +459,18 @@
     }
 
     @Override
-    protected Object getSchemaSource() {        
+    protected Object getSchemaSource() {
         // use the latest schema by default.  'unknown' docs should parse
         // with the latest schema.
         String ormxsd = "orm_2_0-xsd.rsrc";
-        // if the version and/or schema location is for 1.0, use the 1.0 
+        // if the version and/or schema location is for 1.0, use the 1.0
         // schema
         if (_ormVersion != null &&
             _ormVersion.equals(XMLVersionParser.VERSION_1_0) ||
-            (_schemaLocation != null && 
+            (_schemaLocation != null &&
             _schemaLocation.indexOf(ORM_XSD_1_0) != -1)) {
             ormxsd = "orm-xsd.rsrc";
-        }        
+        }
         return XMLPersistenceMetaDataParser.class.getResourceAsStream(ormxsd);
     }
 
@@ -816,15 +816,15 @@
     }
 
     boolean isMetaDataComplete(Attributes attrs) {
-    	return attrs != null 
+    	return attrs != null
     	    && "true".equals(attrs.getValue("metadata-complete"));
     }
-    
+
     void resetAnnotationParser() {
     	setAnnotationParser(((PersistenceMetaDataFactory)getRepository()
     			.getMetaDataFactory()).getAnnotationParser());
     }
-    
+
     @Override
     protected boolean startClass(String elem, Attributes attrs)
         throws SAXException {
@@ -837,12 +837,12 @@
 
         // query mode only?
         _cls = classForName(currentClassName());
-        
+
         // Prevent a reentrant parse for the same class
         if (parseListContains(_cls)) {
             return false;
         }
-        
+
         if (_mode == MODE_QUERY) {
             if (_parser != null)
                 _parser.parse(_cls);
@@ -869,7 +869,7 @@
         if (meta == null) {
             int accessCode = toAccessType(attrs.getValue("access"));
             // if access not specified and access was specified at
-            // the system level, use the system default (which may 
+            // the system level, use the system default (which may
             // be UNKNOWN)
             if (accessCode == AccessCode.UNKNOWN)
                 accessCode = _access;
@@ -899,17 +899,17 @@
                 meta.setTypeAlias(name);
             meta.setAbstract(mappedSuper);
             meta.setEmbeddedOnly(mappedSuper || embeddable);
-            
+
             if (embeddable) {
                 meta.setEmbeddable();
                 setDeferredEmbeddableAccessType(_cls, access);
             }
         }
-        
-        if (attrs.getValue("cacheable") != null) { 
+
+        if (attrs.getValue("cacheable") != null) {
             meta.setCacheEnabled(Boolean.valueOf(attrs.getValue("cacheable")), true);
         }
-        
+
         if (isMappingMode())
             meta.setSourceMode(MODE_MAPPING, true);
         if (isMappingOverrideMode())
@@ -1223,14 +1223,14 @@
         FieldMetaData field = meta.getDeclaredField(name);
         int fldAccess = getFieldAccess(field, attrs);
         // If the access defined in XML is not the same as what was defined
-        // by default or annotation, find the appropriate backing member and 
+        // by default or annotation, find the appropriate backing member and
         // replace what is currently defined in metadata.
         if ((field == null || field.getDeclaredType() == Object.class ||
              field.getAccessType() != fldAccess)
             && meta.getDescribedType() != Object.class) {
             Member member = _repos.getMetaDataFactory().getDefaults()
      	        .getMemberByProperty(meta, name, fldAccess, false);
-            Class<?> type = Field.class.isInstance(member) ? 
+            Class<?> type = Field.class.isInstance(member) ?
                 ((Field)member).getType() : ((Method)member).getReturnType();
 
             if (field == null) {
@@ -1272,9 +1272,9 @@
     }
 
     /**
-     * Determines access for field based upon existing metadata and XML 
+     * Determines access for field based upon existing metadata and XML
      * attributes.
-     * 
+     *
      * @param field FieldMetaData current metadata for field
      * @param attrs XML Attributes defined on this field
      * @return
@@ -1298,7 +1298,7 @@
         }
         return AccessCode.UNKNOWN;
     }
-    
+
     /**
      * Implement to add field mapping data. Does nothing by default.
      */
@@ -1344,7 +1344,7 @@
             fmd.setNullValue(FieldMetaData.NULL_EXCEPTION);
         else if ("true".equals(val)
                 && fmd.getNullValue() == FieldMetaData.NULL_EXCEPTION) {
-            // Reset value if the field was annotated with optional=false. 
+            // Reset value if the field was annotated with optional=false.
             // Otherwise leave it alone.
             fmd.setNullValue(FieldMetaData.NULL_UNSET);
         }
@@ -1419,7 +1419,7 @@
         fmd.setInDefaultFetchGroup(true);
         fmd.setEmbedded(true);
         fmd.setSerialized(false); // override any Lob annotation
-        
+
         if (fmd.getEmbeddedMetaData() == null)
 //            fmd.addEmbeddedMetaData();
             deferEmbeddable(fmd.getDeclaredType(), fmd);
@@ -1453,7 +1453,7 @@
             "orphan-removal"));
         setOrphanRemoval(fmd, orphanRemoval);
         String mapsId = attrs.getValue("maps-id");
-        if (mapsId != null) 
+        if (mapsId != null)
             fmd.setMappedByIdValue(mapsId);
     }
 
@@ -1472,7 +1472,7 @@
         assertPC(fmd, "ManyToOne");
         fmd.setSerialized(false); // override any Lob annotation
         String mapsId = attrs.getValue("maps-id");
-        if (mapsId != null) 
+        if (mapsId != null)
             fmd.setMappedByIdValue(mapsId);
     }
 
@@ -1528,12 +1528,12 @@
             "orphan-removal"));
         setOrphanRemoval(fmd.getElement(), orphanRemoval);
     }
-    
+
     protected void setOrphanRemoval(ValueMetaData vmd, boolean orphanRemoval) {
-        if (orphanRemoval) 
+        if (orphanRemoval)
             vmd.setCascadeDelete(ValueMetaData.CASCADE_AUTO);
     }
-    
+
     protected void parseElementCollection(FieldMetaData fmd, Attributes attrs)
         throws SAXException {
         String val = attrs.getValue("target-class");
@@ -1553,11 +1553,11 @@
             fmd.getElement().setEmbedded(true);
             if (fmd.getElement().getEmbeddedMetaData() == null)
 //                fmd.getElement().addEmbeddedMetaData();
-                deferEmbeddable(fmd.getElement().getDeclaredType(), 
+                deferEmbeddable(fmd.getElement().getDeclaredType(),
                     fmd.getElement());
         }
     }
-    
+
     /**
      * Parse map-key.
      */
@@ -1575,7 +1575,7 @@
         return true;
     }
 
-    
+
     /**
      * Parse map-key-class.
      */
@@ -1598,7 +1598,7 @@
             "The value of the MapKeyClass cannot be null");
         return true;
     }
-    
+
     /**
      * Parse order-by.
      */
@@ -1608,18 +1608,18 @@
         String dec = currentText();
         if (fmd.isElementCollection() &&
             fmd.getElement().getEmbeddedMetaData() != null ||
-            isDeferredEmbeddable(fmd.getElement().getDeclaredType(), 
+            isDeferredEmbeddable(fmd.getElement().getDeclaredType(),
                 fmd.getElement())) {
             if (dec.length() == 0 || dec.equals("ASC") ||
                 dec.equals("DESC"))
                 throw new MetaDataException(_loc.get(
-                    "invalid-orderBy", fmd)); 
+                    "invalid-orderBy", fmd));
         }
         if (StringUtils.isEmpty(dec) || dec.equals("ASC"))
             dec = Order.ELEMENT + " asc";
         else if (dec.equals("DESC"))
             dec = Order.ELEMENT + " desc";
-        
+
         fmd.setOrderDeclaration(dec);
     }
 
@@ -1651,10 +1651,10 @@
         meta.setDefiningType(_cls);
         meta.setQueryString(attrs.getValue("query"));
         meta.setLanguage(JPQLParser.LANG_JPQL);
-        /** TODO: Uncomment when orm.xsd defines lockmode 
+        /** TODO: Uncomment when orm.xsd defines lockmode
         LockModeType lockMode =
                  LockModeType.valueOf(attrs.getValue("lockMode"));
-        meta.addHint("openjpa.FetchPlan.ReadLockMode", 
+        meta.addHint("openjpa.FetchPlan.ReadLockMode",
             JPA2LockLevels.toLockLevel(lockMode));
         **/
         Locator locator = getLocation().getLocator();
@@ -1962,7 +1962,7 @@
 	 */
 	protected void addDeferredEmbeddableMetaData() {
 	    if (_embeddables != null && _embeddables.size() > 0) {
-	        // Reverse iterate the array of remaining deferred embeddables 
+	        // Reverse iterate the array of remaining deferred embeddables
 	        // since elements will be removed as they are processed.
 	        Class<?>[] classes = _embeddables.keySet().toArray(
 	            new Class<?>[_embeddables.size()]);
@@ -1972,28 +1972,28 @@
 	                if (access == null) {
 	                    access = AccessCode.UNKNOWN;
 	                }
-	                addDeferredEmbeddableMetaData(classes[i], 
+	                addDeferredEmbeddableMetaData(classes[i],
 	                    access);
 	            }
 	            catch (Exception e) {
 	                throw new MetaDataException(
-	                    _loc.get("no-embeddable-metadata", 
-	                        classes[i].getName()), e); 
+	                    _loc.get("no-embeddable-metadata",
+	                        classes[i].getName()), e);
 	            }
 	        }
-	    }	    
+	    }	
 	}
 	
     /**
      * Process all deferred embeddables and embeddable mapping overrides
-     * for a given class.  This should only happen after the access type 
+     * for a given class.  This should only happen after the access type
      * of the embeddable is known.
-     * 
-     * @param embedType embeddable class 
+     *
+     * @param embedType embeddable class
      * @param access class level access for embeddable
-     * @throws SAXException 
+     * @throws SAXException
      */
-    protected void addDeferredEmbeddableMetaData(Class<?> embedType, 
+    protected void addDeferredEmbeddableMetaData(Class<?> embedType,
         int access) throws SAXException {
         ArrayList<MetaDataContext> fmds = _embeddables.get(embedType);
         if (fmds != null && fmds.size() > 0) {
@@ -2030,7 +2030,7 @@
     /*
      * Determines whether the embeddable type is deferred.
      */
-    protected boolean isDeferredEmbeddable(Class<?> embedType, 
+    protected boolean isDeferredEmbeddable(Class<?> embedType,
         MetaDataContext fmd) {
         ArrayList<MetaDataContext> fmds = _embeddables.get(embedType);
         if (fmds != null) {
@@ -2038,7 +2038,7 @@
         }
         return false;
     }
-    
+
     /*
      * Add the fmd to the defer list for for the given embeddable type
      */
@@ -2050,7 +2050,7 @@
         }
         fmds.add(fmd);
     }
-    
+
     /*
      * Apply any deferred overrides.
      */
@@ -2066,7 +2066,7 @@
             return;
         _parseList.addAll(parseList);
     }
-    
+
     /*
      * Add the class to the active parse list.
      */
@@ -2091,14 +2091,14 @@
     public ArrayList<Class<?>> getParseList() {
         return _parseList;
     }
-    
+
     /*
      * Returns class currently being parsed.
      */
     public Class<?> getParseClass() {
         return _cls;
     }
-    
+
     protected boolean startDelimitedIdentifiers() {
         return false;
     }



Mime
View raw message