rgen 0.4.6 → 0.5.0

data/lib/rgen/transformer.rb

@@ -1,3 +1,6 @@
+require 'rgen/ecore/ecore'
+require 'rgen/ecore/ecore_ext'
+
 module RGen
 
 # The Transformer class can be used to specify model transformations.
@@ -162,6 +165,55 @@ module RGen
 # occure if the condition are based on transformation target elements, i.e. if +trans+
 # is used within the condition to lookup or transform other elements.
 # 
+# = Copy Transformations
+# 
+# In some cases, transformations should just copy a model, either in the same metamodel
+# or in another metamodel with the same package/class structure. Sometimes, a transformation
+# is not exactly a copy, but a copy with slight modifications. Also in this case most
+# classes need to be copied verbatim.
+#
+# The class method Transformer.copy can be used to specify a copy rule for a single
+# metamodel class. If no target class is specified using the :to named parameter, the
+# target class will be the same as the source class (i.e. in the same metamodel).
+#
+#   copy MM1::ClassA                          # copy within the same metamodel
+#   copy MM1::ClassA, :to => MM2::ClassA
+#
+# The class method Transfomer.copy_all can be used to specify copy rules for all classes
+# of a particular metamodel package. Again with :to, the target metamodel package may
+# be specified which must have the same package/class structure. If :to is omitted, the
+# target metamodel is the same as the source metamodel. In case that for some classes
+# specific transformation rules should be used instead of copy rules, exceptions may be 
+# specified using the :except named parameter. +copy_all+ also provides an easy way to
+# copy (clone) a model within the same metamodel.
+#
+#   copy_all MM1                              # copy rules for the whole metamodel MM1, 
+#                                             # used to clone models of MM1
+#                                          
+#   copy_all MM1, :to => MM2, :except => %w(  # copy rules for all classes of MM1 to
+#     ClassA                                  # equally named classes in MM2, except
+#     Sub1::ClassB                            # "ClassA" and "Sub1::ClassB"
+#   )
+#
+# If a specific class transformation is not an exact copy, the Transformer.transform method
+# should be used to actually specify the transformation. If this transformation is also
+# mostly a copy, the helper method Transformer#copy_features can be used to create the
+# transformation Hash required by the transform method. Any changes to this hash may be done
+# in a hash returned by a block given to +copy_features+. This hash will extend or overwrite
+# the default copy hash. In case a particular feature should not be part of the copy hash
+# (e.g. because it does not exist in the target metamodel), exceptions can be specified using
+# the :except named parameter. Here is an example:
+#
+#   transform ClassA, :to => ClassAx do
+#     copy_features :except => [:featA] do 
+#       { :featB => featA }
+#     end
+#   end
+#
+# In this example, ClassAx is a copy of ClassA except, that feature "featA" in ClassA is renamed
+# into "featB" in ClassAx. Using +copy_features+ all features are copied except "featA". Then
+# "featB" of the target class is assigned the value of "featA" of the source class.
+#
 class Transformer
 	
 	TransformationDescription = Struct.new(:block, :target) # :nodoc:
@@ -205,16 +257,37 @@ class Transformer
 
 	# This class method specifies that all objects of class +from+ are to be copied
 	# into an object of class +to+. If +to+ is omitted, +from+ is used as target class.
+  # The target class may also be specified using the :to => <class> hash notation. 
 	# During copy, all attributes and references of the target object
 	# are set to their transformed counterparts of the source object.
 	# 
 	def self.copy(from, to=nil)
+    raise StandardError.new("Specify target class either directly as second parameter or using :to => <class>") \
+      unless to.nil? || to.is_a?(Class) || (to.is_a?(Hash) && to[:to].is_a?(Class))
+    to = to[:to] if to.is_a?(Hash) 
 		transform(from, :to => to || from) do
-			Hash[*@current_object.class.ecore.eAllStructuralFeatures.inject([]) {|l,a|
-				l + [a.name.to_sym, trans(@current_object.send(a.name))]
-			}]
+      copy_features
 		end
