You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2010/12/16 11:37:30 UTC
svn commit: r1049900 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config:
ImportConfig.java UserManagerConfig.java
Author: angela
Date: Thu Dec 16 10:37:29 2010
New Revision: 1049900
URL: http://svn.apache.org/viewvc?rev=1049900&view=rev
Log:
minor improvement
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java?rev=1049900&r1=1049899&r2=1049900&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ImportConfig.java Thu Dec 16 10:37:29 2010
@@ -45,7 +45,7 @@ public class ImportConfig {
}
public List<? extends ProtectedItemImporter> getProtectedItemImporters() {
- List<ProtectedItemImporter> piis = new ArrayList();
+ List<ProtectedItemImporter> piis = new ArrayList<ProtectedItemImporter>();
for (BeanConfig bc : protectedItemImporters) {
try {
piis.add(bc.newInstance(ProtectedItemImporter.class));
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java?rev=1049900&r1=1049899&r2=1049900&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/UserManagerConfig.java Thu Dec 16 10:37:29 2010
@@ -54,27 +54,27 @@ public class UserManagerConfig extends B
* an new instance from the <code>initArgs</code> matching the
* <code>parameterTypes</code>.
*
- * @param assignablefrom An UserManager class from which the configured
+ * @param assignableFrom An UserManager class from which the configured
* implementation must be assignable.
* @param parameterTypes Array of classes used to lookup the constructor.
* @param initArgs The arguments to create the new user manager instance
* matching the <code>parameterTypes</code>.
* @return A new instance of <code>UserManager</code> that is assignable from
- * the class passed as <code>assignablefrom</code>.
+ * the class passed as <code>assignableFrom</code>.
* @throws ConfigurationException If the configured user manager implementation
* is not assignable from the given UserManager class, does not provide
* a constructor matching <code>parameterTypes</code> or creating the instance
* fails.
*/
- public UserManager getUserManager(Class<? extends UserManager> assignablefrom, Class<?>[] parameterTypes, Object... initArgs) throws ConfigurationException {
+ public UserManager getUserManager(Class<? extends UserManager> assignableFrom, Class<?>[] parameterTypes, Object... initArgs) throws ConfigurationException {
if (constr == null) {
String msg = "Invalid UserManager implementation '" + getClassName() + "'.";
try {
Class<?> umgrCl = Class.forName(getClassName(), true, getClassLoader());
- if (assignablefrom.isAssignableFrom(umgrCl)) {
+ if (assignableFrom.isAssignableFrom(umgrCl)) {
constr = umgrCl.getConstructor(parameterTypes);
} else {
- throw new ConfigurationException("Configured UserManager '" + getClassName() + "' is not assignable from " + assignablefrom);
+ throw new ConfigurationException("Configured UserManager '" + getClassName() + "' is not assignable from " + assignableFrom);
}
} catch (ClassNotFoundException e) {
throw new ConfigurationException(msg, e);