ontomde-uml2 1.0.6 → 2.0.0

data/lib/ontomde-uml2/autoImplement.rb

@@ -3,193 +3,197 @@
 # If a class implements an interface
 #
 
-module Mrdf_Model
-	def umlx_autoImplementProperty!
-		uml_Class_all.each {|c|
-			next unless c.kind_of?(Muml_Class)
-			c.umlx_autoImplementProperty!
-		}
-	end
+module Mrdf_Repository
+  def umlx_autoImplementProperty!
+    uml_Class_all.each {|c|
+      next unless c.kind_of?(Muml_Class)
+      c.umlx_autoImplementProperty!
+    }
+  end
 end
 module Muml_Class
-	rdf_safe_attr_reader_many :umlx_autoImplementComplete
-	def umlx_autoImplementProperty!
-		return if umlx_autoImplementComplete?
-		umlx_autoImplementComplete=RDF_TRUE
-
-		#Recurse begining at top of inheritance
-		uml_generalization.each { |gen|
-			gen.uml_general_one.umlx_autoImplementProperty!
-		}
-
-		#OK my ancesters have been processed
-		#Now if I don't implement an attribute, it is my duty.
-		impAttNames=umlx_ImplementedAttributesNames
-		umlx_ImplementedAttributes.each { |ia|
-			#log.debug { "umlx_autoImplementProperty #{ia} for #{self} #{ia.umlx_isAssociation?}" }
-			next if impAttNames.include?(ia.uml_name.to_s)
-			if(ia.umlx_isAttribute?)
-				att=self.umlx_createAndAddProperty(ia.uml_name.to_s)
-				att.uml_name=ia.uml_name
-				att.uml_type=ia.uml_type
-			else
-				#puts "create and add ..."
-				ms=ia.uml_association_one
-				ms1=ia
-				ms2=ia.umlx_otherEnd;
-				#puts "ms=#{ms}"
-				#puts "ms1=#{ms1} #{ms1.uml_type}"
-				#puts "ms2=#{ms2} #{ms2.uml_type}"
-				m,m1,m2=self.umlx_createAndAddAssociation(self.rdf_uri+ia.uml_name.to_s,ia.uml_type)
-				m1.uml_aggregation=ms1.uml_aggregation
-				m2.uml_aggregation=ms2.uml_aggregation
-				m1.uml_name=ms1.uml_name
-				m2.uml_name=ms2.uml_name
-
-				ms1.umlx_copyToAttributeProperty(m1)
-				ms2.umlx_copyToAttributeProperty(m2)
-
-				#puts "m=#{m}"
-				#puts "m1=#{m1} #{m1.uml_type}"
-				#puts "m2=#{m2} #{m2.uml_type}"
-			end
-		}
-	end
-	def umlx_ImplementedAttributesNames(ret=Set.new())
-		uml_generalization.each { |gen|
-			gen.uml_general_one.umlx_ImplementedAttributesNames(ret)
-		}
-		uml_ownedAttribute.each { |oa|
-			ret << oa.uml_name.to_s
-		}
-		return ret
-	end
-	def umlx_ImplementedAttributes(ret=Set.new())
-		uml_implementation.each { |g|
-			g.uml_supplier_one.umlx_ImplementedAttributes(ret)
-		}
-		return ret
-	end
+  rdf_safe_attr_reader_many :umlx_autoImplementComplete
+  def umlx_autoImplementProperty!
+    return if umlx_autoImplementComplete?
+    umlx_autoImplementComplete=RDF_TRUE
+
+    #Recurse begining at top of inheritance
+    uml_generalization.each { |gen|
+      gen.uml_general_one.umlx_autoImplementProperty!
+    }
+
+    #OK my ancesters have been processed
+    #Now if I don't implement an attribute, it is my duty.
+    impAttNames=umlx_ImplementedAttributesNames
+    umlx_ImplementedAttributes.each { |ia|
+      #log.debug { "umlx_autoImplementProperty #{ia} for #{self} #{ia.umlx_isAssociation?}" }
+      next if impAttNames.include?(ia.uml_name.to_s)
+      if(ia.umlx_isAttribute?)
+        att=self.umlx_createAndAddProperty(ia.uml_name.to_s)
+        att.uml_name=ia.uml_name
+        att.uml_type=ia.uml_type
+      else
+        #puts "create and add ..."
+        ms=ia.uml_association_one
+        ms1=ia
+        ms2=ia.umlx_otherEnd;
+        #puts "ms=#{ms}"
+        #puts "ms1=#{ms1} #{ms1.uml_type}"
+        #puts "ms2=#{ms2} #{ms2.uml_type}"
+        m,m1,m2=self.umlx_createAndAddAssociation(self.rdf_uri+ia.uml_name.to_s,ia.uml_type)
+        m1.uml_aggregation=ms1.uml_aggregation
+        m2.uml_aggregation=ms2.uml_aggregation
+        m1.uml_name=ms1.uml_name
+        m2.uml_name=ms2.uml_name
+
+        ms1.umlx_copyToAttributeProperty(m1)
+        ms2.umlx_copyToAttributeProperty(m2)
+
+        #puts "m=#{m}"
+        #puts "m1=#{m1} #{m1.uml_type}"
+        #puts "m2=#{m2} #{m2.uml_type}"
+      end
+    }
+  end
+  def umlx_ImplementedAttributesNames(ret=Set.new())
+    uml_generalization.each { |gen|
+      gen.uml_general_one.umlx_ImplementedAttributesNames(ret)
+    }
+    uml_ownedAttribute.each { |oa|
+      ret << oa.uml_name.to_s
+    }
+    return ret
+  end
+  def umlx_ImplementedAttributes(ret=Set.new())
+    uml_implementation.each { |g|
+      g.uml_supplier_one.umlx_ImplementedAttributes(ret)
+    }
+    return ret
+  end
 
 end
 module Muml_Interface
