rgen 0.5.0 → 0.5.1

data/CHANGELOG

@@ -93,3 +93,8 @@
 * Cleaned up EA support
 * Added method to clear ecore metamodel reflection cache
 * Improved overriding of metamodel features in reopened classes
+
+=0.5.1 (Nov 10th, 2009)
+
+* Fixed metamodel builder bug: _register at one-side did not unregister from the element referenced by the old value
+* Added helper class for building simple model comparators

data/Rakefile

@@ -3,11 +3,11 @@ require 'rake/rdoctask'
 
 RGenGemSpec = Gem::Specification.new do |s|
   s.name = %q{rgen}
-  s.version = "0.5.0"
-  s.date = %q{2009-06-08}
+  s.version = "0.5.1"
+  s.date = %q{2009-11-10}
   s.summary = %q{Ruby Modelling and Generator Framework}
   s.email = %q{martin dot thiede at gmx de}
-  s.homepage = %q{ruby-gen.org}
+  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

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -270,7 +270,6 @@ module BuilderExtensions
 	def _build_one_methods(props, other_props=nil)
 		name = props.value(:name)
 		other_role = other_props && other_props.value(:name)
-		other_kind = other_props && ( other_props.many? ? :many : :one )
 
 		if props.value(:derived)
 			build_derived_method(name, props, :one)
@@ -301,7 +300,7 @@ module BuilderExtensions
 					<%= type_check_code("val", props) %>
 					oldval = @<%= name %>
 					@<%= name %> = val
-					<% if other_role && other_kind %>
+					<% if other_role %>
 						oldval._unregister<%= firstToUpper(other_role) %>(self) unless oldval.nil?
 						val._register<%= firstToUpper(other_role) %>(self) unless val.nil?
 					<% end %>
@@ -309,6 +308,9 @@ module BuilderExtensions
 				alias set<%= firstToUpper(name) %> <%= name %>=
 
 				def _register<%= firstToUpper(name) %>(val)
+					<% if other_role %>
+						@<%= name %>._unregister<%= firstToUpper(other_role) %>(self) unless @<%= name %>.nil?
+					<% end %>
 					@<%= name %> = val
 				end
         
@@ -327,7 +329,6 @@ module BuilderExtensions
 	def _build_many_methods(props, other_props=nil)
 		name = props.value(:name)
 		other_role = other_props && other_props.value(:name)
-		other_kind = other_props && ( other_props.many? ? :many : :one )
 
 		if props.value(:derived)
 			build_derived_method(name, props, :many)
@@ -351,7 +352,7 @@ module BuilderExtensions
 					return if val.nil? || @<%= name %>.any?{|e| e.object_id == val.object_id} 
 					<%= type_check_code("val", props) %>
 					@<%= name %>.push val
-					<% if other_role && other_kind %>
+					<% if other_role %>
 						val._register<%= firstToUpper(other_role) %>(self)
 					<% end %>
 				end
@@ -361,7 +362,7 @@ module BuilderExtensions
 					@<%= name %>.each_with_index do |e,i|
 						if e.object_id == val.object_id
 							@<%= name %>.delete_at(i)
-    						<% if other_role && other_kind %>
+    						<% if other_role %>
 								val._unregister<%= firstToUpper(other_role) %>(self)
     						<% end %>
 							return

data/lib/rgen/model_comparator_base.rb

