rgen 0.5.4 → 0.6.0

data/CHANGELOG

@@ -123,3 +123,31 @@
 * Fixed ModelSerializer to add :as => in case of ambiguous child roles
 * Made JsonInstantiator search subpackages for unqualified class names
 
+=0.6.0
+
+* Added exception when trying to instantiate abstract class
+* Replaced xmlscan by dependency to nokogiri
+* Made RGen work with Ruby 1.9
+* Cleaned up intermediate attribute and reference description, improvement of metamodel load time
+* Added optional data property for MMProxy
+* Added ECoreToRuby which can create Ruby classes and modules from ECore models in memory (without metamodel generator)
+* Refactored out QualifiedNameProvider and OppositeReferenceFilter
+* Added model fragment/fragmented models support
+* Extended Instantiator::ReferenceResolver and changed it into a class
+* Moved utilities into util folder/module
+* Added FileCacheMap
+* Fixed template language bug: indenting not correct after callback into same template container and iinc/idec
+* Added support for fragmented models
+* Added FileChangeDetector utility
+* Added CachedGlob utility
+* Added index parameter to model element add methods
+* Added MMGeneric
+* Modified has_many_attr to allow the same value in the same attribute multiple times 
+* Made Environment#delete faster on large models
+* Added type check of ecore defaultValueLiteral content in MetamodelBuilder
+* Many-feature setters can work with an Enumerable instead of an Array
+* Added pattern matcher utility
+* Fixed problem of Ruby hanging when exceptions occur
+* Fixed metamodel generator to quote illegal enum literal symbols
+* Imporved UML to ECore transformer and EA support
+

data/Rakefile

@@ -3,21 +3,20 @@ require 'rake/rdoctask'
 
 RGenGemSpec = Gem::Specification.new do |s|
   s.name = %q{rgen}
-  s.version = "0.5.4"
+  s.version = "0.6.0"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.summary = %q{Ruby Modelling and Generator Framework}
   s.email = %q{martin dot thiede at gmx de}
   s.homepage = %q{http://ruby-gen.org}
   s.rubyforge_project = %q{rgen}
   s.description = %q{RGen is a framework supporting Model Driven Software Development (MDSD). This means that it helps you build Metamodels, instantiate Models, modify and transform Models and finally generate arbitrary textual content from it.}
-  s.has_rdoc = true
   s.authors = ["Martin Thiede"]
   gemfiles = Rake::FileList.new
-  gemfiles.include("{lib,test,redist}/**/*")
+  gemfiles.include("{lib,test}/**/*")
   gemfiles.include("README", "CHANGELOG", "MIT-LICENSE", "Rakefile") 
   gemfiles.exclude(/\b\.bak\b/)
   s.files = gemfiles
-  s.rdoc_options = ["--main", "README", "-x", "redist", "-x", "test", "-x", "metamodels", "-x", "ea_support/uml13*"]
+  s.rdoc_options = ["--main", "README", "-x", "test", "-x", "metamodels", "-x", "ea_support/uml13*"]
   s.extra_rdoc_files = ["README", "CHANGELOG", "MIT-LICENSE"]
 end
 

data/lib/ea_support/uml13_ea_metamodel.rb

@@ -12,7 +12,7 @@ module UML13EA
    ScopeKind = Enum.new(:name => 'ScopeKind', :literals =>[ :instance, :classifier ])
    OrderingKind = Enum.new(:name => 'OrderingKind', :literals =>[ :unordered, :ordered, :sorted ])
    CallConcurrencyKind = Enum.new(:name => 'CallConcurrencyKind', :literals =>[ :sequential, :guarded, :concurrent ])
-   AggregationKind = Enum.new(:name => 'AggregationKind', :literals =>[ :none, :aggregate, :composite ])
+   AggregationKind = Enum.new(:name => 'AggregationKind', :literals =>[ :none, :aggregate, :composite, :shared ])
    VisibilityKind = Enum.new(:name => 'VisibilityKind', :literals =>[ :public, :protected, :private ])
 end
 
@@ -188,7 +188,7 @@ class UML13EA::SubactivityState < UML13EA::SubmachineState
 end
 
 class UML13EA::StructuralFeature < UML13EA::Feature
-   has_attr 'changeability', UML13EA::ChangeableKind, :defaultValueLiteral => "changeable" 
+   has_attr 'changeable', UML13EA::ChangeableKind, :defaultValueLiteral => "changeable" 
    has_attr 'targetScope', UML13EA::ScopeKind, :defaultValueLiteral => "instance" 
 end
 
@@ -259,7 +259,7 @@ end
 
 class UML13EA::AssociationEnd < RGen::MetamodelBuilder::MMMultiple(UML13EA::ModelElement, UML13EA::XmiIdProvider)
    has_attr 'isNavigable', Boolean, :defaultValueLiteral => "false" 
-   has_attr 'isOrdered', Boolean, :defaultValueLiteral => "unordered" 
+   has_attr 'isOrdered', Boolean, :defaultValueLiteral => "false" 
    has_attr 'aggregation', UML13EA::AggregationKind, :defaultValueLiteral => "none" 
    has_attr 'targetScope', UML13EA::ScopeKind, :defaultValueLiteral => "instance" 
    has_attr 'changeable', UML13EA::ChangeableKind, :defaultValueLiteral => "changeable" 

data/lib/ea_support/uml13_ea_to_uml13.rb

@@ -8,6 +8,10 @@ class UML13EAToUML13 < RGen::Transformer
   def transform
     trans(:class => Package)
     trans(:class => Class)
+    @env_out.find(:class => UML13::Attribute).each do |me|
+      # remove tagged vales internally used by EA which have been converted to UML
+      me.taggedValue = me.taggedValue.reject{|tv| ["lowerBound", "upperBound"].include?(tv.tag)}
+    end
   end
   
   def cleanModel
@@ -20,10 +24,12 @@ class UML13EAToUML13 < RGen::Transformer
     XmiIdProvider
     AssociationEnd AssociationEndRole
     StructuralFeature
+    Attribute
     Generalization
     ActivityModel 
     CompositeState 
     PseudoState
+    Dependency
   )  
     
   transform AssociationEndRole, :to => UML13::AssociationEndRole do
