[Andromda-cvs] CVS update: metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2 ClassifierFacadeLogicImpl.java

[Chad B. <cwb...@us...>]

  User: cwbrandon
  Date: 06/04/28 09:23:44

  Modified:    uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2
                        Tag: V3_x_HEAD ClassifierFacadeLogicImpl.java
  Log:
  add a check to make sure association ends aren't mapped to attributes
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.1.2.11  +7 -1      metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/ClassifierFacadeLogicImpl.java
  
  Index: ClassifierFacadeLogicImpl.java
  ===================================================================
  RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/ClassifierFacadeLogicImpl.java,v
  retrieving revision 1.1.2.10
  retrieving revision 1.1.2.11
  diff -u -w -r1.1.2.10 -r1.1.2.11
  --- ClassifierFacadeLogicImpl.java	28 Apr 2006 16:13:21 -0000	1.1.2.10
  +++ ClassifierFacadeLogicImpl.java	28 Apr 2006 16:23:44 -0000	1.1.2.11
  @@ -9,6 +9,7 @@
   import java.util.List;
   import java.util.Set;
   
  +import org.andromda.core.metafacade.MetafacadeException;
   import org.andromda.metafacades.uml.AssociationEndFacade;
   import org.andromda.metafacades.uml.AttributeFacade;
   import org.andromda.metafacades.uml.ClassifierFacade;
  @@ -673,12 +674,17 @@
               for (final Iterator iterator = properties.iterator(); iterator.hasNext();)
               {
                   final Property property = (Property)iterator.next();
  -
                   final Object associationEnd = UmlUtilities.getOppositeAssociationEnd(property);
                   if (associationEnd instanceof AssociationEndFacade)
                   {
                       associationEnds.add(associationEnd);
                   }
  +                else
  +                {
  +                    throw new MetafacadeException("The association end has incorrectly been mapped " + 
  +                        "to an instance that does not descend from '" + AssociationEndFacade.class.getName() + "': " + associationEnd 
  +                        + ", check your metafacades.xml and make sure things are mapped correctly");
  +                }
               }
           }
           return associationEnds;