-	def umlx_ImplementedAttributes(ret)
-		uml_generalization.each{|gen|
-			gen.uml_general_one.umlx_ImplementedAttributes(ret)
-			}
-		uml_ownedAttribute.each { |oa|
-			ret << oa
-		}
-		return ret
-	end
+  def umlx_ImplementedAttributes(ret)
+    uml_generalization.each{|gen|
+      gen.uml_general_one.umlx_ImplementedAttributes(ret)
+    }
+    uml_ownedAttribute.each { |oa|
+      ret << oa
+    }
+    return ret
+  end
 end
 
 
 #----------------
 #
-module Mrdf_Model
-	def umlx_autoImplementOperation!
-		uml_Class_all.each { |c|
-			next unless c.kind_of?(Muml_Class)
-			c.umlx_autoImplementOperation!
-		}
-	end
+module Mrdf_Repository
+  def umlx_autoImplementOperation!
+    uml_Class_all.each { |c|
+      next unless c.kind_of?(Muml_Class)
+      c.umlx_autoImplementOperation!
+    }
+    uml_Component_all.each { |c|
+      #next unless c.kind_of?(Muml_Class)
+      c.umlx_autoImplementOperation!
+    }
+  end
 end
 module Muml_Class
-	rdf_safe_attr_reader_many :umlx_autoImplementCompleteOperation
-	def umlx_autoImplementOperation!
-		return if umlx_autoImplementCompleteOperation?
-		return if uml_isAbstract?
-		umlx_autoImplementCompleteOperation=RDF_TRUE
-
-		#Recurse begining at top of inheritance
-		uml_generalization.each { |gen|
-			gen.uml_general_one.umlx_autoImplementOperation!
-		}
-
-		#OK my ancesters have been processed
-		#Now if I don't implement an operation, it is my duty.
-		impOper=umlx_ImplementedOperations
-		umlx_operationIShouldImplement.each { |sig,ia|
-			next if impOper.keys.include?(ia.umlx_signature)
-
-			c=umlx_createAndAddOperation(ia.rdf_uri+"_implem",ia.uml_name);
-			(ia.uml_ownedParameter+ia.uml_returnResult).each { |p|
-				cp=c.umlx_createAndAddParameter(p.rdf_uri+"_implem",p.uml_name_one)
-				p.umlx_copyToAttributeProperty(cp)
-				cp.uml_direction=p.uml_direction
-			}
-			# the new method is considered business Method if the original method is one
-			#NOTE: umlx_businessMethod? changed to umlx_businessMethod
-			c.umlx_businessMethod=ia.umlx_businessMethod
-			c.umlx_redefinesMethod=ia
-		}
-	end
-
-	def umlx_ImplementedOperations(ret=Hash.new())
-		uml_generalization.each { |gen|
-			gen.uml_general_one.umlx_ImplementedOperations(ret)
-		}
-		uml_ownedOperation.each { |oa|
-			next if oa.uml_isAbstract?
-			ret[oa.umlx_signature]=oa
-		}
-		return ret
-	end
-
-	def umlx_operationIShouldImplement(ret=Hash.new())
-
-		#SR16252
-		umlx_classifier_generalization_indirect.each { |i|
-			i.uml_ownedOperation.each { |oo|
-				next unless oo.uml_isAbstract?
-				ret[oo.umlx_signature]=oo
-				}
-		}
-		uml_implementation.each { |g|
-			g.uml_supplier_one.uml_ownedOperation.each { |oo|
-				ret[oo.umlx_signature]=oo
-			}
-			#interface implemented via an interface inheritance
-			g.uml_supplier_one.umlx_classifier_generalization_indirect.each { |i|
-				i.uml_ownedOperation.each { |oo|
-				ret[oo.umlx_signature]=oo
-			}}
-		}
-		return ret
-	end
+  rdf_safe_attr_reader_many :umlx_autoImplementCompleteOperation
+  def umlx_autoImplementOperation!
+    return if umlx_autoImplementCompleteOperation?
+    return if uml_isAbstract?
+    umlx_autoImplementCompleteOperation=RDF_TRUE
+
+    #Recurse begining at top of inheritance
+    uml_generalization.each { |gen|
+      gen.uml_general_one.umlx_autoImplementOperation!
+    }
+
+    #OK my ancesters have been processed
+    #Now if I don't implement an operation, it is my duty.
+    impOper=umlx_ImplementedOperations
+    umlx_operationIShouldImplement.each { |sig,ia|
+      next if impOper.keys.include?(ia.umlx_signature)
+
+      c=umlx_createAndAddOperation(ia.rdf_uri+"_implem",ia.uml_name);
+      (ia.uml_ownedParameter+ia.uml_returnResult).each { |p|
+        cp=c.umlx_createAndAddParameter(p.rdf_uri+"_implem",p.uml_name_one)
+        p.umlx_copyToAttributeProperty(cp)
+        cp.uml_direction=p.uml_direction
+      }
+      # the new method is considered business Method if the original method is one
+      #NOTE: umlx_businessMethod? changed to umlx_businessMethod
+      c.umlx_businessMethod=ia.umlx_businessMethod
+      c.umlx_redefinesMethod=ia
+    }
+  end
+
+  def umlx_ImplementedOperations(ret=Hash.new())
+    uml_generalization.each { |gen|
+      gen.uml_general_one.umlx_ImplementedOperations(ret)
+    }
+    uml_ownedOperation.each { |oa|
+      next if oa.uml_isAbstract?
+      ret[oa.umlx_signature]=oa
+    }
+    return ret
+  end
+
+  def umlx_operationIShouldImplement(ret=Hash.new())
+
+    #SR16252
+    umlx_classifier_generalization_indirect.each { |i|
+      i.uml_ownedOperation.each { |oo|
+        next unless oo.uml_isAbstract?
+        ret[oo.umlx_signature]=oo
+      }
+    }
+    uml_implementation.each { |g|
+      g.uml_supplier_one.uml_ownedOperation.each { |oo|
+        ret[oo.umlx_signature]=oo
+      }
+      #interface implemented via an interface inheritance
+      g.uml_supplier_one.umlx_classifier_generalization_indirect.each { |i|
+        i.uml_ownedOperation.each { |oo|
+          ret[oo.umlx_signature]=oo
+        }}
+    }
+    return ret
+  end
 
 end
 module Muml_Interface
