openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r761509 [3/4] - in /openjpa/trunk: ./ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ openjpa-jdbc/src/main/...
Date Fri, 03 Apr 2009 03:10:00 GMT
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java Fri Apr  3 03:09:53 2009
@@ -351,7 +351,8 @@
     /**
      * Serialize the given set of objects.
      */
-    protected abstract void serialize(Collection<Object> objs) throws SAXException;
+    protected abstract void serialize(Collection<Object> objs) throws
+            SAXException;
 
     /**
      * Return the current set of objects for serialization.

Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java Fri Apr  3 03:09:53 2009
@@ -482,7 +482,8 @@
      * 
      * @return File
      */
-    public static final PrivilegedAction<File> getAbsoluteFileAction(final File f) {
+    public static final PrivilegedAction<File> getAbsoluteFileAction(
+            final File f) {
         return new PrivilegedAction<File>() {
             public File run() {
                 return f.getAbsoluteFile();
@@ -746,7 +747,8 @@
      * @return ServerSocket
      * @throws IOException
      */
-    public static final PrivilegedExceptionAction<ServerSocket> newServerSocketAction(
+    public static final PrivilegedExceptionAction<ServerSocket>
+            newServerSocketAction(
         final int port) throws IOException {
         return new PrivilegedExceptionAction<ServerSocket>() {
             public ServerSocket run() throws IOException {
@@ -1020,7 +1022,8 @@
      *   
      * @return BCField
      */
-    public static final PrivilegedAction<BCField> getFieldInstructionFieldAction(
+    public static final PrivilegedAction<BCField> getFieldInstructionFieldAction
+    (
         final FieldInstruction instruction) {
         return new PrivilegedAction<BCField>() {
             public BCField run() {

Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java Fri Apr  3 03:09:53 2009
@@ -94,7 +94,8 @@
         try {
             Set resourceList = new TreeSet();
             Enumeration resources = AccessController.doPrivileged(
-                J2DoPrivHelper.getResourcesAction(loader, PREFIX + serviceName)); 
+                J2DoPrivHelper.getResourcesAction(loader,
+                        PREFIX + serviceName));
             while (resources.hasMoreElements())
                 addResources((URL) resources.nextElement(), resourceList);
 

Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java Fri Apr  3 03:09:53 2009
@@ -27,7 +27,7 @@
 import org.apache.commons.lang.exception.NestableRuntimeException;
 
 /**
- * UUID value generator.  Type 1 generator is based on the time-based generator  
+ * UUID value generator.  Type 1 generator is based on the time-based generator
  * in the Apache Commons Id project:  http://jakarta.apache.org/commons/sandbox
  * /id/uuid.html  The type 4 generator uses the standard Java UUID generator.
  *

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java Fri Apr  3 03:09:53 2009
@@ -524,12 +524,12 @@
     Unique createUniqueConstraint(MetaDataContext ctx, UniqueConstraint anno) {
 		String[] columnNames = anno.columnNames();
 		if (columnNames == null || columnNames.length == 0)
-			throw new UserException(_loc.get("unique-no-column", ctx));
+            throw new UserException(_loc.get("unique-no-column", ctx));
 		Unique uniqueConstraint = new Unique();
 		for (int i=0; i<columnNames.length; i++) {
 			if (StringUtils.isEmpty(columnNames[i]))
-				throw new UserException(_loc.get("unique-empty-column", 
-						Arrays.toString(columnNames), ctx));
+                throw new UserException(_loc.get("unique-empty-column",
+                        Arrays.toString(columnNames), ctx));
 			Column column = new Column();
 			column.setName(columnNames[i]);
 			uniqueConstraint.addColumn(column);
@@ -739,7 +739,7 @@
     		&& fk.columnNames().length == 0
     		&& fk.specified();
     	if (!isDefault)
-    		throw new UserException(_loc.get("implicit-non-default-fk", _cls, 
+            throw new UserException(_loc.get("implicit-non-default-fk", _cls,
     				getSourceFile()).getMessage());
     }
     
@@ -750,7 +750,8 @@
     private int toForeignKeyAction(ForeignKeyAction action) {
         switch (action) {
             case RESTRICT:
-                return org.apache.openjpa.jdbc.schema.ForeignKey.ACTION_RESTRICT;
+                return org.apache.openjpa.jdbc.schema.ForeignKey.
+                        ACTION_RESTRICT;
             case CASCADE:
                 return org.apache.openjpa.jdbc.schema.ForeignKey.ACTION_CASCADE;
             case NULL:
@@ -1267,7 +1268,8 @@
         }
     }
     
-    public static FieldMapping getEmbeddedFieldMapping(FieldMapping fm, String attrName) {
+    public static FieldMapping getEmbeddedFieldMapping(FieldMapping fm,
+            String attrName) {
         ClassMapping embed = null;
         boolean isKey = false;
         boolean isValue = false;
@@ -1318,7 +1320,8 @@
 
     }
     
-    public static FieldMapping getAttributeOverrideField(String attrName, FieldMapping fm, ClassMapping embed) {
+    public static FieldMapping getAttributeOverrideField(String attrName,
+            FieldMapping fm, ClassMapping embed) {
         FieldMapping efm;
         int idxOfDot = attrName.indexOf("."); 
         if (idxOfDot == -1) {
@@ -1420,7 +1423,7 @@
             }
 
             unique |= (pcols[i].unique()) ? TRUE : FALSE;
-        	secondary = trackSecondaryTable(fm, secondary,	pcols[i].table(), i);
+            secondary = trackSecondaryTable(fm, secondary, pcols[i].table(), i);
         }
 
         if (fm.isElementCollection())
@@ -1872,7 +1875,8 @@
     /**
      * Parse @MapKeyJoinColumn(s).
      */
-    private void parseMapKeyJoinColumns(FieldMapping fm, MapKeyJoinColumn... joins) {
+    private void parseMapKeyJoinColumns(FieldMapping fm,
+            MapKeyJoinColumn... joins) {
         if (joins.length == 0)
             return;
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java Fri Apr  3 03:09:53 2009
@@ -167,9 +167,11 @@
      * Add an annotation builder to list of builders for the specified
      * class metadata.
      */
-    protected void addAnnotation(AnnotationBuilder ab, QueryResultMapping meta) {
+    protected void addAnnotation(AnnotationBuilder ab, QueryResultMapping meta)
+    {
         if (_rsmAnnos == null)
-            _rsmAnnos = new HashMap<QueryResultMapping, List<AnnotationBuilder>>();
+            _rsmAnnos = new HashMap<QueryResultMapping,
+                    List<AnnotationBuilder>>();
         List<AnnotationBuilder> list = _rsmAnnos.get(meta);
         if (list == null) {
             list = new ArrayList<AnnotationBuilder>();
@@ -226,7 +228,8 @@
         for (String second : info.getSecondaryTableNames()) {
             AnnotationBuilder abSecTable =
                 addAnnotation(SecondaryTable.class, mapping);
-            serializeTable(second, null, info, info.getUniques(second), abSecTable);
+            serializeTable(second, null, info, info.getUniques(second),
+                    abSecTable);
         }
     }
 

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java Fri Apr  3 03:09:53 2009
@@ -116,7 +116,8 @@
         return LRSSizeAlgorithm.fromKernelConstant(_fetch.getLRSSize());
     }
 
-    public JDBCFetchPlanImpl setLRSSizeAlgorithm(LRSSizeAlgorithm lrsSizeAlgorithm) {
+    public JDBCFetchPlanImpl setLRSSizeAlgorithm(
+            LRSSizeAlgorithm lrsSizeAlgorithm) {
         _fetch.setLRSSize(lrsSizeAlgorithm.toKernelConstant());
         return this;
     }

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java Fri Apr  3 03:09:53 2009
@@ -153,7 +153,8 @@
     private Table getTable(ClassMapping clm) {
         Table table = clm.getTable();
         if (table == null) {
-            ValueMappingImpl value = (ValueMappingImpl)clm.getEmbeddingMetaData();
+            ValueMappingImpl value =
+                    (ValueMappingImpl)clm.getEmbeddingMetaData();
             if (value == null)
                 return table;
             FieldMetaData field = value.getFieldMetaData();

Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java Fri Apr  3 03:09:53 2009
@@ -189,7 +189,8 @@
             .getClassName(mapping.getDescribedType()), null, 
             info.getUniques(info.getTableName()));
         for (String second : info.getSecondaryTableNames())
-            serializeTable(second, "secondary-table", null, info, info.getUniques(second));
+            serializeTable(second, "secondary-table", null, info,
+                    info.getUniques(second));
         serializeColumns(info, ColType.PK_JOIN, null);
     }
 
@@ -408,7 +409,8 @@
                         }
                     }
                     startElement("collection-table");
-                    ValueMappingImpl elem = (ValueMappingImpl) field.getElement();
+                    ValueMappingImpl elem =
+                            (ValueMappingImpl) field.getElement();
                     serializeColumns(elem.getValueInfo(), ColType.COL,
                             null);
                     endElement("collection-table");

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java Fri Apr  3 03:09:53 2009
@@ -175,7 +175,8 @@
             if (value instanceof List) {
                 sb.append("{");
                 List<AnnotationBuilder> l = (List<AnnotationBuilder>) value;
-                for (Iterator<AnnotationBuilder> i = l.iterator(); i.hasNext();) {
+                for (Iterator<AnnotationBuilder> i = l.iterator(); i.hasNext();)
+                {
                     AnnotationBuilder ab =  i.next();
                     sb.append(ab.toString());
                     if (i.hasNext())

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=761509&r1=761508&r2=761509&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 Fri Apr  3 03:09:53 2009
@@ -27,8 +27,10 @@
 import static org.apache.openjpa.persistence.MetaDataTag.ELEM_TYPE;
 import static org.apache.openjpa.persistence.MetaDataTag.EMBEDDED_ID;
 import static org.apache.openjpa.persistence.MetaDataTag.ENTITY_LISTENERS;
-import static org.apache.openjpa.persistence.MetaDataTag.EXCLUDE_DEFAULT_LISTENERS;
-import static org.apache.openjpa.persistence.MetaDataTag.EXCLUDE_SUPERCLASS_LISTENERS;
+import static org.apache.openjpa.persistence.MetaDataTag.
+        EXCLUDE_DEFAULT_LISTENERS;
+import static org.apache.openjpa.persistence.MetaDataTag.
+        EXCLUDE_SUPERCLASS_LISTENERS;
 import static org.apache.openjpa.persistence.MetaDataTag.EXTERNALIZER;
 import static org.apache.openjpa.persistence.MetaDataTag.EXTERNAL_VALS;
 import static org.apache.openjpa.persistence.MetaDataTag.FACTORY;
@@ -534,7 +536,7 @@
 
         Entity entity = (Entity) _cls.getAnnotation(Entity.class);
         if (isMetaDataMode()) {
-            meta.setAbstract(_cls.getAnnotation(MappedSuperclass.class) != null);
+            meta.setAbstract(_cls.getAnnotation(MappedSuperclass.class) !=null);
             // while the spec only provides for embedded exclusive, it doesn't
             // seem hard to support otherwise
             if (entity == null)
@@ -586,20 +588,20 @@
                         meta.setObjectIdType(((IdClass) anno).value(), true);
                     break;
                 case NATIVE_QUERIES:
-                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
+                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY)==0)
                         parseNamedNativeQueries(_cls,
                             ((NamedNativeQueries) anno).value());
                     break;
                 case NATIVE_QUERY:
-                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
+                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY)==0)
                         parseNamedNativeQueries(_cls, (NamedNativeQuery) anno);
                     break;
                 case QUERIES:
-                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
+                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY)==0)
                         parseNamedQueries(_cls, ((NamedQueries) anno).value());
                     break;
                 case QUERY:
-                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
+                    if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY)==0)
                         parseNamedQueries(_cls, (NamedQuery) anno);
                     break;
                 case SEQ_GENERATOR:
@@ -987,9 +989,9 @@
         		org.apache.openjpa.meta.FetchGroup child =
         	    meta.getFetchGroup(includedFectchGroupName);
         		if (child == null) 
-        			throw new UserException(_loc.get("missing-included-fg", 
-        				meta.getDescribedType().getName(), fg.getName(),
-        				includedFectchGroupName));
+                    throw new UserException(_loc.get("missing-included-fg", 
+                            meta.getDescribedType().getName(), fg.getName(),
+                            includedFectchGroupName));
         		child.addContainedBy(fg);
         	}
         }
@@ -1175,7 +1177,7 @@
                     break;
                 case LOAD_FETCH_GROUP:
                 	if (isMetaDataMode())
-                		fmd.setLoadFetchGroup(((LoadFetchGroup) anno).value());
+                        fmd.setLoadFetchGroup(((LoadFetchGroup) anno).value());
                 	break;
                 case LRS:
                     if (isMetaDataMode())

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java Fri Apr  3 03:09:53 2009
@@ -488,7 +488,8 @@
      */
     protected void addAnnotation(AnnotationBuilder ab, SequenceMetaData meta) {
         if (_seqAnnos == null)
-            _seqAnnos = new HashMap<SequenceMetaData, List<AnnotationBuilder>>();
+            _seqAnnos = new HashMap<SequenceMetaData,
+                    List<AnnotationBuilder>>();
         List<AnnotationBuilder> list = _seqAnnos.get(meta);
         if (list == null) {
             list = new ArrayList<AnnotationBuilder>();
@@ -1236,8 +1237,9 @@
     }
 
     /**
-     * Represents ordered set of {@link org.apache.openjpa.meta.SequenceMetaData}s with a
-     * common class scope.
+     * Represents ordered set of 
+     * {@link org.apache.openjpa.meta.SequenceMetaData}s with a common class
+     * scope.
      *
      * @author Stephen Kim
      * @author Pinaki Poddar
@@ -1304,8 +1306,8 @@
     }
 
     /**
-     * Represents ordered set of {@link org.apache.openjpa.meta.QueryMetaData}s with a
-     * common class scope.
+     * Represents ordered set of {@link org.apache.openjpa.meta.QueryMetaData}s
+     * with a common class scope.
      *
      * @author Stephen Kim
      * @author Pinaki Poddar
@@ -1498,12 +1500,12 @@
             if (fmd1.isVersion()) {
                 if (fmd2.isVersion())
                     return compareListingOrder(fmd1, fmd2);
-				return getStrategy(fmd2) == PersistenceStrategy.BASIC ? 1 : -1;
+                return getStrategy(fmd2) == PersistenceStrategy.BASIC ? 1 : -1;
 			}
 			if (fmd2.isVersion())
-				return getStrategy(fmd1) == PersistenceStrategy.BASIC ? -1 : 1;
+                return getStrategy(fmd1) == PersistenceStrategy.BASIC ? -1 : 1;
 
-			int stcmp = getStrategy(fmd1).compareTo(getStrategy(fmd2));
+            int stcmp = getStrategy(fmd1).compareTo(getStrategy(fmd2));
             if (stcmp != 0)
                 return stcmp;
             return compareListingOrder(fmd1, fmd2);

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java Fri Apr  3 03:09:53 2009
@@ -279,7 +279,7 @@
                         xmlname = member.getName();
                     field.setXmlname("@"+xmlname);
                     field.setXmlnamespace((String) xmlAttributeNamespace.invoke(
-                        el.getAnnotation(xmlAttributeClass), new Object[]{}));               
+                        el.getAnnotation(xmlAttributeClass), new Object[]{}));
                 }
                 if (field != null)
                     meta.addField(member.getName(), field);

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java Fri Apr  3 03:09:53 2009
@@ -1,7 +1,8 @@
 package org.apache.openjpa.persistence;
 
 import static org.apache.openjpa.kernel.QueryHints.HINT_IGNORE_PREPARED_QUERY;
-import static org.apache.openjpa.kernel.QueryHints.HINT_INVALIDATE_PREPARED_QUERY;
+import static org.apache.openjpa.kernel.QueryHints.
+        HINT_INVALIDATE_PREPARED_QUERY;
 import static org.apache.openjpa.kernel.QueryHints.HINT_RESULT_COUNT;
 
 import java.lang.reflect.Method;
@@ -182,7 +183,7 @@
                 Modifier.PUBLIC | Modifier.STATIC | Modifier.FINAL, 
                 String.class));
 
-            _supportedKeys.addAll(ProductDerivations.getSupportedQueryHints());    
+            _supportedKeys.addAll(ProductDerivations.getSupportedQueryHints());
             
             for (String key : _supportedKeys) {
                 _supportedPrefixes.add(getPrefixOf(key));
@@ -308,7 +309,7 @@
             } else if (HINT_RESULT_COUNT.equals(key)) {
                 int v = (Integer)Filters.convert(value, Integer.class);
                 if (v < 0)
-                    throw new ArgumentException(_loc.get("bad-query-hint-value", 
+                    throw new ArgumentException(_loc.get("bad-query-hint-value",
                         key, value), null,  null, false);
                     plan.setHint(key, v);
             }  else if (HINT_INVALIDATE_PREPARED_QUERY.equals(key)) {

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java Fri Apr  3 03:09:53 2009
@@ -151,8 +151,8 @@
     }
 
     /**
-     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated with the
-     * persistent object <code>o</code>.
+     * Returns the {@link org.apache.openjpa.meta.ClassMetaData} associated with
+     * the persistent object <code>o</code>.
      */
     public static ClassMetaData getMetaData(Object o) {
         if (o == null)

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java Fri Apr  3 03:09:53 2009
@@ -163,7 +163,8 @@
     public static OpenJPAEntityManager getEntityManager(Object o) {
         try {
             if (ImplHelper.isManageable(o)) {
-                PersistenceCapable pc = ImplHelper.toPersistenceCapable(o, null);
+                PersistenceCapable pc = ImplHelper.toPersistenceCapable(o,
+                        null);
                 if (pc != null)
                     return JPAFacadeHelper.toEntityManager(
                         (Broker) pc.pcGetGenericContext());

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java Fri Apr  3 03:09:53 2009
@@ -76,7 +76,7 @@
 
     private static final List EMPTY_LIST = new ArrayList(0);
     private static final String SELECT = "SELECT ";
-	private static final Localizer _loc = Localizer.forPackage(QueryImpl.class);
+    private static final Localizer _loc = Localizer.forPackage(QueryImpl.class);
 
 	private DelegatingQuery _query;
 	private transient EntityManagerImpl _em;
@@ -108,7 +108,8 @@
 	 * 
 	 * @deprecated
 	 */
-	public QueryImpl(EntityManagerImpl em, org.apache.openjpa.kernel.Query query) {
+	public QueryImpl(EntityManagerImpl em,
+	        org.apache.openjpa.kernel.Query query) {
 		this(em, null, query);
 	}
 
@@ -128,7 +129,7 @@
 	}
 
 	public QueryOperationType getOperation() {
-		return QueryOperationType.fromKernelConstant(_query.getOperation());
+        return QueryOperationType.fromKernelConstant(_query.getOperation());
 	}
 
 	public FetchPlan getFetchPlan() {
@@ -137,9 +138,9 @@
 		_query.lock();
 		try {
 			if (_fetch == null)
-				_fetch = ((EntityManagerFactoryImpl) _em
-						.getEntityManagerFactory()).toFetchPlan(_query
-						.getBroker(), _query.getFetchConfiguration());
+                _fetch = ((EntityManagerFactoryImpl) _em
+                        .getEntityManagerFactory()).toFetchPlan(_query
+                        .getBroker(), _query.getFetchConfiguration());
 			return _fetch;
 		} finally {
 			_query.unlock();
@@ -178,7 +179,7 @@
 		return this;
 	}
 
-	public OpenJPAQuery removeAggregateListener(AggregateListener listener) {
+    public OpenJPAQuery removeAggregateListener(AggregateListener listener) {
 		_em.assertNotCloseInvoked();
 		_query.removeAggregateListener(listener);
 		return this;
@@ -217,7 +218,7 @@
 	public OpenJPAQuery setSubclasses(boolean subs) {
 		_em.assertNotCloseInvoked();
 		Class cls = _query.getCandidateType();
-		_query.setCandidateExtent(_query.getBroker().newExtent(cls, subs));
+        _query.setCandidateExtent(_query.getBroker().newExtent(cls, subs));
 		return this;
 	}
 
@@ -232,7 +233,7 @@
 			end = Long.MAX_VALUE;
 		else
 			end = startPosition
-					+ (_query.getEndRange() - _query.getStartRange());
+                    + (_query.getEndRange() - _query.getStartRange());
 		_query.setRange(startPosition, end);
 		return this;
 	}
@@ -258,9 +259,9 @@
 	}
 	
 	private Object execute() {
-		if (!isNative() && _query.getOperation() != QueryOperations.OP_SELECT)
-			throw new InvalidStateException(_loc.get("not-select-query", _query
-					.getQueryString()), null, null, false);
+        if (!isNative() && _query.getOperation() != QueryOperations.OP_SELECT)
+            throw new InvalidStateException(_loc.get("not-select-query", _query
+                    .getQueryString()), null, null, false);
 		try {
 		    lock();
             Map params = _positional != null ? _positional 
@@ -282,8 +283,8 @@
 		if (ob instanceof List) {
 			List ret = (List) ob;
 			if (ret instanceof ResultList)
-				return new DelegatingResultList((ResultList) ret,
-						PersistenceExceptions.getRollbackTranslator(_em));
+                return new DelegatingResultList((ResultList) ret,
+                        PersistenceExceptions.getRollbackTranslator(_em));
 			else
 				return ret;
 		}
@@ -296,14 +297,14 @@
 	 */
 	public Object getSingleResult() {
 		_em.assertNotCloseInvoked();
-		setHint("openjpa.hint.OptimizeResultCount", 1); // for DB2 optimization
+        setHint("openjpa.hint.OptimizeResultCount", 1); // for DB2 optimization
 		List result = getResultList();
 		if (result == null || result.isEmpty())
-			throw new NoResultException(_loc.get("no-result", getQueryString())
-				.getMessage());
+            throw new NoResultException(_loc.get("no-result", getQueryString())
+                    .getMessage());
 		if (result.size() > 1)
-			throw new NonUniqueResultException(_loc.get("non-unique-result",
-				getQueryString(), result.size()).getMessage());
+            throw new NonUniqueResultException(_loc.get("non-unique-result",
+                    getQueryString(), result.size()).getMessage());
 		try {
 		    return result.get(0);
 		} catch (Exception e) {
@@ -330,8 +331,8 @@
 				return asInt(_query.updateAll(_named));
 			return asInt(_query.updateAll());
 		}
-		throw new InvalidStateException(_loc.get("not-update-delete-query",
-				_query.getQueryString()), null, null, false);
+        throw new InvalidStateException(_loc.get("not-update-delete-query",
+                _query.getQueryString()), null, null, false);
 	}
 
 	/**
@@ -340,20 +341,20 @@
 	private static int asInt(long l) {
 		if (l > Integer.MAX_VALUE)
 			return Integer.MAX_VALUE;
-		if (l < Integer.MIN_VALUE) // unlikely, but we might as well check
+        if (l < Integer.MIN_VALUE) // unlikely, but we might as well check
 			return Integer.MIN_VALUE;
 		return (int) l;
 	}
 
 	public FlushModeType getFlushMode() {
 		return EntityManagerImpl.fromFlushBeforeQueries(_query
-				.getFetchConfiguration().getFlushBeforeQueries());
+                .getFetchConfiguration().getFlushBeforeQueries());
 	}
 
 	public OpenJPAQuery setFlushMode(FlushModeType flushMode) {
 		_em.assertNotCloseInvoked();
 		_query.getFetchConfiguration().setFlushBeforeQueries(
-				EntityManagerImpl.toFlushBeforeQueries(flushMode));
+                EntityManagerImpl.toFlushBeforeQueries(flushMode));
 		return this;
 	}
 
@@ -362,12 +363,13 @@
 		return setParameter(position, convertTemporalType(value, t));
 	}
 
-	public OpenJPAQuery setParameter(int position, Date value, TemporalType type) {
+    public OpenJPAQuery setParameter(int position, Date value,
+            TemporalType type) {
 		return setParameter(position, convertTemporalType(value, type));
 	}
 
 	/**
-	 * Converts the given Date to a value corresponding to given temporal type.
+     * Converts the given Date to a value corresponding to given temporal type.
 	 */
 
 	Object convertTemporalType(Date value, TemporalType type) {
@@ -393,18 +395,18 @@
 		_query.lock();
 		try {
 			if (isNative() && position < 1) {
-				throw new IllegalArgumentException(_loc.get("bad-pos-params",
-						position, _query.getQueryString()).toString());
+                throw new IllegalArgumentException(_loc.get("bad-pos-params",
+                        position, _query.getQueryString()).toString());
 			}
-			// not allowed to mix positional and named parameters (EDR2 3.6.4)
+            // not allowed to mix positional and named parameters (EDR2 3.6.4)
 			if (_named != null)
 				throw new InvalidStateException(_loc.get(
-						"no-pos-named-params-mix", _query.getQueryString()),
-						null, null, false);
+                       "no-pos-named-params-mix", _query.getQueryString()),
+                       null, null, false);
 
 			if (position < 1)
-				throw new InvalidStateException(_loc.get("illegal-index",
-						position), null, null, false);
+                throw new InvalidStateException(_loc.get("illegal-index",
+                        position), null, null, false);
 
 			if (_positional == null)
 				_positional = new TreeMap<Integer, Object>();
@@ -421,7 +423,8 @@
 		return setParameter(name, convertTemporalType(value, type));
 	}
 
-	public OpenJPAQuery setParameter(String name, Date value, TemporalType type) {
+    public OpenJPAQuery setParameter(String name, Date value, TemporalType type)
+    {
 		return setParameter(name, convertTemporalType(value, type));
 	}
 
@@ -431,14 +434,14 @@
 		_query.lock();
 		try {
 			if (isNative()) {
-				throw new IllegalArgumentException(_loc.get("no-named-params",
-						name, _query.getQueryString()).toString());
+                throw new IllegalArgumentException(_loc.get("no-named-params",
+                        name, _query.getQueryString()).toString());
 			}
-			// not allowed to mix positional and named parameters (EDR2 3.6.4)
+            // not allowed to mix positional and named parameters (EDR2 3.6.4)
 			if (_positional != null)
 				throw new InvalidStateException(_loc.get(
-						"no-pos-named-params-mix", _query.getQueryString()),
-						null, null, false);
+                        "no-pos-named-params-mix", _query.getQueryString()),
+                        null, null, false);
 
 			if (_named == null)
 				_named = new HashMap();
@@ -492,7 +495,7 @@
 	public Map<String, Object> getNamedParameters() {
 		_query.lock();
 		try {
-			return (_named == null) ? Collections.EMPTY_MAP : Collections
+            return (_named == null) ? Collections.EMPTY_MAP : Collections
 					.unmodifiableMap(_named);
 		} finally {
 			_query.unlock();
@@ -507,8 +510,8 @@
 			_positional = null;
 			_named = null;
 			if (params != null)
-				for (Map.Entry e : (Set<Map.Entry>) params.entrySet())
-					setParameter((String) e.getKey(), e.getValue());
+                for (Map.Entry e : (Set<Map.Entry>) params.entrySet())
+                    setParameter((String) e.getKey(), e.getValue());
 			return this;
 		} finally {
 			_query.unlock();

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=761509&r1=761508&r2=761509&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 Fri Apr  3 03:09:53 2009
@@ -1475,7 +1475,8 @@
 
         if (fmd.getDeclaredTypeCode() != JavaTypes.COLLECTION &&
             fmd.getDeclaredTypeCode() != JavaTypes.MAP)
-            throw getException(_loc.get("bad-meta-anno", fmd, "ElementCollection"));
+            throw getException(_loc.get("bad-meta-anno", fmd,
+                    "ElementCollection"));
 
         val = attrs.getValue("fetch");
         if (val != null)
@@ -1558,7 +1559,8 @@
         if (meta != null) {
         	Class defType = meta.getDefiningType();
             if ((defType != _cls) && log.isWarnEnabled()) {
-            	log.warn(_loc.get("dup-query", name, currentLocation(), defType));
+                log.warn(_loc.get("dup-query", name, currentLocation(),
+            	        defType));
             }
             pushElement(meta);
             return true;
@@ -1569,7 +1571,8 @@
         meta.setQueryString(attrs.getValue("query"));
         meta.setLanguage(JPQLParser.LANG_JPQL);
         /** TODO: Uncomment when orm.xsd defines lockmode 
-        LockModeType lockMode = LockModeType.valueOf(attrs.getValue("lockMode"));
+        LockModeType lockMode =
+                 LockModeType.valueOf(attrs.getValue("lockMode"));
         meta.addHint("openjpa.FetchPlan.ReadLockMode", 
             JPA2LockLevels.toLockLevel(lockMode));
         **/

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java Fri Apr  3 03:09:53 2009
@@ -1470,12 +1470,12 @@
             if (fmd1.isVersion()) {
                 if (fmd2.isVersion())
                     return compareListingOrder(fmd1, fmd2);
-				return getStrategy(fmd2) == PersistenceStrategy.BASIC ? 1 : -1;
+                return getStrategy(fmd2) == PersistenceStrategy.BASIC ? 1 : -1;
 			}
 			if (fmd2.isVersion())
-				return getStrategy(fmd1) == PersistenceStrategy.BASIC ? -1 : 1;
+                return getStrategy(fmd1) == PersistenceStrategy.BASIC ? -1 : 1;
 
-			int stcmp = getStrategy(fmd1).compareTo(getStrategy(fmd2));
+            int stcmp = getStrategy(fmd1).compareTo(getStrategy(fmd2));
             if (stcmp != 0)
                 return stcmp;
             return compareListingOrder(fmd1, fmd2);

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java Fri Apr  3 03:09:53 2009
@@ -63,7 +63,7 @@
 	 * Also the joined path becomes a domain of the owning query.
 	 */
 	public DomainObject join(String attr) {
-		return _owner.addDomain(new JoinPath(this, PathOperator.INNER, attr));
+        return _owner.addDomain(new JoinPath(this, PathOperator.INNER, attr));
 	}
 	
 	/**
@@ -71,14 +71,14 @@
 	 * Also the joined path becomes a domain of the owning query.
 	 */
 	public DomainObject leftJoin(String attr) {
-		return _owner.addDomain(new JoinPath(this, PathOperator.OUTER, attr));
+        return _owner.addDomain(new JoinPath(this, PathOperator.OUTER, attr));
 	}
 	
 	/**
 	 * Derives a path from this path by fetch joining the given field.
 	 */
 	public FetchJoinObject joinFetch(String attr) {
-		return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_INNER, 
+        return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_INNER, 
 			attr));
 	}
 
@@ -86,7 +86,7 @@
 	 * Derives a path from this path by fetch joining the given field.
 	 */
 	public FetchJoinObject leftJoinFetch(String attr) {
-		return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_OUTER, 
+        return _owner.addDomain(new FetchPath(this, PathOperator.FETCH_OUTER,
 			attr));
 	}
 

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java Fri Apr  3 03:09:53 2009
@@ -52,15 +52,15 @@
 		_operator = op;
 	}
 	
-	// ------------------------------------------------------------------------
-	// Path related functions.
-	// ------------------------------------------------------------------------
+    // ------------------------------------------------------------------------
+    // Path related functions.
+    // ------------------------------------------------------------------------
 	
 	final QueryDefinitionImpl getOwner() {
 		return _owner;
 	}
 	/**
-	 * Gets the parent from which this receiver has been derived. Can be null
+     * Gets the parent from which this receiver has been derived. Can be null
 	 * for a root path.
 	 */
 	public AbstractPath getParent() {
@@ -82,9 +82,9 @@
 		return _part2;
 	}
 
-	// -----------------------------------------------------------------------
-	// Implementation of PathExpression
-	// -----------------------------------------------------------------------
+    // -----------------------------------------------------------------------
+    // Implementation of PathExpression
+    // -----------------------------------------------------------------------
 	public Aggregate avg() {
 		return new AverageExpression(this);
 	}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java Fri Apr  3 03:09:53 2009
@@ -33,19 +33,19 @@
 	public static final String EMPTY = "";
 	
 	public String asExpression(AliasContext ctx) {
-		throw new UnsupportedOperationException(this.getClass().getName());
+        throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
 	public String asProjection(AliasContext ctx) {
-		throw new UnsupportedOperationException(this.getClass().getName());
+        throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
 	public String getAliasHint(AliasContext ctx) {
-		throw new UnsupportedOperationException(this.getClass().getName());
+        throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
 	public String asJoinable(AliasContext ctx) {
-		throw new UnsupportedOperationException(this.getClass().getName());
+        throw new UnsupportedOperationException(this.getClass().getName());
 	}
 
 }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java Fri Apr  3 03:09:53 2009
@@ -53,7 +53,7 @@
 	public String setAlias(ExpressionImpl path) {
 		if (_aliases.containsKey(path))
 			return _aliases.get(path);
-		String alias = path.getAliasHint(this).substring(0,1).toLowerCase();
+        String alias = path.getAliasHint(this).substring(0,1).toLowerCase();
 		int i = 2;
 		while (_aliases.containsValue(alias)) {
 			alias = alias.substring(0,1) + i;
@@ -73,7 +73,7 @@
 	
 	public AliasContext push(Object e) {
 		if (_operating.contains(e))
-			throw new RuntimeException(e + " is already in this ctx");
+            throw new RuntimeException(e + " is already in this ctx");
 		_operating.add(e);
 		return this;
 	}

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java Fri Apr  3 03:09:53 2009
@@ -20,7 +20,7 @@
 
 
 /**
- * A single expression that holds an array of values. Used as the second operand 
+ * A single expression that holds an array of values. Used as the second operand
  * in e1 IN(e2) expression, for example. Different than 
  * {@link VarArgsExpression} which represents multiple expressions.  
  * 
@@ -40,8 +40,8 @@
 		for (int i = 0; i < _values.length; i++) {
 			Object v = _values[i];
 			tmp.append((v instanceof Visitable ? 
-				((Visitable)v).asExpression(ctx) : JPQLHelper.toJPQL(ctx, v)))
-			   .append(i == _values.length-1 ? EMPTY : COMMA + SPACE);
+                ((Visitable)v).asExpression(ctx) : JPQLHelper.toJPQL(ctx, v)))
+                .append(i == _values.length-1 ? EMPTY : COMMA + SPACE);
 		}
 		tmp.append(CLOSE_BRACE);
 		return tmp.toString();

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java Fri Apr  3 03:09:53 2009
@@ -62,7 +62,7 @@
 	
 	public Predicate not() {
 		if (  _nop == null)
-			throw new UnsupportedOperationException(this.toString());
+            throw new UnsupportedOperationException(this.toString());
 		return new BinaryExpressionPredicate(_e1, _nop, _op, _e2);
 	}
 

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java Fri Apr  3 03:09:53 2009
@@ -29,7 +29,7 @@
 	protected final Expression _e2;
 	protected final BinaryFunctionalOperator   _op;
 	
-	public BinaryOperatorExpression(Expression e1, BinaryFunctionalOperator op, 
+    public BinaryOperatorExpression(Expression e1, BinaryFunctionalOperator op,
 		Expression e2) {
 		_e1 = e1;
 		_e2 = e2;

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpression.java Fri Apr  3 03:09:53 2009
@@ -44,8 +44,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Expression when);
@@ -56,8 +56,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Number when);
@@ -80,8 +80,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Date when);
@@ -92,8 +92,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Calendar when);
@@ -104,8 +104,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Class when);
@@ -116,8 +116,8 @@
      * the result of the specific case. Clauses are evaluated in the order added
      *
      * @param when -
-     *             corresponds to the value against which the case operand of the
-     *             simple case is tested
+     *             corresponds to the value against which the case operand of
+     *             the simple case is tested
      * @return CaseExpression corresponding to the case with the added clause
      */
     CaseExpression when(Enum<?> when);
@@ -266,9 +266,9 @@
      * clause.
 	 *
 	 * @param arg -
-	 *            corresponds to the result of the case expression if the when
-	 *            condition is not satisfied
-	 * @return Expression corresponding to the case expression with the added
+     *            corresponds to the result of the case expression if the when
+     *            condition is not satisfied
+     * @return Expression corresponding to the case expression with the added
 	 *         clause
 	 */
 	Expression elseCase(Calendar arg);
@@ -278,9 +278,9 @@
 	 * clause.
 	 *
 	 * @param arg -
-	 *            corresponds to the result of the case expression if the when
+     *            corresponds to the result of the case expression if the when
 	 *            condition is not satisfied
-	 * @return Expression corresponding to the case expression with the added
+     * @return Expression corresponding to the case expression with the added
 	 *         clause
 	 */
 	Expression elseCase(Class arg);
@@ -290,9 +290,9 @@
 	 * clause.
 	 *
 	 * @param arg -
-	 *            corresponds to the result of the case expression if the when
+     *            corresponds to the result of the case expression if the when
 	 *            condition is not satisfied
-	 * @return Expression corresponding to the case expression with the added
+     * @return Expression corresponding to the case expression with the added
 	 *         clause
 	 */
 	Expression elseCase(Enum<?> arg);

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java Fri Apr  3 03:09:53 2009
@@ -163,13 +163,13 @@
 	void assertWhenState() {
 		boolean ok = _whens.isEmpty() || _whens.getLast().hasThen();
 		if (!ok)
-			throw new IllegalStateException("when() can not be called now");
+            throw new IllegalStateException("when() can not be called now");
 	}
 	
 	void assertThenState() {
 		boolean ok = !_whens.isEmpty() && !_whens.getLast().hasThen();
 		if (!ok)
-			throw new IllegalStateException("then() can not be called now");
+            throw new IllegalStateException("then() can not be called now");
 	}
 	
 	public String asExpression(AliasContext ctx) {

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java Fri Apr  3 03:09:53 2009
@@ -45,7 +45,7 @@
 		Now now = (_type == Date.class 
 				? Now.CURRENT_DATE
 				: (_type == Time.class
-						? Now.CURRENT_TIME : Now.CURRENT_TIMESTAMP));
+                        ? Now.CURRENT_TIME : Now.CURRENT_TIMESTAMP));
 		return now.toString();
 	}
 	

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DomainObject.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DomainObject.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DomainObject.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DomainObject.java Fri Apr  3 03:09:53 2009
@@ -35,7 +35,8 @@
      * object.
      *
      * @param attribute -
-     *                  name of the attribute that references the target of the join
+     *                  name of the attribute that references the target of the
+     *                  join
      * @return the new DomainObject that is added for the target of the join
      */
     DomainObject join(String attribute);
@@ -51,7 +52,8 @@
      * newly joined domain object.
      *
      * @param attribute -
-     *                  name of the attribute that references the target of the join
+     *                  name of the attribute that references the target of the
+     *                  join
      * @return the new DomainObject that is added for the target of the join
      */
     DomainObject leftJoin(String attribute);
@@ -63,7 +65,8 @@
      * The query is modified to include the joined domain object.
      *
      * @param attribute -
-     *                  name of the attribute that references the target of the join
+     *                  name of the attribute that references the target of the
+     *                  join
      * @return the FetchJoinObject that is added for the target of the join
      */
     FetchJoinObject joinFetch(String attribute);
@@ -75,7 +78,8 @@
      * attribute. The query is modified to include the joined domain object.
      *
      * @param attribute -
-     *                  name of the attribute that references the target of the join
+     *                  name of the attribute that references the target of the
+     *                  join
      * @return the FetchJoinObject that is added for the target of the join
      */
     FetchJoinObject leftJoinFetch(String attribute);
@@ -114,7 +118,7 @@
      * Return an expression that corresponds to the index. of the domain object
      * in the referenced association or element collection. This method is only
 	 * permitted to be invoked upon a domain object that corresponds to a
-	 * multi-valued association or element collection for which an order column
+     * multi-valued association or element collection for which an order column
 	 * has been defined.
 	 *
 	 * @return Expression denoting the index

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/Expression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/Expression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/Expression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/Expression.java Fri Apr  3 03:09:53 2009
@@ -341,8 +341,8 @@
      * @param str      -
      *                 string to be located
      * @param position -
-     *                 expression corresponding to position at which to start the
-     *                 search
+     *                 expression corresponding to position at which to start
+     *                 the search
      * @return expression denoting the first position at which the string was
      *         found or expression denoting 0 if the string was not found
      */
@@ -372,8 +372,8 @@
      * @param str      -
      *                 expression corresponding to the string to be located
      * @param position -
-     *                 expression corresponding to position at which to start the
-     *                 search
+     *                 expression corresponding to position at which to start
+     *                 the search
      * @return expression denoting the first position at which the string was
      *         found or expression denoting 0 if the string was not found
      */
@@ -491,7 +491,7 @@
 	Expression abs();
 
 	/**
-	 * Square root. This method must be invoked on an expression corresponding
+     * Square root. This method must be invoked on an expression corresponding
 	 * to a number.
 	 *
 	 * @return expression corresponding to the square root
@@ -499,26 +499,26 @@
 	Expression sqrt();
 
 	/**
-	 * Modulo operation. This must be invoked on an expression corresponding to
+     * Modulo operation. This must be invoked on an expression corresponding to
 	 * an integer value
 	 *
 	 * @param num -
 	 *            integer divisor
-	 * @return expression corresponding to the integer remainder of the division
+     * @return expression corresponding to the integer remainder of the division
 	 *         of the integer corresponding to the expression on which the
 	 *         method was invoked by the argument.
 	 */
 	Expression mod(int num);
 
 	/**
-         * Modulo operation. This must be invoked on an expression corresponding to
-         * an integer value
-         *
-         * @param expr -
-         *             expression corresponding to integer divisor
-         * @return expression corresponding to the integer remainder of the division
-         *         of the integer corresponding to the expression on which the
-         *         method was invoked by the argument.
-         */
+     * Modulo operation. This must be invoked on an expression corresponding to
+     * an integer value
+     *
+     * @param expr -
+     *             expression corresponding to integer divisor
+     * @return expression corresponding to the integer remainder of the division
+     *         of the integer corresponding to the expression on which the
+     *         method was invoked by the argument.
+     */
 	Expression mod(Expression expr);
 }
\ No newline at end of file

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java Fri Apr  3 03:09:53 2009
@@ -48,7 +48,7 @@
 	}
 
 	public Expression dividedBy(Number num) {
-		return new DividedByExpression(this, new ConstantExpression(num));
+        return new DividedByExpression(this, new ConstantExpression(num));
 	}
 
 	public Expression dividedBy(Expression expr) {
@@ -164,11 +164,13 @@
 	}
 
 	public Expression substring(int start, Expression len) {
-		return new SubStringExpression(this, new ConstantExpression(start), len);
+        return new SubStringExpression(this, new ConstantExpression(start),
+                len);
 	}
 
 	public Expression substring(Expression start, int len) {
-		return new SubStringExpression(this, start, new ConstantExpression(len));
+        return new SubStringExpression(this, start,
+                new ConstantExpression(len));
 	}
 
 	public Expression substring(Expression start, Expression len) {
@@ -236,11 +238,11 @@
 
 	public Predicate between(Number arg1, Number arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			new ConstantExpression(arg1), new ConstantExpression(arg2)));
+            new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
 	public Predicate between(PredicateOperand arg1, String arg2) {
-		return new BetweenExpression(this, new RangeExpression((Expression)arg1, 
+        return new BetweenExpression(this, new RangeExpression((Expression)arg1,
 			new ConstantExpression(arg2)));
 	}
 
@@ -251,22 +253,22 @@
 
 	public Predicate between(String arg1, String arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			new ConstantExpression(arg1), new ConstantExpression(arg2)));
+            new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
 	public Predicate between(PredicateOperand arg1, Date arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			(Expression)arg1, new ConstantExpression(arg2)));
+            (Expression)arg1, new ConstantExpression(arg2)));
 	}
 
 	public Predicate between(Date arg1, PredicateOperand arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			new ConstantExpression(arg1), (Expression)arg2));
+            new ConstantExpression(arg1), (Expression)arg2));
 	}
 
 	public Predicate between(Date arg1, Date arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			new ConstantExpression(arg1), new ConstantExpression(arg2)));
+            new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
 	public Predicate between(PredicateOperand arg1, Calendar arg2) {
@@ -281,7 +283,7 @@
 
 	public Predicate between(Calendar arg1, Calendar arg2) {
 		return new BetweenExpression(this, new RangeExpression(
-			new ConstantExpression(arg1), new ConstantExpression(arg2)));
+            new ConstantExpression(arg1), new ConstantExpression(arg2)));
 	}
 
 	public Predicate equal(PredicateOperand arg) {
@@ -317,108 +319,108 @@
 	}
 
 	public Predicate greaterEqual(PredicateOperand arg) {
-		return new GreaterEqualExpression(this, new ConstantExpression(arg));
+        return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterEqual(Number arg) {
-		return new GreaterEqualExpression(this, new ConstantExpression(arg));
+        return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterEqual(String arg) {
-		return new GreaterEqualExpression(this, new ConstantExpression(arg));
+        return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterEqual(Date arg) {
-		return new GreaterEqualExpression(this, new ConstantExpression(arg));
+        return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterEqual(Calendar arg) {
-		return new GreaterEqualExpression(this, new ConstantExpression(arg));
+        return new GreaterEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterThan(PredicateOperand arg) {
-		return new GreaterThanExpression(this, (Expression)arg);
+        return new GreaterThanExpression(this, (Expression)arg);
 	}
 
 	public Predicate greaterThan(Number arg) {
-		return new GreaterThanExpression(this, new ConstantExpression(arg));
+        return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterThan(String arg) {
-		return new GreaterThanExpression(this, new ConstantExpression(arg));
+        return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterThan(Date arg) {
-		return new GreaterThanExpression(this, new ConstantExpression(arg));
+        return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate greaterThan(Calendar arg) {
-		return new GreaterThanExpression(this, new ConstantExpression(arg));
+        return new GreaterThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessEqual(PredicateOperand arg) {
-		return new LessEqualExpression(this, new ConstantExpression(arg));
+        return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessEqual(Number arg) {
-		return new LessEqualExpression(this, new ConstantExpression(arg));
+        return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessEqual(String arg) {
-		return new LessEqualExpression(this, new ConstantExpression(arg));
+        return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessEqual(Date arg) {
-		return new LessEqualExpression(this, new ConstantExpression(arg));
+        return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessEqual(Calendar arg) {
-		return new LessEqualExpression(this, new ConstantExpression(arg));
+        return new LessEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessThan(PredicateOperand arg) {
-		return new LessThanExpression(this, (Expression)arg);
+        return new LessThanExpression(this, (Expression)arg);
 	}
 
 	public Predicate lessThan(Number arg) {
-		return new LessThanExpression(this, new ConstantExpression(arg));
+        return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessThan(String arg) {
-		return new LessThanExpression(this, new ConstantExpression(arg));
+        return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessThan(Date arg) {
-		return new LessThanExpression(this, new ConstantExpression(arg));
+        return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate lessThan(Calendar arg) {
-		return new LessThanExpression(this, new ConstantExpression(arg));
+        return new LessThanExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate like(PredicateOperand pattern) {
 		return new LikeExpression(this, (Expression)pattern);
 	}
 
-	public Predicate like(PredicateOperand pattern, PredicateOperand escChar) {
+    public Predicate like(PredicateOperand pattern, PredicateOperand escChar) {
 		return new LikeExpression(this, (Expression)pattern, escChar);
 	}
 
 	public Predicate like(PredicateOperand pattern, char escapeChar) {
-		return new LikeExpression(this, (Expression)pattern, escapeChar);
+        return new LikeExpression(this, (Expression)pattern, escapeChar);
 	}
 
 	public Predicate like(String pattern) {
-		return new LikeExpression(this, new ConstantExpression(pattern));
+        return new LikeExpression(this, new ConstantExpression(pattern));
 	}
 
 	public Predicate like(String pattern, PredicateOperand escapeChar) {
-		return new LikeExpression(this, new ConstantExpression(pattern), 
+        return new LikeExpression(this, new ConstantExpression(pattern), 
 			escapeChar);
 	}
 
 	public Predicate like(String pattern, char escChar) {
-		return new LikeExpression(this, new ConstantExpression(pattern), 
+        return new LikeExpression(this, new ConstantExpression(pattern), 
 			escChar);
 	}
 
@@ -427,27 +429,27 @@
 	}
 
 	public Predicate notEqual(Class cls) {
-		return new NotEqualExpression(this, new ConstantExpression(cls));
+        return new NotEqualExpression(this, new ConstantExpression(cls));
 	}
 
 	public Predicate notEqual(Number arg) {
-		return new NotEqualExpression(this, new ConstantExpression(arg));
+        return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate notEqual(String arg) {
-		return new NotEqualExpression(this, new ConstantExpression(arg));
+        return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate notEqual(boolean arg) {
-		return new NotEqualExpression(this, new ConstantExpression(arg));
+        return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate notEqual(Date arg) {
-		return new NotEqualExpression(this, new ConstantExpression(arg));
+        return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate notEqual(Calendar arg) {
-		return new NotEqualExpression(this,	new ConstantExpression(arg));
+        return new NotEqualExpression(this, new ConstantExpression(arg));
 	}
 
 	public Predicate notEqual(Enum<?> e) {

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java Fri Apr  3 03:09:53 2009
@@ -28,7 +28,7 @@
  */
 public class FetchPath extends AbstractDomainObject 
     implements FetchJoinObject, Visitable {
-	FetchPath(AbstractDomainObject parent, PathOperator joinType, String attr) {
+    FetchPath(AbstractDomainObject parent, PathOperator joinType, String attr) {
 		super(parent.getOwner(), parent, joinType, attr);
 	}
 	

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java Fri Apr  3 03:09:53 2009
@@ -26,7 +26,8 @@
  */
 public class GreaterThanExpression extends BinaryExpressionPredicate {
 	public GreaterThanExpression(Expression op1, Expression op2) {
-		super(op1, BinaryConditionalOperator.GREATER, BinaryConditionalOperator.LESSEQUAL, op2);
+        super(op1, BinaryConditionalOperator.GREATER,
+                BinaryConditionalOperator.LESSEQUAL, op2);
 	}
 
 }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java Fri Apr  3 03:09:53 2009
@@ -27,7 +27,8 @@
  *
  */
 public class JoinPath extends AbstractDomainObject implements DomainObject {
-	public JoinPath(AbstractDomainObject parent, PathOperator join, String attr) {
+    public JoinPath(AbstractDomainObject parent, PathOperator join, String attr)
+    {
 		super(parent.getOwner(), parent, join, attr);
 	}
 	
@@ -75,7 +76,7 @@
 	}
 	
 	public String toString() {
-		return getOperator() + getParent().toString() + "*" + getLastSegment();
+        return getOperator() + getParent().toString() + "*" + getLastSegment();
 	}
 
 }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java Fri Apr  3 03:09:53 2009
@@ -45,8 +45,8 @@
 	
 	@Override
 	public String asExpression(AliasContext ctx) {
-		return super.asExpression(ctx) 
-		    + (_escaped ? "ESCAPE " + JPQLHelper.toJPQL(ctx, _echar) : EMPTY);
+		return super.asExpression(ctx) +
+            (_escaped ? "ESCAPE " + JPQLHelper.toJPQL(ctx, _echar) : EMPTY);
 	}
 
 }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java Fri Apr  3 03:09:53 2009
@@ -31,7 +31,8 @@
 	private final Expression _start;
 
 	public LocateExpression(Expression key, String str, int start) {
-		super(key, BinaryFunctionalOperator.LOCATE, new ConstantExpression(str));
+        super(key, BinaryFunctionalOperator.LOCATE,
+                new ConstantExpression(str));
 		_start = new ConstantExpression(start);
 	}
 	
@@ -41,17 +42,19 @@
 	}
 	
 	public LocateExpression(Expression key, String str, Expression start) {
-		super(key, BinaryFunctionalOperator.LOCATE, new ConstantExpression(str));
+        super(key, BinaryFunctionalOperator.LOCATE,
+                new ConstantExpression(str));
 		_start = start;
 	}
 	
-	public LocateExpression(Expression key, Expression str, Expression start) {
-		super(key, BinaryFunctionalOperator.LOCATE, str);
+    public LocateExpression(Expression key, Expression str, Expression start) {
+        super(key, BinaryFunctionalOperator.LOCATE, str);
 		_start = start;
 	}
 	
 	public String asExpression(AliasContext ctx) {
-		String start = _start == null ? EMPTY : COMMA + ((Visitable)_start).asExpression(ctx);
+        String start = _start == null ? EMPTY : COMMA +
+                ((Visitable)_start).asExpression(ctx);
 		return new StringBuffer(_op.toString())
 		    .append(OPEN_BRACE)
 		    .append(((Visitable)_e1).asExpression(ctx))

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java Fri Apr  3 03:09:53 2009
@@ -26,7 +26,7 @@
  *
  */
 class NavigationPath extends AbstractDomainObject implements PathExpression {
-	protected NavigationPath(QueryDefinitionImpl owner, AbstractPath parent, 
+    protected NavigationPath(QueryDefinitionImpl owner, AbstractPath parent, 
 		String attr) {
 		super(owner, parent, NAVIGATION, attr);
 	}
@@ -45,13 +45,13 @@
 	public String asProjection(AliasContext ctx) {
 		AbstractPath parent = getParent();
 		if (ctx.hasAlias(parent))
-			return ctx.getAlias(parent) + NAVIGATION + getLastSegment();
-		return getParent().asProjection(ctx) + NAVIGATION + getLastSegment();
+            return ctx.getAlias(parent) + NAVIGATION + getLastSegment();
+        return getParent().asProjection(ctx) + NAVIGATION + getLastSegment();
 	}
 		
 	@Override
 	public String asExpression(AliasContext ctx) {
-		return getParent().asExpression(ctx) + NAVIGATION + getLastSegment();
+        return getParent().asExpression(ctx) + NAVIGATION + getLastSegment();
 	}
 	
 	/**

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java Fri Apr  3 03:09:53 2009
@@ -48,7 +48,7 @@
 	
 	
 	public String asProjection(AliasContext ctx) {
-		StringBuffer tmp = new StringBuffer("NEW ").append(_cls.getName())
+        StringBuffer tmp = new StringBuffer("NEW ").append(_cls.getName())
 		    .append("(");
 		if (_args == null || _args.isEmpty())
 			return tmp.append(")").toString();

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java Fri Apr  3 03:09:53 2009
@@ -27,7 +27,7 @@
  *
  */
 public class OperatorPath extends AbstractDomainObject {
-	public OperatorPath(AbstractDomainObject operand, PathOperator operator) {
+    public OperatorPath(AbstractDomainObject operand, PathOperator operator) {
 		super(operand.getOwner(), operand, operator, null);
 	}
 		
@@ -43,12 +43,12 @@
 	
 	@Override
 	public String asProjection(AliasContext ctx) {
-		return getOperator() + "(" + getParent().asProjection(ctx) + ")";
+        return getOperator() + "(" + getParent().asProjection(ctx) + ")";
 	}
 	
 	@Override
 	public String asExpression(AliasContext ctx) {
-		return getOperator() + "(" + getParent().asExpression(ctx) + ")";
+        return getOperator() + "(" + getParent().asExpression(ctx) + ")";
 	}
 		
 	@Override

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java Fri Apr  3 03:09:53 2009
@@ -44,7 +44,7 @@
 	}
 	
 	public String asExpression(AliasContext ctx) {
-		return (ctx.hasAlias(_e) ? ctx.getAlias(_e) : _e.asExpression(ctx)) 
+        return (ctx.hasAlias(_e) ? ctx.getAlias(_e) : _e.asExpression(ctx))
 		    + (_asc == null ? "" : (_asc ? " ASC " : " DESC"));
 	}
 }

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PredicateOperand.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PredicateOperand.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PredicateOperand.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PredicateOperand.java Fri Apr  3 03:09:53 2009
@@ -558,8 +558,8 @@
 	Predicate like(PredicateOperand pattern, char escapeChar);
 
 	/**
-	 * Create a predicate for testing whether the PredicateOperand satisfies the
-	 * given pattern.
+     * Create a predicate for testing whether the PredicateOperand satisfies
+     * the given pattern.
 	 *
 	 * @param pattern
 	 * @return conditional predicate
@@ -567,8 +567,8 @@
 	Predicate like(String pattern);
 
 	/**
-	 * Create a predicate for testing whether the PredicateOperand satisfies the
-	 * given pattern.
+     * Create a predicate for testing whether the PredicateOperand satisfies
+     * the given pattern.
 	 *
 	 * @param pattern
 	 * @param escapeChar
@@ -577,8 +577,8 @@
 	Predicate like(String pattern, PredicateOperand escapeChar);
 
 	/**
-	 * Create a predicate for testing whether the PredicateOperand satisfies the
-	 * given pattern.
+     * Create a predicate for testing whether the PredicateOperand satisfies
+     * the given pattern.
 	 *
 	 * @param pattern
 	 * @param escapeChar

Modified: openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java (original)
+++ openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java Fri Apr  3 03:09:53 2009
@@ -63,7 +63,7 @@
 			.getMetaDataRepositoryInstance();
 		AliasContext ctx = new AliasContext(repos);
 		if (query instanceof AbstractDomainObject)
-			return ((AbstractDomainObject)query).getOwner().asExpression(ctx);
+            return ((AbstractDomainObject)query).getOwner().asExpression(ctx);
 		return ((QueryDefinitionImpl)query).asExpression(ctx);
 	}
 	



Mime
View raw message