-	end
+  end
+
+  # Create copy rules for all classes of metamodel package (module) +from+ and its subpackages.
+  # The target classes are the classes with the same name in the metamodel package
+  # specified using named parameter :to. If no target metamodel is specified, source
+  # and target classes will be the same.
+  # The named parameter :except can be used to specify classes by qualified name for which 
+  # no copy rules should be created. Qualified names are relative to the metamodel package
+  # specified.
+  #
+  def self.copy_all(from, hash={})
+    to = hash[:to] || from
+    except = hash[:except]
+    fromDepth = from.ecore.qualifiedName.split("::").size
+    from.ecore.eAllClasses.each do |c|
+      path = c.qualifiedName.split("::")[fromDepth..-1]
+      next if except && except.include?(path.join("::"))
+      copy c.instanceClass, :to => path.inject(to){|m,c| m.const_get(c)}
+    end
+  end
 	
 	# Define a transformer method for the current transformer class.
 	# In contrast to regular Ruby methods, a method defined this way executes in the
@@ -283,6 +356,24 @@ class Transformer
 		@transformer_results[obj]
 	end
 	
+  # Create the hash required as return value of the block given to the Transformer.transform method.
+  # The hash will assign feature values of the source class to the features of the target class,
+  # assuming the features of both classes are the same. If the :except named parameter specifies
+  # an Array of symbols, the listed features are not copied by the hash. In order to easily manipulate
+  # the resulting hash, a block may be given which should also return a feature assignmet hash. This
+  # hash should be created manually and will extend/overwrite the automatically created hash.
+  #
+  def copy_features(options={})
+    hash = {}
+    @current_object.class.ecore.eAllStructuralFeatures.each do |f|
+      next if f.derived
+      next if options[:except] && options[:except].include?(f.name.to_sym)
+      hash[f.name.to_sym] = trans(@current_object.send(f.name))
+    end
+    hash.merge!(yield) if block_given?
+    hash
+  end
+  
 	def _transformProperties(obj, block_desc) #:nodoc:
 		old_object, @current_object = @current_object, obj
 		block_result = instance_eval(&block_desc.block)

data/lib/transformers/ecore_to_uml13.rb

@@ -0,0 +1,66 @@
+require 'rgen/transformer'
+require 'rgen/ecore/ecore'
+require 'metamodels/uml13_metamodel'
+
+class ECoreToUML13 < RGen::Transformer
+  include RGen::ECore
+  
+  def transform
+    trans(:class => EPackage)
+    trans(:class => EClass)
+  end
+
+  transform EPackage, :to => UML13::Package do
+    {:name => name,
+      :namespace => trans(eSuperPackage) || model,
+      :ownedElement => trans(eClassifiers.select{|c| c.is_a?(EClass)} + eSubpackages)
+    }
+  end
+  
+  transform EClass, :to => UML13::Class do
+    {:name => name,
+      :namespace => trans(ePackage),
+      :feature => trans(eStructuralFeatures.select{|f| f.is_a?(EAttribute)} + eOperations),
+      :associationEnd => trans(eStructuralFeatures.select{|f| f.is_a?(EReference)}),
+      :generalization => eSuperTypes.collect { |st| 
+        @env_out.new(UML13::Generalization, :parent => trans(st), :namespace => trans(ePackage) || model)
+      }
+    }
+  end
+  
+  transform EAttribute, :to => UML13::Attribute do
+    _typemap = {EString => "string", EBoolean => "boolean", EInt => "int", EFloat => "float"}
+    {:name => name, 
+     :taggedValue => [@env_out.new(UML13::TaggedValue, :tag => "type", :value => _typemap[eType] || "")] 
+    }
+  end
+  
+  transform EReference, :to => UML13::AssociationEnd do
+    _otherAssocEnd = eOpposite ? trans(eOpposite) : 
+      @env_out.new(UML13::AssociationEnd, 
+        :type => trans(eType), :name => name, :multiplicity => createMultiplicity(@current_object), 
+        :aggregation => :none, :isNavigable => true)
+    { :association => trans(@current_object).association || @env_out.new(UML13::Association, 
+        :connection => [_otherAssocEnd], :namespace => trans(eContainingClass.ePackage) || model),
+      :name => eOpposite && eOpposite.name,
+      :multiplicity => eOpposite && createMultiplicity(eOpposite),
+      :aggregation => containment ? :composite : :none,
+      :isNavigable => !eOpposite.nil?
+    }
+  end
+  
+  transform EOperation, :to => UML13::Operation do 
+    {:name => name}
+  end
+  
+  def createMultiplicity(ref)
+    @env_out.new(UML13::Multiplicity, :range => [
+      @env_out.new(UML13::MultiplicityRange, 
+        :lower => ref.lowerBound.to_s.sub("-1","*"), :upper => ref.upperBound.to_s.sub("-1","*"))])    
+  end
+  
+  def model
+    @model ||= @env_out.new(UML13::Model, :name => "Model")
+  end
+  
+end