@@ -0,0 +1,137 @@
+require 'andand'
+
+module RGen
+	
+class ModelComparatorBase
+	
+	CompareSpec = Struct.new(:identifier, :recurse, :filter, :ignore_features, :display_name, :sort)
+	INDENT = "  "	
+
+	class << self
+		attr_reader :compareSpecs
+		
+		def compare_spec(clazz, hash)
+			@compareSpecs ||= {}
+			raise "Compare spec already defined for #{clazz}" if @compareSpecs[clazz]
+			spec = CompareSpec.new
+			hash.each_pair do |k,v|
+				spec.send("#{k}=",v)
+			end
+			@compareSpecs[clazz] = spec
+		end
+	end
+	
+	# compares two sets of elements
+	def compare(as, bs, recursive=true)
+		result = []
+		aById = as.select{|e| useElement?(e)}.inject({}){|r, e| r[elementIdentifier(e)] = e; r}
+		bById = bs.select{|e| useElement?(e)}.inject({}){|r, e| r[elementIdentifier(e)] = e; r}
+		onlyA = sortElements((aById.keys - bById.keys).collect{|id| aById[id]})
+		onlyB = sortElements((bById.keys - aById.keys).collect{|id| bById[id]})
+		aAndB = sortElementPairs((aById.keys & bById.keys).collect{|id| [aById[id], bById[id]]})
+		onlyA.each do |e|
+			result << "- #{elementDisplayName(e)}"
+		end
+		onlyB.each do |e|
+			result << "+ #{elementDisplayName(e)}"
+		end
+		if recursive
+			aAndB.each do |ab|
+				a, b = *ab
+				r = compareElements(a, b)
+				if r.size > 0
+					result << "#{elementDisplayName(a)}"
+					result += r.collect{|l| INDENT+l}
+				end
+			end
+		end
+		result
+	end
+	
+	def sortElementPairs(pairs)
+		pairs.sort do |x,y|
+			a, b = x[0], y[0]
+			r = a.class.name <=> b.class.name
+			r = compareSpec(a).sort.call(a,b) if r == 0 && compareSpec(a) && compareSpec(a).sort
+			r
+		end
+	end
+	
+	def sortElements(elements)
+		elements.sort do |a,b|
+			r = a.class.name <=> b.class.name
+			r = compareSpec(a).sort.call(a,b) if r == 0 && compareSpec(a) && compareSpec(a).sort
+			r
+		end
+	end
+	
+	def elementDisplayName(e)
+		if compareSpec(e) && compareSpec(e).display_name
+			compareSpec(e).display_name.call(e)
+		else
+			elementIdentifier(e)
+		end
+	end
+	
+	def compareElements(a, b)
+		result = []
+		if a.class != b.class
+			result << "Class: #{a.class} -> #{b.class}"
+		else
+			a.class.ecore.eAllStructuralFeatures.reject{|f| f.derived || compareSpec(a).andand.ignore_features.andand.include?(f.name.to_sym)}.each do |f|
+				va, vb = a.getGeneric(f.name), b.getGeneric(f.name)
+				if f.is_a?(RGen::ECore::EAttribute)
+					r = compareValues(f.name, va, vb)
+					result << r if r
+				else
+					va, vb = [va].compact, [vb].compact unless f.many
+					r = compare(va, vb, f.containment || compareSpec(a).andand.recurse.andand.include?(f.name.to_sym))
+					if r.size > 0
+						result << "[#{f.name}]"
+						result += r.collect{|l| INDENT+l}
+					end
+				end	
+			end
+		end
+		result
+	end
+	
+	def compareValues(name, val1, val2)
+		result = nil
+		result = "[#{name}] #{val1} -> #{val2}" if val1 != val2
+		result
+	end
+	
+	def elementIdentifier(element)
+		cs = compareSpec(element)
+		if cs && cs.identifier
+			if cs.identifier.is_a?(Proc)
+				cs.identifier.call(element)
+			else
+				cs.identifier
+			end
+		else
+			if element.respond_to?(:name)
+				element.name
+			else
+				element.object_id
+			end
+		end
+	end
+	
+	def useElement?(element)
+		cs = compareSpec(element)
+		!(cs && cs.filter) || cs.filter.call(element)
+	end
+	
+	def compareSpec(element)
+		@compareSpec ||= {}
+		return @compareSpec[element.class] if @compareSpec[element.class]
+		return nil unless self.class.compareSpecs
+		key = self.class.compareSpecs.keys.find{|k| element.is_a?(k)}
+		@compareSpec[element.class] = self.class.compareSpecs[key]
+	end
+	
+end
+
+end

data/test/metamodel_builder_test.rb

@@ -189,6 +189,38 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_equal [], ManyClass.ecore.eReferences.select{|r| r.many == true}
   end
   
