harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apetre...@apache.org
Subject svn commit: r536174 - in /harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext: BeanContextServicesSupport.java BeanContextSupport.java
Date Tue, 08 May 2007 12:25:16 GMT
Author: apetrenko
Date: Tue May  8 05:25:15 2007
New Revision: 536174

URL: http://svn.apache.org/viewvc?view=rev&rev=536174
Log:
Patch for HARMONY-3807 "[classlib][beans] japitool reports errors for the beans module"

Modified:
    harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
    harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?view=diff&rev=536174&r1=536173&r2=536174
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
Tue May  8 05:25:15 2007
@@ -139,13 +139,13 @@
         }
     }
 
-    protected transient ArrayList<BeanContextServicesListener> bcsListeners;
+    protected transient ArrayList bcsListeners;
 
     protected transient BCSSProxyServiceProvider proxy;
 
     protected transient int serializable;
 
-    protected transient HashMap<Class, BCSSServiceProvider> services;
+    protected transient HashMap services;
 
     public BeanContextServicesSupport() {
         super();
@@ -276,7 +276,7 @@
     protected final void fireServiceAdded(
             BeanContextServiceAvailableEvent bcssae) {
 
-        for (BeanContextServicesListener l : this.bcsListeners) {
+        for (BeanContextServicesListener l : (ArrayList<BeanContextServicesListener>)this.bcsListeners)
{
             l.serviceAvailable(bcssae);
         }
     }
@@ -287,7 +287,7 @@
 
     protected final void fireServiceRevoked(BeanContextServiceRevokedEvent bcsre) {
 
-        for (BeanContextServicesListener l : this.bcsListeners) {
+        for (BeanContextServicesListener l : (ArrayList<BeanContextServicesListener>)this.bcsListeners)
{
             l.serviceRevoked(bcsre);
         }
     }
@@ -348,7 +348,7 @@
 
         synchronized (BeanContext.globalHierarchyLock) {
             synchronized (this.services) {
-                BCSSServiceProvider bcsp = this.services.get(serviceClass);
+                BCSSServiceProvider bcsp = (BCSSServiceProvider)this.services.get(serviceClass);
                 if (bcsp == null) {
                     return null;
                 }
@@ -394,7 +394,7 @@
             Object service = null;
 
             synchronized (this.services) {
-                BCSSServiceProvider bcsp = this.services.get(serviceClass);
+                BCSSServiceProvider bcsp = (BCSSServiceProvider)this.services.get(serviceClass);
 
                 if (bcsp != null) {
                     service = bcsp.getServiceProvider().getService(
@@ -546,7 +546,7 @@
             throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
         }
 
-        for (BeanContextServicesListener l : this.bcsListeners) {
+        for (BeanContextServicesListener l : (ArrayList<BeanContextServicesListener>)this.bcsListeners)
{
             l.serviceAvailable(bcssae);
         }
     }
@@ -557,7 +557,7 @@
             throw new NullPointerException(Messages.getString("beans.1C")); //$NON-NLS-1$
         }
 
-        for (BeanContextServicesListener l : this.bcsListeners) {
+        for (BeanContextServicesListener l : (ArrayList<BeanContextServicesListener>)this.bcsListeners)
{
             l.serviceRevoked(bcssre);
         }
     }

Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=536174&r1=536173&r2=536174
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
(original)
+++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
Tue May  8 05:25:15 2007
@@ -117,9 +117,9 @@
 
     private static final long serialVersionUID = -4879613978649577204L;
 
-    protected transient ArrayList<BeanContextMembershipListener> bcmListeners;
+    protected transient ArrayList bcmListeners;
 
-    protected transient HashMap<Object, BCSChild> children;
+    protected transient HashMap children;
 
     /**
      * @serial
@@ -458,13 +458,13 @@
     }
 
     protected final void fireChildrenAdded(BeanContextMembershipEvent bcme) {
-        for (BeanContextMembershipListener cur : bcmListeners) {
+        for (BeanContextMembershipListener cur : (ArrayList<BeanContextMembershipListener>)bcmListeners)
{
             cur.childrenAdded(bcme);
         }
     }
 
     protected final void fireChildrenRemoved(BeanContextMembershipEvent bcme) {
-        for (BeanContextMembershipListener cur : bcmListeners) {
+        for (BeanContextMembershipListener cur : (ArrayList<BeanContextMembershipListener>)bcmListeners)
{
             cur.childrenRemoved(bcme);
         }
     }
@@ -821,7 +821,7 @@
                 synchronized (this.children) {
                     // Just before removing save a reference to it for later use
                     // in childJustRemovedHook() method
-                    BCSChild ch = this.children.get(targetChild);
+                    BCSChild ch = (BCSChild)this.children.get(targetChild);
                     removed = this.children.remove(targetChild);
                     childJustRemovedHook(targetChild, ch);
                 }



Mime
View raw message