data/lib/transformers/uml13_to_ecore.rb

@@ -31,7 +31,7 @@ class UML13ToECore < RGen::Transformer
 			:eStructuralFeatures => trans(feature.select{|f| f.is_a?(UML13::Attribute)} + associationEnd),
 			:eOperations => trans(feature.select{|f| f.is_a?(UML13::Operation)}),
 			:eSuperTypes =>  trans(generalization.parent + clientDependency.select{|d| d.stereotype.name == "implements"}.supplier),
-            :eAnnotations => [ EAnnotation.new(:details => trans(taggedValue)) ] }
+      :eAnnotations => createAnnotations(taggedValue) }
 	end
 
 	transform UML13::Interface, :to => EClass do
@@ -44,9 +44,8 @@ class UML13ToECore < RGen::Transformer
 
 	transform UML13::Attribute, :to => EAttribute do
 		typemap = { "string" => EString, "boolean" => EBoolean, "int" => EInt, "float" => EFloat }
-		typetv = taggedValue.find{|tv| tv.tag == "type"}
-		{	:name => name && name.strip, :eType => (typetv && typetv.value && typemap[typetv.value.downcase]),
-            :eAnnotations => [ EAnnotation.new(:details => trans(taggedValue)) ] }
+		{	:name => name && name.strip, :eType => getType && typemap[getType.name && getType.name.downcase],
+      :eAnnotations => createAnnotations(taggedValue) }
 	end
 	
 	transform UML13::Operation, :to => EOperation do
@@ -58,16 +57,26 @@ class UML13ToECore < RGen::Transformer
 		{ :eType => trans(otherEnd.type),
 			:name => otherEnd.name && otherEnd.name.strip,
 			:eOpposite => trans(otherEnd),
-			:lowerBound => otherEnd.multiplicity ? otherEnd.multiplicity.range.first.lower.to_i : 0,
-			:upperBound => otherEnd.multiplicity ? otherEnd.multiplicity.range.first.upper.gsub('*','-1').to_i : 1,
+			:lowerBound => (otherEnd.multiplicity && otherEnd.multiplicity.range.first.lower &&
+        otherEnd.multiplicity.range.first.lower.to_i) || 0,
+			:upperBound => (otherEnd.multiplicity && otherEnd.multiplicity.range.first.upper && 
+        otherEnd.multiplicity.range.first.upper.gsub('*','-1').to_i) || 1,
 			:containment => (aggregation == :composite),
-            :eAnnotations => [ EAnnotation.new(:details => trans(association.taggedValue)) ] }
+      :eAnnotations => createAnnotations(association.taggedValue) }
 	end
 	
 	method :isReference do
 	  otherEnd = association.connection.find{|ae| ae != @current_object}
       otherEnd.name && otherEnd.name.size > 0
 	end			
+  
+  def createAnnotations(taggedValues)
+    if taggedValues.size > 0
+      [ EAnnotation.new(:details => trans(taggedValues)) ]
+    else
+      []
+    end
+  end
 
 	transform UML13::TaggedValue, :to => EStringToStringMapEntry do
 	 { :key => tag, :value => value}

data/test/ea_instantiator_test.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'test/unit'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
-require 'instantiators/ea_instantiator'
+require 'ea_support/ea_support'
 require 'transformers/uml13_to_ecore'
 require 'testmodel/class_model_checker'
 require 'testmodel/object_model_checker'
@@ -19,23 +19,17 @@ class EAInstantiatorTest < Test::Unit::TestCase
 		
 	def test_instantiator
 		envUML = RGen::Environment.new
-		File.open(MODEL_DIR+"/ea_testmodel.xml") { |f|
-			inst = EAInstantiator.new(envUML, EAInstantiator::ERROR)
-			inst.instantiate(f.read)
-		}
-        checkClassModel(envUML)
-        checkObjectModel(envUML)
-        envECore = RGen::Environment.new
-        UML13ToECore.new(envUML, envECore).transform
-        checkECoreModel(envECore)
+    EASupport.instantiateUML13FromXMI11(envUML, MODEL_DIR+"/ea_testmodel.xml") 
+    checkClassModel(envUML)
+    checkObjectModel(envUML)
+    envECore = RGen::Environment.new
+    UML13ToECore.new(envUML, envECore).transform
+    checkECoreModel(envECore)
 	end
 	
 	def test_partial
 		envUML = RGen::Environment.new