+  def test_one_to_many_replace1
+    oc1 = OneClass.new
+    oc2 = OneClass.new
+    mc = ManyClass.new  	
+    
+    oc1.manyClasses = [mc]
+    assert_equal [mc], oc1.manyClasses
+    assert_equal [], oc2.manyClasses
+    assert_equal oc1, mc.oneClass
+    
+    oc2.manyClasses = [mc]
+    assert_equal [mc], oc2.manyClasses
+    assert_equal [], oc1.manyClasses
+    assert_equal oc2, mc.oneClass
+	end
+
+  def test_one_to_many_replace2
+    oc = OneClass.new
+    mc1 = ManyClass.new  	
+    mc2 = ManyClass.new  	
+    
+    mc1.oneClass = oc
+    assert_equal [mc1], oc.manyClasses
+    assert_equal oc, mc1.oneClass
+    assert_equal nil, mc2.oneClass
+    
+    mc2.oneClass = oc
+    assert_equal [mc1, mc2], oc.manyClasses
+    assert_equal oc, mc1.oneClass
+    assert_equal oc, mc2.oneClass
+	end
+	
   class OneClass2 < RGen::MetamodelBuilder::MMBase
   end
   class ManyClass2 < RGen::MetamodelBuilder::MMBase
@@ -247,7 +279,7 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_respond_to bc, :aClass
     assert_respond_to bc, :aClass=
     assert_nil bc.aClass
-    
+
     # put the AClass into the BClass
     bc.aClass = ac
     assert_equal ac, bc.aClass
@@ -274,6 +306,22 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     assert_equal [], BClassOO.ecore.eReferences.select{|r| r.many == true}
   end
   
+  def test_one_to_one_replace
+    a = AClassOO.new
+    b1 = BClassOO.new
+    b2 = BClassOO.new
+    
+    a.bClass = b1
+    assert_equal b1, a.bClass
+    assert_equal a, b1.aClass
+    assert_equal nil, b2.aClass
+  
+    a.bClass = b2
+    assert_equal b2, a.bClass
+    assert_equal nil, b1.aClass
+    assert_equal a, b2.aClass
+	end	
+  
   class AClassMM < RGen::MetamodelBuilder::MMBase
   end
   class BClassMM < RGen::MetamodelBuilder::MMBase

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -6,56 +6,55 @@ 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'
-      has_attr 'sex', HouseMetamodel::SexEnum 
-   end
+   module Rooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
 
-   class MeetingPlace < RGen::MetamodelBuilder::MMBase
-      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
 
-
-   module Rooms
+   module DependingOnRooms
       extend RGen::MetamodelBuilder::ModuleExtension
       include RGen::MetamodelBuilder::DataTypes
 
+   end
+end
 
-      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'
-      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'
-      end
+class HouseMetamodel::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 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'
-      end
+class HouseMetamodel::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'
+   has_attr 'sex', HouseMetamodel::SexEnum 
+   has_many_attr 'nicknames', String 
+end
 
-   end
+class HouseMetamodel::MeetingPlace < RGen::MetamodelBuilder::MMBase
+   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
 
-   module DependingOnRooms
-      extend RGen::MetamodelBuilder::ModuleExtension
-      include RGen::MetamodelBuilder::DataTypes
+class HouseMetamodel::Rooms::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'
+end
 
+class HouseMetamodel::Rooms::Bathroom < HouseMetamodel::Rooms::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'
+end
 
-      class RoomSub < HouseMetamodel::Rooms::Room
-      end
+class HouseMetamodel::Rooms::Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, HouseMetamodel::Rooms::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'
+end
 
-   end
+class HouseMetamodel::DependingOnRooms::RoomSub < HouseMetamodel::Rooms::Room
 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'

data/test/metamodel_roundtrip_test/houseMetamodel_Regenerated.ecore

@@ -1,9 +1,9 @@
 <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="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">
+  <eClassifiers name="House" abstract="false" instanceClassName="HouseMetamodel::House" interface="false" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="size" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" unique="true"/>
+    <eStructuralFeatures name="module" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unique="true"/>
+    <eStructuralFeatures name="address" derived="false" transient="false" changeable="false" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unique="true">
+      <eAnnotations 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"/>
@@ -17,14 +17,14 @@
         <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">
