[Andromdaplugins-cvs] CVS update: cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades EJB3SessionFacadeLogicImpl.java

[Vance K. <va...@us...>]

  User: vancek  
  Date: 06/02/05 20:06:30

  Modified:    andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
                        EJB3SessionFacadeLogicImpl.java
  Log:
  moved getInterceptorsAsList to util class
  getInterceptorReferences transforms collection of dependencies to return the target elements
  
  Revision  Changes    Path
  1.10      +8 -21     cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java
  
  Index: EJB3SessionFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3SessionFacadeLogicImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -w -r1.9 -r1.10
  --- EJB3SessionFacadeLogicImpl.java	29 Jan 2006 01:55:58 -0000	1.9
  +++ EJB3SessionFacadeLogicImpl.java	6 Feb 2006 04:06:30 -0000	1.10
  @@ -719,7 +719,6 @@
                   DependencyFacade dependency = (DependencyFacade)object;
                   ModelElementFacade targetElement = dependency.getTargetElement();
                   return (targetElement != null 
  -                        && dependency.hasStereotype(EJB3Profile.STEREOTYPE_MESSAGE_DRIVEN_REF)
                           && targetElement.hasStereotype(EJB3Profile.STEREOTYPE_MESSAGE_DRIVEN));
               }
           });
  @@ -731,7 +730,7 @@
        */
       protected Collection handleGetInterceptorReferences()
       {
  -        Collection references = super.getSourceDependencies();
  +        Collection references = this.getSourceDependencies();
           CollectionUtils.filter(references, new Predicate()
           {
               public boolean evaluate(Object object)
  @@ -741,26 +740,14 @@
                   return (targetElement != null && targetElement.hasStereotype(EJB3Profile.STEREOTYPE_INTERCEPTOR));
               }
           });
  -        return references;
  -    }
  -
  -    /**
  -     * @see org.andromda.cartridges.ejb3.metafacades.EJB3SessionFacadeLogic#
  -     *      handleGetInterceptorsAsList(java.util.Collection)
  -     */
  -    protected String handleGetInterceptorsAsList(Collection interceptors)
  +        CollectionUtils.transform(references, new Transformer()
       {
  -        StringBuffer sb = new StringBuffer();
  -        String separator = "";
  -
  -        for (final Iterator it = interceptors.iterator(); it.hasNext();)
  +            public Object transform(final Object object)
           {
  -            DependencyFacade dependency = (DependencyFacade)it.next();
  -            sb.append(separator);
  -            separator = ", ";
  -            sb.append(dependency.getTargetElement().getFullyQualifiedName() + ".class");
  +                return ((DependencyFacade)object).getTargetElement();
           }
  -        return sb.toString();
  +        });
  +        return references;
       }
   
       /**