-		File.open(MODEL_DIR+"/ea_testmodel_partial.xml") { |f|
-			inst = EAInstantiator.new(envUML, EAInstantiator::ERROR)
-			inst.instantiate(f.read)
-		}
+    EASupport.instantiateUML13FromXMI11(envUML, MODEL_DIR+"/ea_testmodel_partial.xml") 
 		checkClassModelPartial(envUML)
 	end
 end

data/test/ea_serializer_test.rb

@@ -3,7 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 require 'test/unit'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
-require 'instantiators/ea_instantiator'
+require 'ea_support/ea_support'
 require 'rgen/serializer/xmi11_serializer'
 
 class EASerializerTest < Test::Unit::TestCase
@@ -13,17 +13,11 @@ class EASerializerTest < Test::Unit::TestCase
   
 	def test_serializer
 		envUML = RGen::Environment.new
-		File.open(MODEL_DIR+"/ea_testmodel.xml") { |f|
-			inst = EAInstantiator.new(envUML, EAInstantiator::ERROR)
-			inst.instantiate(f.read)
-		}
+    EASupport.instantiateUML13FromXMI11(envUML, MODEL_DIR+"/ea_testmodel.xml") 
     models = envUML.find(:class => UML13::Model)
     assert_equal 1, models.size
     
-    File.open(TEST_DIR+"/ea_testmodel_regenerated.xml", "w") do |f|
-      ser = RGen::Serializer::XMI11Serializer.new(f)
-      ser.serialize(models.first, {:documentation => {:exporter => "Enterprise Architect", :exporterVersion => "2.5"}})
-    end
+    EASupport.serializeUML13ToXMI11(envUML, MODEL_DIR+"/ea_testmodel_regenerated.xml") 
 	end
 	
 end

data/test/ea_serializer_test/ea_testmodel_regenerated.xml

@@ -383,7 +383,7 @@
                     <TaggedValue tag="stereotype" value="implements" xmi.id="27945150"/>
                     <TaggedValue tag="headStyle" value="0" xmi.id="27944460"/>
                     <TaggedValue tag="lineStyle" value="0" xmi.id="27943770"/>
-                    <TaggedValue tag="conditional" value="�implements�" xmi.id="27943080"/>
+                    <TaggedValue tag="conditional" value="implements" xmi.id="27943080"/>
                     <TaggedValue tag="src_visibility" value="Public" xmi.id="27942390"/>
                     <TaggedValue tag="src_aggregation" value="0" xmi.id="27941700"/>
                     <TaggedValue tag="src_isOrdered" value="false" xmi.id="27941010"/>
@@ -395,7 +395,7 @@
                     <TaggedValue tag="dst_isNavigable" value="true" xmi.id="27936870"/>
                     <TaggedValue tag="dst_containment" value="Unspecified" xmi.id="27936180"/>
                     <TaggedValue tag="virtualInheritance" value="0" xmi.id="27935490"/>
-                    <TaggedValue tag="mb" value="�implements�" xmi.id="27934800"/>
+                    <TaggedValue tag="mb" value="implements" xmi.id="27934800"/>
                   </ModelElement.taggedValue>
                 </Dependency>
                 <Package visibility="public" name="Rooms" isLeaf="false" isAbstract="false" isRoot="true" xmi.id="27933420">

data/test/ea_serializer_test/ea_testmodel_regenerated_import.log

@@ -0,0 +1,3 @@
+
+
+

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -6,8 +6,17 @@ module HouseMetamodel
 
    SexEnum = Enum.new(:name => 'SexEnum', :literals =>[ :male, :female ])
 
+   class House < RGen::MetamodelBuilder::MMBase
+      annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      has_attr 'size', Integer 
+      has_attr 'module', String 
+      has_attr 'address', String, :changeable => false do
+         annotation 'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
+      end
+   end
+
    class Person < RGen::MetamodelBuilder::MMBase
-      annotation       'complexity' => '1', 'date_created' => '2006-06-27 08:34:23', 'date_modified' => '2006-06-27 08:34:26', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:34:23', 'date_modified' => '2006-06-27 08:34:26', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
       has_attr 'sex', HouseMetamodel::SexEnum 
    end
 