+    <eStructuralFeatures name="bathroom" derived="false" containment="false" transient="true" changeable="true" resolveProxies="true" 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" eOpposite="#//Rooms/Kitchen/house" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Kitchen" unique="true">
+      <eAnnotations 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">
+    <eStructuralFeatures name="room" derived="false" containment="true" transient="false" changeable="true" resolveProxies="true" eOpposite="#//Rooms/Room/house" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="1" eType="#//Rooms/Room" unique="true"/>
+    <eAnnotations 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="2005-09-16 19:52:18" key="date_created"/>
@@ -42,14 +42,15 @@
       <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
     </eAnnotations>
   </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="Person" abstract="false" instanceClassName="HouseMetamodel::Person" interface="false" xsi:type="ecore:EClass">
+    <eStructuralFeatures name="sex" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="#//SexEnum" unique="true"/>
+    <eStructuralFeatures name="nicknames" derived="false" transient="false" changeable="true" unsettable="false" iD="false" xsi:type="ecore:EAttribute" upperBound="-1" ordered="true" volatile="false" lowerBound="0" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" unique="true"/>
+    <eStructuralFeatures name="home" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" unsettable="false" xsi:type="ecore:EReference" upperBound="-1" ordered="true" volatile="false" lowerBound="0" eType="#//House" unique="true">
+      <eAnnotations xsi:type="ecore:EAnnotation">
         <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eAnnotations eModelElement="#//Person" xsi:type="ecore:EAnnotation">
+    <eAnnotations xsi:type="ecore:EAnnotation">
       <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="Class" key="ea_stype"/>
@@ -66,12 +67,12 @@
       <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
     </eAnnotations>
   </eClassifiers>
-  <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 name="SexEnum" instanceClassName="HouseMetamodel::SexEnum" xsi:type="ecore:EEnum">
+    <eLiterals name="male" xsi:type="ecore:EEnumLiteral"/>
+    <eLiterals name="female" xsi:type="ecore:EEnumLiteral"/>
   </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="MeetingPlace" abstract="false" instanceClassName="HouseMetamodel::MeetingPlace" interface="false" xsi:type="ecore:EClass" eSubTypes="#//Rooms/Kitchen">
+    <eAnnotations xsi:type="ecore:EAnnotation" source="testmodel">
       <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="Class" key="ea_stype"/>
@@ -88,18 +89,13 @@
       <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
     </eAnnotations>
   </eClassifiers>
-  <eSubpackages name="Rooms" xsi:type="ecore:EPackage" eSuperPackage="#/">
-    <eClassifiers name="Room" abstract="true" instanceClassName="HouseMetamodel::Rooms::Room" interface="false" ePackage="#//Rooms" xsi:type="ecore:EClass" eSubTypes="#//Rooms/Kitchen #//Rooms/Bathroom #//DependingOnRooms/RoomSub">
-      <eStructuralFeatures name="house" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//Rooms/Room" eOpposite="#//House/room" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="#//House" unique="true">
-        <eAnnotations eModelElement="#//Rooms/Room/house" xsi:type="ecore:EAnnotation">
-          <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
-        </eAnnotations>
-      </eStructuralFeatures>
-      <eAnnotations eModelElement="#//Rooms/Room" xsi:type="ecore:EAnnotation">
+  <eSubpackages name="Rooms" xsi:type="ecore:EPackage">
+    <eClassifiers name="Bathroom" abstract="false" instanceClassName="HouseMetamodel::Rooms::Bathroom" interface="false" xsi:type="ecore:EClass" eSuperTypes="#//Rooms/Room">
+      <eAnnotations xsi:type="ecore:EAnnotation">
         <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2005-09-16 19:52:28" key="date_created"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:32:25" key="date_created"/>
         <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-22 21:15:25" key="date_modified"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:23" 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"/>
@@ -112,17 +108,17 @@
         <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
       </eAnnotations>
     </eClassifiers>