-	def umlx_ImplementedOperation(ret=Hash.new())
-		return ret
-	end
+  def umlx_ImplementedOperation(ret=Hash.new())
+    return ret
+  end
 end
 
 module Muml_Operation
-	#operation this operation redefines.
-	rdf_safe_attr_reader_many :umlx_redefinesMethod
-
-	def umlx_signature
-		#todo: take parameter into account
-		r="#{uml_name}("
-		sep=""
-		uml_ownedParameter.each { |p|
-			next if Cuml_ParameterDirectionKind::Return==p.uml_direction_one
-			r="#{r}#{sep}#{p.umlx_signature}"
-			sep=","
-		}
-		r="#{r})"
-		return r
-	end
+  #operation this operation redefines.
+  rdf_safe_attr_reader_many :umlx_redefinesMethod
+
+  def umlx_signature
+    #todo: take parameter into account
+    r="#{uml_name}("
+    sep=""
+    uml_ownedParameter.each { |p|
+      next if Cuml_ParameterDirectionKind::Return==p.uml_direction_one
+      r="#{r}#{sep}#{p.umlx_signature}"
+      sep=","
+    }
+    r="#{r})"
+    return r
+  end
 end
 
 module Muml_Parameter
-	# Returns parameter signature
-	# Examples: String[], int, ...
-	def umlx_signature
-		return self.uml_type
-	end
+  # Returns parameter signature
+  # Examples: String[], int, ...
+  def umlx_signature
+    return self.uml_type
+  end
 end
 
 

