forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r447810 - /forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
Date Tue, 19 Sep 2006 10:48:49 GMT
Author: thorsten
Date: Tue Sep 19 03:48:48 2006
New Revision: 447810

URL: http://svn.apache.org/viewvc?view=rev&rev=447810
Log:
white noise - formating changes

Modified:
    forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java

Modified: forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java
URL: http://svn.apache.org/viewvc/forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java?view=diff&rev=447810&r1=447809&r2=447810
==============================================================================
--- forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java (original)
+++ forrest/trunk/main/java/org/apache/forrest/conf/ForrestConfModule.java Tue Sep 19 03:48:48
2006
@@ -196,17 +196,17 @@
                             filteringProperties, forrestPropertiesStringURI);
                 }
             }
-//          get forrest.properties and load the values
-            forrestPropertiesStringURI = projectHome + SystemUtils.FILE_SEPARATOR
-                + "forrest.properties";        
+            // get forrest.properties and load the values
+            forrestPropertiesStringURI = projectHome
+                    + SystemUtils.FILE_SEPARATOR + "forrest.properties";
             filteringProperties = loadAntPropertiesFromURI(filteringProperties,
-                forrestPropertiesStringURI);
+                    forrestPropertiesStringURI);
 
-        // get default-forrest.properties and load the values
-        String defaultForrestPropertiesStringURI = contextHome + SystemUtils.FILE_SEPARATOR
-                + "default-forrest.properties";
-        filteringProperties = loadAntPropertiesFromURI(filteringProperties,
-                defaultForrestPropertiesStringURI);
+            // get default-forrest.properties and load the values
+            String defaultForrestPropertiesStringURI = contextHome
+                    + SystemUtils.FILE_SEPARATOR + "default-forrest.properties";
+            filteringProperties = loadAntPropertiesFromURI(filteringProperties,
+                    defaultForrestPropertiesStringURI);
         } finally {
             ForrestConfUtils.aliasSkinProperties(filteringProperties);
             if (debugging())
@@ -249,16 +249,16 @@
             }
         }
     }
-    
+
     /**
      * @param antPropertiesStringURI
      * @throws MalformedURLException
      * @throws IOException
      * @throws SourceNotFoundException
      */
-    private AntProperties loadAntPropertiesFromURI(AntProperties precedingProperties,
-            String antPropertiesStringURI) throws MalformedURLException, IOException,
-            SourceNotFoundException {
+    private AntProperties loadAntPropertiesFromURI(
+            AntProperties precedingProperties, String antPropertiesStringURI)
+            throws MalformedURLException, IOException, SourceNotFoundException {
 
         Source source = null;
         InputStream in = null;
@@ -266,13 +266,14 @@
             source = m_resolver.resolveURI(antPropertiesStringURI);
             if (debugging())
                 debug("Searching for forrest.properties in" + source.getURI());
-            if (source.exists()){
+            if (source.exists()) {
                 in = source.getInputStream();
                 filteringProperties = new AntProperties(precedingProperties);
                 filteringProperties.load(in);
 
                 if (debugging())
-                    debug("Loaded:" + antPropertiesStringURI + filteringProperties.toString());
+                    debug("Loaded:" + antPropertiesStringURI
+                            + filteringProperties.toString());
             }
 
         } finally {



Mime
View raw message