[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 06/12/16 09:06:57

  Modified:    src/main/org/jboss/seam/core   Events.java Init.java
  Log:
  better handling of empty string
  JBSEAM-570, @Observer(create=false)
  
  Revision  Changes    Path
  1.16      +5 -2      jboss-seam/src/main/org/jboss/seam/core/Events.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Events.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Events.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- Events.java	16 Dec 2006 04:34:06 -0000	1.15
  +++ Events.java	16 Dec 2006 14:06:57 -0000	1.16
  @@ -110,11 +110,14 @@
         {
            for (ObserverMethod observer: observers)
            {
  -            Object listener = Component.getInstance( observer.component.getName(), true );
  +            Object listener = Component.getInstance( observer.component.getName(), observer.create );
  +            if (listener!=null)
  +            {
               observer.component.callComponentMethod(listener, observer.method, parameters);
            }
         }
      }
  +   }
      
      public void raiseAsynchronousEvent(String type, Object... parameters)
      {
  
  
  
  1.34      +6 -4      jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- Init.java	30 Nov 2006 02:09:10 -0000	1.33
  +++ Init.java	16 Dec 2006 14:06:57 -0000	1.34
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.33 2006/11/30 02:09:10 gavin Exp $
  +//$Id: Init.java,v 1.34 2006/12/16 14:06:57 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -188,10 +188,12 @@
      public static class ObserverMethod {
         public Method method;
         public Component component;
  -      ObserverMethod(Method method, Component component)
  +      public boolean create;
  +      ObserverMethod(Method method, Component component, boolean create)
         {
            this.method = method;
            this.component = component;
  +         this.create = create;
         }
         @Override
         public String toString()
  @@ -205,7 +207,7 @@
         return observers.get(eventType);
      }
      
  -   public void addObserverMethod(String eventType, Method method, Component component)
  +   public void addObserverMethod(String eventType, Method method, Component component, boolean create)
      {
         List<ObserverMethod> observerList = observers.get(eventType);
         if (observerList==null)
  @@ -213,7 +215,7 @@
            observerList = new ArrayList<ObserverMethod>();
            observers.put(eventType, observerList);
         }
  -      observerList.add( new ObserverMethod(method, component) );
  +      observerList.add( new ObserverMethod(method, component, create) );
      }
      
      public boolean isJbpmInstalled()