data/lib/ontomde-uml2/check.rb

@@ -1,6 +1,6 @@
 
 
-module Mrdf_Model
+module Mrdf_Repository
   def umlx_checkAbstractAndInheritance()
     return unless context[:checkForAbstractAndInheritance,false]
     msg=""

data/lib/ontomde-uml2/component.rb

@@ -0,0 +1,45 @@
+# 
+
+module Mrdf_Repository
+  # generate implicit components from 
+  # methods defined on domain class.
+  def umlx_autoCreateImplicitComponent!
+    uml_Class_all.each {|clazz|
+      next unless clazz.kind_of?(Cuml_Class)
+      clazz.umlx_autoCreateImplicitComponent!
+    }
+  end
+end
+
+module Muml_Component
+  # class this component was generated from (nil if none)
+  rdf_safe_attr_reader_many :umlx_implicitClass
+end
+
+module Muml_Class
+  def umlx_autoCreateImplicitComponent!
+    # next if uml_isAbstract?
+    
+    p=umlx_owner_one  
+    p=p.umlx_getOrCreatePackage(context[:componentPackage,"component"],p)
+    co=p.umlx_createAndAddComponent(rdf_uri+"_component","#{uml_name} Component")
+    co.umlx_implicitClass=self
+    
+    uml_ownedOperation.each { |op|
+      #log.debug { "Copy operation #{op} to interface #{i}" }
+      nop=co.umlx_createAndAddOperation("#{op.rdf_uri}_interface",op.uml_name.to_s)
+      #copy parameter
+      op.uml_ownedParameter.each { |pa|
+        np=nop.umlx_createAndAddParameter("#{pa.rdf_uri}_interface",pa.uml_name.to_s)
+        pa.umlx_copyToAttributeProperty(np)
+      }
+      #copy return parameter
+      op.uml_returnResult.each { |pa|
+        np=nop.umlx_createAndAddReturnParameter("#{pa.rdf_uri}_interface",pa.uml_name.to_s)
+        pa.umlx_copyToAttributeProperty(np)
+      }
+    }
+    
+    
+  end
+end

