directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r1001499 - in /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema: ldif/extractor/impl/ loader/ldif/ manager/impl/
Date Sun, 26 Sep 2010 19:18:48 GMT
Author: seelmann
Date: Sun Sep 26 19:18:47 2010
New Revision: 1001499

URL: http://svn.apache.org/viewvc?rev=1001499&view=rev
Log:
Fixed checkstyle errors

Modified:
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/ResourceMap.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
    directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/ResourceMap.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/ResourceMap.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/ResourceMap.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/ldif/extractor/impl/ResourceMap.java
Sun Sep 26 19:18:47 2010
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ResourceMap
+public final class ResourceMap
 {
     /** the system property which can be used to load schema from a user specified
      *  resource like a absolute path to a directory or jar file.
@@ -51,8 +51,16 @@ public class ResourceMap
      *  */
     private static final String SCHEMA_RESOURCE_LOCATION = "schema.resource.location";
     
+    /** The logger. */
     private static final Logger LOG = LoggerFactory.getLogger( ResourceMap.class );
     
+    /**
+     * Private contstructor.
+     */
+    private ResourceMap()
+    {
+    }
+    
    /**
     * For all elements of java.class.path OR from the resource name set in the 
     * system property 'schema.resource.location' get a Map of resources

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/AttributeClassLoader.java
Sun Sep 26 19:18:47 2010
@@ -35,7 +35,7 @@ import org.apache.directory.shared.ldap.
  */
 public class AttributeClassLoader extends ClassLoader
 {
-    public EntryAttribute attribute;
+    private EntryAttribute attribute;
     
 
     public AttributeClassLoader()

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/JarLdifSchemaLoader.java
Sun Sep 26 19:18:47 2010
@@ -84,7 +84,7 @@ public class JarLdifSchemaLoader extends
     }
 
 
-    private final URL getResource( String resource, String msg ) throws IOException
+    private URL getResource( String resource, String msg ) throws IOException
     {
         if ( RESOURCE_MAP.get( resource ) )
         {
@@ -153,7 +153,7 @@ public class JarLdifSchemaLoader extends
      * @param schema the schema to get the path for
      * @return the regex.Pattern fragment for the path for the specified schema directory
      */
-    private final String getSchemaDirectory( Schema schema )
+    private String getSchemaDirectory( Schema schema )
     {
         return "schema" + SEPARATOR_PATTERN + "ou=schema" + SEPARATOR_PATTERN
                         + "cn=" + schema.getSchemaName() + SEPARATOR_PATTERN;

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/LdifSchemaLoader.java
Sun Sep 26 19:18:47 2010
@@ -240,7 +240,7 @@ public class LdifSchemaLoader extends Ab
      * @param schema the schema to get the file for
      * @return the file for the specific schema directory
      */
-    private final File getSchemaDirectory( Schema schema )
+    private File getSchemaDirectory( Schema schema )
     {
         return new File( new File( baseDirectory, SchemaConstants.OU_SCHEMA ), "cn=" + schema.getSchemaName()
);
     }

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaEntityFactory.java
Sun Sep 26 19:18:47 2010
@@ -71,7 +71,7 @@ import org.slf4j.LoggerFactory;
 public class SchemaEntityFactory implements EntityFactory
 {
     /** Slf4j logger */
-    private final static Logger LOG = LoggerFactory.getLogger( SchemaEntityFactory.class
);
+    private static final Logger LOG = LoggerFactory.getLogger( SchemaEntityFactory.class
);
 
     private static final List<String> EMPTY_LIST = new ArrayList<String>();
     private static final String[] EMPTY_ARRAY = new String[]

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
Sun Sep 26 19:18:47 2010
@@ -105,7 +105,7 @@ public class SingleLdifSchemaLoader exte
             }
             else
             {
-                _loadSchemaObject( currentSchema.getSchemaName(), ldifEntry );
+                loadSchemaObject( currentSchema.getSchemaName(), ldifEntry );
             }
         }
 
@@ -113,7 +113,7 @@ public class SingleLdifSchemaLoader exte
     }
 
 
-    private void _loadSchemaObject( String schemaName, LdifEntry ldifEntry ) throws Exception
+    private void loadSchemaObject( String schemaName, LdifEntry ldifEntry ) throws Exception
     {
         for ( String scObjTypeRdn : schemaObjectTypeRdns )
         {

Modified: directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java?rev=1001499&r1=1001498&r2=1001499&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
(original)
+++ directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
Sun Sep 26 19:18:47 2010
@@ -109,7 +109,7 @@ public class DefaultSchemaManager implem
     private SchemaLoader schemaLoader;
 
     /** the factory that generates respective SchemaObjects from LDIF entries */
-    protected final EntityFactory factory;
+    private final EntityFactory factory;
 
     /** the normalized name for the schema modification attributes */
     private DN schemaModificationAttributesDN;
@@ -884,7 +884,7 @@ public class DefaultSchemaManager implem
      * @param schemaObject The SchemaObject containing the SchemaObject description
      * @param schema The associated schema
      * @return the created schemaObject instance
-     * @throws Exception If the registering failed
+     * @throws LdapException If the registering failed
      */
     private SchemaObject addSchemaObject( Registries registries, SchemaObject schemaObject,
Schema schema )
         throws LdapException
@@ -1080,7 +1080,7 @@ public class DefaultSchemaManager implem
      * @throws Exception if there is a cycle detected and/or another
      * failure results while loading, producing and or registering schema objects
      */
-    private final void loadDepsFirst( Registries registries, Schema schema ) throws Exception
+    private void loadDepsFirst( Registries registries, Schema schema ) throws Exception
     {
         if ( schema == null )
         {



Mime
View raw message