-    <eClassifiers name="Kitchen" abstract="false" instanceClassName="HouseMetamodel::Rooms::Kitchen" interface="false" ePackage="#//Rooms" xsi:type="ecore:EClass" eSuperTypes="#//MeetingPlace #//Rooms/Room">
-      <eStructuralFeatures name="house" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eContainingClass="#//Rooms/Kitchen" eOpposite="#//House/kitchen" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//House" unique="true">
-        <eAnnotations eModelElement="#//Rooms/Kitchen/house" xsi:type="ecore:EAnnotation">
+    <eClassifiers name="Room" abstract="true" instanceClassName="HouseMetamodel::Rooms::Room" interface="false" xsi:type="ecore:EClass" eSubTypes="#//Rooms/Bathroom #//Rooms/Kitchen #//DependingOnRooms/RoomSub">
+      <eStructuralFeatures name="house" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eOpposite="#//House/room" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="0" eType="#//House" unique="true">
+        <eAnnotations xsi:type="ecore:EAnnotation">
           <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
         </eAnnotations>
       </eStructuralFeatures>
-      <eAnnotations eModelElement="#//Rooms/Kitchen" xsi:type="ecore:EAnnotation">
+      <eAnnotations xsi:type="ecore:EAnnotation">
         <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2005-11-30 19:26:13" key="date_created"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2005-09-16 19:52:28" key="date_created"/>
         <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-22 21:15:34" key="date_modified"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-22 21:15:25" 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"/>
@@ -135,12 +131,17 @@
         <details xsi:type="ecore:EStringToStringMapEntry" value="Java" key="gentype"/>
       </eAnnotations>
     </eClassifiers>
-    <eClassifiers name="Bathroom" abstract="false" instanceClassName="HouseMetamodel::Rooms::Bathroom" interface="false" ePackage="#//Rooms" xsi:type="ecore:EClass" eSuperTypes="#//Rooms/Room">
-      <eAnnotations eModelElement="#//Rooms/Bathroom" xsi:type="ecore:EAnnotation">
+    <eClassifiers name="Kitchen" abstract="false" instanceClassName="HouseMetamodel::Rooms::Kitchen" interface="false" xsi:type="ecore:EClass" eSuperTypes="#//MeetingPlace #//Rooms/Room">
+      <eStructuralFeatures name="house" derived="false" containment="false" transient="false" changeable="true" resolveProxies="true" eOpposite="#//House/kitchen" unsettable="false" xsi:type="ecore:EReference" upperBound="1" ordered="true" volatile="false" lowerBound="1" eType="#//House" unique="true">
+        <eAnnotations xsi:type="ecore:EAnnotation">
+          <details xsi:type="ecore:EStringToStringMapEntry" value="Unspecified" key="containment"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eAnnotations xsi:type="ecore:EAnnotation">
         <details xsi:type="ecore:EStringToStringMapEntry" value="Proposed" key="status"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:32:25" key="date_created"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2005-11-30 19:26:13" key="date_created"/>
         <details xsi:type="ecore:EStringToStringMapEntry" value="Class" key="ea_stype"/>
-        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-27 08:34:23" key="date_modified"/>
+        <details xsi:type="ecore:EStringToStringMapEntry" value="2006-06-22 21:15:34" 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"/>
@@ -154,7 +155,7 @@
       </eAnnotations>
     </eClassifiers>
   </eSubpackages>
-  <eSubpackages name="DependingOnRooms" xsi:type="ecore:EPackage" eSuperPackage="#/">
-    <eClassifiers name="RoomSub" abstract="false" instanceClassName="HouseMetamodel::DependingOnRooms::RoomSub" interface="false" ePackage="#//DependingOnRooms" xsi:type="ecore:EClass" eSuperTypes="#//Rooms/Room"/>
+  <eSubpackages name="DependingOnRooms" xsi:type="ecore:EPackage">
+    <eClassifiers name="RoomSub" abstract="false" instanceClassName="HouseMetamodel::DependingOnRooms::RoomSub" interface="false" xsi:type="ecore:EClass" eSuperTypes="#//Rooms/Room"/>
   </eSubpackages>
 </ecore:EPackage>