data/lib/ontomde-uml2/createAndAdd.rb

@@ -4,7 +4,7 @@
 
 module Muml_Operation
   def umlx_createAndAddParameter(new_uri,new_name=nil)
-    p=Cuml_Parameter.new(rdf_model,new_uri)
+    p=Cuml_Parameter.new(rdf_Repository,new_uri)
     uml_ownedParameter_add(p)
     p.uml_name=new_name unless new_name.nil?
     p.uml_isUnique=RDF_TRUE
@@ -16,7 +16,7 @@ module Muml_Operation
   #Create and add a return parameter.
   #
   def umlx_createAndAddReturnParameter(new_uri,new_name="return")
-    p=Cuml_Parameter.new(rdf_model,new_uri)
+    p=Cuml_Parameter.new(rdf_Repository,new_uri)
     uml_ownedParameter_add(p)
     p.uml_name=new_name
     p.uml_isUnique=RDF_TRUE
@@ -28,7 +28,7 @@ module Muml_Operation
 end
 module Muml_Interface
   def umlx_createAndAddGeneralization(gen)
-    g=Cuml_Generalization.new(rdf_model,nil)
+    g=Cuml_Generalization.new(rdf_Repository,nil)
     g.uml_general=gen
     g.uml_specific=self
     self.uml_generalization_add(g)
@@ -40,7 +40,7 @@ module Muml_Class
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddClass(new_uri,new_name=nil)
-    c=Cuml_Class.new(rdf_model,new_uri)
+    c=Cuml_Class.new(rdf_Repository,new_uri)
     #uml_ownedMember_add(c)
     uml_nestedClassifier_add(c)
     c.umlx_owner=self
@@ -50,7 +50,7 @@ module Muml_Class
     return c
   end
   def umlx_createAndAddGeneralization(gen)
-    g=Cuml_Generalization.new(rdf_model,nil)
+    g=Cuml_Generalization.new(rdf_Repository,nil)
     g.uml_general=gen
     g.uml_specific=self
     self.uml_generalization_add(g)
@@ -58,7 +58,7 @@ module Muml_Class
   end
 
   def umlx_createAndAddImplementation(gen)
-    g=Cuml_Implementation.new(rdf_model,nil)
+    g=Cuml_Implementation.new(rdf_Repository,nil)
     g.uml_supplier=gen
     g.uml_implementingClassifier=self
     self.uml_implementation_add(g)
@@ -68,13 +68,13 @@ end
 module Muml_Enumeration
   def umlx_createAndAddLiteral(lit)
     lit=lit.to_s
-    o=Cuml_EnumerationLiteral.new(rdf_model,"#{rdf_uri}_#{lit}")
+    o=Cuml_EnumerationLiteral.new(rdf_Repository,"#{rdf_uri}_#{lit}")
     o.uml_name=lit
     self.uml_ownedLiteral_add(o)
     return o
   end
   def umlx_createAndAddImplementation(gen)
-    g=Cuml_Implementation.new(rdf_model,nil)
+    g=Cuml_Implementation.new(rdf_Repository,nil)
     g.uml_supplier=gen
     g.uml_implementingClassifier=self
     self.uml_implementation_add(g)
