[Andromda-cvs] SF.net SVN: andromda:[14858] trunk/metafacades/uml

[<wal...@us...>]

Revision: 14858
          http://andromda.svn.sourceforge.net/andromda/?rev=14858&view=rev
Author:   walterim
Date:     2011-02-16 11:29:42 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
Enabling the defaultMultiplicity namespace property and the classifierNameMask to the FrontEndControllerLogicImpl

Modified Paths:
--------------
    trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/OperationFacadeLogicImpl.java
    trunk/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml
    trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeFacadeLogicImpl.java
    trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/ParameterFacadeLogicImpl.java
    trunk/metafacades/uml/emf/uml22/src/main/resources/META-INF/andromda/metafacades.xml
    trunk/metafacades/uml/uml14/src/main/resources/META-INF/andromda/metafacades.xml

Modified: trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/OperationFacadeLogicImpl.java
===================================================================
--- trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/OperationFacadeLogicImpl.java	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/emf/uml2/src/main/java/org/andromda/metafacades/emf/uml2/OperationFacadeLogicImpl.java	2011-02-16 11:29:42 UTC (rev 14858)
@@ -744,10 +744,9 @@
     protected int handleGetLower()
     {
         // MD11.5 Exports multiplicity as String
-        return this.metaObject.getLower();
-        //return UmlUtilities.parseLowerMultiplicity(this.metaObject.getLower(),
-        //    (ClassifierFacade) this.getReturnType(), "0");
-            // ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
+        return this.metaObject.getLower();
+//        return UmlUtilities.parseLowerMultiplicity(this.metaObject.getLower(),
+//            (ClassifierFacade) this.getReturnType(), ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
     }
 
     /**

Modified: trunk/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml
===================================================================
--- trunk/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/emf/uml2/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 11:29:42 UTC (rev 14858)
@@ -81,6 +81,7 @@
         <property reference="preconditionNamePattern"/>
         <property reference="postconditionNamePattern"/>
         <property reference="operationNameMask"/>
+        <property reference="defaultMultiplicity"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.emf.uml2.AttributeFacadeLogicImpl">
         <mapping class="org.andromda.metafacades.emf.uml2.AttributeImpl"/>
@@ -92,6 +93,7 @@
         <mapping class="org.eclipse.uml2.impl.ParameterImpl"/>
         <property reference="parameterNameMask"/>
         <property reference="pluralizeParameterNames"/>
+        <property reference="defaultMultiplicity"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.emf.uml2.GeneralizationFacadeLogicImpl">
         <mapping class="org.eclipse.uml2.impl.GeneralizationImpl"/>
@@ -319,6 +321,7 @@
         <mapping class="org.eclipse.uml2.impl.ClassImpl">
             <property name="useCase"/>
         </mapping>
+        <property reference="classifierNameMask"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.emf.uml2.FrontEndControllerOperationLogicImpl">
         <mapping class="org.eclipse.uml2.impl.OperationImpl">

Modified: trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeFacadeLogicImpl.java
===================================================================
--- trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeFacadeLogicImpl.java	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/AttributeFacadeLogicImpl.java	2011-02-16 11:29:42 UTC (rev 14858)
@@ -430,9 +430,8 @@
     {
         // MD11.5 Exports multiplicity as String
         return UmlUtilities.parseLowerMultiplicity(this.metaObject.getLowerValue(),
-            this.getType(), "1");
-            //ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
-            //ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
+            this.getType(), 
+            ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
     }
 
     /**

Modified: trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/ParameterFacadeLogicImpl.java
===================================================================
--- trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/ParameterFacadeLogicImpl.java	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/emf/uml22/src/main/java/org/andromda/metafacades/emf/uml22/ParameterFacadeLogicImpl.java	2011-02-16 11:29:42 UTC (rev 14858)
@@ -435,8 +435,7 @@
     protected int handleGetLower()
     {
         return UmlUtilities.parseLowerMultiplicity(this.metaObject.getLowerValue(), 
-            this.getType(), "1");
-    //      Throws no property 'defaultMultiplicity' registered under metafacade 'org.andromda.metafacades.uml.ParameterFacade' for namespace
-    //    ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
+                this.getType(), 
+                ObjectUtils.toString(this.getConfiguredProperty(UMLMetafacadeProperties.DEFAULT_MULTIPLICITY)));
     }
 }

Modified: trunk/metafacades/uml/emf/uml22/src/main/resources/META-INF/andromda/metafacades.xml
===================================================================
--- trunk/metafacades/uml/emf/uml22/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/emf/uml22/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 11:29:42 UTC (rev 14858)
@@ -87,6 +87,7 @@
         <property reference="preconditionNamePattern"/>
         <property reference="postconditionNamePattern"/>
         <property reference="operationNameMask"/>
+        <property reference="defaultMultiplicity"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.emf.uml22.AttributeFacadeLogicImpl">
         <mapping class="org.andromda.metafacades.emf.uml22.AttributeImpl"/>
@@ -98,6 +99,7 @@
         <mapping class="org.eclipse.uml2.uml.internal.impl.ParameterImpl"/>
         <property reference="parameterNameMask"/>
         <property reference="pluralizeParameterNames"/>
+        <property reference="defaultMultiplicity"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.emf.uml22.GeneralizationFacadeLogicImpl">
         <mapping class="org.eclipse.uml2.uml.internal.impl.GeneralizationImpl"/>

Modified: trunk/metafacades/uml/uml14/src/main/resources/META-INF/andromda/metafacades.xml
===================================================================
--- trunk/metafacades/uml/uml14/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 06:13:29 UTC (rev 14857)
+++ trunk/metafacades/uml/uml14/src/main/resources/META-INF/andromda/metafacades.xml	2011-02-16 11:29:42 UTC (rev 14858)
@@ -288,6 +288,7 @@
         <mapping class="org.omg.uml.foundation.core.UmlClass$Impl">
             <property name="useCase"/>
         </mapping>
+        <property reference="classifierNameMask"/>
     </metafacade>
     <metafacade class="org.andromda.metafacades.uml14.FrontEndControllerOperationLogicImpl">
         <mapping class="org.omg.uml.foundation.core.Operation$Impl">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.