@@ -15,15 +24,6 @@ module HouseMetamodel
       annotation :source => "testmodel", :details => {'complexity' => '1', 'date_created' => '2006-07-12 08:40:46', 'date_modified' => '2006-07-12 08:44:02', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'}
    end
 
-   class House < RGen::MetamodelBuilder::MMBase
-      annotation       'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-      has_attr 'size', Integer 
-      has_attr 'module', String 
-      has_attr 'address', String, :changeable => false do
-         annotation          'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
-      end
-   end
-
 
    module Rooms
       extend RGen::MetamodelBuilder::ModuleExtension
@@ -32,15 +32,15 @@ module HouseMetamodel
 
       class Room < RGen::MetamodelBuilder::MMBase
          abstract
-         annotation          'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+         annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
       end
 
       class Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, Room)
-         annotation          'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+         annotation 'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
       end
 
       class Bathroom < Room
-         annotation          'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+         annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
       end
 
    end
@@ -56,14 +56,14 @@ module HouseMetamodel
    end
 end
 
-HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
-   annotation    'containment' => 'Unspecified'
-end
 HouseMetamodel::House.has_one 'bathroom', HouseMetamodel::Rooms::Bathroom, :transient => true, :lowerBound => 1 
 HouseMetamodel::House.one_to_one 'kitchen', HouseMetamodel::Rooms::Kitchen, 'house', :lowerBound => 1, :opposite_lowerBound => 1 do
-   annotation    'containment' => 'Unspecified'
-   opposite_annotation    'containment' => 'Unspecified'
+   annotation 'containment' => 'Unspecified'
+   opposite_annotation 'containment' => 'Unspecified'
 end
 HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
-   opposite_annotation    'containment' => 'Unspecified'
+   opposite_annotation 'containment' => 'Unspecified'
+end
+HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
+   annotation 'containment' => 'Unspecified'
 end

data/test/metamodel_roundtrip_test/houseMetamodel_Regenerated.ecore

@@ -1,20 +1,35 @@
 <ecore:EPackage xmi:version="2.0" name="HouseMetamodel" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
-  <eClassifiers name="SexEnum" instanceClassName="HouseMetamodel::SexEnum" ePackage="#/" xsi:type="ecore:EEnum">
-    <eLiterals name="male" xsi:type="ecore:EEnumLiteral" eEnum="#//SexEnum"/>
-    <eLiterals name="female" xsi:type="ecore:EEnumLiteral" eEnum="#//SexEnum"/>
-  </eClassifiers>
-  <eClassifiers name="Person" abstract="false" instanceClassName="HouseMetamodel::Person" interface="false" ePackage="#/" xsi:type="ecore:EClass">
-    <eStructuralFeatures name="sex" derived="false" transient="false" changeable="true" eContainingClass="#//Person" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="#//SexEnum" unique="true"/>
-    <eStructuralFeatures name="home" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//Person" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="0" eType="#//House" unique="true">
-      <eAnnotations eModelElement="#//Person/home" xsi:type="ecore:EAnnotation">
+  <eClassifiers name="House" abstract="false" instanceClassName="HouseMetamodel::House" interface="false" ePackage="#/" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="size" derived="false" transient="false" changeable="true" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true"/>
+    <eStructuralFeatures name="module" derived="false" transient="false" changeable="true" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true"/>
+    <eStructuralFeatures name="address" derived="false" transient="false" changeable="false" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true">
+      <eAnnotations eModelElement="#//House/address" xsi:type="ecore:EAnnotation">
+        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="derived"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="Not Specified" key="containment"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}" key="ea_guid"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="duplicates"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="false" key="collection"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="String" key="type"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="volatile=0;" key="styleex"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="1" key="upperBound"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="ordered"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="1" key="lowerBound"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="position"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures name="bathroom" derived="false" containment="false" transient="true" changeable="true" resolveProxies="true" eContainingClass="#//House" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Bathroom" unique="true"/>
+    <eStructuralFeatures name="kitchen" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//House" eOpposite="#//Rooms/Kitchen/house" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Kitchen" unique="true">
+      <eAnnotations eModelElement="#//House/kitchen" xsi:type="ecore:EAnnotation">
         <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eAnnotations eModelElement="#//Person" xsi:type="ecore:EAnnotation">
