From: Chad B. <cwb...@us...> - 2005-11-20 17:08:29
|
User: cwbrandon Date: 05/11/20 09:08:22 Modified: uml/emf/uml2/src/main/resources/META-INF/andromda metafacades.xml Log: fix package names Revision Changes Path 1.2 +24 -24 metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml Index: metafacades.xml =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- metafacades.xml 18 Nov 2005 02:38:15 -0000 1.1 +++ metafacades.xml 20 Nov 2005 17:08:22 -0000 1.2 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!-- contains the default metafacade mappings --> <metafacades metaclassPattern="{0}.impl.{1}Impl"> - <default class="org.andromda.metafacades.eclipseUml2.ModelElementFacadeLogicImpl"/> + <default class="org.andromda.metafacades.emf.uml2.ModelElementFacadeLogicImpl"/> <property reference="languageMappingsUri"/> <property reference="wrapperMappingsUri"/> <property reference="namespaceSeparator"/> @@ -18,77 +18,77 @@ <property reference="defaultResolveable"/> <property reference="defaultPageSize"/> <property reference="defaultMaximumListSize"/> - <metafacade class="org.andromda.metafacades.eclipseUml2.PackageFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.PackageFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.PackageImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.ModelFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ModelFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.ModelImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.ClassifierFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ClassifierFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.ClassifierImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EnumerationLiteralFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EnumerationLiteralFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.EnumerationLiteralImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EnumerationFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EnumerationFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.EnumerationImpl"/> <property reference="enumerationNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EnumerationFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EnumerationFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.ClassImpl"> <stereotype>ENUMERATION</stereotype> </mapping> <property reference="enumerationNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.AssociationClassFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.AssociationClassFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.AssociationClassImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.AssociationFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.AssociationFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.AssociationImpl"/> <property reference="relationNameSeparator"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.DependencyFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.DependencyFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.DependencyImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.OperationFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.OperationFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.OperationImpl"/> <property reference="preconditionNamePattern"/> <property reference="postconditionNamePattern"/> <property reference="operationNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.AssociationEndFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.AssociationEndFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.PropertyImpl"> <property name="association"/> </mapping> <property reference="enumerationLiteralNameMask"/> <property reference="defaultMultiplicity"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.AttributeFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.AttributeFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.PropertyImpl"/> <property reference="enumerationLiteralNameMask"/> <property reference="defaultMultiplicity"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.ParameterFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ParameterFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.ParameterImpl"/> <property reference="parameterNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.GeneralizationFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.GeneralizationFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.GeneralizationImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.StereotypeFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.StereotypeFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.StereotypeImpl"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.ConstraintFacadeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ConstraintFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.ConstraintInpl"/> </metafacade> <!-- Value Object metafacades --> - <metafacade class="org.andromda.metafacades.eclipseUml2.ValueObjectLogicImpl" contextRoot="true"> + <metafacade class="org.andromda.metafacades.emf.uml2.ValueObjectLogicImpl" contextRoot="true"> <mapping class="org.eclipse.uml2.impl.ClassImpl"> <stereotype>VALUE_OBJECT</stereotype> </mapping> </metafacade> <!-- Entity metafacades --> - <metafacade class="org.andromda.metafacades.eclipseUml2.EntityLogicImpl" contextRoot="true"> + <metafacade class="org.andromda.metafacades.emf.uml2.EntityLogicImpl" contextRoot="true"> <mapping class="org.eclipse.uml2.impl.ClassImpl"> <stereotype>ENTITY</stereotype> </mapping> @@ -99,7 +99,7 @@ <property reference="relationNameSeparator"/> <property reference="entityNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EntityAttributeLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EntityAttributeLogicImpl"> <mapping> <context>org.andromda.metafacades.uml.Entity</context> </mapping> @@ -107,7 +107,7 @@ <property reference="jdbcMappingsUri"/> <property reference="entityPropertyNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EntityAssociationEndLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationEndLogicImpl"> <mapping> <context>org.andromda.metafacades.uml.Entity</context> <property name="association"/> @@ -116,18 +116,18 @@ <property reference="jdbcMappingsUri"/> <property reference="entityPropertyNameMask"/> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.EntityAssociationLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationLogicImpl"> <mapping> <context>org.andromda.metafacades.uml.Entity</context> </mapping> </metafacade> <!-- Service metafacades --> - <metafacade class="org.andromda.metafacades.eclipseUml2.ServiceLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ServiceLogicImpl"> <mapping> <stereotype>SERVICE</stereotype> </mapping> </metafacade> - <metafacade class="org.andromda.metafacades.eclipseUml2.ServiceOperationLogicImpl"> + <metafacade class="org.andromda.metafacades.emf.uml2.ServiceOperationLogicImpl"> <mapping> <property name="service"/> </mapping> |
From: Chad B. <cwb...@us...> - 2005-11-24 07:52:58
|
User: cwbrandon Date: 05/11/23 23:52:51 Modified: uml/emf/uml2/src/main/resources/META-INF/andromda metafacades.xml Log: add tagged value mapping Revision Changes Path 1.3 +3 -0 metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml Index: metafacades.xml =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -w -r1.2 -r1.3 --- metafacades.xml 20 Nov 2005 17:08:22 -0000 1.2 +++ metafacades.xml 24 Nov 2005 07:52:51 -0000 1.3 @@ -18,6 +18,9 @@ <property reference="defaultResolveable"/> <property reference="defaultPageSize"/> <property reference="defaultMaximumListSize"/> + <metafacade class="org.andromda.metafacades.emf.uml2.TaggedValueFacadeLogicImpl"> + <mapping class="org.andromda.metafacades.emf.uml2.TagDefinitionImpl"/> + </metafacade> <metafacade class="org.andromda.metafacades.emf.uml2.PackageFacadeLogicImpl"> <mapping class="org.eclipse.uml2.impl.PackageImpl"/> </metafacade> |
From: Steve J. <sj...@us...> - 2006-04-29 18:15:23
|
User: sjerman Date: 06/04/29 11:15:19 Modified: uml/emf/uml2/src/main/resources/META-INF/andromda Tag: V3_x_HEAD metafacades.xml Log: Fix metafacade mapping. Revision Changes Path No revision No revision 1.3.2.4 +2 -2 metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml Index: metafacades.xml =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml,v retrieving revision 1.3.2.3 retrieving revision 1.3.2.4 diff -u -w -r1.3.2.3 -r1.3.2.4 --- metafacades.xml 16 Jan 2006 00:14:29 -0000 1.3.2.3 +++ metafacades.xml 29 Apr 2006 18:15:18 -0000 1.3.2.4 @@ -116,7 +116,6 @@ <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationEndLogicImpl"> <mapping> <property name="type.entityMetaType"/> - <property name="association"/> </mapping> <property reference="sqlMappingsUri"/> <property reference="jdbcMappingsUri"/> @@ -124,6 +123,7 @@ </metafacade> <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationLogicImpl"> <mapping> + <property name="association"/> <property name="associationEndA.entityAssociationEndMetaType"/> </mapping> </metafacade> |
From: Steve J. <sj...@us...> - 2006-05-01 19:02:31
|
User: sjerman Date: 06/05/01 12:02:26 Modified: uml/uml2/src/main/java/org/andromda/metafacades/uml2 Tag: V3_x_HEAD EntityAssociationLogicImpl.java AssociationEndFacadeLogicImpl.java uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2 Tag: V3_x_HEAD EntityAssociationLogicImpl.java EntityAssociationEndLogicImpl.java ClassifierFacadeLogicImpl.java UmlUtilities.java AssociationEndFacadeLogicImpl.java uml/uml14/src/java/org/andromda/metafacades/uml14 Tag: V3_x_HEAD EntityAssociationLogicImpl.java AssociationEndFacadeLogicImpl.java uml/common/src/uml Tag: V3_x_HEAD andromda-metafacades-uml.xml.zip uml/emf/uml2/src/main/resources/META-INF/andromda Tag: V3_x_HEAD metafacades.xml Log: fix cyclic dependency in mapping of entityassociation/associationend Revision Changes Path No revision No revision 1.1.2.4 +5 -0 metafacades/uml/uml2/src/main/java/org/andromda/metafacades/uml2/Attic/EntityAssociationLogicImpl.java Index: EntityAssociationLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml2/src/main/java/org/andromda/metafacades/uml2/Attic/EntityAssociationLogicImpl.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -w -r1.1.2.3 -r1.1.2.4 --- EntityAssociationLogicImpl.java 18 Apr 2006 01:45:30 -0000 1.1.2.3 +++ EntityAssociationLogicImpl.java 1 May 2006 19:02:24 -0000 1.1.2.4 @@ -36,4 +36,9 @@ // TODO: put your implementation here. return null; } + + protected boolean handleIsEntityAssociation() { + // TODO Auto-generated method stub + return false; + } } \ No newline at end of file 1.1.2.2 +18 -0 metafacades/uml/uml2/src/main/java/org/andromda/metafacades/uml2/Attic/AssociationEndFacadeLogicImpl.java Index: AssociationEndFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml2/src/main/java/org/andromda/metafacades/uml2/Attic/AssociationEndFacadeLogicImpl.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -r1.1.2.1 -r1.1.2.2 --- AssociationEndFacadeLogicImpl.java 6 Jan 2006 06:12:04 -0000 1.1.2.1 +++ AssociationEndFacadeLogicImpl.java 1 May 2006 19:02:24 -0000 1.1.2.2 @@ -177,4 +177,22 @@ return null; } + /** + * Get the UML upper multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetUpper() + { + return 0; + } + + /** + * Get the UML lower multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetLower() + { + return 0; + } + } \ No newline at end of file No revision No revision 1.1.2.2 +27 -0 metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/EntityAssociationLogicImpl.java Index: EntityAssociationLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/EntityAssociationLogicImpl.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -u -w -r1.1.2.1 -r1.1.2.2 --- EntityAssociationLogicImpl.java 18 Apr 2006 01:45:32 -0000 1.1.2.1 +++ EntityAssociationLogicImpl.java 1 May 2006 19:02:24 -0000 1.1.2.2 @@ -1,7 +1,9 @@ package org.andromda.metafacades.emf.uml2; import java.util.Collection; +import java.util.Iterator; +import org.andromda.core.metafacade.MetafacadeImplsException; import org.andromda.metafacades.uml.AssociationEndFacade; import org.andromda.metafacades.uml.ClassifierFacade; import org.andromda.metafacades.uml.Entity; @@ -10,6 +12,9 @@ import org.andromda.metafacades.uml.UMLProfile; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.StringUtils; +import org.eclipse.uml2.Association; +import org.eclipse.uml2.Property; +import org.eclipse.uml2.Type; /** @@ -72,4 +77,26 @@ } return schemaName; } + + /** + * It is an entity association if both ends are entities (have the entity stereotype + */ + protected boolean handleIsEntityAssociation() { + if (this.metaObject == null || !(this.metaObject instanceof Association)) + { + throw new MetafacadeImplsException ("Incorrect metafacade mapping for "+this.toString()); + } + boolean isEntityAssociation = true; + for (Iterator ends = ((Association) this.metaObject).getMemberEnds().iterator(); ends.hasNext();) + { + final Property prop = (Property) ends.next(); + final Type propertyType = prop.getType(); + if (propertyType == null || !UmlUtilities.containsStereotype(propertyType,"Entity")) + { + isEntityAssociation = false; + } + } + return isEntityAssociation; + } + } \ No newline at end of file 1.1.2.4 +6 -0 metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/EntityAssociationEndLogicImpl.java Index: EntityAssociationEndLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/EntityAssociationEndLogicImpl.java,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -w -r1.1.2.3 -r1.1.2.4 --- EntityAssociationEndLogicImpl.java 12 Mar 2006 12:05:33 -0000 1.1.2.3 +++ EntityAssociationEndLogicImpl.java 1 May 2006 19:02:24 -0000 1.1.2.4 @@ -2,6 +2,7 @@ import java.util.Collection; +import org.andromda.core.metafacade.MetafacadeImplsException; import org.andromda.metafacades.uml.AttributeFacade; import org.andromda.metafacades.uml.ClassifierFacade; import org.andromda.metafacades.uml.Entity; @@ -13,6 +14,8 @@ import org.andromda.metafacades.uml.UMLProfile; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.ObjectUtils; +import org.eclipse.uml2.Property; +import org.eclipse.uml2.Type; /** @@ -222,4 +225,7 @@ { return this.hasStereotype(UMLProfile.STEREOTYPE_TRANSIENT); } + + + } \ No newline at end of file 1.1.2.12 +9 -10 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.11 retrieving revision 1.1.2.12 diff -u -w -r1.1.2.11 -r1.1.2.12 --- ClassifierFacadeLogicImpl.java 28 Apr 2006 16:23:44 -0000 1.1.2.11 +++ ClassifierFacadeLogicImpl.java 1 May 2006 19:02:24 -0000 1.1.2.12 @@ -674,17 +674,16 @@ 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"); + if (property.getAssociation() == null) + continue; + final Property associationEnd = (Property) UmlUtilities.getOppositeAssociationEnd(property); + if (associationEnd == null) + { + throw new MetafacadeException("There is an error in the model or a cartiridge metafacade mapping file. "+ + "The opposite end of "+ property +" is null."+ + ", check your metafacades.xml and make sure things are mapped correctly"); } + associationEnds.add(associationEnd); } } return associationEnds; 1.4.2.4 +1 -2 metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/UmlUtilities.java Index: UmlUtilities.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/UmlUtilities.java,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -u -w -r1.4.2.3 -r1.4.2.4 --- UmlUtilities.java 28 Apr 2006 16:06:27 -0000 1.4.2.3 +++ UmlUtilities.java 1 May 2006 19:02:25 -0000 1.4.2.4 @@ -631,8 +631,7 @@ Object opposite = null; Association association = associationEnd.getAssociation(); - // - for now we don't return association classes with associations (maybe we should?) - if (association != null && !(association instanceof AssociationClass)) + if (association != null) { Collection ends = association.getMemberEnds(); for (final Iterator endIterator = ends.iterator(); endIterator.hasNext();) 1.1.2.5 +18 -0 metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java Index: AssociationEndFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/AssociationEndFacadeLogicImpl.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -w -r1.1.2.4 -r1.1.2.5 --- AssociationEndFacadeLogicImpl.java 25 Apr 2006 17:10:02 -0000 1.1.2.4 +++ AssociationEndFacadeLogicImpl.java 1 May 2006 19:02:25 -0000 1.1.2.5 @@ -199,4 +199,22 @@ { return this.getType(); } + + /** + * Get the UML upper multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetUpper() + { + return this.metaObject.getUpper(); + } + + /** + * Get the UML lower multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetLower() + { + return this.metaObject.getLower(); + } } \ No newline at end of file No revision No revision 1.6.6.3 +7 -0 metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/EntityAssociationLogicImpl.java Index: EntityAssociationLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/EntityAssociationLogicImpl.java,v retrieving revision 1.6.6.2 retrieving revision 1.6.6.3 diff -u -w -r1.6.6.2 -r1.6.6.3 --- EntityAssociationLogicImpl.java 18 Apr 2006 01:45:31 -0000 1.6.6.2 +++ EntityAssociationLogicImpl.java 1 May 2006 19:02:25 -0000 1.6.6.3 @@ -71,4 +71,11 @@ } return schemaName; } + + /** + * This method is only needed for the UML2 facades. + */ + protected boolean handleIsEntityAssociation() { + throw new java.lang.UnsupportedOperationException("entityAssociation not implemented for this facade."); + } } \ No newline at end of file 1.36.6.5 +18 -0 metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java Index: AssociationEndFacadeLogicImpl.java =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/uml14/src/java/org/andromda/metafacades/uml14/AssociationEndFacadeLogicImpl.java,v retrieving revision 1.36.6.4 retrieving revision 1.36.6.5 diff -u -w -r1.36.6.4 -r1.36.6.5 --- AssociationEndFacadeLogicImpl.java 14 Dec 2005 10:15:24 -0000 1.36.6.4 +++ AssociationEndFacadeLogicImpl.java 1 May 2006 19:02:25 -0000 1.36.6.5 @@ -338,4 +338,22 @@ { return ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)); } + + /** + * Get the UML upper multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetUpper() + { + throw new java.lang.UnsupportedOperationException("'upper' is not a UML1.4 feature"); + } + + /** + * Get the UML lower multiplicity + * Not implemented for UML1.4 + */ + protected int handleGetLower() + { + throw new java.lang.UnsupportedOperationException("'lower' is not a UML1.4 feature"); + } } \ No newline at end of file No revision No revision 1.1.2.17 +500 -497 metafacades/uml/common/src/uml/andromda-metafacades-uml.xml.zip <<Binary file>> No revision No revision 1.3.2.5 +5 -6 metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml Index: metafacades.xml =================================================================== RCS file: /cvsroot/andromda/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -w -r1.3.2.4 -r1.3.2.5 --- metafacades.xml 29 Apr 2006 18:15:18 -0000 1.3.2.4 +++ metafacades.xml 1 May 2006 19:02:26 -0000 1.3.2.5 @@ -106,7 +106,7 @@ <property reference="entityNameMask"/> </metafacade> <metafacade class="org.andromda.metafacades.emf.uml2.EntityAttributeLogicImpl"> - <mapping> + <mapping class="org.eclipse.uml2.impl.PropertyImpl"> <property name="owner.entityMetaType"/> </mapping> <property reference="sqlMappingsUri"/> @@ -114,7 +114,7 @@ <property reference="entityPropertyNameMask"/> </metafacade> <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationEndLogicImpl"> - <mapping> + <mapping class="org.eclipse.uml2.impl.PropertyImpl"> <property name="type.entityMetaType"/> </mapping> <property reference="sqlMappingsUri"/> @@ -122,9 +122,8 @@ <property reference="entityPropertyNameMask"/> </metafacade> <metafacade class="org.andromda.metafacades.emf.uml2.EntityAssociationLogicImpl"> - <mapping> - <property name="association"/> - <property name="associationEndA.entityAssociationEndMetaType"/> + <mapping class="org.eclipse.uml2.impl.AssociationImpl"> + <property name="entityAssociation"/> </mapping> </metafacade> <!-- Service metafacades --> |