@@ -46,12 +52,30 @@ class UML13EAToUML13 < RGen::Transformer
     end
   end
 
-  transform StructuralFeature, :to => UML13::StructuralFeature do
+  transform StructuralFeature, :to => UML13::StructuralFeature, 
+    :if => lambda{|c| !@current_object.is_a?(UML13EA::Attribute)} do
     copy_features :except => [:changeable] do
       {:changeability => {:none => :frozen}[changeable] }
     end
   end
 
+  transform StructuralFeature, :to => UML13::Attribute, 
+    :if => lambda{|c| @current_object.is_a?(UML13EA::Attribute)} do
+    _lowerBound = taggedValue.find{|tv| tv.tag == "lowerBound"}
+    _upperBound = taggedValue.find{|tv| tv.tag == "upperBound"}
+    if _lowerBound || _upperBound
+      _multiplicity = UML13::Multiplicity.new(
+        :range => [UML13::MultiplicityRange.new(
+          :lower => (_lowerBound && _lowerBound.value) || "0",
+          :upper => (_upperBound && _upperBound.value) || "1"
+        )])
+    end
+    copy_features :except => [:changeable] do
+      {:changeability => {:none => :frozen}[changeable],
+       :multiplicity => _multiplicity }
+    end
+  end
+
   transform Generalization, :to => UML13::Generalization do
     copy_features :except => [:subtype, :supertype] do 
       { :child => trans(subtype),
@@ -68,5 +92,12 @@ class UML13EAToUML13 < RGen::Transformer
   end
   
   copy PseudoState, :to => UML13::Pseudostate
+
+  transform Dependency, :to => UML13::Dependency do
+    _name_tag = taggedValue.find{|tv| tv.tag == "dst_name"}
+    copy_features do
+      { :name => (_name_tag && _name_tag.value) || "Anonymous" }
+    end
+  end
   
-end
+end

data/lib/ea_support/uml13_to_uml13_ea.rb

@@ -18,6 +18,7 @@ class UML13ToUML13EA < RGen::Transformer
     Association AssociationEnd AssociationEndRole
     Generalization
     Pseudostate    
+    Attribute
   )  
   
   copy ActivityGraph, :to => UML13EA::ActivityModel
@@ -72,6 +73,12 @@ class UML13ToUML13EA < RGen::Transformer
     end
   end
 
