openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r761509 [1/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
Author: mikedd
Date: Fri Apr  3 03:09:53 2009
New Revision: 761509

URL: http://svn.apache.org/viewvc?rev=761509&view=rev
Log:
OPENJPA-1015 fix line wrapping in source files. Based on patch contributed by B.J. Reed. Updates made to do enforce line wrapping during the process-sources phase of the build.

Modified:
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DerbyDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PostgresDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/PrimaryRow.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Result.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Row.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLBuffer.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLErrorCodeReader.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SQLServerDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/Select.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SybaseDictionary.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/CacheMarshaller.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfiguration.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAConfigurationImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/AbstractQueryCache.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/CacheStatistics.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/datacache/DataCachePCDataImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCDataGenerator.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCSubclassValidator.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/JMSRemoteCommitProvider.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/LogOrphanedKeyAction.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/RemoteCommitListener.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachedStateManager.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FinderCache.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/InMemorySavepointManager.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQuery.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/PreparedQueryCache.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryStatistics.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StateManagerImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/StoreQuery.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/UUIDType4StringSeq.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/exps/AbstractExpressionBuilder.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/jpql/JPQLExpressionBuilder.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ProxySetupStateManager.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
    openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/QueryException.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/PluginValue.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivation.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/DepthFirstAnalysis.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/graph/Edge.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
    openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingSerializer.java
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/JDBCFetchPlanImpl.java
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/PersistenceMappingDefaults.java
    openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingSerializer.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationBuilder.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataSerializer.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/HintHandler.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/JPAFacadeHelper.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistence.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/QueryImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataSerializer.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractDomainObject.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AbstractVisitable.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/AliasContext.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ArrayExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryExpressionPredicate.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/BinaryOperatorExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CaseExpressionImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/CurrentTimeExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/DomainObject.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/Expression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/ExpressionImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/FetchPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/GreaterThanExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/JoinPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LikeExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/LocateExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NavigationPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/NewInstance.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OperatorPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/OrderableItem.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/PredicateOperand.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryBuilderImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinition.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryDefinitionImpl.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/QueryExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/RootPath.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/SubStringExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryExpressionPredicate.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/UnaryOperatorExpression.java
    openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/query/WhenClause.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedBrokerImpl.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedConfiguration.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributedQueryImpl.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/DistributionPolicy.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/ProductDerivation.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/ReplicationPolicy.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceImplHelper.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SliceInfo.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/SlicePersistence.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedConnection.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedDataSource.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCBrokerFactory.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCConfigurationImpl.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedPreparedStatement.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedResultSet.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreQuery.java
    openjpa/trunk/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedTemplate.java
    openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/ObjectData.java
    openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/JDBCConfigurationImpl.java Fri Apr  3 03:09:53 2009
@@ -317,7 +317,8 @@
         preparedQueryCachePlugin.setDefault(aliases[0]);
         preparedQueryCachePlugin.setClassName(aliases[1]);
         preparedQueryCachePlugin.setDynamic(true);
-        preparedQueryCachePlugin.setInstantiatingGetter("getQuerySQLCacheInstance");
+        preparedQueryCachePlugin.setInstantiatingGetter(
+                "getQuerySQLCacheInstance");
 
         finderCachePlugin = addPlugin("jdbc.FinderCache", true);
         aliases = new String[] {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java Fri Apr  3 03:09:53 2009
@@ -151,7 +151,7 @@
      * <code>TYPE_CONTIGUOUS</code> the connection from the {@link StoreManager}
      * will be returned. 
      * 
-     * <P>Otherwise a new connection will be obtained using DataSource2 from the 
+     * <P>Otherwise a new connection will be obtained using DataSource2 from the
      * current configuration. In this case autocommit is set to false prior to 
      * returning the connection.</P>
      */

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractUpdateManager.java Fri Apr  3 03:09:53 2009
@@ -92,9 +92,11 @@
                 StateManagerImpl sm = (StateManagerImpl) obj;
                 if (sm.getMappedByIdFields() != null)
                     mappedByIdStates.add(sm);
-                else exceps = populateRowManager(sm, rowMgr, store, exceps, customs);
+                else exceps = populateRowManager(sm, rowMgr, store, exceps,
+                        customs);
             } else 
-                exceps = populateRowManager(obj, rowMgr, store, exceps, customs);
+                exceps = populateRowManager(obj, rowMgr, store, exceps,
+                        customs);
         }
 
         // flush rows
@@ -364,8 +366,9 @@
     /**
      * Update version and discriminator indicators.
      */
