You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mp...@apache.org on 2007/07/04 00:42:46 UTC
svn commit: r553010 [1/3] - in /openjpa/trunk: ./
openjpa-examples/src/main/java/hellojpa/
openjpa-examples/src/main/java/relations/
openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/an...
Author: mprudhom
Date: Tue Jul 3 15:42:39 2007
New Revision: 553010
URL: http://svn.apache.org/viewvc?view=rev&rev=553010
Log:
OPENJPA-244 Fixed some formatting inconsistencies with the patch for OPENJPA-244
Modified:
openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java
openjpa/trunk/openjpa-examples/src/main/java/relations/Main.java
openjpa/trunk/openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.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/exps/ConstPath.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/DiscriminatorMappingInfo.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/MappingTool.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/EmbedValueHandler.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/FileSchemaFactory.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/DBDictionaryFactory.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
openjpa/trunk/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.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/DynamicStorageGenerator.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/Reflection.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.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/Filters.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.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/QueryLanguages.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.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/AbstractMetaDataDefaults.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/FieldMetaData.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.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/SequenceMetaData.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxies.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/Serialization.java
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.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/FileValue.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/ProductDerivations.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.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/ClasspathMetaDataIterator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.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/meta/ZipFileMetaDataIterator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.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/JavaVersions.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.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/StreamResourceBundleProvider.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java
openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestSelectForUpdateOverride.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/ManyOneCompoundIdOwnerId.java
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/relations/TestManyOneAsId.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/MetaDataParsers.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataDefaults.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceMetaDataFactory.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceUnitInfoImpl.java
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/XMLPersistenceMetaDataParser.java
openjpa/trunk/openjpa-xmlstore/src/main/java/org/apache/openjpa/xmlstore/XMLFileHandler.java
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java (original)
+++ openjpa/trunk/openjpa-examples/src/main/java/hellojpa/Main.java Tue Jul 3 15:42:39 2007
@@ -64,7 +64,7 @@
// Go through each of the entities and print out each of their
// messages, as well as the date on which it was created
- for (Message m : (List<Message>)q.getResultList()) {
+ for (Message m : (List<Message>) q.getResultList()) {
System.out.println(m.getMessage()
+ " (created on: " + m.getCreated() + ")");
}
Modified: openjpa/trunk/openjpa-examples/src/main/java/relations/Main.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/src/main/java/relations/Main.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-examples/src/main/java/relations/Main.java (original)
+++ openjpa/trunk/openjpa-examples/src/main/java/relations/Main.java Tue Jul 3 15:42:39 2007
@@ -135,33 +135,33 @@
// Go through each of the entities and print out each of their
// messages, as well as the date on which it was created
- for (Deity m : (List<Deity>)q.getResultList()) {
+ for (Deity m : (List<Deity>) q.getResultList()) {
System.out.println(m.getName());
}
q = em.createQuery("select x from Deity x "
+ "where x.father.name = 'Zeus'");
- for (Deity m : (List<Deity>)q.getResultList()) {
+ for (Deity m : (List<Deity>) q.getResultList()) {
System.out.println("Child of Zeus: " + m.getName());
}
q = em.createNamedQuery("siblings").
setParameter(1, em.getReference(Deity.class, "Rhea"));
- for (Deity m : (List<Deity>)em.createNamedQuery("siblings").
+ for (Deity m : (List<Deity>) em.createNamedQuery("siblings").
setParameter(1, em.getReference(Deity.class, "Rhea")).
getResultList()) {
System.out.println("Siblings of Rhea: " + m.getName());
}
- for (Deity m : (List<Deity>)em.createNamedQuery("half-siblings").
+ for (Deity m : (List<Deity>) em.createNamedQuery("half-siblings").
setParameter(1, em.getReference(Deity.class, "Apollo")).
getResultList()) {
System.out.println("Half-siblings of Apollo: " + m.getName());
}
- for (Deity m : (List<Deity>)em.createNamedQuery("cousins").
+ for (Deity m : (List<Deity>) em.createNamedQuery("cousins").
setParameter(1, em.getReference(Deity.class, "Leto")).
getResultList()) {
System.out.println("Cousins of Leto: " + m.getName());
Modified: openjpa/trunk/openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java (original)
+++ openjpa/trunk/openjpa-jdbc-5/src/main/java/org/apache/openjpa/jdbc/meta/strats/XMLValueHandler.java Tue Jul 3 15:42:39 2007
@@ -73,7 +73,7 @@
m.marshal( val, result );
return result.toString();
}
- catch(JAXBException je) {
+ catch (JAXBException je) {
throw new InternalException(je);
}
}
@@ -89,7 +89,7 @@
return u.unmarshal(new StreamSource(new StringReader
(val.toString())));
}
- catch(JAXBException je) {
+ catch (JAXBException je) {
throw new InternalException(je);
}
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/MappingToolTask.java Tue Jul 3 15:42:39 2007
@@ -186,7 +186,7 @@
MultiLoaderClassResolver resolver = new MultiLoaderClassResolver();
resolver.addClassLoader(loader);
- resolver.addClassLoader((ClassLoader)AccessController.doPrivileged(
+ resolver.addClassLoader((ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(MappingTool.class)));
JDBCConfiguration conf = (JDBCConfiguration) getConfiguration();
conf.setClassResolver(resolver);
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/ant/ReverseMappingToolTask.java Tue Jul 3 15:42:39 2007
@@ -262,14 +262,14 @@
// load customizer properties
Properties customProps = new Properties();
File propsFile = Files.getFile(customizerProperties, loader);
- if (propsFile != null && ((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( propsFile ))).booleanValue() ) {
+ if (propsFile != null && ((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(propsFile))).booleanValue()) {
FileInputStream fis = null;
try {
fis = (FileInputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileInputStreamAction(propsFile));
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
}
customProps.load(fis);
}
@@ -278,7 +278,7 @@
JDBCConfiguration conf = (JDBCConfiguration) getConfiguration();
flags.customizer = (ReverseCustomizer) Configurations.
newInstance(customizerClass, conf, null,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
ReverseCustomizer.class)));
if (flags.customizer != null)
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/conf/MappingRepositoryValue.java Tue Jul 3 15:42:39 2007
@@ -48,14 +48,14 @@
// we need to manually perform the instantiation
try {
Class cls = Strings.toClass(clsName,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(type)));
return cls.getConstructor(new Class[]{ JDBCConfiguration.class }).
newInstance(new Object[]{ conf });
} catch (RuntimeException e) {
throw e;
} catch (InvocationTargetException e) {
- if (e.getTargetException()instanceof RuntimeException)
+ if (e.getTargetException() instanceof RuntimeException)
throw(RuntimeException) e.getTargetException();
// fall back to default behavior for better error reporting
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -252,7 +252,7 @@
FetchConfiguration fetch, Object context) {
ConnectionInfo info = (ConnectionInfo) context;
try {
- return initializeState(sm, state, (JDBCFetchConfiguration)fetch,
+ return initializeState(sm, state, (JDBCFetchConfiguration) fetch,
info);
} catch (ClassNotFoundException cnfe) {
throw new UserException(cnfe);
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/ConstPath.java Tue Jul 3 15:42:39 2007
@@ -127,7 +127,8 @@
action = itr.next();
if (action instanceof Class) {
try {
- cstate.value = Filters.convert(cstate.value, (Class)action);
+ cstate.value = Filters.convert(cstate.value,
+ (Class) action);
continue;
} catch (ClassCastException cce) {
failed = true;
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -361,7 +361,7 @@
Table table = cm.getTable();
Collection result = new ArrayList();
while (uniqueConstraints.hasNext()) {
- Unique template = (Unique)uniqueConstraints.next();
+ Unique template = (Unique) uniqueConstraints.next();
Column[] templateColumns = template.getColumns();
Column[] uniqueColumns = new Column[templateColumns.length];
boolean missingColumn = true;
@@ -380,7 +380,7 @@
if (unique != null)
result.add(unique);
}
- return (Unique[])result.toArray(new Unique[result.size()]);
+ return (Unique[]) result.toArray(new Unique[result.size()]);
}
public File getSourceFile() {
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/DiscriminatorMappingInfo.java Tue Jul 3 15:42:39 2007
@@ -123,7 +123,7 @@
// set io before syncing cols
setColumnIO(disc.getColumnIO());
syncColumns(disc, disc.getColumns(), disc.getValue() != null
- && !(disc.getValue()instanceof String));
+ && !(disc.getValue() instanceof String));
syncIndex(disc, disc.getIndex());
if (disc.getValue() == Discriminator.NULL)
_value = "null";
@@ -131,7 +131,7 @@
_value = disc.getValue().toString();
if (disc.getStrategy() == null
- || disc.getStrategy()instanceof SuperclassDiscriminatorStrategy)
+ || disc.getStrategy() instanceof SuperclassDiscriminatorStrategy)
return;
// explicit discriminator strategy if:
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -449,18 +449,18 @@
try {
if (strat == null)
strat = JavaTypes.classForName(name, cls,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
ClassStrategy.class)));
ClassStrategy strategy =
- (ClassStrategy)AccessController.doPrivileged(
+ (ClassStrategy) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(strat));
Configurations.configureInstance(strategy, getConfiguration(),
props);
return strategy;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-cls-strategy",
cls, name), e);
}
@@ -483,7 +483,7 @@
name = Configurations.getClassName(name);
try {
Class c = JavaTypes.classForName(name, field,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(FieldStrategy.class)));
if (FieldStrategy.class.isAssignableFrom(c)) {
FieldStrategy strat = (FieldStrategy)
@@ -496,7 +496,7 @@
// must be named handler
if (installHandlers) {
- ValueHandler vh = (ValueHandler)AccessController.doPrivileged(
+ ValueHandler vh = (ValueHandler) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
Configurations.configureInstance(vh, getConfiguration(),
props);
@@ -505,7 +505,7 @@
return new HandlerFieldStrategy();
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException )e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-field-strategy",
field, name), e);
}
@@ -556,7 +556,7 @@
if (strat == null)
strat = JavaTypes.classForName(name,
discrim.getClassMapping(),
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
DiscriminatorStrategy.class)));
DiscriminatorStrategy strategy = (DiscriminatorStrategy)
@@ -567,7 +567,7 @@
return strategy;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException )e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-discrim-strategy",
discrim.getClassMapping(), name), e);
}
@@ -618,7 +618,7 @@
if (strat == null)
strat = JavaTypes.classForName(name,
version.getClassMapping(),
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
VersionStrategy.class)));
} catch (Exception e) {
@@ -643,7 +643,7 @@
return strategy;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException )e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-version-strategy",
version.getClassMapping(), strat + ""), e);
}
@@ -941,7 +941,7 @@
name = Configurations.getClassName(name);
try {
Class c = JavaTypes.classForName(name, val,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(FieldStrategy.class)));
Object o = AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
@@ -949,7 +949,7 @@
return o;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException )e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-mapped-strategy",
val, name), e);
}
@@ -968,10 +968,10 @@
name = Configurations.getClassName(name);
try {
Class c = JavaTypes.classForName(name, val,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(ValueHandler.class)));
if (ValueHandler.class.isAssignableFrom(c)) {
- ValueHandler vh = (ValueHandler)AccessController.doPrivileged(
+ ValueHandler vh = (ValueHandler) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
Configurations.configureInstance(vh, getConfiguration(),
props);
@@ -980,7 +980,7 @@
return null; // named field strategy
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException )e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("bad-value-handler",
val, name), e);
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Tue Jul 3 15:42:39 2007
@@ -1078,12 +1078,12 @@
Class[] types = Services.getImplementorClasses(ImportExport.class);
ImportExport[] instances = new ImportExport[types.length];
for (int i = 0; i < types.length; i++)
- instances[i] = (ImportExport)AccessController.doPrivileged(
+ instances[i] = (ImportExport) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(types[i]));
return instances;
} catch (Throwable t) {
if (t instanceof PrivilegedActionException)
- t = ((PrivilegedActionException)t).getException();
+ t = ((PrivilegedActionException) t).getException();
throw new InternalException(_loc.get("importexport-instantiate"),t);
}
}
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -1895,14 +1895,14 @@
File customFile = Files.getFile
(opts.removeProperty("customizerProperties", "cp", null), null);
Properties customProps = new Properties();
- if (customFile != null && ((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( customFile ))).booleanValue()) {
+ if (customFile != null && ((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(customFile))).booleanValue()) {
FileInputStream fis = null;
try {
fis = (FileInputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileInputStreamAction(customFile));
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
}
customProps.load(fis);
}
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -73,7 +73,7 @@
syncIndex(version, version.getIndex());
if (version.getStrategy() == null
- || version.getStrategy()instanceof SuperclassVersionStrategy)
+ || version.getStrategy() instanceof SuperclassVersionStrategy)
return;
// explicit version strategy if:
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -60,7 +60,7 @@
for (int i = 0; i < fms.length; i++) {
if (fms[i].getManagement() != FieldMapping.MANAGE_PERSISTENT)
continue;
- if (!(fms[i].getStrategy()instanceof Embeddable))
+ if (!(fms[i].getStrategy() instanceof Embeddable))
throw new MetaDataException(_loc.get("not-embeddable",
vm, fms[i]));
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -112,7 +112,7 @@
// see if their driver name is actually a data source
if (DataSource.class.isAssignableFrom(driverClass)) {
return (DataSource) Configurations.newInstance(driver,
- conf, props, (ClassLoader)AccessController.doPrivileged(
+ conf, props, (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
DataSource.class)));
}
@@ -156,7 +156,8 @@
// ask the DriverDataSource to provide any additional decorators
if (ds instanceof DriverDataSource) {
- List decs = ((DriverDataSource)ds).createConnectionDecorators();
+ List decs = ((DriverDataSource) ds).
+ createConnectionDecorators();
if (decs != null)
decorators.addAll(decs);
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/FileSchemaFactory.java Tue Jul 3 15:42:39 2007
@@ -79,7 +79,7 @@
}
public SchemaGroup readSchema() {
- URL url = (URL)AccessController.doPrivileged(
+ URL url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(_loader, _fileName));
if (url == null)
return new SchemaGroup();
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -171,14 +171,14 @@
try {
Class c = Class.forName(_connectionDriverName,
true, _classLoader);
- _driver = (Driver)AccessController.doPrivileged(
+ _driver = (Driver) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
return _driver;
} catch (Exception e) {
if (e instanceof RuntimeException)
throw(RuntimeException) e;
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new StoreException(e);
}
}
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?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- 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 Tue Jul 3 15:42:39 2007
@@ -476,7 +476,7 @@
"[Errp=" + getSqlErrpMethd.invoke(sqlca, new Object[]{})
+ ", Errd=" + errdStr);
- String Warn = new String((char[])getSqlWarnMethd.
+ String Warn = new String((char[]) getSqlWarnMethd.
invoke(sqlca, new Object[]{}));
if(Warn.trim().length() != 0)
exceptionMsg = exceptionMsg.concat(", Warn=" +Warn + "]" );
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java Tue Jul 3 15:42:39 2007
@@ -890,7 +890,7 @@
else if (col != null && col.getType() == Types.TIME)
setTime(stmnt, idx, new Time(val.getTime()), null, col);
else if (val instanceof Timestamp)
- setTimestamp(stmnt, idx,(Timestamp)val, null, col);
+ setTimestamp(stmnt, idx,(Timestamp) val, null, col);
else
setTimestamp(stmnt, idx, new Timestamp(val.getTime()), null, col);
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Tue Jul 3 15:42:39 2007
@@ -121,14 +121,14 @@
DBDictionary dict = null;
try {
Class c = Class.forName(dclass, true,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
DBDictionary.class)));
- dict = (DBDictionary)AccessController.doPrivileged(
+ dict = (DBDictionary) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new UserException(e).setFatal(true);
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/HSQLDictionary.java Tue Jul 3 15:42:39 2007
@@ -223,7 +223,7 @@
// HSQL has a bug where it cannot store a double if it is
// exactly the same as Long.MAX_VALUE or MIN_VALUE
if (val == Long.MAX_VALUE || val == Long.MIN_VALUE) {
- stmnt.setLong(idx, (long)val);
+ stmnt.setLong(idx, (long) val);
} else {
super.setDouble(stmnt, idx, val, col);
}
Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java (original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java Tue Jul 3 15:42:39 2007
@@ -1213,7 +1213,7 @@
int count = 0;
for (int i = 0; i < toCols.length; i++, count++) {
if (pks == null)
- val = (oid == null) ? null : Numbers.valueOf(((Id)oid).getId());
+ val = (oid == null) ? null : Numbers.valueOf(((Id) oid).getId());
else {
// must be app identity; use pk index to get correct pk value
join = mapping.assertJoinable(toCols[i]);
@@ -2796,7 +2796,7 @@
Object id = (ident && _idents != null) ? _idents.get(i)
: _ids.get(i);
Object alias = _aliases.get(id);
- if (id instanceof Column && ((Column)id).isXML())
+ if (id instanceof Column && ((Column) id).isXML())
alias = alias + _dict.getStringVal;
String as = null;
Modified: openjpa/trunk/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java (original)
+++ openjpa/trunk/openjpa-kernel-5/src/main/java/org/apache/openjpa/enhance/PCEnhancerAgent.java Tue Jul 3 15:42:39 2007
@@ -57,7 +57,7 @@
conf.setConnectionFactoryName(null);
// set single class resolver
final ClassLoader tmpLoader = new TemporaryClassLoader(
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction()));
conf.setClassResolver(new ClassResolver() {
public ClassLoader getClassLoader(Class context, ClassLoader env) {
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/abstractstore/AbstractStoreBrokerFactory.java Tue Jul 3 15:42:39 2007
@@ -133,7 +133,7 @@
private static AbstractStoreManager createStoreManager(String cls,
String props) {
AbstractStoreManager store = (AbstractStoreManager) Configurations.
- newInstance(cls, (ClassLoader)AccessController.doPrivileged(
+ newInstance(cls, (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
AbstractStoreManager.class)));
Configurations.configureInstance(store, null, props,
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java Tue Jul 3 15:42:39 2007
@@ -113,7 +113,7 @@
buf.append("java.class.path:\n");
StringTokenizer tok = new StringTokenizer
- ((String)AccessController.doPrivileged(
+ ((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction("java.class.path")),
File.pathSeparator);
while (tok.hasMoreTokens()) {
@@ -138,7 +138,7 @@
private StringBuffer appendProperty(String prop, StringBuffer buf) {
return buf.append(prop).append(": ")
- .append((String)AccessController.doPrivileged(
+ .append((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction(prop)));
}
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/ee/AutomaticManagedRuntime.java Tue Jul 3 15:42:39 2007
@@ -1,85 +1,85 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openjpa.ee;
-
-import java.util.LinkedList;
-import java.util.List;
-import javax.transaction.TransactionManager;
-
-import org.apache.openjpa.lib.conf.Configurable;
-import org.apache.openjpa.lib.conf.Configuration;
-import org.apache.openjpa.lib.util.Localizer;
-import org.apache.openjpa.util.InvalidStateException;
-
-/**
- * Implementation of the {@link ManagedRuntime} interface that searches
- * through a set of known JNDI locations and method invocations to locate the
- * appropriate mechanism for obtaining a TransactionManager.
- * Built in support is provided for the following Application Servers:
- * <ul>
- * <li>Bluestone</li>
- * <li>HP Application Server</li>
- * <li>JBoss</li>
- * <li>JRun</li>
- * <li>OpenEJB</li>
- * <li>Oracle Application Server</li>
- * <li>Orion</li>
- * <li>SunONE</li>
- * <li>Weblogic</li>
- * <li>Websphere</li>
- * </ul>
- *
- * @author Marc Prud'hommeaux
- */
-public class AutomaticManagedRuntime
- implements ManagedRuntime, Configurable {
-
- private static final String [] JNDI_LOCS = new String []{
- "javax.transaction.TransactionManager", // weblogic
- "java:/TransactionManager", // jboss & jrun
- "java:/DefaultDomain/TransactionManager", // jrun too
- "java:comp/pm/TransactionManager", // orion & oracle
- "java:comp/TransactionManager", // generic
- "java:pm/TransactionManager", // borland
- };
- private static final String [] METHODS = new String[]{
- "com.arjuna.jta.JTA_TransactionManager.transactionManager", // hp
- "com.bluestone.jta.SaTransactionManagerFactory.SaGetTransactionManager",
- "org.openejb.OpenEJB.getTransactionManager",
- "com.sun.jts.jta.TransactionManagerImpl.getTransactionManagerImpl",
- "com.inprise.visitransact.jta.TransactionManagerImpl."
- + "getTransactionManagerImpl", // borland
- };
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openjpa.ee;
+
+import java.util.LinkedList;
+import java.util.List;
+import javax.transaction.TransactionManager;
+
+import org.apache.openjpa.lib.conf.Configurable;
+import org.apache.openjpa.lib.conf.Configuration;
+import org.apache.openjpa.lib.util.Localizer;
+import org.apache.openjpa.util.InvalidStateException;
+
+/**
+ * Implementation of the {@link ManagedRuntime} interface that searches
+ * through a set of known JNDI locations and method invocations to locate the
+ * appropriate mechanism for obtaining a TransactionManager.
+ * Built in support is provided for the following Application Servers:
+ * <ul>
+ * <li>Bluestone</li>
+ * <li>HP Application Server</li>
+ * <li>JBoss</li>
+ * <li>JRun</li>
+ * <li>OpenEJB</li>
+ * <li>Oracle Application Server</li>
+ * <li>Orion</li>
+ * <li>SunONE</li>
+ * <li>Weblogic</li>
+ * <li>Websphere</li>
+ * </ul>
+ *
+ * @author Marc Prud'hommeaux
+ */
+public class AutomaticManagedRuntime
+ implements ManagedRuntime, Configurable {
+
+ private static final String [] JNDI_LOCS = new String []{
+ "javax.transaction.TransactionManager", // weblogic
+ "java:/TransactionManager", // jboss & jrun
+ "java:/DefaultDomain/TransactionManager", // jrun too
+ "java:comp/pm/TransactionManager", // orion & oracle
+ "java:comp/TransactionManager", // generic
+ "java:pm/TransactionManager", // borland
+ };
+ private static final String [] METHODS = new String[]{
+ "com.arjuna.jta.JTA_TransactionManager.transactionManager", // hp
+ "com.bluestone.jta.SaTransactionManagerFactory.SaGetTransactionManager",
+ "org.openejb.OpenEJB.getTransactionManager",
+ "com.sun.jts.jta.TransactionManagerImpl.getTransactionManagerImpl",
+ "com.inprise.visitransact.jta.TransactionManagerImpl."
+ + "getTransactionManagerImpl", // borland
+ };
private static final ManagedRuntime REGISTRY;
- private static final WLSManagedRuntime WLS;
- private static final SunOneManagedRuntime SUNONE;
- private static final WASManagedRuntime WAS;
-
- private static Localizer _loc = Localizer.forPackage
- (AutomaticManagedRuntime.class);
-
- static {
- ManagedRuntime mr = null;
+ private static final WLSManagedRuntime WLS;
+ private static final SunOneManagedRuntime SUNONE;
+ private static final WASManagedRuntime WAS;
+
+ private static Localizer _loc = Localizer.forPackage
+ (AutomaticManagedRuntime.class);
+
+ static {
+ ManagedRuntime mr = null;
mr = null;
- try {
+ try {
mr = (ManagedRuntime) Class.
forName("org.apache.openjpa.ee.RegistryManagedRuntime").
newInstance();
@@ -91,38 +91,38 @@
mr = null;
try {
- mr = new WLSManagedRuntime();
- } catch (Throwable t) {
- }
- WLS = (WLSManagedRuntime) mr;
-
- mr = null;
- try {
- mr = new SunOneManagedRuntime();
- } catch (Throwable t) {
- }
- SUNONE = (SunOneManagedRuntime) mr;
-
- mr = null;
- try {
- mr = new WASManagedRuntime();
- }
- catch(Throwable t) {
- }
- WAS= (WASManagedRuntime) mr;
- }
-
- private Configuration _conf = null;
- private ManagedRuntime _runtime = null;
-
- public TransactionManager getTransactionManager()
- throws Exception {
- if (_runtime != null)
- return _runtime.getTransactionManager();
-
- List errors = new LinkedList();
- TransactionManager tm = null;
-
+ mr = new WLSManagedRuntime();
+ } catch (Throwable t) {
+ }
+ WLS = (WLSManagedRuntime) mr;
+
+ mr = null;
+ try {
+ mr = new SunOneManagedRuntime();
+ } catch (Throwable t) {
+ }
+ SUNONE = (SunOneManagedRuntime) mr;
+
+ mr = null;
+ try {
+ mr = new WASManagedRuntime();
+ }
+ catch (Throwable t) {
+ }
+ WAS= (WASManagedRuntime) mr;
+ }
+
+ private Configuration _conf = null;
+ private ManagedRuntime _runtime = null;
+
+ public TransactionManager getTransactionManager()
+ throws Exception {
+ if (_runtime != null)
+ return _runtime.getTransactionManager();
+
+ List errors = new LinkedList();
+ TransactionManager tm = null;
+
// first try the registry, which is the official way to obtain
// transaction synchronication in JTA 1.1
if (REGISTRY != null) {
@@ -137,111 +137,111 @@
}
}
- if (WLS != null) {
- try {
- tm = WLS.getTransactionManager();
- } catch (Throwable t) {
- errors.add(t);
- }
- if (tm != null) {
- _runtime = WLS;
- return tm;
- }
- }
-
- if (WAS != null) {
- try {
- WAS.setConfiguration(_conf);
- WAS.startConfiguration();
- WAS.endConfiguration();
- tm = WAS.getTransactionManager();
- } catch (Throwable t) {
- errors.add(t);
- }
- if (tm != null) {
- _runtime = WAS;
- return tm;
- }
- }
-
- // try to find a jndi runtime
- JNDIManagedRuntime jmr = new JNDIManagedRuntime();
- for (int i = 0; i < JNDI_LOCS.length; i++) {
- jmr.setTransactionManagerName(JNDI_LOCS[i]);
- try {
- tm = jmr.getTransactionManager();
- } catch (Throwable t) {
- errors.add(t);
- }
- if (tm != null) {
- _runtime = jmr;
- return tm;
- }
- }
-
- // look for a method runtime
- InvocationManagedRuntime imr = new InvocationManagedRuntime();
- for (int i = 0; i < METHODS.length; i++) {
- imr.setConfiguration(_conf);
- imr.setTransactionManagerMethod(METHODS[i]);
- try {
- tm = imr.getTransactionManager();
- } catch (Throwable t) {
- errors.add(t);
- }
- if (tm != null) {
- _runtime = imr;
- return tm;
- }
- }
-
- if (SUNONE != null) {
- try {
- tm = SUNONE.getTransactionManager();
- } catch (Throwable t) {
- errors.add(t);
- }
- if (tm != null) {
- _runtime = SUNONE;
- return tm;
- }
- }
-
- Throwable[] t = (Throwable []) errors.toArray(
- new Throwable [errors.size()]);
- throw new InvalidStateException(_loc.get("tm-not-found")).
- setFatal(true).setNestedThrowables(t);
- }
-
- public void setConfiguration(Configuration conf) {
- _conf = conf;
- }
-
- public void startConfiguration() {
- }
-
- public void endConfiguration() {
- }
-
- public void setRollbackOnly(Throwable cause)
- throws Exception {
- // check to see if the runtime is cached
- if (_runtime == null)
- getTransactionManager();
-
- if (_runtime != null)
- _runtime.setRollbackOnly(cause);
- }
-
- public Throwable getRollbackCause()
- throws Exception {
- // check to see if the runtime is cached
- if (_runtime == null)
- getTransactionManager();
-
- if (_runtime != null)
- return _runtime.getRollbackCause();
-
- return null;
- }
-}
+ if (WLS != null) {
+ try {
+ tm = WLS.getTransactionManager();
+ } catch (Throwable t) {
+ errors.add(t);
+ }
+ if (tm != null) {
+ _runtime = WLS;
+ return tm;
+ }
+ }
+
+ if (WAS != null) {
+ try {
+ WAS.setConfiguration(_conf);
+ WAS.startConfiguration();
+ WAS.endConfiguration();
+ tm = WAS.getTransactionManager();
+ } catch (Throwable t) {
+ errors.add(t);
+ }
+ if (tm != null) {
+ _runtime = WAS;
+ return tm;
+ }
+ }
+
+ // try to find a jndi runtime
+ JNDIManagedRuntime jmr = new JNDIManagedRuntime();
+ for (int i = 0; i < JNDI_LOCS.length; i++) {
+ jmr.setTransactionManagerName(JNDI_LOCS[i]);
+ try {
+ tm = jmr.getTransactionManager();
+ } catch (Throwable t) {
+ errors.add(t);
+ }
+ if (tm != null) {
+ _runtime = jmr;
+ return tm;
+ }
+ }
+
+ // look for a method runtime
+ InvocationManagedRuntime imr = new InvocationManagedRuntime();
+ for (int i = 0; i < METHODS.length; i++) {
+ imr.setConfiguration(_conf);
+ imr.setTransactionManagerMethod(METHODS[i]);
+ try {
+ tm = imr.getTransactionManager();
+ } catch (Throwable t) {
+ errors.add(t);
+ }
+ if (tm != null) {
+ _runtime = imr;
+ return tm;
+ }
+ }
+
+ if (SUNONE != null) {
+ try {
+ tm = SUNONE.getTransactionManager();
+ } catch (Throwable t) {
+ errors.add(t);
+ }
+ if (tm != null) {
+ _runtime = SUNONE;
+ return tm;
+ }
+ }
+
+ Throwable[] t = (Throwable []) errors.toArray(
+ new Throwable [errors.size()]);
+ throw new InvalidStateException(_loc.get("tm-not-found")).
+ setFatal(true).setNestedThrowables(t);
+ }
+
+ public void setConfiguration(Configuration conf) {
+ _conf = conf;
+ }
+
+ public void startConfiguration() {
+ }
+
+ public void endConfiguration() {
+ }
+
+ public void setRollbackOnly(Throwable cause)
+ throws Exception {
+ // check to see if the runtime is cached
+ if (_runtime == null)
+ getTransactionManager();
+
+ if (_runtime != null)
+ _runtime.setRollbackOnly(cause);
+ }
+
+ public Throwable getRollbackCause()
+ throws Exception {
+ // check to see if the runtime is cached
+ if (_runtime == null)
+ getTransactionManager();
+
+ if (_runtime != null)
+ return _runtime.getRollbackCause();
+
+ return null;
+ }
+}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java Tue Jul 3 15:42:39 2007
@@ -1419,10 +1419,10 @@
name = Strings.getPackageName(context) + "." + name;
// first try with regular class loader
- ClassLoader loader = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(context));
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
try {
return Class.forName(name, false, loader);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/DynamicStorageGenerator.java Tue Jul 3 15:42:39 2007
@@ -97,7 +97,7 @@
// the project/classloader for the classes.
private final Project _project = new Project();
private final BCClassLoader _loader = new BCClassLoader(_project,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(DynamicStorage.class)));
/**
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java Tue Jul 3 15:42:39 2007
@@ -133,7 +133,7 @@
static {
Class[] classes = Services.getImplementorClasses(
AuxiliaryEnhancer.class,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(AuxiliaryEnhancer.class)));
List auxEnhancers = new ArrayList(classes.length);
for (int i = 0; i < classes.length; i++) {
@@ -484,7 +484,7 @@
* Package-protected and static for testing.
*/
static BCField getReturnedField(BCMethod meth) {
- return findField(meth, ((Code)AccessController.doPrivileged(
+ return findField(meth, ((Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction())).xreturn()
.setType(meth.getReturnType()), false);
}
@@ -494,7 +494,7 @@
* Package-protected and static for testing.
*/
static BCField getAssignedField(BCMethod meth) {
- return findField(meth, ((Code)AccessController.doPrivileged(
+ return findField(meth, ((Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction())).putfield(), true);
}
@@ -596,7 +596,7 @@
*/
private void replaceAndValidateFieldAccess() {
// create template putfield/getfield instructions to search for
- Code template = (Code)AccessController.doPrivileged(
+ Code template = (Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction());
Instruction put = template.putfield();
Instruction get = template.getfield();
@@ -1204,55 +1204,55 @@
try {
// pcGetGenericContext
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "get" + CONTEXTNAME, (Class[]) null)));
// pcFetchObjectId
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "fetchObjectId", (Class[]) null)));
// pcIsDeleted
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "isDeleted", (Class[]) null)));
// pcIsDirty
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "isDirty", (Class[]) null)));
// pcIsNew
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "isNew", (Class[]) null)));
// pcIsPersistent
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "isPersistent", (Class[]) null)));
// pcIsTransactional
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "isTransactional", (Class[]) null)));
// pcSerializing
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "serializing", (Class[]) null)));
// pcDirty
translateFromStateManagerMethod(
- (Method)AccessController.doPrivileged(
+ (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
SMTYPE, "dirty", new Class[]{ String.class })));
@@ -1265,8 +1265,8 @@
code.areturn();
code.calculateMaxStack();
code.calculateMaxLocals();
- } catch( PrivilegedActionException pae ) {
- throw (NoSuchMethodException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (NoSuchMethodException) pae.getException();
}
}
@@ -2195,8 +2195,8 @@
try {
method = (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(owner, name, params));
- } catch( PrivilegedActionException pae ) {
- throw (NoSuchMethodException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (NoSuchMethodException) pae.getException();
}
return method;
}
@@ -2497,7 +2497,7 @@
code.vreturn();
}
- Instruction tmplate = ((Code)AccessController.doPrivileged(
+ Instruction tmplate = ((Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction())).vreturn();
JumpInstruction toret;
Instruction ret;
@@ -2766,7 +2766,7 @@
if (clinit != null) {
code = clinit.getCode(true);
if (replaceLast) {
- Code template = (Code)AccessController.doPrivileged(
+ Code template = (Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction());
code.searchForward(template.vreturn());
code.previous();
@@ -2808,8 +2808,8 @@
if (clone == null) {
// add clone support for base classes
// which also implement cloneable
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.isInstanceOfAction( _pc, Cloneable.class )))
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.isInstanceOfAction(_pc, Cloneable.class)))
.booleanValue()
|| !superName.equals(Object.class.getName()))
return;
@@ -2838,7 +2838,7 @@
}
// create template super.clone () instruction to match against
- Instruction template = ((Code)AccessController.doPrivileged(
+ Instruction template = ((Code) AccessController.doPrivileged(
J2DoPrivHelper.newCodeAction())).invokespecial()
.setMethod(superName, "clone", Object.class.getName(), null);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/Reflection.java Tue Jul 3 15:42:39 2007
@@ -118,8 +118,8 @@
*/
private static Method getDeclaredMethod(Class cls, String name,
Class param) {
- Method[] methods = (Method[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodsAction( cls ));
+ Method[] methods = (Method[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredMethodsAction(cls));
for (int i = 0 ; i < methods.length; i++) {
if (name.equals(methods[i].getName())) {
Class[] methodParams = methods[i].getParameterTypes();
@@ -163,8 +163,8 @@
* @since 0.9.8
*/
private static Field getDeclaredField(Class cls, String name) {
- Field[] fields = (Field[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredFieldsAction( cls ));
+ Field[] fields = (Field[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredFieldsAction(cls));
for (int i = 0 ; i < fields.length; i++) {
if (name.equals(fields[i].getName()))
return fields[i];
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/BeanLifecycleCallbacks.java Tue Jul 3 15:42:39 2007
@@ -67,7 +67,7 @@
J2DoPrivHelper.newInstanceAction(cls));
} catch (Throwable t) {
if (t instanceof PrivilegedActionException)
- t = ((PrivilegedActionException )t).getException();
+ t = ((PrivilegedActionException) t).getException();
throw new UserException(_loc.get("bean-constructor",
cls.getName()), t);
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/MethodLifecycleCallbacks.java Tue Jul 3 15:42:39 2007
@@ -103,8 +103,8 @@
protected static Method getMethod(Class cls, String method, Class[] args) {
Class currentClass = cls;
do {
- Method[] methods = (Method[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodsAction( currentClass ));
+ Method[] methods = (Method[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredMethodsAction(currentClass));
for (int i = 0; i < methods.length; i++) {
if (!method.equals(methods[i].getName()))
continue;
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Bootstrap.java Tue Jul 3 15:42:39 2007
@@ -116,7 +116,7 @@
// handle cases where there is a mismatch between loaders by falling
// back to the configuration's class loader for broker resolution
cls = getFactoryClass(conf,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(conf.getClass())));
meth = cls.getMethod(methodName, FACTORY_ARGS);
}
@@ -139,7 +139,7 @@
private static Class getFactoryClass(ConfigurationProvider conf,
ClassLoader loader) {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
Object cls = BrokerFactoryValue.get(conf);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java Tue Jul 3 15:42:39 2007
@@ -258,7 +258,7 @@
public void initialize(AbstractBrokerFactory factory,
DelegatingStoreManager sm, boolean managed, int connMode) {
_initializeWasInvoked = true;
- _loader = (ClassLoader)AccessController.doPrivileged(
+ _loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
_jca = new JCAHelper();
_conf = factory.getConfiguration();
@@ -4135,7 +4135,7 @@
if (!PCRegistry.isRegistered(cls)) {
try {
Class.forName(cls.getName(), true,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(cls)));
} catch (Throwable t) {
}
@@ -4275,10 +4275,10 @@
if (intfs[i].getName().equals(PersistenceCapable.class.getName())) {
throw new UserException(_loc.get("pc-loader-different",
Exceptions.toString(obj),
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
PersistenceCapable.class)),
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(intfs[i]))))
.setFailedObject(obj);
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java Tue Jul 3 15:42:39 2007
@@ -752,7 +752,7 @@
Class.forName((String) hint, true, loader)));
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
cause = e;
}
}
@@ -785,13 +785,13 @@
AggregateListener[] aggs = new AggregateListener[clss.length];
try {
for (int i = 0; i < clss.length; i++)
- aggs[i] = (AggregateListener)AccessController.doPrivileged(
+ aggs[i] = (AggregateListener) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(
Class.forName(clss[i], true, loader)));
return aggs;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
cause = e;
}
}
@@ -813,12 +813,12 @@
Exception cause = null;
if (hint instanceof String) {
try {
- return (FilterListener)AccessController.doPrivileged(
+ return (FilterListener) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(
Class.forName((String) hint, true, loader)));
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
cause = e;
}
}
@@ -850,13 +850,13 @@
FilterListener[] filts = new FilterListener[clss.length];
try {
for (int i = 0; i < clss.length; i++)
- filts[i] = (FilterListener)AccessController.doPrivileged(
+ filts[i] = (FilterListener) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(
Class.forName(clss[i], true, loader)));
return filts;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
cause = e;
}
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ObjectIdStateManager.java Tue Jul 3 15:42:39 2007
@@ -717,7 +717,7 @@
getMetaData().getDescribedType()));
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new GeneralException(e);
}
} else if (_oid == null)
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryImpl.java Tue Jul 3 15:42:39 2007
@@ -1557,7 +1557,7 @@
// first check the aliases map in the MetaDataRepository
ClassLoader loader = (_class == null) ? _loader
- : (ClassLoader)AccessController.doPrivileged(
+ : (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(_class));
ClassMetaData meta = _broker.getConfiguration().
getMetaDataRepositoryInstance().getMetaData(name, loader, false);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/QueryLanguages.java Tue Jul 3 15:42:39 2007
@@ -41,14 +41,14 @@
// Load and cache all the query languages available in the system.
Class[] classes = Services.getImplementorClasses(
ExpressionParser.class,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(ExpressionParser.class)));
for (int i = 0; i < classes.length; i++) {
ExpressionParser ep;
try {
- ep = (ExpressionParser)AccessController.doPrivileged(
+ ep = (ExpressionParser) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(classes[i]));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new InternalException(pae.getException());
} catch (InstantiationException e) {
throw new InternalException(e);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/ResultPacker.java Tue Jul 3 15:42:39 2007
@@ -252,7 +252,7 @@
return user;
} catch (OpenJPAException ke) {
throw ke;
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new UserException(_loc.get("pack-instantiation-err",
_resultClass), pae.getException());
} catch (InstantiationException ie) {