svn commit: r431637 - in /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring: ConfigReader.java PoolableFactoryBean.java XmlConfigCreator.java

[cz...@apache.org]

Author: cziegeler
Date: Tue Aug 15 09:47:11 2006
New Revision: 431637

URL: http://svn.apache.org/viewvc?rev=431637&view=rev
Log:
Clean up

Modified:
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java
    cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java?rev=431637&r1=431636&r2=431637&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java Tue Aug 15 09:47:11 2006
@@ -249,7 +249,7 @@
             ComponentInfo info;
             if (className == null) {
                 // Get the default class name for this role
-                info = (ComponentInfo)this.configInfo.getRole( role );
+                info = this.configInfo.getRole( role );
                 if (info == null) {
                     if ( this.configInfo.getComponents().get( role) != null ) {
                         throw new ConfigurationException("Duplicate component definition for role " + role + " at " + componentConfig.getLocation());
@@ -516,7 +516,7 @@
             }
 
             if ( defaultClassName != null ) {
-                ComponentInfo info = (ComponentInfo)this.configInfo.getRole(roleName);
+                ComponentInfo info = this.configInfo.getRole(roleName);
                 if (info == null) {
                     // Create a new info and store it
                     info = new ComponentInfo();

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java?rev=431637&r1=431636&r2=431637&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java Tue Aug 15 09:47:11 2006
@@ -304,14 +304,14 @@
      * Get a list of interfaces to proxy by scanning through
      * all interfaces a class implements.
      *
-     * @param interfaces      the array of interfaces
+     * @param classInterfaces      the array of interfaces
      * @param workInterfaces  the set of current work interfaces
      */
-    private void addInterfaces( final Class[] interfaces,
+    private void addInterfaces( final Class[] classInterfaces,
                                 final Set workInterfaces ) {
-        for ( int i = 0; i < interfaces.length; i++ ) {
-            workInterfaces.add( interfaces[i] );
-            this.addInterfaces(interfaces[i].getInterfaces(), workInterfaces);
+        for ( int i = 0; i < classInterfaces.length; i++ ) {
+            workInterfaces.add( classInterfaces[i] );
+            this.addInterfaces(classInterfaces[i].getInterfaces(), workInterfaces);
         }
     }
 

Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java?rev=431637&r1=431636&r2=431637&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java Tue Aug 15 09:47:11 2006
@@ -201,10 +201,11 @@
     }
 
     protected String xml(String value) {
-        value = StringUtils.replace(value, "&", "&amp;");
-        value = StringUtils.replace(value, "<", "&lt;");
-        value = StringUtils.replace(value, ">", "&gt;");
-        return value;
+        String result;
+        result = StringUtils.replace(value, "&", "&amp;");
+        result = StringUtils.replace(result, "<", "&lt;");
+        result = StringUtils.replace(result, ">", "&gt;");
+        return result;
     }
 
     protected void appendAttribute(StringBuffer buffer, String attr, String value) {