+    <eStructuralFeatures name="room" derived="false" containment="true" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//House" eOpposite="#//Rooms/Room/house" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Room" unique="true"/>
+    <eAnnotations eModelElement="#//House" xsi:type="ecore:EAnnotation">
+      <details xsi:type="ecore:EStringToStringMapEntry" value="dummy" key="stereotype"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:23" key="date_created"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2005-09-16 19:52:18" key="date_created"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:26" key="date_modified"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-02-28 08:29:19" key="date_modified"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="tagged"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="ea_ntype"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="1.0" key="version"/>
@@ -27,12 +42,18 @@
       <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers name="MeetingPlace" abstract="false" instanceClassName="HouseMetamodel::MeetingPlace" interface="false" ePackage="#/" xsi:type="ecore:EClass" eSubTypes="#//Rooms/Kitchen">
-    <eAnnotations eModelElement="#//MeetingPlace" xsi:type="ecore:EAnnotation" source="testmodel">
+  <eClassifiers name="Person" abstract="false" instanceClassName="HouseMetamodel::Person" interface="false" ePackage="#/" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="sex" derived="false" transient="false" changeable="true" eContainingClass="#//Person" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="#//SexEnum" unique="true"/>
+    <eStructuralFeatures name="home" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//Person" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="0" eType="#//House" unique="true">
+      <eAnnotations eModelElement="#//Person/home" xsi:type="ecore:EAnnotation">
+        <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eAnnotations eModelElement="#//Person" xsi:type="ecore:EAnnotation">
       <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-07-12 08:40:46" key="date_created"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:23" key="date_created"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-07-12 08:44:02" key="date_modified"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:26" key="date_modified"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="tagged"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="ea_ntype"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="1.0" key="version"/>
@@ -45,37 +66,16 @@
       <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
     </eAnnotations>
   </eClassifiers>
-  <eClassifiers name="House" abstract="false" instanceClassName="HouseMetamodel::House" interface="false" ePackage="#/" xsi:type="ecore:EClass">
-    <eStructuralFeatures name="size" derived="false" transient="false" changeable="true" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true"/>
-    <eStructuralFeatures name="module" derived="false" transient="false" changeable="true" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true"/>
-    <eStructuralFeatures name="address" derived="false" transient="false" changeable="false" eContainingClass="#//House" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" unique="true">
-      <eAnnotations eModelElement="#//House/address" xsi:type="ecore:EAnnotation">
-        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="derived"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="Not Specified" key="containment"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}" key="ea_guid"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="duplicates"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="false" key="collection"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="String" key="type"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="volatile=0;" key="styleex"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="1" key="upperBound"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="ordered"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="1" key="lowerBound"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="position"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures name="bathroom" derived="false" containment="false" transient="true" changeable="true" resolveProxies="true" eContainingClass="#//House" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Bathroom" unique="true"/>
-    <eStructuralFeatures name="kitchen" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//House" eOpposite="#//Rooms/Kitchen/house" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Kitchen" unique="true">
-      <eAnnotations eModelElement="#//House/kitchen" xsi:type="ecore:EAnnotation">
-        <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures name="room" derived="false" containment="true" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//House" eOpposite="#//Rooms/Room/house" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Room" unique="true"/>
-    <eAnnotations eModelElement="#//House" xsi:type="ecore:EAnnotation">
-      <details xsi:type="ecore:EStringToStringMapEntry" value="dummy" key="stereotype"/>
+  <eClassifiers name="SexEnum" instanceClassName="HouseMetamodel::SexEnum" ePackage="#/" xsi:type="ecore:EEnum">
+    <eLiterals name="male" xsi:type="ecore:EEnumLiteral" eEnum="#//SexEnum"/>
+    <eLiterals name="female" xsi:type="ecore:EEnumLiteral" eEnum="#//SexEnum"/>
+  </eClassifiers>
+  <eClassifiers name="MeetingPlace" abstract="false" instanceClassName="HouseMetamodel::MeetingPlace" interface="false" ePackage="#/" xsi:type="ecore:EClass" eSubTypes="#//Rooms/Kitchen">
+    <eAnnotations eModelElement="#//MeetingPlace" xsi:type="ecore:EAnnotation" source="testmodel">
       <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2005-09-16 19:52:18" key="date_created"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-07-12 08:40:46" key="date_created"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-02-28 08:29:19" key="date_modified"/>
+      <details xsi:type="ecore:EStringToStringMapEntry" value="2006-07-12 08:44:02" key="date_modified"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="tagged"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="0" key="ea_ntype"/>
       <details xsi:type="ecore:EStringToStringMapEntry" value="1.0" key="version"/>