-    protected void updateIndicators(OpenJPAStateManager sm, ClassMapping mapping,
-        RowManager rowMgr, JDBCStore store, Collection customs,
+    protected void updateIndicators(OpenJPAStateManager sm,
+            ClassMapping mapping, RowManager rowMgr, JDBCStore store,
+            Collection customs,
         boolean versionUpdateOnly) throws SQLException {
         while (mapping.getJoinablePCSuperclassMapping() != null)
             mapping = mapping.getJoinablePCSuperclassMapping();
@@ -410,7 +413,8 @@
         private final OpenJPAStateManager _sm;
         private final Strategy _strat;
 
-        public CustomMapping(int action, OpenJPAStateManager sm, Strategy strat) {
+        public CustomMapping(int action, OpenJPAStateManager sm, Strategy strat)
+        {
             _action = action;
             _sm = sm;
             _strat = strat;

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingConstraintUpdateManager.java Fri Apr  3 03:09:53 2009
@@ -36,7 +36,7 @@
  * the following property: 
  * <PRE>
  *   < property name="openjpa.jdbc.UpdateManager" 
- *     value="org.apache.openjpa.jdbc.kernel.YourOperationOrderUpdateManager" />   
+ *     value="org.apache.openjpa.jdbc.kernel.YourOperationOrderUpdateManager" />
  * </PRE></P>
  * @author Teresa Kan
  */

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/BatchingPreparedStatementManagerImpl.java Fri Apr  3 03:09:53 2009
@@ -256,7 +256,7 @@
                         row.getSQL(_dict)).getMessage());
                 break;
             case Statement.SUCCESS_NO_INFO: // -2
-                if (_dict.reportsSuccessNoInfoOnBatchUpdates &&                    
+                if (_dict.reportsSuccessNoInfoOnBatchUpdates &&
                     updateSuccessCnt != count.length) {
                     // Oracle batching specifics:
                     // treat update/delete of SUCCESS_NO_INFO as failed case

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ConstraintUpdateManager.java Fri Apr  3 03:09:53 2009
@@ -511,8 +511,9 @@
 
                 if (!breakableLink.isRemovedFromGraph()) {
 
-                    // use a primary row update to prevent setting pk and fk values
-                    // until after flush, to get latest auto-increment values
+                    // use a primary row update to prevent setting pk and fk
+                    // values until after flush, to get latest auto-increment
+                    // values
                     PrimaryRow row = (PrimaryRow) breakableLink.getFrom();
                     if (row.getAction() == Row.ACTION_DELETE) {
                         addDeleteUpdate(breakableLink, deleteUpdates);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/FinderCacheImpl.java Fri Apr  3 03:09:53 2009
@@ -104,7 +104,7 @@
      * {@link QueryHints#HINT_IGNORE_FINDER HINT_IGNORE_FINDER} will ignore
      * any cached finder that may exist in this cache and will return null.
      * {@link QueryHints#HINT_INVALIDATE_FINDER HINT_INVALIDATE_FINDER} will 
-     * invalidate any cached finder that may exist in this cache and will return 
+     * invalidate any cached finder that may exist in this cache and will return
      * null.
      * 
      */

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java Fri Apr  3 03:09:53 2009
@@ -108,7 +108,8 @@
     private static final Class<ClientConnection> clientConnectionImpl;
     private static final Class<RefCountConnection> refCountConnectionImpl;
     private static final Class<CancelStatement> cancelStatementImpl;
-    private static final Class<CancelPreparedStatement> cancelPreparedStatementImpl;
+    private static final Class<CancelPreparedStatement>
+            cancelPreparedStatementImpl;
 
     static {
         try {
@@ -1415,7 +1416,8 @@
      * Connection returned to client code. Makes sure its wrapped connection
      * ref count is decremented on finalize.
      */
-    protected abstract static class ClientConnection extends DelegatingConnection {
+    protected abstract static class ClientConnection extends
+            DelegatingConnection {
 
         private boolean _closed = false;
 
@@ -1563,7 +1565,8 @@
      * Statement type that adds and removes itself from the set of active
      * statements so that it can be canceled.
      */
-    protected abstract class CancelPreparedStatement extends DelegatingPreparedStatement {
+    protected abstract class CancelPreparedStatement extends
+            DelegatingPreparedStatement {
 
         public CancelPreparedStatement(PreparedStatement stmnt, 
             Connection conn) {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreQuery.java Fri Apr  3 03:09:53 2009
@@ -514,7 +514,7 @@
                 try {
                     stmnt = prepareStatement(conn, sql[i]);
                     dict.setTimeouts(stmnt, fetch, true);
-                    count += executeUpdate(conn, stmnt, sql[i], isUpdate);                    
+                    count += executeUpdate(conn, stmnt, sql[i], isUpdate);
                 } catch (SQLException se) {
                     throw SQLExceptions.getStore(se, sql[i].getSQL(), 
                         _store.getDBDictionary());

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedQueryCacheImpl.java Fri Apr  3 03:09:53 2009
@@ -60,7 +60,7 @@
 	private final QueryStatistics<String> _stats;
 	private ReentrantLock _lock = new ReentrantLock();
 	private Log _log;
-	private Localizer _loc = Localizer.forPackage(PreparedQueryCacheImpl.class);
+    private Localizer _loc = Localizer.forPackage(PreparedQueryCacheImpl.class);
 
 	public PreparedQueryCacheImpl() {
 		_delegate = new HashMap<String, PreparedQuery>();
@@ -68,7 +68,7 @@
 		_stats = new QueryStatistics.Default<String>();
 	}
 	
-	public Boolean register(String id, Query query, FetchConfiguration hints) {
+    public Boolean register(String id, Query query, FetchConfiguration hints) {
         if (id == null 
             || query == null 
             || QueryLanguages.LANG_SQL.equals(query.getLanguage()) 
@@ -89,9 +89,9 @@
 	public Map<String,String> getMapView() {
 		lock();
 		try {
-			Map<String, String> view = new TreeMap<String, String>();
-			for (Map.Entry<String, PreparedQuery> entry : _delegate.entrySet())
-				view.put(entry.getKey(), entry.getValue().getTargetQuery());
+            Map<String, String> view = new TreeMap<String, String>();
+            for (Map.Entry<String, PreparedQuery> entry : _delegate.entrySet())
+                view.put(entry.getKey(), entry.getValue().getTargetQuery());
 			return view;
 		} finally {
 			unlock();
@@ -110,7 +110,7 @@
 			String id = q.getIdentifier();
 			if (isCachable(id) == Boolean.FALSE) {
 				if (_log != null && _log.isWarnEnabled())
-					_log.warn(_loc.get("prepared-query-not-cachable", id));
+                    _log.warn(_loc.get("prepared-query-not-cachable", id));
 				return false;
 			}
 			String pattern = getMatchedExclusionPattern(id);
@@ -145,7 +145,7 @@
 		lock();
 		try {
 			if (_log.isTraceEnabled())
-				_log.trace(_loc.get("prepared-query-invalidate", id));
+                _log.trace(_loc.get("prepared-query-invalidate", id));
 			return _delegate.remove(id) != null;
 		} finally {
 			unlock();
@@ -181,14 +181,14 @@
 	private PreparedQuery markUncachable(String id, String reason) {
 		lock();
 		try {
-			boolean excludedByUser = _uncachables.get(id) == EXLUDED_BY_USER;
+            boolean excludedByUser = _uncachables.get(id) == EXLUDED_BY_USER;
 			if (!excludedByUser)
 				_uncachables.put(id, reason);
 			if (_log != null && _log.isInfoEnabled()) {
 				if (excludedByUser) 
-					_log.info(_loc.get("prepared-query-uncache-strong", id));
-				else 
-					_log.info(_loc.get("prepared-query-uncache-weak", id, 
+                    _log.info(_loc.get("prepared-query-uncache-strong", id));
+                else
+                    _log.info(_loc.get("prepared-query-uncache-weak", id,
 						reason));
 			}
 			return _delegate.remove(id);
@@ -222,8 +222,8 @@
 	}
 	
 	/**
-	 * Adds a pattern for exclusion. Any query cached currently whose identifier
-	 * matches the given pattern will be marked invalidated as a side-effect.
+     * Adds a pattern for exclusion. Any query cached currently whose identifier
+     * matches the given pattern will be marked invalidated as a side-effect.
 	 */
 	public void addExclusionPattern(String pattern) {
 		lock();
@@ -231,10 +231,10 @@
 			if (_exclusionPatterns == null)
 				_exclusionPatterns = new ArrayList<String>();
 			_exclusionPatterns.add(pattern);
-			Collection<String> invalidKeys = getMatchedKeys(pattern, 
-					_delegate.keySet());
-			if (!invalidKeys.isEmpty() && _log != null && _log.isInfoEnabled())
-				_log.info(_loc.get("prepared-query-add-pattern", pattern, 
+            Collection<String> invalidKeys = getMatchedKeys(pattern,
+                    _delegate.keySet());
+            if (!invalidKeys.isEmpty() && _log != null && _log.isInfoEnabled())
+                _log.info(_loc.get("prepared-query-add-pattern", pattern,
 					invalidKeys.size(), invalidKeys));
 			for (String invalidKey : invalidKeys)
 				markUncachable(invalidKey, pattern);
@@ -245,7 +245,7 @@
 	
 	/**
 	 * Removes a pattern for exclusion. Any query identifier marked as not 
-	 * cachable due to the given pattern will now be removed from the list of
+     * cachable due to the given pattern will now be removed from the list of
 	 * uncachables as a side-effect.
 	 */
 	public void removeExclusionPattern(String pattern) {
@@ -254,9 +254,9 @@
 			if (_exclusionPatterns == null)
 				return;
 			_exclusionPatterns.remove(pattern);
-			Collection<String> reborns = getMatchedKeys(pattern, _uncachables);
-			if (!reborns.isEmpty() && _log != null && _log.isInfoEnabled())
-				_log.info(_loc.get("prepared-query-remove-pattern", pattern, 
+            Collection<String> reborns = getMatchedKeys(pattern, _uncachables);
+            if (!reborns.isEmpty() && _log != null && _log.isInfoEnabled())
+                _log.info(_loc.get("prepared-query-remove-pattern", pattern,
 					reborns.size(), reborns));
 			for (String rebornKey : reborns)
 				_uncachables.remove(rebornKey);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedSQLStoreQuery.java Fri Apr  3 03:09:53 2009
@@ -130,10 +130,11 @@
         /**
          * Convert given userParams to an array whose ordering matches as 
          * per expected during executeXXX() methods.
-         * The given userParams is already re-parameterized, so this method have 
+         * The given userParams is already re-parameterized, so this method have
          * to merely copy the given Map values.
          * 
-         * @see PreparedQueryImpl#reparametrize(Map, org.apache.openjpa.kernel.Broker)
+         * @see PreparedQueryImpl#reparametrize(Map,
+         * org.apache.openjpa.kernel.Broker)
          */
         public Object[] toParameterArray(StoreQuery q, Map userParams) {
             Object[] array = new Object[userParams.size()];

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/PreparedStatementManagerImpl.java Fri Apr  3 03:09:53 2009
@@ -125,7 +125,8 @@
                         sql).getMessage());
             }
             if (autoAssignColNames != null)
-                populateAutoAssignCols(stmnt, autoAssign, autoAssignColNames, row);
+                populateAutoAssignCols(stmnt, autoAssign, autoAssignColNames, 
+                    row);
             else {
                 StateManagerImpl sm = (StateManagerImpl)row.getPrimaryKey();
                 if (sm != null) {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/SQLStoreQuery.java Fri Apr  3 03:09:53 2009
@@ -377,7 +377,8 @@
             tok.wordChars('?', '?');
 
             StringBuffer buf = new StringBuffer(sql.length());
-            for (int ttype; (ttype = tok.nextToken()) != StreamTokenizer.TT_EOF;) {
+            for (int ttype; (ttype = tok.nextToken()) !=
+                    StreamTokenizer.TT_EOF;) {
                 switch (ttype) {
                     case StreamTokenizer.TT_WORD:
                         // a token is a positional parameter if it starts with

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java Fri Apr  3 03:09:53 2009
@@ -390,8 +390,9 @@
     		Unique u = table.addUnique(uniqueName);
     		for (String columnName : _uniqueColumnNames) {
     			if (!table.containsColumn(columnName))
-    				throw new UserException(_loc.get("unique-missing-column",
-    					columnName, table.getName(), table.getColumnNames()));
+                    throw new UserException(_loc.get("unique-missing-column",
+                            columnName, table.getName(),
+                            table.getColumnNames()));
     			Column col = table.getColumn(columnName);
     			u.addColumn(col);
     		}
@@ -416,7 +417,8 @@
                         runnable);
                 }
                 catch(NotSupportedException nse) { 
-                    SQLException sqlEx = new SQLException(nse.getLocalizedMessage());
+                    SQLException sqlEx = new SQLException(
+                            nse.getLocalizedMessage());
                     sqlEx.initCause(nse);
                     throw sqlEx;
                 }
@@ -560,7 +562,8 @@
 
                 // update the value
                 upd = new SQLBuffer(dict);
-                String tableName = resolveTableName(mapping, _seqColumn.getTable());
+                String tableName = resolveTableName(mapping,
+                        _seqColumn.getTable());
                 upd.append("UPDATE ").append(tableName).
                     append(" SET ").append(_seqColumn).append(" = ").
                     appendValue(Numbers.valueOf(cur + inc), _seqColumn).
@@ -570,7 +573,8 @@
 
                 stmnt = prepareStatement(conn, upd);
                 dict.setTimeouts(stmnt, _conf, true);
-                updates = executeUpdate(_conf, conn, stmnt, upd, RowImpl.ACTION_UPDATE);
+                updates = executeUpdate(_conf, conn, stmnt, upd,
+                        RowImpl.ACTION_UPDATE);
             } finally {
                 if (rs != null) 
                     try { rs.close(); } catch (SQLException se) {}
@@ -765,7 +769,8 @@
      * implementation of executing update.
      */
     protected int executeUpdate(JDBCConfiguration conf, Connection conn,  
-        PreparedStatement stmnt, SQLBuffer buf, int opcode) throws SQLException {
+        PreparedStatement stmnt, SQLBuffer buf, int opcode) throws SQLException
+    {
         return stmnt.executeUpdate();
     }
     
@@ -782,7 +787,8 @@
      * This method is to provide override for non-JDBC or JDBC-like 
      * implementation of getting sequence from the result set.
      */
-    protected long getSequence(ResultSet rs, DBDictionary dict) throws SQLException {
+    protected long getSequence(ResultSet rs, DBDictionary dict)
+            throws SQLException {
         if (rs == null || !rs.next())
             return -1;
         return dict.getLong(rs, 1);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/CollectionParam.java Fri Apr  3 03:09:53 2009
@@ -180,11 +180,13 @@
                 sql.appendValue(((Object[]) pstate.sqlValue[i])[index], 
                         pstate.getColumn(index), this);
             else if (pstate.cols != null)
-                sql.appendValue(pstate.sqlValue[i], pstate.getColumn(index), this);
+                sql.appendValue(pstate.sqlValue[i], pstate.getColumn(index),
+                        this);
             else if (pstate.discValue[i] != null)
                 sql.appendValue(pstate.discValue[i]);
             else
-                sql.appendValue(pstate.sqlValue[i], pstate.getColumn(index), this);
+                sql.appendValue(pstate.sqlValue[i], pstate.getColumn(index),
+                        this);
         }
     }
 }

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/JDBCExpressionFactory.java Fri Apr  3 03:09:53 2009
@@ -486,7 +486,8 @@
         for (int i = 0; i < vals.length; i++) {
             if (vals[i] instanceof Lit) {
                 Lit val = (Lit) vals[i];
-                StringBuffer value = new StringBuffer(val.getValue().toString());
+                StringBuffer value =
+                        new StringBuffer(val.getValue().toString());
                 if (val.getParseType() == Literal.TYPE_SQ_STRING)
                     value.insert(0, "'").append("'");
                 val.setValue(new Raw(value.toString()));

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapEntry.java Fri Apr  3 03:09:53 2009
@@ -97,10 +97,12 @@
         return new Entry(key, val);
     }
 
-    public void orderBy(Select sel, ExpContext ctx, ExpState state, boolean asc) {
+    public void orderBy(Select sel, ExpContext ctx, ExpState state, boolean asc)
+    {
     }
 
-    public void select(Select sel, ExpContext ctx, ExpState state, boolean pks) {
+    public void select(Select sel, ExpContext ctx, ExpState state, boolean pks)
+    {
         selectColumns(sel, ctx, state, pks);
     }
 

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/MapKey.java Fri Apr  3 03:09:53 2009
@@ -92,7 +92,8 @@
         return key;
     }
 
-    public void select(Select sel, ExpContext ctx, ExpState state, boolean pks) {
+    public void select(Select sel, ExpContext ctx, ExpState state, boolean pks)
+    {
         selectColumns(sel, ctx, state, pks);
     }
 

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java Fri Apr  3 03:09:53 2009
@@ -211,7 +211,7 @@
         // we build the remaining xpath that follows the root element.
         while (itr.hasNext()) {
             action = (Action) itr.next();
-            if (((XMLMetaData) action.data).getXmlname() != null)                 
+            if (((XMLMetaData) action.data).getXmlname() != null)
                 xpath.append(((XMLMetaData) action.data).getXmlname());
             else
                 xpath.append("*");
@@ -296,7 +296,8 @@
                 case JavaTypes.ARRAY:
                 case JavaTypes.COLLECTION:
                     ValueMapping elem = pstate.field.getElementMapping();
-                    if (pstate.joinedRel && elem.getTypeCode() == JavaTypes.PC) {
+                    if (pstate.joinedRel && elem.getTypeCode() == JavaTypes.PC)
+                    {
                         if (pstate.field.isElementCollection() &&
                             pstate.field.getElement().isEmbedded())
                             return ((HandlerCollectionTableFieldStrategy)
@@ -544,7 +545,8 @@
                         pstate.joins = from.joinSuperclass(pstate.joins, false);
                     }
                 }
-                // nothing more to do from here on as we encountered an xpath action
+                // nothing more to do from here on as we encountered an xpath
+                // action
                 if (action.op == Action.GET_XPATH)
                     break;
             }
@@ -628,8 +630,8 @@
             if (action.op != Action.GET && action.op != Action.GET_OUTER)
                 continue;
             try {
-                candidate = sm.fetchField(((FieldMapping)action.data).getIndex(), 
-                    true);
+                candidate = sm.fetchField(
+                        ((FieldMapping)action.data).getIndex(), true);
             } catch (ClassCastException cce) {
                 throw new RuntimeException(action.data + " not a field path");
             } finally {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ClassMappingInfo.java Fri Apr  3 03:09:53 2009
@@ -366,7 +366,7 @@
         if (cinfo._uniques != null) {
         	if (_uniques == null)
         		_uniques = new HashMap<String, List<Unique>>();
-        	for (Entry<String, List<Unique>> entry : cinfo._uniques.entrySet())
+        for (Entry<String, List<Unique>> entry : cinfo._uniques.entrySet())
         		if (!_uniques.containsKey(entry.getKey()))
         			_uniques.put(entry.getKey(), entry.getValue());
         }
@@ -382,9 +382,9 @@
     public void addUnique(String table, Unique unique) {
     	if (!StringUtils.equals(_tableName, table) &&
     	   (_seconds == null || !_seconds.containsKey(table))) {
-    	   		throw new UserException(_loc.get("unique-no-table", 
-    	   			new Object[]{table, _className, _tableName, 
-    	   				((_seconds == null) ? "" : _seconds.keySet())}));
+            throw new UserException(_loc.get("unique-no-table", 
+                    new Object[]{table, _className, _tableName, 
+                    ((_seconds == null) ? "" : _seconds.keySet())}));
     	}
     	if (unique == null)
     		return;
@@ -425,16 +425,17 @@
         	List<Unique> uniqueConstraints = _uniques.get(tableName);
         	for (Unique template : uniqueConstraints) {
         		Column[] templateColumns = template.getColumns();
-        		Column[] uniqueColumns = new Column[templateColumns.length];
-        		Table table = getTable((ClassMapping)cm, tableName, adapt);
+                Column[] uniqueColumns = new Column[templateColumns.length];
+                Table table = getTable((ClassMapping)cm, tableName, adapt);
         		for (int i=0; i<uniqueColumns.length; i++) {
-        			String columnName = templateColumns[i].getName();
+                    String columnName = templateColumns[i].getName();
         			if (!table.containsColumn(columnName)) {
-        				throw new UserException(_loc.get("unique-missing-column", 
-                           new Object[]{cm, columnName, tableName, 
-        						Arrays.toString(table.getColumnNames())}));
+                        throw new UserException(_loc.get(
+                                "unique-missing-column", 
+                                new Object[]{cm, columnName, tableName, 
+                                Arrays.toString(table.getColumnNames())}));
         			}
-        			Column uniqueColumn = table.getColumn(columnName);
+                    Column uniqueColumn = table.getColumn(columnName);
         			uniqueColumns[i] = uniqueColumn;
         		}
         		Unique unique = createUnique(cm, "unique", template,  

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMapping.java Fri Apr  3 03:09:53 2009
@@ -1187,9 +1187,9 @@
         		ForeignKey rjfk = rfm.getJoinForeignKey();
         		if (rjfk == null) 
         		    continue;
-        		if (rjfk.getTable() == jfk.getTable()
-        		 && jfk.getTable().getColumns().length 
-        		 == jfk.getColumns().length + rjfk.getColumns().length) {
+                if (rjfk.getTable() == jfk.getTable() &&
+                        jfk.getTable().getColumns().length ==
+                        jfk.getColumns().length + rjfk.getColumns().length) {
         			_bidirectionalJoinTableOwner = true;
         			break;
         		}
@@ -1227,13 +1227,14 @@
         for (int i=0; i<relFmds.length;i++) {
             FieldMapping rfm = relFmds[i];
             ValueMapping relem = rfm.getElementMapping();
-            if (relem != null && relem.getDeclaredTypeMapping() == getDeclaringMapping()) {
+            if (relem != null && relem.getDeclaredTypeMapping() ==
+                    getDeclaringMapping()) {
         		ForeignKey rjfk = rfm.getJoinForeignKey();
         		if (rjfk == null) 
         		    continue;
-        		if (rjfk.getTable() == jfk.getTable()
-        		 && jfk.getTable().getColumns().length 
-        		 == jfk.getColumns().length + rjfk.getColumns().length) {
+        		if (rjfk.getTable() == jfk.getTable() && 
+        		        jfk.getTable().getColumns().length ==
+                        jfk.getColumns().length + rjfk.getColumns().length) {
         			_bidirectionalJoinTableNonOwner = true;
         			break;
         		}

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/FieldMappingInfo.java Fri Apr  3 03:09:53 2009
@@ -58,7 +58,7 @@
     private Column _orderCol = null;
     private boolean _canOrderCol = true;
     private String[] _comments = null;
-    private List<Unique> _joinTableUniques; // Unique constraints on the JoinTable
+    private List<Unique> _joinTableUniques; // Unique constraints on JoinTable
 
     /**
      * The user-supplied name of the table for this field.
@@ -158,8 +158,8 @@
         if (cols.isEmpty()) {
         	ClassMapping mapping;
         	if (field.isEmbedded() && 
-        		field.getDeclaringMapping().getEmbeddingMapping() != null) {
-        		mapping = field.getDeclaringMapping().getEmbeddingMapping()
+                    field.getDeclaringMapping().getEmbeddingMapping() != null) {
+                mapping = field.getDeclaringMapping().getEmbeddingMapping()
         			.getFieldMapping().getDeclaringMapping();
         	} else {
         		mapping = field.getDefiningMapping();
@@ -368,7 +368,8 @@
     /**
      * Sets internal constraint information to match given mapped constraint.
      */
-    protected void syncJoinTableUniques(MetaDataContext context, Unique[] unqs) {
+    protected void syncJoinTableUniques(MetaDataContext context, Unique[] unqs)
+    {
         if (unqs == null) {
             _joinTableUniques = null;
             return;

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingDefaultsImpl.java Fri Apr  3 03:09:53 2009
@@ -470,7 +470,7 @@
      * Provides a default value for the given Discriminator. 
      * 
      * <P>
-     * The type of the object returned relies on the javaType field being set on 
+     * The type of the object returned relies on the javaType field being set on
      * the Discriminator which is provided.
      * <TABLE border="2"> 
      * <TH>JavaType

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingInfo.java Fri Apr  3 03:09:53 2009
@@ -147,8 +147,8 @@
     }
 
     /** 
-	 *  Affirms if this instance represents an implicit relation. For example, a 
-	 *  relation expressed as the value of primary key of the related class and 
+     *  Affirms if this instance represents an implicit relation. For example, a
+     *  relation expressed as the value of primary key of the related class and
 	 *  not as object reference.
      *
      * @since 1.3.0
@@ -553,10 +553,10 @@
         	if ((!adapt && !fill) && given.size() != tmplates.length) {
         		// try default table
         		given = getColumns("");
-            	if ((!adapt && !fill) && given.size() != tmplates.length) {
-            		throw new MetaDataException(_loc.get(prefix + "-num-cols",
-            			context, String.valueOf(tmplates.length),
-            			String.valueOf(given.size())));
+                if ((!adapt && !fill) && given.size() != tmplates.length) {
+                    throw new MetaDataException(_loc.get(prefix + "-num-cols",
+                            context, String.valueOf(tmplates.length),
+                            String.valueOf(given.size())));
             	}
         	}
         }
@@ -573,7 +573,8 @@
         return cols;
     }
     
-    boolean canMerge(List given, Column[] templates, boolean adapt, boolean fill) {
+    boolean canMerge(List given, Column[] templates, boolean adapt,
+            boolean fill) {
     	return !((!given.isEmpty() || (!adapt && !fill)) 
     			&& given.size() != templates.length);
     }

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingRepository.java Fri Apr  3 03:09:53 2009
@@ -51,7 +51,8 @@
 import org.apache.openjpa.jdbc.meta.strats.MaxEmbeddedCharArrayFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.MaxEmbeddedClobFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.MultiColumnVersionStrategy;
-import org.apache.openjpa.jdbc.meta.strats.NanoPrecisionTimestampVersionStrategy;
+import org.apache.openjpa.jdbc.meta.strats.
+        NanoPrecisionTimestampVersionStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneClassStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneFieldStrategy;
@@ -60,13 +61,15 @@
 import org.apache.openjpa.jdbc.meta.strats.ObjectIdClassStrategy;
 import org.apache.openjpa.jdbc.meta.strats.ObjectIdValueHandler;
 import org.apache.openjpa.jdbc.meta.strats.PrimitiveFieldStrategy;
-import org.apache.openjpa.jdbc.meta.strats.RelationCollectionInverseKeyFieldStrategy;
+import org.apache.openjpa.jdbc.meta.strats.
+        RelationCollectionInverseKeyFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationCollectionTableFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationHandlerMapTableFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationMapInverseKeyFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationMapTableFieldStrategy;
-import org.apache.openjpa.jdbc.meta.strats.RelationRelationMapTableFieldStrategy;
+import org.apache.openjpa.jdbc.meta.strats.
+        RelationRelationMapTableFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.StateComparisonVersionStrategy;
 import org.apache.openjpa.jdbc.meta.strats.StringFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.SubclassJoinDiscriminatorStrategy;

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java Fri Apr  3 03:09:53 2009
@@ -54,7 +54,8 @@
 import org.apache.openjpa.jdbc.meta.strats.MaxEmbeddedClobFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.NoneDiscriminatorStrategy;
 import org.apache.openjpa.jdbc.meta.strats.PrimitiveFieldStrategy;
-import org.apache.openjpa.jdbc.meta.strats.RelationCollectionInverseKeyFieldStrategy;
+import org.apache.openjpa.jdbc.meta.strats.
+        RelationCollectionInverseKeyFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationCollectionTableFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.RelationFieldStrategy;
 import org.apache.openjpa.jdbc.meta.strats.StateComparisonVersionStrategy;

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/VersionMappingInfo.java Fri Apr  3 03:09:53 2009
@@ -70,8 +70,9 @@
             boolean adapt) {
     	Table primaryTable = vers.getClassMapping().getTable();
     	List<String> secondaryTableNames = Arrays.asList(vers
-    		.getClassMapping().getMappingInfo().getSecondaryTableNames());
-    	Map<Table, List<Column>> assign = new LinkedHashMap<Table, List<Column>>();
+                .getClassMapping().getMappingInfo().getSecondaryTableNames());
+        Map<Table, List<Column>> assign = new LinkedHashMap<Table,
+                List<Column>>();
     	for (Column col : templates) {
     	    String tableName = col.getTableName();
     	    Table table;
@@ -81,7 +82,7 @@
     		} else if (secondaryTableNames.contains(tableName)) {
     			table = primaryTable.getSchema().getTable(tableName);
     		} else {
-    			throw new UserException(_loc.get("bad-version-column-table", 
+                throw new UserException(_loc.get("bad-version-column-table",
     					col.getName(), tableName));
     		}
     		if (!assign.containsKey(table))
@@ -94,7 +95,7 @@
     		List<Column> cols = assign.get(table);
     		Column[] partTemplates = cols.toArray(new Column[cols.size()]);
     		def.populateColumns(vers, table, partTemplates);
-    		result.addAll(Arrays.asList(createColumns(vers, null, partTemplates, 
+            result.addAll(Arrays.asList(createColumns(vers, null, partTemplates,
     				table, adapt)));
     	}
     	return result.toArray(new Column[result.size()]);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/ColumnVersionStrategy.java Fri Apr  3 03:09:53 2009
@@ -65,8 +65,8 @@
      * one column. 
      */
     protected int getJavaType(int i) {
-    	throw new AbstractMethodError(
-    		_loc.get("multi-column-version-unsupported",getAlias()).toString());
+        throw new AbstractMethodError(_loc.get(
+                "multi-column-version-unsupported",getAlias()).toString());
     }
     
     /**
@@ -107,13 +107,13 @@
 
 	/**
 	 * Compare each element of the given arrays that must be of equal size. 
-	 * The given array values represent version values and the result designate
+     * The given array values represent version values and the result designate
 	 * whether first version is earlier, same or later than the second one.
 	 * 
 	 * @return If any element of a1 is later than corresponding element of
-	 * a2 then returns 1 i.e. the first version is later than the second version.
-	 * If each element of a1 is equal to corresponding element of a2 then return
-	 * 0 i.e. the first version is same as the second version.
+     * a2 then returns 1 i.e. the first version is later than the second
+     * version. If each element of a1 is equal to corresponding element of a2
+     * then return 0 i.e. the first version is same as the second version.
 	 * else return a negative number i.e. the first version is earlier than 
 	 * the second version.
 	 */
@@ -148,7 +148,7 @@
         		templates[i].setTableName(infoColumn.getTableName());
         		templates[i].setType(infoColumn.getType());
         		templates[i].setSize(infoColumn.getSize());
-        		templates[i].setDecimalDigits(infoColumn.getDecimalDigits());
+                templates[i].setDecimalDigits(infoColumn.getDecimalDigits());
         		templates[i].setJavaType(getJavaType(i));
         		templates[i].setName(infoColumn.getName());
         	}
@@ -162,7 +162,8 @@
            tmplate.setJavaType(getJavaType());
            tmplate.setName("versn");
 
-           Column[] cols = info.getColumns(vers, new Column[]{ tmplate }, adapt);
+           Column[] cols = info.getColumns(vers, new Column[]{ tmplate },
+                   adapt);
            cols[0].setVersionStrategy(this);
            vers.setColumns(cols);
            vers.setColumnIO(info.getColumnIO());
@@ -178,7 +179,8 @@
         ColumnIO io = vers.getColumnIO();
         Object initial = nextVersion(null);
         for (int i = 0; i < cols.length; i++) {
-            Row row = rm.getRow(cols[i].getTable(), Row.ACTION_INSERT, sm, true);
+            Row row = rm.getRow(cols[i].getTable(), Row.ACTION_INSERT, sm,
+                    true);
             if (io.isInsertable(i, initial == null))
                 row.setObject(cols[i], getColumnValue(initial, i));
         }
@@ -201,7 +203,8 @@
 
         // set where and update conditions on row
         for (int i = 0; i < cols.length; i++) {
-            Row row = rm.getRow(cols[i].getTable(), Row.ACTION_UPDATE, sm, true);
+            Row row = rm.getRow(cols[i].getTable(), Row.ACTION_UPDATE, sm,
+                    true);
             row.setFailedObject(sm.getManagedInstance());
             if (curVersion != null && sm.isVersionCheckRequired()) {
                 row.whereObject(cols[i], getColumnValue(curVersion, i));

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/EmbedValueHandler.java Fri Apr  3 03:09:53 2009
@@ -152,9 +152,11 @@
                 if (cval instanceof PersistenceCapable) {
                     OpenJPAStateManager embedSm = (OpenJPAStateManager)
                         ((PersistenceCapable)cval).pcGetStateManager();
-                    idx = toDataStoreValue1(embedSm, val, store, cols, rvals, idx);
+                    idx = toDataStoreValue1(embedSm, val, store, cols, rvals,
+                            idx);
                 } else if (cval instanceof ObjectIdStateManager) {
-                    idx = toDataStoreValue1((ObjectIdStateManager)cval, val, store, cols, rvals, idx);
+                    idx = toDataStoreValue1((ObjectIdStateManager)cval, val,
+                            store, cols, rvals, idx);
                 } else if (cval == null) {
                     idx = toDataStoreValue1(null, val, store, cols, rvals, idx);
                 }
@@ -222,7 +224,8 @@
                 idx = toObjectValue1(em1, vm1, val, store, fetch, cols, idx);
                 } else if (em instanceof ObjectIdStateManager) {
                     em1 = new ObjectIdStateManager(null, null, vm1);
-                    idx = toObjectValue1(em1, vm1, val, store, null, getColumns(fms[i]), idx);
+                    idx = toObjectValue1(em1, vm1, val, store, null,
+                            getColumns(fms[i]), idx);
                 }
                 cval = em1.getManagedInstance();
             } else {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerCollectionTableFieldStrategy.java Fri Apr  3 03:09:53 2009
@@ -148,7 +148,7 @@
 
         ValueMapping elem = field.getElementMapping();
         Column order = field.getOrderColumn();
-        boolean setOrder = field.getOrderColumnIO().isInsertable(order, false);        
+        boolean setOrder = field.getOrderColumnIO().isInsertable(order, false);
         int idx = (setOrder && order != null) ? order.getBase() : 0;
         for (Iterator itr = coll.iterator(); itr.hasNext(); idx++) {
             HandlerStrategies.set(elem, itr.next(), store, row, _cols,

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/HandlerHandlerMapTableFieldStrategy.java Fri Apr  3 03:09:53 2009
@@ -115,7 +115,8 @@
         } else {
             DBDictionary dict = field.getMappingRepository().getDBDictionary();
             _kcols = HandlerStrategies.map(key, 
-                    dict.getValidColumnName("key", field.getTable()), _kio, adapt);
+                    dict.getValidColumnName("key", field.getTable()), _kio,
+                    adapt);
         }
         _vio = new ColumnIO();
         _vcols = HandlerStrategies.map(val, "value", _vio, adapt);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MapTableFieldStrategy.java Fri Apr  3 03:09:53 2009
@@ -204,7 +204,8 @@
                     throw new MetaDataException(_loc.get
                         ("mapped-inverse-unjoined", field.getName(),
                             field.getDefiningMapping(), mapped));
-                ForeignKey fk = mapped.getForeignKey(field.getDefiningMapping());
+                ForeignKey fk = mapped.getForeignKey(
+                        field.getDefiningMapping());
                 field.setForeignKey(fk);
                 field.setJoinForeignKey(fk);
             } else if (mapped.getElement().getTypeCode() == JavaTypes.PC) {
@@ -220,7 +221,8 @@
                 ValueMapping elem = mapped.getElementMapping();
                 ForeignKey fk = elem.getForeignKey();
                 field.setJoinForeignKey(fk);
-                field.getElementMapping().setForeignKey(mapped.getJoinForeignKey());
+                field.getElementMapping().setForeignKey(
+                        mapped.getJoinForeignKey());
             } else
                 throw new MetaDataException(_loc.get("not-inv-relation",
                     field, mapped));
@@ -256,8 +258,9 @@
         return true;
     }
 
-    protected boolean populateKey(Row row, OpenJPAStateManager valsm, Object obj,
-            StoreContext ctx, RowManager rm, JDBCStore store) throws SQLException {
+    protected boolean populateKey(Row row, OpenJPAStateManager valsm,
+            Object obj, StoreContext ctx, RowManager rm, JDBCStore store)
+            throws SQLException {
         ClassMapping meta = (ClassMapping)valsm.getMetaData();
         FieldMapping fm = getFieldMapping(meta);
         if (fm == null) 

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/MultiColumnVersionStrategy.java Fri Apr  3 03:09:53 2009
@@ -46,7 +46,7 @@
     		Column[] cols = vers.getColumns();
     		_initials = new Number[cols.length];
     		for (int i = 0; i < cols.length; i++) {
-    			_initials[i] = nextValue(Numbers.valueOf(0), getJavaType(i));
+                _initials[i] = nextValue(Numbers.valueOf(0), getJavaType(i));
     		}
     	}
     	super.initialize();
@@ -78,7 +78,7 @@
     
     protected int getJavaType(int i) {
     	if (_javaTypes == null) {
-    		_javaTypes = new Integer[vers.getMappingInfo().getColumns().size()];
+            _javaTypes = new Integer[vers.getMappingInfo().getColumns().size()];
     	}
     	if (_javaTypes[i] == null) {
     		Column col = (Column)vers.getMappingInfo().getColumns().get(i);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/strats/RelationFieldStrategy.java Fri Apr  3 03:09:53 2009
@@ -213,15 +213,18 @@
                 if ((fmds[i].getName().equals(mappedByIdValue)) ||
                     mappedByIdValue.length() == 0) {
                     if (fmds[i].getValue().getEmbeddedMetaData() != null) {
-                        EmbedValueHandler.getEmbeddedIdCols((FieldMapping)fmds[i], cols);
+                        EmbedValueHandler.getEmbeddedIdCols(
+                                (FieldMapping)fmds[i], cols);
                     } else 
-                        EmbedValueHandler.getIdColumns((FieldMapping)fmds[i], cols);
+                        EmbedValueHandler.getIdColumns(
+                                (FieldMapping)fmds[i], cols);
                 }
             }
             return cols;
         } else { // primary key is single-value
             Class pkType = pk.getDeclaredType();
-            FieldMetaData[] pks = field.getValue().getDeclaredTypeMetaData().getPrimaryKeyFields();
+            FieldMetaData[] pks = field.getValue().getDeclaredTypeMetaData().
+                    getPrimaryKeyFields();
             if (pks.length != 1 || pks[0].getDeclaredType() != pkType)
                 return Collections.EMPTY_LIST;
             pkCols = pk.getColumns();
@@ -346,9 +349,9 @@
             nullInverse(sm, rm);
             updateInverse(sm, rel, store, rm);
         } else {
-        	int action = (rel == null 
-        			&& field.isBidirectionalJoinTableMappingNonOwner()) ?
-        					Row.ACTION_DELETE : Row.ACTION_UPDATE;
+            int action = (rel == null && 
+                    field.isBidirectionalJoinTableMappingNonOwner()) ?
+                    Row.ACTION_DELETE : Row.ACTION_UPDATE;
             Row row = field.getRow(sm, store, rm, action);
             if (row != null) {
                 field.setForeignKey(row, rel);
@@ -385,7 +388,7 @@
                     fk.getDeleteAction() == ForeignKey.ACTION_CASCADE) {
                     Row row = field.getRow(sm, store, rm, Row.ACTION_DELETE);
                     row.setForeignKey(fk, null, rel);
-                    // this is for bi-directional maps, the key and value of the 
+                    // this is for bi-directional maps, the key and value of the
                     // map are stored in the table of the mapped-by entity  
                     setMapKey(sm, rel, store, row);
                 }
@@ -692,7 +695,7 @@
         Object oid = null;
         if (relMapping.isMapped()) {
             oid = relMapping.getObjectId(store, res, field.getForeignKey(),
-            		field.getPolymorphic() != ValueMapping.POLY_FALSE, null);
+                    field.getPolymorphic() != ValueMapping.POLY_FALSE, null);
         } else {
             Column[] cols = field.getColumns();
             if (relMapping.getIdentityType() == ClassMapping.ID_DATASTORE) {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/Column.java Fri Apr  3 03:09:53 2009
@@ -768,8 +768,8 @@
     }
     
     /** 
-	 *  Affirms if this instance represents an implicit relation. For example, a 
-	 *  relation expressed as the value of primary key of the related class and 
+     *  Affirms if this instance represents an implicit relation. For example, a
+     *  relation expressed as the value of primary key of the related class and
 	 *  not as object reference.
      *
      * @since 1.3.0

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java Fri Apr  3 03:09:53 2009
@@ -222,7 +222,7 @@
                 // add trace info for autoCommit setting
                 if (log.isTraceEnabled())
                     log.trace(_loc.get("set-auto-commit", new Object[] {
-                    dict.supportsMultipleNontransactionalResultSets}));                
+                    dict.supportsMultipleNontransactionalResultSets}));
             }
             Options opts = Configurations.parseProperties((factory2)
                 ? conf.getConnectionFactory2Properties()

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaGroup.java Fri Apr  3 03:09:53 2009
@@ -213,8 +213,8 @@
                 // We can't handle the case that one entity has schema name
                 // and other entity does not have schema name but both entities
                 // map to the same table.
-                if (tab != null
-                        && (schemas[i] == inSchema || inSchema.getName() == null))
+                if (tab != null &&
+                        (schemas[i] == inSchema || inSchema.getName() == null))
                     return tab;
 
             }
@@ -297,8 +297,8 @@
             Sequence seq;
             for (int i = 0; i < schemas.length; i++) {
                 seq = schemas[i].getSequence(name);
-                if ((seq != null)
-                        && (schemas[i] == inSchema || inSchema.getName() == null))
+                if ((seq != null) &&
+                        (schemas[i] == inSchema || inSchema.getName() == null))
                     return seq;
             }
 

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java Fri Apr  3 03:09:53 2009
@@ -450,7 +450,8 @@
             for (int i = 0; i < schemas.length; i++) {
                 seqs = schemas[i].getSequences();
                 for (int j = 0; j < seqs.length; j++) {
-                    if (db.findSequence(schemas[i], seqs[j].getFullName()) != null)
+                    if (db.findSequence(schemas[i], seqs[j].getFullName()) !=
+                            null)
                         continue;
 
                     if (createSequence(seqs[j])) {

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SimpleDriverDataSource.java Fri Apr  3 03:09:53 2009
@@ -95,8 +95,8 @@
         throws SQLException {
     	Connection con = getDriver().connect(_connectionURL, props);
     	if (con == null) {
-        	throw new SQLException(_eloc.get("poolds-null",
-        			_connectionDriverName, _connectionURL).getMessage());
+            throw new SQLException(_eloc.get("poolds-null",
+                    _connectionDriverName, _connectionURL).getMessage());
         }
         return con;
     }

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=761509&r1=761508&r2=761509&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Fri Apr  3 03:09:53 2009
@@ -233,8 +233,9 @@
         // TRANSACTION_READ_COMMITTED
         conn = super.decorate(conn);
 
-        if (conf.getTransactionIsolationConstant() == -1
-            && conn.getTransactionIsolation() < Connection.TRANSACTION_READ_COMMITTED)
+        if (conf.getTransactionIsolationConstant() == -1 &&
+                conn.getTransactionIsolation() <
+                Connection.TRANSACTION_READ_COMMITTED)
             conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED);
 
         return conn;
@@ -278,7 +279,7 @@
         // verify that database product is supported
         if (db2ServerType == 0 || maj == 0)
             throw new UnsupportedException(_loc.get("db-not-supported",
-                new Object[] {databaseProductName, databaseProductVersion }));                    
+                new Object[] {databaseProductName, databaseProductVersion }));
 
     	if (maj >= 9 || (maj == 8 && min >= 2)) {
     	    supportsLockingWithMultipleTables = true;
@@ -843,9 +844,11 @@
             if (subtype == StoreException.LOCK && errorState.equals("57033")
                 && ex.getMessage().indexOf("80") != -1) {
                 recoverable = Boolean.TRUE;
-            } else if (subtype == StoreException.QUERY && errorState.equals("57014")
-                && ex.getMessage().indexOf("40001") == -1) {
-                // FIXME drwoods - OPENJPA-964 - Need to determine expected DB2 behavior for query timeouts
+            } else if (subtype == StoreException.QUERY &&
+                    errorState.equals("57014") &&
+                    ex.getMessage().indexOf("40001") == -1) {
+                // FIXME drwoods - OPENJPA-964 - Need to determine expected DB2
+                // behavior for query timeouts
                 recoverable = Boolean.TRUE;
             }
         }



Mime
View raw message