[Mobies-commit] [commit] r3778 - UDM/trunk/src/UdmCliGen

[ksmyth at redhat1.isis.vanderbilt.edu]

Author: ksmyth
Date: Wed Jul  6 09:47:16 2011
New Revision: 3778

Log:
Explicity implement interface to avoid name clash; FIXME

Modified:
   UDM/trunk/src/UdmCliGen/Implementation.tmpl
   UDM/trunk/src/UdmCliGen/Initialize.tmpl

Modified: UDM/trunk/src/UdmCliGen/Implementation.tmpl
==============================================================================
--- UDM/trunk/src/UdmCliGen/Implementation.tmpl	Tue Jul  5 12:44:46 2011	(r3777)
+++ UDM/trunk/src/UdmCliGen/Implementation.tmpl	Wed Jul  6 09:47:16 2011	(r3778)
@@ -154,7 +154,7 @@
 #for $crole in $c.childRoles
 #set prole = crole.parent.parentRole_role_children[0]
 #set meta_name = $fq_name($c) + "." + role_metaname(prole)
-        public $fq_iname(prole.target) @$role_name(prole)
+        $fq_iname(prole.target) $fq_iname($c).@$role_name(prole)
         {
             get
             {
@@ -176,7 +176,7 @@
 #set crole = prole.parent.childRole_role_children[0]
 #set meta_name = $fq_name($c) + "." + role_metaname(crole)
 #if crole.max == 1
-        public $fq_iname(crole.target) @$role_name(crole) {
+        $fq_iname(crole.target) $fq_iname($c).@$role_name(crole) {
             get
             {
                 global::Udm.Native.ObjectImpl_vector v = backing.__impl().getChildren($meta_name, ${fq_name(crole.target)}.meta);
@@ -190,7 +190,7 @@
             set {}
         }
 #else
-        public global::System.Collections.Generic.IEnumerable<$fq_iname(crole.target)> @$role_name(crole) {
+        global::System.Collections.Generic.IEnumerable<$fq_iname(crole.target)> $fq_iname($c).@$role_name(crole) {
             get
             {
                 return global::System.Linq.Enumerable.ToList(

Modified: UDM/trunk/src/UdmCliGen/Initialize.tmpl
==============================================================================
--- UDM/trunk/src/UdmCliGen/Initialize.tmpl	Tue Jul  5 12:44:46 2011	(r3777)
+++ UDM/trunk/src/UdmCliGen/Initialize.tmpl	Wed Jul  6 09:47:16 2011	(r3778)
@@ -32,6 +32,7 @@
 ${fq_name($o)}.meta = classes["${get_path($o, "/")}"];
 downcasts.Add(${fq_name($o)}.meta, ${fq_name($o)}.Cast);
 #else if $o.type.name == "Attribute"
+// FIXME: if not found, say what
 ${fq_name($o.parent)}.$role_metaname($o) = attributes["${get_path($o, "/")}"];
 #end if
 #end for