cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r416673 - in /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal: event/impl/ layout/ pluto/om/ pluto/om/common/ tools/transformation/
Date Fri, 23 Jun 2006 11:27:07 GMT
Author: cziegeler
Date: Fri Jun 23 04:27:03 2006
New Revision: 416673

URL: http://svn.apache.org/viewvc?rev=416673&view=rev
Log:
Fix some bugs

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/ResourceRefSet.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/PortalToolsI18nTransformer.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
Fri Jun 23 04:27:03 2006
@@ -402,6 +402,13 @@
             }
             return false;
         }
+
+        /**
+         * @see java.lang.Object#hashCode()
+         */
+        public int hashCode() {
+            return this.className.hashCode();
+        }
     }
 
     protected static final class ReceiverInfo {
@@ -422,6 +429,13 @@
                      && ((ReceiverInfo)obj).method.equals(this.method);
             }
             return false;
+        }
+
+        /**
+         * @see java.lang.Object#hashCode()
+         */
+        public int hashCode() {
+            return this.receiver.hashCode() + this.method.hashCode();
         }
     }
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
Fri Jun 23 04:27:03 2006
@@ -170,7 +170,7 @@
      * The parent of this layout object or null.
      */
     public Item getParent() {
-        return this.getParent();
+        return this.parent;
     }
 
     /**

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletApplicationDefinitionImpl.java
Fri Jun 23 04:27:03 2006
@@ -41,10 +41,10 @@
     protected String version;
     protected PortletDefinitionRegistryImpl registry;
 
-    private ArrayList customPortletMode = new ArrayList();
-    private ArrayList customPortletState = new ArrayList();
-    private ArrayList userAttribute = new ArrayList();
-    private ArrayList securityConstraint = new ArrayList();
+    private Collection customPortletMode = new ArrayList();
+    private Collection customPortletState = new ArrayList();
+    private Collection userAttribute = new ArrayList();
+    private Collection securityConstraint = new ArrayList();
 
     private PortletDefinitionListImpl portlets = new PortletDefinitionListImpl();
 
@@ -203,7 +203,7 @@
     }
 
     public void setCustomPortletMode(Collection customPortletMode) {
-        this.customPortletMode = (ArrayList)customPortletMode;
+        this.customPortletMode = customPortletMode;
     }
 
     public Collection getCustomPortletState() {
@@ -211,7 +211,7 @@
     }
 
     public void setCustomPortletState(Collection customPortletState) {
-        this.customPortletState = (ArrayList)customPortletState;
+        this.customPortletState = customPortletState;
     }
 
     public Collection getUserAttribute() {
@@ -219,7 +219,7 @@
     }
 
     public void setUserAttribute(Collection userAttribute) {
-        this.userAttribute = (ArrayList)userAttribute;
+        this.userAttribute = userAttribute;
     }
 
     public Collection getSecurityConstraint() {
@@ -227,7 +227,7 @@
     }
 
     public void setSecurityConstraint(Collection securityConstraint) {
-        this.securityConstraint = (ArrayList)securityConstraint;
+        this.securityConstraint = securityConstraint;
     }
 
     // additional internal methods

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionImpl.java
Fri Jun 23 04:27:03 2006
@@ -56,7 +56,7 @@
     private LanguageSet castorResources ;
 
     // contains String objects
-    private ArrayList castorSupportedLocales = new ArrayList();
+    private Collection castorSupportedLocales = new ArrayList();
     private ClassLoader classLoader;
     private String className;
     private ContentTypeSet contentTypes = new ContentTypeSetImpl();
@@ -345,7 +345,7 @@
     } 
 
     public void setCastorSupportedLocales(Collection castorSupportedLocales) {
-        this.castorSupportedLocales = (ArrayList)castorSupportedLocales;
+        this.castorSupportedLocales = castorSupportedLocales;
     }
 
     public void setExpirationCache(String expirationCache) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/ResourceRefSet.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/ResourceRefSet.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/ResourceRefSet.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/pluto/om/common/ResourceRefSet.java
Fri Jun 23 04:27:03 2006
@@ -42,7 +42,8 @@
     }
 
     public ResourceRef add(ResourceRef ref) {
-        return this.add(ref);
+        this.add((Object)ref);
+        return ref;
     }
 
     public ResourceRef remove(ResourceRef ref) {

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/PortalToolsI18nTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/PortalToolsI18nTransformer.java?rev=416673&r1=416672&r2=416673&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/PortalToolsI18nTransformer.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/tools/transformation/PortalToolsI18nTransformer.java
Fri Jun 23 04:27:03 2006
@@ -32,7 +32,7 @@
  */
 public class PortalToolsI18nTransformer extends I18nTransformer {
 
-    public static String ROLE = PortalToolsI18nTransformer.class.getName();
+    public static final String ROLE = PortalToolsI18nTransformer.class.getName();
 
     /**
      * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)



Mime
View raw message