+  transform Attribute, :to => UML13EA::Attribute do
+    copy_features :except => [:changeability] do
+      { :changeable => {:frozen => :none}[changeability] }
+    end
+  end
+
   transform Generalization, :to => UML13EA::Generalization do
     copy_features :except => [:child, :parent] do
       { :taggedValue => trans(taggedValue) + [@env_out.new(UML13EA::TaggedValue, :tag => "ea_type", :value => "Generalization")],

data/lib/mmgen/mm_ext/ecore_mmgen_ext.rb

@@ -1,11 +1,11 @@
-require 'rgen/name_helper'
+require 'rgen/util/name_helper'
 
 module RGen
   
   module ECore
     
     module EPackage::ClassModule
-      include RGen::NameHelper
+      include RGen::Util::NameHelper
       
       def moduleName
         firstToUpper(name)
@@ -58,7 +58,7 @@ module RGen
     end
     
     module EClassifier::ClassModule
-      include RGen::NameHelper
+      include RGen::Util::NameHelper
       def classifierName
         firstToUpper(name)			
       end
@@ -88,4 +88,4 @@ module RGen
     
   end
   
-end
+end

data/lib/mmgen/templates/metamodel_generator.tpl

@@ -1,172 +1,172 @@
 
 <% define 'GenerateMetamodel', :for => EPackage do |filename| %>
-	<% file filename do %>
-		require 'rgen/metamodel_builder'
-		<%nl%>
-		<% if needClassReorder? %>
-			<% expand 'GeneratePackagesOnly' %>
-			<% expand 'GenerateClassesReordered' %>
-		<% else %>
-			<% expand 'GeneratePackage' %>
-		<% end %>
-		<%nl%>
-		<% expand 'GenerateAssocs' %>
-	<% end %>
+  <% file filename do %>
+    require 'rgen/metamodel_builder'
+    <%nl%>
+    <% if needClassReorder? %>
+      <% expand 'GeneratePackagesOnly' %>
+      <% expand 'GenerateClassesReordered' %>
+    <% else %>
+      <% expand 'GeneratePackage' %>
+    <% end %>
+    <%nl%>
+    <% expand 'GenerateAssocs' %>
+  <% end %>
 <% end %>
-		
+    
 <% define 'GeneratePackage', :for => EPackage do %>
-	module <%= moduleName %><% iinc %>
-		extend RGen::MetamodelBuilder::ModuleExtension
-		include RGen::MetamodelBuilder::DataTypes
-		<% expand 'annotations::Annotations' %>
-		<%nl%>
-		<% expand 'EnumTypes' %>
-		<% for c in ownClasses %><%nl%>
-			<% expand 'ClassHeader', this, :for => c %><%iinc%>
-				<% if c.abstract %>abstract<% end %>
-				<% expand 'annotations::Annotations', :for => c %>
-				<% expand 'Attribute', this, :foreach => c.eAttributes %>
-				<%idec%>
-			end
-		<% end %><%nl%>
-		<% for p in eSubpackages %>
-			<%nl%><% expand 'GeneratePackage', :for => p %>
-		<% end %><%idec%>
-	end
+  module <%= moduleName %><% iinc %>
+    extend RGen::MetamodelBuilder::ModuleExtension
+    include RGen::MetamodelBuilder::DataTypes
+    <% expand 'annotations::Annotations' %>
+    <%nl%>
+    <% expand 'EnumTypes' %>
+    <% for c in ownClasses %><%nl%>
+      <% expand 'ClassHeader', this, :for => c %><%iinc%>
+        <% if c.abstract %>abstract<% end %>
+        <% expand 'annotations::Annotations', :for => c %>
+        <% expand 'Attribute', this, :foreach => c.eAttributes %>
+        <%idec%>
+      end
+    <% end %><%nl%>
+    <% for p in eSubpackages %>
+      <%nl%><% expand 'GeneratePackage', :for => p %>
+    <% end %><%idec%>
+  end
 <% end %>
 
 <% define 'GenerateClassesReordered', :for => EPackage do %>
-	<% for c in allClassesSorted %><%nl%>
-		<% expand 'ClassHeaderFullyQualified', this, :for => c %><%iinc%>
-			<% if c.abstract %>abstract<% end %>
-			<% expand 'annotations::Annotations', :for => c %>
-			<% expand 'Attribute', this, :foreach => c.eAttributes %>
-			<%idec%>
-		end
-	<% end %><%nl%>
+  <% for c in allClassesSorted %><%nl%>
+    <% expand 'ClassHeaderFullyQualified', this, :for => c %><%iinc%>
+      <% if c.abstract %>abstract<% end %>
+      <% expand 'annotations::Annotations', :for => c %>
+      <% expand 'Attribute', this, :foreach => c.eAttributes %>
+      <%idec%>
+    end
+  <% end %><%nl%>
 <% end %>
 
 <% define 'GeneratePackagesOnly', :for => EPackage do %>
-	module <%= moduleName %><% iinc %>
-		extend RGen::MetamodelBuilder::ModuleExtension
-		include RGen::MetamodelBuilder::DataTypes
-		<% expand 'annotations::Annotations' %>
-		<%nl%>
-		<% expand 'EnumTypes' %>
-		<% for p in eSubpackages %>
-			<%nl%><% expand 'GeneratePackagesOnly', :for => p %>
-		<% end %><%idec%>
-	end
+  module <%= moduleName %><% iinc %>
+    extend RGen::MetamodelBuilder::ModuleExtension
+    include RGen::MetamodelBuilder::DataTypes
+    <% expand 'annotations::Annotations' %>
+    <%nl%>
+    <% expand 'EnumTypes' %>
+    <% for p in eSubpackages %>
+      <%nl%><% expand 'GeneratePackagesOnly', :for => p %>
+    <% end %><%idec%>
+  end
 <% end %>
 
 <% define 'Attribute', :for => EAttribute do |rootp| %>
-	<% if upperBound == 1%>has_attr<% else %>has_many_attr<% end %> '<%= name %>', <%nows%>
-	<% if eType.is_a?(EEnum) %><%nows%>
-		<%= eType.qualifiedClassifierName(rootp) %><%nows%>
-	<% else %><%nows%>
-		<%= eType && eType.instanceClass.to_s %><%nows%>
-	<% end %><%nows%>
-	<% for p in RGen::MetamodelBuilder::AttributeDescription.propertySet %>
-		<% unless p == :name || (p == :upperBound && (upperBound == 1 || upperBound == -1)) || 
-      RGen::MetamodelBuilder::AttributeDescription.default_value(p) == getGeneric(p) %>
-	    	, :<%=p%> => <%nows%>
-	    	<% if getGeneric(p).is_a?(String) %>
-	    		"<%= getGeneric(p) %>"<%nows%>
-	    	<% elsif getGeneric(p).is_a?(Symbol) %>
-	    		:<%= getGeneric(p) %><%nows%>
-	    	<% else %>
-	    		<%= getGeneric(p) %><%nows%>
-	    	<% end %>
-		<% end %>
-	<% end %>
-	<%ws%><% expand 'annotations::Annotations' %><%nl%>
+  <% if upperBound == 1%>has_attr<% else %>has_many_attr<% end %> '<%= name %>', <%nows%>
+  <% if eType.is_a?(EEnum) %><%nows%>
+    <%= eType.qualifiedClassifierName(rootp) %><%nows%>
+  <% else %><%nows%>
+    <%= eType && eType.instanceClass.to_s %><%nows%>
+  <% end %><%nows%>
+  <% for p in RGen::MetamodelBuilder::Intermediate::Attribute.properties %>
+    <% unless p == :name || (p == :upperBound && (upperBound == 1 || upperBound == -1)) || 
+      RGen::MetamodelBuilder::Intermediate::Attribute.default_value(p) == getGeneric(p) %>
+        , :<%=p%> => <%nows%>
+        <% if getGeneric(p).is_a?(String) %>
+          "<%= getGeneric(p) %>"<%nows%>
+        <% elsif getGeneric(p).is_a?(Symbol) %>
+          :<%= getGeneric(p) %><%nows%>
+        <% else %>
+          <%= getGeneric(p) %><%nows%>
+        <% end %>
+    <% end %>
+  <% end %>
+  <%ws%><% expand 'annotations::Annotations' %><%nl%>
 <% end %>
 
 <% define 'EnumTypes', :for => EPackage do %>
-	<% for enum in eClassifiers.select{|c| c.is_a?(EEnum)} %>
-		<%= enum.name %> = Enum.new(:name => '<%= enum.name %>', :literals =>[ <%nows%>
-		<%= enum.eLiterals.collect { |lit| ":"+lit.name }.join(', ') %> ])
-	<% end %>
+  <% for enum in eClassifiers.select{|c| c.is_a?(EEnum)} %>
+    <%= enum.name %> = Enum.new(:name => '<%= enum.name %>', :literals =>[ <%nows%>
+    <%= enum.eLiterals.collect { |lit| ":"+(lit.name =~ /^\d|\W/ ? "'"+lit.name+"'" : lit.name) }.join(', ') %> ])
+  <% end %>
 <% end %>
 
 <% define 'GenerateAssocs', :for => EPackage do %>
-	<% refDone = {} %>
-	<% for ref in eAllClassifiers.select{|c| c.is_a?(EClass)}.eReferences %>
-		<% if !refDone[ref] && ref.eOpposite %>
-			<% ref = ref.eOpposite if ref.eOpposite.containment %>
-			<% refDone[ref] = refDone[ref.eOpposite] = true %>
-			<% if !ref.many && !ref.eOpposite.many %>
-				<% if ref.containment %>
-					<% expand 'Reference', "contains_one", this, :for => ref %>
-				<% else %>
-					<% expand 'Reference', "one_to_one", this, :for => ref %>
-				<% end %>
-			<% elsif !ref.many && ref.eOpposite.many %>
-				<% expand 'Reference', "many_to_one", this, :for => ref %>
-			<% elsif ref.many && !ref.eOpposite.many %>
-				<% if ref.containment %>
-					<% expand 'Reference', "contains_many", this, :for => ref %>
-				<% else %>
-					<% expand 'Reference', "one_to_many", this, :for => ref %>
-				<% end %>
-			<% elsif ref.many && ref.eOpposite.many %>
-				<% expand 'Reference', "many_to_many", this, :for => ref %>
-			<% end %>
-			<% expand 'annotations::Annotations', :for => ref %><%nl%>
-		<% elsif !refDone[ref] %>
-			<% refDone[ref] = true %>
-			<% if !ref.many %>
-				<% if ref.containment %>
-					<% expand 'Reference', "contains_one_uni", this, :for => ref %>
-				<% else %>
-					<% expand 'Reference', "has_one", this, :for => ref %>
-				<% end %>
-			<% elsif ref.many %>
-				<% if ref.containment %>
-					<% expand 'Reference', "contains_many_uni", this, :for => ref %>
-				<% else %>
-					<% expand 'Reference', "has_many", this, :for => ref %>
-				<% end %>
-			<% end %>
-			<% expand 'annotations::Annotations', :for => ref %><%nl%>
-		<% end %>
-	<% end %>
+  <% refDone = {} %>
+  <% for ref in eAllClassifiers.select{|c| c.is_a?(EClass)}.eReferences %>
+    <% if !refDone[ref] && ref.eOpposite %>
+      <% ref = ref.eOpposite if ref.eOpposite.containment %>
+      <% refDone[ref] = refDone[ref.eOpposite] = true %>
+      <% if !ref.many && !ref.eOpposite.many %>
+        <% if ref.containment %>
+          <% expand 'Reference', "contains_one", this, :for => ref %>
+        <% else %>
+          <% expand 'Reference', "one_to_one", this, :for => ref %>
+        <% end %>
+      <% elsif !ref.many && ref.eOpposite.many %>
+        <% expand 'Reference', "many_to_one", this, :for => ref %>
+      <% elsif ref.many && !ref.eOpposite.many %>
+        <% if ref.containment %>
+          <% expand 'Reference', "contains_many", this, :for => ref %>
+        <% else %>
+          <% expand 'Reference', "one_to_many", this, :for => ref %>
+        <% end %>
+      <% elsif ref.many && ref.eOpposite.many %>
+        <% expand 'Reference', "many_to_many", this, :for => ref %>
+      <% end %>
+      <% expand 'annotations::Annotations', :for => ref %><%nl%>
+    <% elsif !refDone[ref] %>
+      <% refDone[ref] = true %>
+      <% if !ref.many %>
+        <% if ref.containment %>
+          <% expand 'Reference', "contains_one_uni", this, :for => ref %>
+        <% else %>
+          <% expand 'Reference', "has_one", this, :for => ref %>
+        <% end %>
+      <% elsif ref.many %>
+        <% if ref.containment %>
+          <% expand 'Reference', "contains_many_uni", this, :for => ref %>
+        <% else %>
+          <% expand 'Reference', "has_many", this, :for => ref %>
+        <% end %>
+      <% end %>
+      <% expand 'annotations::Annotations', :for => ref %><%nl%>
+    <% end %>
+  <% end %>
 <% end %>
 
 <% define 'Reference', :for => EReference do |cmd, rootpackage| %>
-	<%= eContainingClass.qualifiedClassifierName(rootpackage) %>.<%= cmd %> '<%= name %>', <%= eType && eType.qualifiedClassifierName(rootpackage) %><%nows%>
-	<% if eOpposite %><%nows%>
-		, '<%= eOpposite.name%>'<%nows%>
-	<% end %><%nows%>
-	<% pset = RGen::MetamodelBuilder::ReferenceDescription.propertySet.reject{|p| p == :name || p == :upperBound || p == :containment} %>
-	<% for p in pset.reject{|p| RGen::MetamodelBuilder::ReferenceDescription.default_value(p) == getGeneric(p)} %>
-    	, :<%=p%> => <%=getGeneric(p)%><%nows%>
-	<% end %>
-	<% if eOpposite %>
-		<% for p in pset.reject{|p| RGen::MetamodelBuilder::ReferenceDescription.default_value(p) == eOpposite.getGeneric(p)} %>
-	    	, :opposite_<%=p%> => <%=eOpposite.getGeneric(p)%><%nows%>
-		<% end %>
-	<% end %><%ws%>
+  <%= eContainingClass.qualifiedClassifierName(rootpackage) %>.<%= cmd %> '<%= name %>', <%= eType && eType.qualifiedClassifierName(rootpackage) %><%nows%>
+  <% if eOpposite %><%nows%>
+    , '<%= eOpposite.name%>'<%nows%>
+  <% end %><%nows%>
+  <% pset = RGen::MetamodelBuilder::Intermediate::Reference.properties.reject{|p| p == :name || p == :upperBound || p == :containment} %>
+  <% for p in pset.reject{|p| RGen::MetamodelBuilder::Intermediate::Reference.default_value(p) == getGeneric(p)} %>
+      , :<%=p%> => <%=getGeneric(p)%><%nows%>
+  <% end %>
+  <% if eOpposite %>
+    <% for p in pset.reject{|p| RGen::MetamodelBuilder::Intermediate::Reference.default_value(p) == eOpposite.getGeneric(p)} %>
+        , :opposite_<%=p%> => <%=eOpposite.getGeneric(p)%><%nows%>
+    <% end %>
+  <% end %><%ws%>
 <% end %>
 
 <% define 'ClassHeader', :for => EClass do |rootp| %>
-	class <%= classifierName %> < <% nows %>
-	<% if eSuperTypes.size > 1 %><% nows %>
-		RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierNameIfRequired(rootp)}.join(', ') %>)
-	<% elsif eSuperTypes.size > 0 %><% nows %>
-		<%= eSuperTypes.first.qualifiedClassifierNameIfRequired(rootp) %>
-	<% else %><% nows %>
-		RGen::MetamodelBuilder::MMBase
-	<% end %>
+  class <%= classifierName %> < <% nows %>
+  <% if eSuperTypes.size > 1 %><% nows %>
+    RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierNameIfRequired(rootp)}.join(', ') %>)
+  <% elsif eSuperTypes.size > 0 %><% nows %>
+    <%= eSuperTypes.first.qualifiedClassifierNameIfRequired(rootp) %>
+  <% else %><% nows %>
+    RGen::MetamodelBuilder::MMBase
+  <% end %>
 <% end %>
 
 <% define 'ClassHeaderFullyQualified', :for => EClass do |rootp| %>
-	class <%= qualifiedClassifierName(rootp) %> < <% nows %>
-	<% if eSuperTypes.size > 1 %><% nows %>
-		RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierName(rootp)}.join(', ') %>)
-	<% elsif eSuperTypes.size > 0 %><% nows %>
-		<%= eSuperTypes.first.qualifiedClassifierName(rootp) %>
-	<% else %><% nows %>
-		RGen::MetamodelBuilder::MMBase
-	<% end %>
+  class <%= qualifiedClassifierName(rootp) %> < <% nows %>
+  <% if eSuperTypes.size > 1 %><% nows %>
+    RGen::MetamodelBuilder::MMMultiple(<%= eSuperTypes.collect{|t| t.qualifiedClassifierName(rootp)}.join(', ') %>)
+  <% elsif eSuperTypes.size > 0 %><% nows %>
+    <%= eSuperTypes.first.qualifiedClassifierName(rootp) %>
+  <% else %><% nows %>
+    RGen::MetamodelBuilder::MMBase
+  <% end %>
 <% end %>