commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgo...@apache.org
Subject svn commit: r771511 - in /commons/proper/configuration/trunk/src/java/org/apache/commons/configuration: DefaultConfigurationBuilder.java resolver/CatalogResolver.java resolver/EntityResolverSupport.java
Date Tue, 05 May 2009 00:43:07 GMT
Author: rgoers
Date: Tue May  5 00:43:06 2009
New Revision: 771511

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

Modified:
    commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
    commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java
    commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/EntityResolverSupport.java

Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java?rev=771511&r1=771510&r2=771511&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
(original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/DefaultConfigurationBuilder.java
Tue May  5 00:43:06 2009
@@ -1397,7 +1397,7 @@
             {
                 DefaultConfigurationBuilder builder = decl.getConfigurationBuilder();
                 EntityResolver resolver = builder.getEntityResolver();
-                ((EntityResolverSupport)config).setEntityResolver(resolver);
+                ((EntityResolverSupport) config).setEntityResolver(resolver);
             }
 
             return config;

Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java?rev=771511&r1=771510&r2=771511&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java
(original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/CatalogResolver.java
Tue May  5 00:43:06 2009
@@ -246,6 +246,9 @@
      */
     public static class CatalogManager extends org.apache.xml.resolver.CatalogManager
     {
+        /** The static catalog used by this manager. */
+        private static org.apache.xml.resolver.Catalog staticCatalog;
+
         /** The FileSystem */
         private FileSystem fs;
 
@@ -255,9 +258,6 @@
         /** The String Substitutor */
         private StrSubstitutor substitutor;
 
-        /** The static catalog used by this manager. */
-        private static org.apache.xml.resolver.Catalog staticCatalog = null;
-
         /**
          * Set the FileSystem
          * @param fileSystem The FileSystem in use.
@@ -314,6 +314,7 @@
          * implementation.
          *
          * This method always returns a new instance of the underlying catalog class.
+         * @return the Catalog.
          */
         public org.apache.xml.resolver.Catalog getPrivateCatalog()
         {
@@ -323,19 +324,19 @@
             {
                 try
                 {
-	                catalog = new Catalog();
-	                catalog.setCatalogManager(this);
-	                catalog.setupReaders();
-	                catalog.loadSystemCatalogs();
+                    catalog = new Catalog();
+                    catalog.setCatalogManager(this);
+                    catalog.setupReaders();
+                    catalog.loadSystemCatalogs();
                 }
                 catch (Exception ex)
                 {
-	                ex.printStackTrace();
+                    ex.printStackTrace();
                 }
 
                 if (getUseStaticCatalog())
                 {
-	                staticCatalog = catalog;
+                    staticCatalog = catalog;
                 }
             }
 
@@ -347,6 +348,7 @@
          *
          * If this manager uses static catalogs, the same static catalog will
          * always be returned. Otherwise a new catalog will be returned.
+         * @return The Catalog.
          */
         public org.apache.xml.resolver.Catalog getCatalog()
         {

Modified: commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/EntityResolverSupport.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/EntityResolverSupport.java?rev=771511&r1=771510&r2=771511&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/EntityResolverSupport.java
(original)
+++ commons/proper/configuration/trunk/src/java/org/apache/commons/configuration/resolver/EntityResolverSupport.java
Tue May  5 00:43:06 2009
@@ -20,6 +20,10 @@
 
 /**
  * Interface that identifies the class as using an EntityResolver
+ * @author <a href="http://commons.apache.org/configuration/team-list.html">Commons
+ * Configuration team</a>
+ * @since 1.7
+ * @version $Id:  $
  */
 public interface EntityResolverSupport
 {



Mime
View raw message