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 [2/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...
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractCFMetaDataFactory.java Tue Jul 3 15:42:39 2007
@@ -97,8 +97,8 @@
File file;
for (int i = 0; i < strs.length; i++) {
file = new File(strs[i]);
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
this.files.add(file);
}
}
@@ -377,8 +377,8 @@
queries[i].setSource(defaultSourceFile(queries[i],
clsNames), queries[i].getSourceScope(),
queries[i].getSourceType());
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( queries[i].getSourceFile())))
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(queries[i].getSourceFile())))
.booleanValue()) {
if (files == null)
files = new HashSet();
@@ -390,7 +390,7 @@
if (getSourceFile(seqs[i]) == null)
setSourceFile(seqs[i], defaultSourceFile(seqs[i],
clsNames));
- if (((Boolean)AccessController.doPrivileged(
+ if (((Boolean) AccessController.doPrivileged(
J2DoPrivHelper.existsAction(getSourceFile(seqs[i]))))
.booleanValue()) {
if (files == null)
@@ -418,8 +418,8 @@
if (queries[i].getSourceFile() == null)
queries[i].setSource(defaultSourceFile(queries[i], clsNames),
queries[i].getSourceScope(), queries[i].getSourceType());
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( queries[i].getSourceFile() )))
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(queries[i].getSourceFile())))
.booleanValue()) {
if (files == null)
files = new HashSet();
@@ -683,8 +683,8 @@
scan(new ZipStreamMetaDataIterator(
new ZipInputStream(is),
newMetaDataFilter()), cparser, names, true, url);
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
} else {
if (log.isTraceEnabled())
@@ -703,7 +703,7 @@
for (Iterator itr = rsrcs.iterator(); itr.hasNext();) {
rsrc = (String) itr.next();
if (rsrc.endsWith(".jar")) {
- url = (URL)AccessController.doPrivileged(
+ url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, rsrc));
if (url != null) {
if (log.isTraceEnabled())
@@ -716,8 +716,8 @@
(new ZipInputStream(is),
newMetaDataFilter()), cparser, names, true,
url);
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
} else {
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java Tue Jul 3 15:42:39 2007
@@ -187,7 +187,7 @@
FieldMetaData fmd;
for (int i = 0; i < fieldNames.length; i ++) {
if (meta.getAccessType() == ClassMetaData.ACCESS_FIELD)
- member = (Field)AccessController.doPrivileged(
+ member = (Field) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredFieldAction(
cls,fieldNames[i]));
else
@@ -205,7 +205,7 @@
throw ke;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new UserException(e);
}
}
@@ -217,11 +217,11 @@
Member[] members;
boolean iface = meta.getDescribedType().isInterface();
if (meta.getAccessType() == ClassMetaData.ACCESS_FIELD && !iface)
- members = (Field[])AccessController.doPrivileged(
+ members = (Field[]) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredFieldsAction(
meta.getDescribedType()));
else
- members = (Method[])AccessController.doPrivileged(
+ members = (Method[]) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodsAction(
meta.getDescribedType()));
@@ -332,7 +332,7 @@
throw ke;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new InternalException(e);
}
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java Tue Jul 3 15:42:39 2007
@@ -845,8 +845,8 @@
if (getDeclaredField(field) != null)
return true;
if (_staticFields == null) {
- Field[] fields = (Field[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredFieldsAction( _type ));
+ Field[] fields = (Field[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredFieldsAction(_type));
Set names = new HashSet((int) (fields.length * 1.33 + 1));
for (int i = 0; i < fields.length; i++)
if (Modifier.isStatic(fields[i].getModifiers()))
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FieldMetaData.java Tue Jul 3 15:42:39 2007
@@ -1251,7 +1251,7 @@
if (e instanceof OpenJPAException)
throw (OpenJPAException) e;
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("factory-err", this,
Exceptions.toString(val), e.toString())).setCause(e);
}
@@ -1975,7 +1975,7 @@
IOException ioe = new IOException(e.getMessage());
ioe.initCause(e);
throw ioe;
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
IOException ioe = new IOException(
pae.getException().getMessage());
ioe.initCause(pae);
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/InterfaceImplGenerator.java Tue Jul 3 15:42:39 2007
@@ -77,7 +77,7 @@
if (impl != null)
return impl;
- ClassLoader parentLoader = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader parentLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(iface));
BCClassLoader loader = new BCClassLoader(_project, parentLoader);
BCClassLoader enhLoader = new BCClassLoader(_enhProject, parentLoader);
@@ -87,7 +87,7 @@
if (sup != null) {
bc.setSuperclass(sup.getInterfaceImpl());
enhLoader = new BCClassLoader(_enhProject,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
sup.getInterfaceImpl())));
}
@@ -170,8 +170,8 @@
*/
private void invalidateNonBeanMethods(BCClass bc, Class iface,
Set methods) {
- Method[] meths = (Method[])AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodsAction( iface ));
+ Method[] meths = (Method[]) AccessController.doPrivileged(
+ J2DoPrivHelper.getDeclaredMethodsAction(iface));
BCMethod meth;
Code code;
Class type = _repos.getMetaDataFactory().getDefaults().
@@ -208,7 +208,7 @@
return (Method) AccessController.doPrivileged(
J2DoPrivHelper.getDeclaredMethodAction(
iface, name, arg == null ? null : new Class[]{arg}));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new InternalException (_loc.get ("interface-mismatch", name));
}
}
@@ -218,7 +218,7 @@
return true;
try {
Method meth = (Method) AccessController.doPrivileged(
- J2DoPrivHelper.getDeclaredMethodAction( iface, "is" +
+ J2DoPrivHelper.getDeclaredMethodAction(iface, "is" +
StringUtils.capitalize(fmd.getName()), (Class[]) null));
return meth == null;
} catch (PrivilegedActionException pae) {}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataRepository.java Tue Jul 3 15:42:39 2007
@@ -401,7 +401,7 @@
if ((_validate & VALIDATE_RUNTIME) != 0) {
try {
Class.forName(cls.getName(), true,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(cls)));
} catch (Throwable t) {
}
@@ -980,7 +980,7 @@
if (_log.isTraceEnabled())
_log.trace(_loc.get("resolve-identity", oidClass));
- ClassLoader cl = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader cl = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(oidClass));
String className;
while (oidClass != null && oidClass != Object.class) {
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/SequenceMetaData.java Tue Jul 3 15:42:39 2007
@@ -255,7 +255,7 @@
String clsName = plugin.getClassName();
Class cls = Class.forName(clsName, true,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(Seq.class)));
StringBuffer props = new StringBuffer();
if (plugin.getProperties() != null)
@@ -281,7 +281,7 @@
throw ke;
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
- e = ((PrivilegedActionException)e).getException();
+ e = ((PrivilegedActionException) e).getException();
throw new MetaDataException(_loc.get("cant-init-seq", _name)).
setCause(e);
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ApplicationIds.java Tue Jul 3 15:42:39 2007
@@ -194,7 +194,7 @@
J2DoPrivHelper.newInstanceAction(oidType));
} catch (Throwable t) {
if (t instanceof PrivilegedActionException)
- t = ((PrivilegedActionException)t).getException();
+ t = ((PrivilegedActionException) t).getException();
throw new GeneralException(t);
}
@@ -328,7 +328,7 @@
J2DoPrivHelper.newInstanceAction(oidType));
} catch (Throwable t) {
if (t instanceof PrivilegedActionException)
- t = ((PrivilegedActionException)t).getException();
+ t = ((PrivilegedActionException) t).getException();
throw new GeneralException(t);
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ClassResolverImpl.java Tue Jul 3 15:42:39 2007
@@ -40,15 +40,15 @@
// class (the bootstrap loader is the parent of the system loader)
ClassLoader contextLoader = null;
if (contextClass != null) {
- contextLoader = (ClassLoader)AccessController.doPrivileged(
+ contextLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(contextClass));
if (contextLoader == null)
- contextLoader = (ClassLoader)AccessController.doPrivileged(
+ contextLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getSystemClassLoaderAction());
}
// if there is only one unique loader, just return it
- ClassLoader threadLoader = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader threadLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
if ((contextLoader == null || contextLoader == threadLoader)
&& (envLoader == null || envLoader == threadLoader))
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Id.java Tue Jul 3 15:42:39 2007
@@ -78,7 +78,7 @@
*/
public Id(String str, ClassLoader loader) {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
if (str == null)
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxies.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxies.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxies.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Proxies.java Tue Jul 3 15:42:39 2007
@@ -48,10 +48,10 @@
public static void assertAllowedType(Object value, Class allowed) {
if (value != null && allowed != null && !allowed.isInstance(value)) {
throw new UserException(_loc.get("bad-elem-type", new Object[]{
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(allowed)),
allowed,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(value.getClass())),
value.getClass()
}));
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyCollections.java Tue Jul 3 15:42:39 2007
@@ -287,7 +287,7 @@
public static Object afterRemove(ProxyCollection coll, int index,
Object removed) {
if (coll.getChangeTracker() != null)
- ((CollectionChangeTracker)coll.getChangeTracker()).removed(removed);
+ ((CollectionChangeTracker) coll.getChangeTracker()).removed(removed);
removed(coll, removed, false);
return removed;
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java Tue Jul 3 15:42:39 2007
@@ -88,7 +88,7 @@
if (JavaVersions.VERSION >= 5) {
try {
Class queue = Class.forName("java.util.Queue", false,
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(
Collection.class)));
_stdCollections.put(queue, LinkedList.class);
@@ -502,9 +502,9 @@
} catch (InstantiationException ie) {
throw new UnsupportedException(_loc.get("cant-newinstance",
cls.getSuperclass().getName()));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
Exception e = pae.getException();
- if( e instanceof InstantiationException)
+ if (e instanceof InstantiationException)
throw new UnsupportedException(_loc.get("cant-newinstance",
cls.getSuperclass().getName()));
else
@@ -519,9 +519,9 @@
* classes.
*/
private static ClassLoader getMostDerivedLoader(Class c1, Class c2) {
- ClassLoader l1 = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader l1 = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(c1));
- ClassLoader l2 = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader l2 = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(c2));
if (l1 == l2)
return l1;
@@ -530,10 +530,10 @@
if (l2 == null)
return l1;
- for (ClassLoader p = (ClassLoader)AccessController.doPrivileged(
- J2DoPrivHelper.getParentAction( l1 )); p != null;
- p = (ClassLoader)AccessController.doPrivileged(
- J2DoPrivHelper.getParentAction( p )))
+ for (ClassLoader p = (ClassLoader) AccessController.doPrivileged(
+ J2DoPrivHelper.getParentAction(l1)); p != null;
+ p = (ClassLoader) AccessController.doPrivileged(
+ J2DoPrivHelper.getParentAction(p)))
if (p == l2)
return l1;
return l2;
@@ -1588,7 +1588,7 @@
public static void main(String[] args)
throws ClassNotFoundException, IOException {
File dir = Files.getClassFile(ProxyManagerImpl.class);
- dir = (dir == null) ? new File((String)AccessController.doPrivileged(
+ dir = (dir == null) ? new File((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction("user.dir")))
: dir.getParentFile();
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java Tue Jul 3 15:42:39 2007
@@ -131,7 +131,7 @@
}
protected void addContextClassLoaders(MultiClassLoader loader) {
- loader.addClassLoader((ClassLoader)AccessController.doPrivileged(
+ loader.addClassLoader((ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction()));
}
}
Modified: openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java (original)
+++ openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/StoreFacadeTypeRegistry.java Tue Jul 3 15:42:39 2007
@@ -42,7 +42,7 @@
*/
public void registerImplementation(Class facadeType, Class storeType,
Class implType) {
- Object key = (storeType == null) ? (Object)facadeType
+ Object key = (storeType == null) ? (Object) facadeType
: new Key(facadeType, storeType);
_impls.put(key, implType);
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/ant/AbstractTask.java Tue Jul 3 15:42:39 2007
@@ -161,7 +161,7 @@
_conf = newConfiguration();
if (_conf.getPropertiesResource() == null) {
ConfigurationProvider cp = ProductDerivations.loadDefaults
- ((ClassLoader)AccessController.doPrivileged(
+ ((ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(_conf.getClass())));
if (cp != null)
cp.setInto(_conf);
@@ -191,8 +191,8 @@
File f = new File(dsFiles[j]);
if (!f.isFile())
f = new File(ds.getBasedir(), dsFiles[j]);
- files.add((String)AccessController.doPrivileged(
- J2DoPrivHelper.getAbsolutePathAction( f )));
+ files.add((String) AccessController.doPrivileged(
+ J2DoPrivHelper.getAbsolutePathAction(f)));
}
}
return (String[]) files.toArray(new String[files.size()]);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java Tue Jul 3 15:42:39 2007
@@ -165,7 +165,7 @@
*/
public boolean loadGlobals() {
MultiClassLoader loader = new MultiClassLoader();
- loader.addClassLoader((ClassLoader)AccessController.doPrivileged(
+ loader.addClassLoader((ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction()));
loader.addClassLoader(getClass().getClassLoader());
ConfigurationProvider provider = ProductDerivations.loadGlobals(loader);
@@ -175,7 +175,7 @@
// let system properties override other globals
try {
fromProperties(new HashMap(
- (Properties)AccessController.doPrivileged(
+ (Properties) AccessController.doPrivileged(
J2DoPrivHelper.getPropertiesAction())));
} catch (SecurityException se) {
// security manager might disallow
@@ -418,7 +418,7 @@
descs.add(new MethodDescriptor(read));
}
}
- _mds = (MethodDescriptor[])descs.
+ _mds = (MethodDescriptor[]) descs.
toArray(new MethodDescriptor[descs.size()]);
return _mds;
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/Configurations.java Tue Jul 3 15:42:39 2007
@@ -212,8 +212,8 @@
return AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(cls));
} catch (Exception e) {
- if( e instanceof PrivilegedActionException) {
- e = ((PrivilegedActionException)e).getException();
+ if (e instanceof PrivilegedActionException) {
+ e = ((PrivilegedActionException) e).getException();
}
RuntimeException re = new NestableRuntimeException(_loc.get
("obj-create", cls).getMessage(), e);
@@ -236,32 +236,32 @@
// we always prefer the thread loader, because it's the only thing we
// can access that isn't bound to the OpenJPA classloader, unless
// the conf object is of a custom class
- ClassLoader ctxLoader = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader ctxLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
if (loader == null) {
if (ctxLoader != null)
return ctxLoader;
if (conf != null)
- return (ClassLoader)AccessController.doPrivileged(
+ return (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(conf.getClass()));
return Configurations.class.getClassLoader();
}
for (ClassLoader parent = ctxLoader; parent != null;
- parent = (ClassLoader)AccessController.doPrivileged(
- J2DoPrivHelper.getParentAction( parent ))) {
+ parent = (ClassLoader) AccessController.doPrivileged(
+ J2DoPrivHelper.getParentAction(parent))) {
if (parent == loader)
return ctxLoader;
}
if (conf != null) {
for (ClassLoader parent = (ClassLoader)
- AccessController.doPrivileged(
+ AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(conf.getClass()));
parent != null;
- parent = (ClassLoader)AccessController.doPrivileged(
- J2DoPrivHelper.getParentAction( parent ))) {
+ parent = (ClassLoader) AccessController.doPrivileged(
+ J2DoPrivHelper.getParentAction(parent))) {
if (parent == loader)
- return (ClassLoader)AccessController.doPrivileged(
+ return (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(conf.getClass()));
}
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/FileValue.java Tue Jul 3 15:42:39 2007
@@ -59,8 +59,8 @@
}
protected String getInternalString() {
- return (value == null) ? null : (String)AccessController.doPrivileged(
- J2DoPrivHelper.getAbsolutePathAction( value ));
+ return (value == null) ? null : (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getAbsolutePathAction(value));
}
protected void setInternalString(String val) {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ObjectValue.java Tue Jul 3 15:42:39 2007
@@ -97,10 +97,10 @@
boolean fatal) {
ClassLoader cl = (ClassLoader) _classloaderCache.get(type);
if (cl == null) {
- cl = (ClassLoader)AccessController.doPrivileged(
+ cl = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(type));
if (cl == null) { // System classloader is returned as null
- cl = (ClassLoader)AccessController.doPrivileged(
+ cl = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getSystemClassLoaderAction());
}
_classloaderCache.put(type, cl);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java Tue Jul 3 15:42:39 2007
@@ -49,7 +49,7 @@
private static final Throwable[] _derivationErrors;
private static String[] _prefixes;
static {
- ClassLoader l = (ClassLoader)AccessController.doPrivileged(
+ ClassLoader l = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(ProductDerivation.class));
_derivationNames = Services.getImplementors(ProductDerivation.class, l);
_derivationErrors = new Throwable[_derivationNames.length];
@@ -64,7 +64,7 @@
derivations.add(d);
} catch (Throwable t) {
if (t instanceof PrivilegedActionException)
- t = ((PrivilegedActionException)t).getException();
+ t = ((PrivilegedActionException) t).getException();
_derivationErrors[i] = t;
}
}
@@ -235,7 +235,7 @@
if (StringUtils.isEmpty(resource))
return null;
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
ConfigurationProvider provider = null;
StringBuffer errs = null;
@@ -266,7 +266,7 @@
if (file == null)
return null;
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
ConfigurationProvider provider = null;
StringBuffer errs = null;
@@ -281,8 +281,8 @@
errs.append(_derivations[i].getClass().getName() + ":" + t);
}
}
- String aPath = (String)AccessController.doPrivileged(
- J2DoPrivHelper.getAbsolutePathAction( file ));
+ String aPath = (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getAbsolutePathAction(file));
reportErrors(errs, aPath);
throw new MissingResourceException(aPath,
ProductDerivations.class.getName(), aPath);
@@ -308,7 +308,7 @@
private static ConfigurationProvider load(ClassLoader loader,
boolean globals) {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
ConfigurationProvider provider = null;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java Tue Jul 3 15:42:39 2007
@@ -185,10 +185,10 @@
_out = new PrintStream((FileOutputStream)
AccessController.doPrivileged(
J2DoPrivHelper.newFileOutputStreamAction(
- (String)AccessController.doPrivileged(
- J2DoPrivHelper.getCanonicalPathAction( f )),
+ (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getCanonicalPathAction(f)),
true)));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new IllegalArgumentException(_loc.get("log-bad-file",
file) + " " + pae.getException());
} catch (IOException ioe) {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java Tue Jul 3 15:42:39 2007
@@ -298,7 +298,7 @@
return null;
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
boolean fullName = name.indexOf('.') != -1;
boolean noPackage = StringUtils.isEmpty(pkg);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java Tue Jul 3 15:42:39 2007
@@ -214,8 +214,8 @@
return new String[]{ getFromClassFile(file) };
if (arg.endsWith(".java"))
return new String[]{ getFromJavaFile(file) };
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue()) {
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue()) {
Collection col = getFromMetaDataFile(file);
return (String[]) col.toArray(new String[col.size()]);
}
@@ -303,8 +303,8 @@
fin = (FileInputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileInputStreamAction(file));
return getFromClass(fin);
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
} finally {
if (fin != null)
try {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -82,7 +82,7 @@
if (cls != null)
{
ClassLoader clsLoader = (ClassLoader)
- AccessController.doPrivileged(
+ AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(cls));
if (clsLoader != null)
multi.addClassLoader(clsLoader);
@@ -155,11 +155,11 @@
_url = -1;
_urls.clear();
try {
- e = (Enumeration)AccessController.doPrivileged(
+ e = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(
_loader, (String) _locs.get(_loc)));
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
while (e.hasMoreElements())
_urls.add(e.nextElement());
@@ -177,10 +177,10 @@
if (_url == -1 || _url >= _urls.size())
throw new IllegalStateException();
try {
- return (InputStream)AccessController.doPrivileged(
+ return (InputStream) AccessController.doPrivileged(
J2DoPrivHelper.openStreamAction((URL) _urls.get(_url)));
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
@@ -189,8 +189,8 @@
throw new IllegalStateException();
File file = new File(URLDecoder.decode(((URL) _urls.get(_url)).
getFile()));
- return (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue()) ? file:null;
+ return (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue()) ? file:null;
}
public void close() {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -50,7 +50,7 @@
*/
public ClasspathMetaDataIterator(String[] dirs, MetaDataFilter filter)
throws IOException {
- Properties props = (Properties)AccessController.doPrivileged(
+ Properties props = (Properties) AccessController.doPrivileged(
J2DoPrivHelper.getPropertiesAction());
String path = props.getProperty("java.class.path");
String[] tokens = Strings.split(path,
@@ -61,8 +61,8 @@
continue;
File file = new File(tokens[i]);
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
continue;
if (file.isDirectory())
addIterator(new FileMetaDataIterator(file, filter));
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -121,8 +121,8 @@
fis = (FileInputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileInputStreamAction(_file));
return fis;
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
}
}
@@ -148,14 +148,14 @@
}
public byte[] getContent() throws IOException {
- long len = ((Long)AccessController.doPrivileged(
- J2DoPrivHelper.lengthAction( _file ))).longValue();
+ long len = ((Long) AccessController.doPrivileged(
+ J2DoPrivHelper.lengthAction(_file))).longValue();
FileInputStream fin = null;
try {
fin = (FileInputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileInputStreamAction(_file));
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
}
try {
byte[] content;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -65,15 +65,15 @@
}
try {
- Enumeration e = (Enumeration)AccessController.doPrivileged(
+ Enumeration e = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(loader, rsrc));
while (e.hasMoreElements()) {
if (_urls == null)
_urls = new ArrayList(3);
_urls.add(e.nextElement());
}
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
@@ -91,10 +91,10 @@
if (_url == -1 || _url >= _urls.size())
throw new IllegalStateException();
try {
- return (InputStream)AccessController.doPrivileged(
+ return (InputStream) AccessController.doPrivileged(
J2DoPrivHelper.openStreamAction((URL) _urls.get(_url)));
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
@@ -103,8 +103,8 @@
throw new IllegalStateException();
File file = new File(URLDecoder.decode(((URL) _urls.get(_url)).
getFile()));
- return (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue()) ? file :null;
+ return (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue()) ? file :null;
}
public void close() {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java Tue Jul 3 15:42:39 2007
@@ -49,7 +49,7 @@
for (int i = 0; i < trackers.length; i++) {
sourceFilePath = (trackers[i].getSourceFile() == null ?
_loc.get("source-tracker-file-unknown").getMessage() :
- (String)AccessController.doPrivileged(
+ (String) AccessController.doPrivileged(
J2DoPrivHelper.getAbsolutePathAction(
trackers[i].getSourceFile())));
buf.append(" ").append(_loc.get(
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -64,10 +64,10 @@
if (_url == null)
return null;
try {
- return (InputStream)AccessController.doPrivileged(
+ return (InputStream) AccessController.doPrivileged(
J2DoPrivHelper.openStreamAction(_url));
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
@@ -77,8 +77,8 @@
if (_url == null)
return null;
File file = new File(URLDecoder.decode(_url.getPath()));
- return (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue()) ? file:null;
+ return (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue()) ? file:null;
}
public void close() {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java Tue Jul 3 15:42:39 2007
@@ -631,7 +631,7 @@
if (_loader != null)
return _loader;
if (_curLoader == null)
- _curLoader = (ClassLoader)AccessController.doPrivileged(
+ _curLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
return _curLoader;
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java Tue Jul 3 15:42:39 2007
@@ -138,10 +138,10 @@
File backup = Files.backup(file, false);
if (backup == null) {
File parent = file.getParentFile();
- if (parent != null && !((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( parent ))).booleanValue())
- AccessController.doPrivileged(
- J2DoPrivHelper.mkdirsAction( parent ));
+ if (parent != null && !((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(parent))).booleanValue())
+ AccessController.doPrivileged(
+ J2DoPrivHelper.mkdirsAction(parent));
}
return backup;
}
@@ -198,13 +198,13 @@
_backup = prepareWrite(file);
try {
FileWriter out = new FileWriter(
- (String)AccessController.doPrivileged(
- J2DoPrivHelper.getCanonicalPathAction( file )),
+ (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getCanonicalPathAction(file)),
(flags & APPEND) > 0);
serialize(out, flags);
out.close();
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java Tue Jul 3 15:42:39 2007
@@ -61,8 +61,8 @@
try {
_file = (ZipFile) AccessController.doPrivileged(
J2DoPrivHelper.getContentAction(con));
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
_filter = filter;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Files.java Tue Jul 3 15:42:39 2007
@@ -51,17 +51,17 @@
* the file does not exist or a backup could not be created, returns null.
*/
public static File backup(File file, boolean copy) {
- if (file == null || !((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
+ if (file == null || !((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
return null;
// create new file object copy so we don't modify the original
- String aPath = (String)AccessController.doPrivileged(
- J2DoPrivHelper.getAbsolutePathAction( file ));
+ String aPath = (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getAbsolutePathAction(file));
File clone = new File(aPath);
File bk = new File(aPath + "~");
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.renameToAction( clone, bk ))).booleanValue())
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.renameToAction(clone, bk))).booleanValue())
return null;
if (copy) {
try {
@@ -83,17 +83,17 @@
return null;
if (!backup.getName().endsWith("~"))
backup = new File(backup.getPath() + "~");
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( backup ))).booleanValue())
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(backup))).booleanValue())
return null;
// create new file object copy so we don't modify the original
- String path = (String)AccessController.doPrivileged(
- J2DoPrivHelper.getAbsolutePathAction( backup ));
+ String path = (String) AccessController.doPrivileged(
+ J2DoPrivHelper.getAbsolutePathAction(backup));
File clone = new File(path);
File orig = new File(path.substring(0, path.length() - 1));
- if (!((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.renameToAction( clone, orig ))).booleanValue())
+ if (!((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.renameToAction(clone, orig))).booleanValue())
return null;
if (copy) {
try {
@@ -132,7 +132,7 @@
if (innerIdx != -1)
name = name.substring(0, innerIdx);
- URL rsrc = (URL)AccessController.doPrivileged(
+ URL rsrc = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(cls, name + ext));
if (rsrc != null && rsrc.getProtocol().equals("file"))
return new File(URLDecoder.decode(rsrc.getFile()));
@@ -148,34 +148,34 @@
*/
public static File getPackageFile(File base, String pkg, boolean mkdirs) {
if (base == null)
- base = new File((String)AccessController.doPrivileged(
+ base = new File((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction("user.dir")));
if (StringUtils.isEmpty(pkg)) {
- if (mkdirs && !((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( base ))).booleanValue())
+ if (mkdirs && !((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(base))).booleanValue())
AccessController.doPrivileged(
- J2DoPrivHelper.mkdirsAction( base ));
+ J2DoPrivHelper.mkdirsAction(base));
return base;
}
pkg = pkg.replace('.', File.separatorChar);
File file = null;
try {
- if (((String)AccessController.doPrivileged(
- J2DoPrivHelper.getCanonicalPathAction( base ))).endsWith(pkg))
+ if (((String) AccessController.doPrivileged(
+ J2DoPrivHelper.getCanonicalPathAction(base))).endsWith(pkg))
file = base;
else
file = new File(base, pkg);
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new NestableRuntimeException(
- (IOException)pae.getException());
+ (IOException) pae.getException());
} catch (IOException ioe) {
throw new NestableRuntimeException(ioe);
}
- if (mkdirs && !((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
- AccessController.doPrivileged(J2DoPrivHelper.mkdirsAction( file ));
+ if (mkdirs && !((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
+ AccessController.doPrivileged(J2DoPrivHelper.mkdirsAction(file));
return file;
}
@@ -195,21 +195,21 @@
return null;
File file = new File(name);
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( file ))).booleanValue())
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(file))).booleanValue())
return file;
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
- URL url = (URL)AccessController.doPrivileged(
+ URL url = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, name));
if (url != null) {
String urlFile = url.getFile();
if (urlFile != null) {
File rsrc = new File(URLDecoder.decode(urlFile));
- if (((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( rsrc ))).booleanValue())
+ if (((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(rsrc))).booleanValue())
return rsrc;
}
}
@@ -257,7 +257,7 @@
return (FileOutputStream) AccessController.doPrivileged(
J2DoPrivHelper.newFileOutputStreamAction(
getFile(file, loader)));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw new NestableRuntimeException(pae.getException());
} catch (IOException ioe) {
throw new NestableRuntimeException(ioe);
@@ -269,8 +269,8 @@
*/
public static boolean copy(File from, File to) throws IOException {
if (from == null || to == null ||
- !((Boolean)AccessController.doPrivileged(
- J2DoPrivHelper.existsAction( from ))).booleanValue())
+ !((Boolean) AccessController.doPrivileged(
+ J2DoPrivHelper.existsAction(from))).booleanValue())
return false;
FileInputStream in = null;
@@ -285,8 +285,8 @@
for (int b; (b = inbuf.read()) != -1; outbuf.write(b)) ;
outbuf.flush();
return true;
- } catch( PrivilegedActionException pae ) {
- throw (FileNotFoundException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (FileNotFoundException) pae.getException();
} finally {
if (in != null)
try {
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/J2DoPrivHelper.java Tue Jul 3 15:42:39 2007
@@ -74,31 +74,31 @@
* 2) Methods with no exception thrown. PrivilegedAction is returned from
* J2DoPrivHelper.*Action(). E.g.
*
- * ClassLoader loader = (ClassLoader)AccessController.doPrivileged(
- * J2DoPrivHelper.getClassLoaderAction( clazz ));
+ * ClassLoader loader = (ClassLoader) AccessController.doPrivileged(
+ * J2DoPrivHelper.getClassLoaderAction(clazz));
*
* ClassLoader loader = (ClassLoader) (System.getSecurityManager() == null)
* ? clazz.getClassLoader()
- * : AccessController.doPrivileged(
- * J2DoPrivHelper.getClassLoaderAction( clazz ));
+ * : AccessController.doPrivileged(
+ * J2DoPrivHelper.getClassLoaderAction(clazz));
* 3) Methods with exception thrown. PrivilegedExceptionAction is returned
* from J2DoPrivHelper.*Action(). E.g.
*
* try {
* method = (Method) AccessController.doPrivileged(
* J2DoPrivHelper.getDeclaredMethodAction(clazz, name, parameterType));
- * } catch( PrivilegedActionException pae ) {
- * throw (NoSuchMethodException)pae.getException();
+ * } catch (PrivilegedActionException pae) {
+ * throw (NoSuchMethodException) pae.getException();
* }
*
* try {
- * method = ( System.getSecurityManager() == null )
+ * method = (System.getSecurityManager() == null)
* ? clazz.getDeclaredMethod(name,parameterType)
* : (Method) AccessController.doPrivileged(
* J2DoPrivHelper.getDeclaredMethodAction(
* clazz, name, parameterType));
- * } catch( PrivilegedActionException pae ) {
- * throw (NoSuchMethodException)pae.getException()
+ * } catch (PrivilegedActionException pae) {
+ * throw (NoSuchMethodException) pae.getException()
* }
* </xmp>
* @author Albert Lee
@@ -409,7 +409,7 @@
public static final PrivilegedAction lengthAction(final File f) {
return new PrivilegedAction() {
public Object run() {
- return new Long( f.length() );
+ return new Long(f.length());
}
};
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java Tue Jul 3 15:42:39 2007
@@ -46,7 +46,7 @@
private static Method INIT_CAUSE = null;
static {
- String specVersion = (String)AccessController.doPrivileged(
+ String specVersion = (String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction("java.specification.version"));
if ("1.2".equals(specVersion))
VERSION = 2;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Localizer.java Tue Jul 3 15:42:39 2007
@@ -100,7 +100,7 @@
return loc;
else {
loc = new Localizer(pkg, file, locale,
- cls == null ? null:(ClassLoader)AccessController.doPrivileged(
+ cls == null ? null:(ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getClassLoaderAction(cls)));
_localizers.put(key, loc);
return loc;
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java Tue Jul 3 15:42:39 2007
@@ -48,7 +48,7 @@
* The standard system class loader.
*/
public static final ClassLoader SYSTEM_LOADER =
- (ClassLoader)AccessController.doPrivileged(
+ (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getSystemClassLoaderAction());
private List _loaders = new ArrayList(5);
@@ -85,7 +85,7 @@
for (int i = 0; i < loaders.length; i++) {
loader = (ClassLoader) itr.next();
if (loader == THREAD_LOADER)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
loaders[i] = loader;
}
@@ -98,7 +98,7 @@
public ClassLoader getClassLoader(int index) {
ClassLoader loader = (ClassLoader) _loaders.get(index);
if (loader == THREAD_LOADER)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
return loader;
}
@@ -206,7 +206,7 @@
for (Iterator itr = _loaders.iterator(); itr.hasNext();) {
loader = (ClassLoader) itr.next();
if (loader == THREAD_LOADER)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
try {
return Class.forName(name, false, loader);
@@ -222,13 +222,13 @@
for (Iterator itr = _loaders.iterator(); itr.hasNext();) {
loader = (ClassLoader) itr.next();
if (loader == THREAD_LOADER)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
if (loader == null) // skip
continue;
- rsrc = (URL)AccessController.doPrivileged(
+ rsrc = (URL) AccessController.doPrivileged(
J2DoPrivHelper.getResourceAction(loader, name));
if (rsrc != null)
return rsrc;
@@ -244,20 +244,20 @@
for (Iterator itr = _loaders.iterator(); itr.hasNext();) {
loader = (ClassLoader) itr.next();
if (loader == THREAD_LOADER)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
try {
- rsrcs = (Enumeration)AccessController.doPrivileged(
+ rsrcs = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(loader, name));
while (rsrcs.hasMoreElements()) {
rsrc = rsrcs.nextElement();
if (!all.contains(rsrc))
all.addElement(rsrc);
}
- } catch( PrivilegedActionException pae ) {
- throw (IOException)pae.getException();
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
}
}
return all.elements();
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Options.java Tue Jul 3 15:42:39 2007
@@ -369,7 +369,7 @@
try {
inner = AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(innerType));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw pae.getException();
}
invoke(match[0], setter, new Object[]{ inner });
@@ -455,7 +455,7 @@
try {
return AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(subType));
- } catch( PrivilegedActionException pae ) {
+ } catch (PrivilegedActionException pae) {
throw pae.getException();
}
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java Tue Jul 3 15:42:39 2007
@@ -211,7 +211,7 @@
if (_params.containsKey(param.toString()))
copy.append(_params.get(param.toString()));
else
- copy.append((String)AccessController.doPrivileged(
+ copy.append((String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction(param.toString())));
param = null;
} else if (param != null)
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/Services.java Tue Jul 3 15:42:39 2007
@@ -85,12 +85,12 @@
public static String[] getImplementors(String serviceName,
ClassLoader loader) {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
try {
Set resourceList = new TreeSet();
- Enumeration resources = (Enumeration)AccessController.doPrivileged(
+ Enumeration resources = (Enumeration) AccessController.doPrivileged(
J2DoPrivHelper.getResourcesAction(loader, PREFIX + serviceName));
while (resources.hasMoreElements())
addResources((URL) resources.nextElement(), resourceList);
@@ -178,7 +178,7 @@
public static Class[] getImplementorClasses(String serviceName,
ClassLoader loader, boolean skipMissing) throws ClassNotFoundException {
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
String[] names = getImplementors(serviceName, loader);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java Tue Jul 3 15:42:39 2007
@@ -38,7 +38,7 @@
ClassLoader loader) {
String rsrc = name.replace('.', '/') + ".properties";
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
InputStream in = loader.getResourceAsStream(rsrc);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java Tue Jul 3 15:42:39 2007
@@ -88,7 +88,7 @@
// when it overflows
private static long _lastMillis = 0L;
private static final int MAX_14BIT = 0x3FFF;
- private static short _seq = (short)RANDOM.nextInt(MAX_14BIT);
+ private static short _seq = (short) RANDOM.nextInt(MAX_14BIT);
/*
* Static initializer to get the IP address of the host machine.
@@ -216,7 +216,7 @@
private static void incrementSequence() {
// increment, but if it's greater than its 14-bits, reset it
if (++_seq > MAX_14BIT) {
- _seq = (short)RANDOM.nextInt(MAX_14BIT); // semi-random
+ _seq = (short) RANDOM.nextInt(MAX_14BIT); // semi-random
}
}
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java Tue Jul 3 15:42:39 2007
@@ -40,7 +40,7 @@
ClassLoader loader) {
String rsrc = name.replace('.', '/') + ".properties";
if (loader == null)
- loader = (ClassLoader)AccessController.doPrivileged(
+ loader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
InputStream in = loader.getResourceAsStream(rsrc);
Modified: openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java (original)
+++ openjpa/trunk/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java Tue Jul 3 15:42:39 2007
@@ -55,7 +55,7 @@
static {
NanoTimer timer = null;
try {
- String nanoTimerClassName = (String)AccessController.doPrivileged(
+ String nanoTimerClassName = (String) AccessController.doPrivileged(
J2DoPrivHelper.getPropertyAction(providerProp));
if (nanoTimerClassName != null) {
Class cls = Class.forName(nanoTimerClassName);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/XMLPersistenceMappingParser.java Tue Jul 3 15:42:39 2007
@@ -886,10 +886,10 @@
* ClassMappingInfo.
*/
private void endUniqueConstraint() {
- Unique unique = (Unique)popElement();
+ Unique unique = (Unique) popElement();
Object current = currentElement();
if (current instanceof ClassMapping && _secondaryTable == null)
- ((ClassMapping)current).getMappingInfo().addUnique(unique);
+ ((ClassMapping) current).getMappingInfo().addUnique(unique);
}
/**
@@ -899,7 +899,7 @@
private boolean endColumnName() {
Object current = currentElement();
if (current instanceof Unique) {
- Unique unique = (Unique)current;
+ Unique unique = (Unique) current;
Column column = new Column();
column.setName(this.currentText());
unique.addColumn(column);
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java?view=diff&rev=553010&r1=553009&r2=553010
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/jdbc/TestIsolationLevelOverride.java Tue Jul 3 15:42:39 2007
@@ -83,8 +83,8 @@
q.getResultList();
if (dict instanceof DB2Dictionary) {
- if ((((DB2Dictionary)dict).getDb2ServerType() == 1)
- || (((DB2Dictionary)dict).getDb2ServerType()== 2)) {
+ if ((((DB2Dictionary) dict).getDb2ServerType() == 1)
+ || (((DB2Dictionary) dict).getDb2ServerType()== 2)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.id, t0.booleanField, t0.byteField,"
+ " t0.charField, t0.dateField, t0.doubleField,"
@@ -94,8 +94,8 @@
+ " FOR UPDATE OF");
}
// it is DB2 v82 or later
- else if ((((DB2Dictionary)dict).getDb2ServerType() == 3)
- || (((DB2Dictionary)dict).getDb2ServerType() == 4)) {
+ else if ((((DB2Dictionary) dict).getDb2ServerType() == 3)
+ || (((DB2Dictionary) dict).getDb2ServerType() == 4)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.id, t0.booleanField, t0.byteField,"
+ " t0.charField, t0.dateField, t0.doubleField,"
@@ -105,7 +105,7 @@
+ " FOR READ ONLY WITH RR USE AND KEEP "
+ "UPDATE LOCKS");
}
- else if (((DB2Dictionary)dict).getDb2ServerType() == 5) {
+ else if (((DB2Dictionary) dict).getDb2ServerType() == 5) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.id, t0.booleanField, t0.byteField,"
+ " t0.charField, t0.dateField, t0.doubleField,"
@@ -126,8 +126,8 @@
.setIsolation(IsolationLevel.SERIALIZABLE);
em.find(AllFieldTypes.class, 0);
if (dict instanceof DB2Dictionary ) {
- if ((((DB2Dictionary)dict).getDb2ServerType() == 1)
- || (((DB2Dictionary)dict).getDb2ServerType()== 2)) {
+ if ((((DB2Dictionary) dict).getDb2ServerType() == 1)
+ || (((DB2Dictionary) dict).getDb2ServerType()== 2)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"
@@ -137,8 +137,8 @@
+ " FOR UPDATE OF optimize for 1 row");
}
// it is DB2 v82 or later
- else if ((((DB2Dictionary)dict).getDb2ServerType() == 3)
- || (((DB2Dictionary)dict).getDb2ServerType() == 4)) {
+ else if ((((DB2Dictionary) dict).getDb2ServerType() == 3)
+ || (((DB2Dictionary) dict).getDb2ServerType() == 4)) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"
@@ -148,7 +148,7 @@
+ " FOR READ ONLY WITH RR USE AND KEEP UPDATE LOCKS"
+ " optimize for 1 row");
}
- else if (((DB2Dictionary)dict).getDb2ServerType() == 5) {
+ else if (((DB2Dictionary) dict).getDb2ServerType() == 5) {
assertEquals(1, sql.size());
assertSQL("SELECT t0.booleanField, t0.byteField, "
+ "t0.charField, t0.dateField, t0.doubleField,"