@@ -86,7 +86,7 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddEnumeration(new_uri,new_name=nil)
-    c=Cuml_Enumeration.new(rdf_model,new_uri)
+    c=Cuml_Enumeration.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -98,7 +98,7 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddInterface(new_uri,new_name=nil)
-    c=Cuml_Interface.new(rdf_model,new_uri)
+    c=Cuml_Interface.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -110,7 +110,19 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddClass(new_uri,new_name=nil)
-    c=Cuml_Class.new(rdf_model,new_uri)
+    c=Cuml_Class.new(rdf_Repository,new_uri)
+    uml_ownedMember_add(c)
+    c.umlx_owner=self
+    c.uml_name=new_name unless new_name.nil?
+    c.uml_visibility=::Cuml_VisibilityKind::Public
+    #puts "création classe #{new_name} in #{self.java_qualifiedName}"
+    return c
+  end
+  #Creates and add a new UML Class.
+  #Return the newly created element.
+  #new_uri should be globaly unique.
+  def umlx_createAndAddComponent(new_uri,new_name=nil)
+    c=Cuml_Component.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -122,7 +134,7 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddDataType(new_uri,new_name=nil)
-    c=Cuml_DataType.new(rdf_model,new_uri)
+    c=Cuml_DataType.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -134,7 +146,7 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddStereotype(new_uri,new_name=nil)
-    c=Cuml_Stereotype.new(rdf_model,new_uri)
+    c=Cuml_Stereotype.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -145,7 +157,7 @@ module Muml_Package
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddPackage(new_uri,new_name=nil)
-    c=Cuml_Package.new(rdf_model,new_uri)
+    c=Cuml_Package.new(rdf_Repository,new_uri)
     uml_ownedMember_add(c)
     c.umlx_owner=self
     c.uml_name=new_name unless new_name.nil?
@@ -159,7 +171,7 @@ module Muml_Classifier
   #Return the newly created element.
   #new_uri should be globaly unique.
   def umlx_createAndAddOperation(new_uri,new_name=nil)
-    m=Cuml_Operation.new(rdf_model,new_uri)
+    m=Cuml_Operation.new(rdf_Repository,new_uri)
     self.uml_ownedOperation_add(m)
     m.uml_name=new_name unless new_name.nil?
     m.uml_visibility=::Cuml_VisibilityKind::Public
@@ -171,7 +183,7 @@ module Muml_Classifier
   #new_uri should be globaly unique.
   def umlx_createAndAddProperty(new_uri,new_name=nil)
     #log.debug { %{umlx_createAndAddProperty : name="#{new_name}" uri="#{uri}" owner="#{self}" owner_uri="#{self.rdf_uri}"} }
-    m=Cuml_Property.new(rdf_model,new_uri)
+    m=Cuml_Property.new(rdf_Repository,new_uri)
     self.uml_ownedAttribute_add(m)
     m.uml_name=new_name unless new_name.nil?
     m.uml_isUnique=RDF_TRUE
@@ -186,14 +198,14 @@ module Muml_Classifier
   #new_uri should be globaly unique.
   def umlx_createAndAddAssociation(new_uri,otherEnd)
     c1=self; c2=otherEnd
-    a=Cuml_Association.new(rdf_model,new_uri)
+    a=Cuml_Association.new(rdf_Repository,new_uri)
 
-    m1=Cuml_Property.new(rdf_model,"#{new_uri}_e1")
+    m1=Cuml_Property.new(rdf_Repository,"#{new_uri}_e1")
     m1.uml_type=c2
     #m1.uml_class=c1
     c1.uml_ownedAttribute_add(m1)
 
-    m2=Cuml_Property.new(rdf_model,"#{new_uri}_e2")
+    m2=Cuml_Property.new(rdf_Repository,"#{new_uri}_e2")
     m2.uml_type=c1
     #m2.uml_class=c1
     #c2.uml_ownedAttribute_add(m2)
@@ -215,7 +227,7 @@ end
 module Muml_Element
   #Create a uml_Comment and append it to uml_ownedComment
   def umlx_createAndAddComment(uri,txtComment)
-    c=Cuml_Comment.new(rdf_model,uri);
+    c=Cuml_Comment.new(rdf_Repository,uri);
     uml_ownedComment_add(c)
     c.uml_body=txtComment
   end