ontomde-uml2 2.0.0 → 2.0.4

data/Manifest.txt

@@ -24,6 +24,7 @@ lib/ontomde-uml2/kb/command.rb
 lib/ontomde-uml2/kb/datatypeMapping.rb
 lib/ontomde-uml2/kb/protege.rb
 lib/ontomde-uml2/multipleInheritance.rb
+lib/ontomde-uml2/nocode.rb
 lib/ontomde-uml2/nt_old_to_nt_new.sh
 lib/ontomde-uml2/owner.rb
 lib/ontomde-uml2/salvageErrors.rb

data/lib/ontomde-uml2.rb

@@ -29,5 +29,6 @@ require 'ontomde-uml2/helper.rb'
 require 'ontomde-uml2/shortcut.rb'
 require 'ontomde-uml2/UMLdatatypeMapping.rb'
 require 'ontomde-uml2/component.rb'
+require 'ontomde-uml2/nocode.rb'
 
 

data/lib/ontomde-uml2/UMLdatatypeMapping.rb

@@ -25,7 +25,7 @@ def addDataTypeMapping(umlDataTypeName,baseMapping,regexp=nil,&block)
 	end
 	DatatypeMapping#{rubyName}.class_eval( &block ) unless block.nil?
 
-	DatatypeMapping#{rubyName}.instance #register
+	DatatypeMapping#{rubyName}.instance.register #register
   }
   t=eval s
   puts "Added datatype '#{umlDataTypeName}'"
@@ -37,7 +37,7 @@ class DatatypeMapping
     return @@types
   end
   @@types=Array.new
-  def initialize
+  def register 
     return if self.class==DatatypeMapping
     @@types << self
     #log.debug { %{registered(##{@@types.size}): #{self.class}} }
@@ -110,7 +110,10 @@ END
   # max length of this element represented as a string
   attr :maxStringLength
   attr_writer :maxStringLength
-  @maxStringLength=nil
+  def initialize 
+     super
+     @maxStringLength=nil
+  end
 
   def getValidationRegexp
     #log.error %{getValidationRegexp not implemented for #{self.class}}
@@ -126,13 +129,16 @@ class DatatypeMappingText < DatatypeMapping
   include Singleton
 
   #default string length
-  @maxStringLength=10
+  def initialize 
+    super
+    @maxStringLength=255 # aligned with mysql default
+  end
 
-  MATCHING_UML_NAME=["String","string"]
+  MATCHING_UML_NAME=['string','shorttext','text']
   #MATCHING_JAVA_NAME=["String","java.lang.String"]
   
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -144,10 +150,14 @@ end
 
 class DatatypeMappingLargeText < DatatypeMappingText
   include Singleton
+  def initialize 
+    super
+    @maxStringLength=5000
+  end
   HELPMSG=" "
-  MATCHING_UML_NAME=["LargeText"]
+  MATCHING_UML_NAME=['largetext','longtext']
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
   
@@ -159,9 +169,9 @@ end
 
 class DatatypeMappingMimeType < DatatypeMappingText
   include Singleton
-  MATCHING_UML_NAME=["MimeType"]
+  MATCHING_UML_NAME=['mimetype']
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
   end
    
   def getHelp
@@ -179,10 +189,10 @@ end
 
 class DatatypeMappingInteger < DatatypeMappingOrdinal
   include Singleton
-  MATCHING_UML_NAME=["integer","Integer","int"]
+  MATCHING_UML_NAME=['integer','int']
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #	return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -208,7 +218,7 @@ class DatatypeMappingLong < DatatypeMappingOrdinal
 end
 class DatatypeMappingLongObject < DatatypeMappingOrdinal
   include Singleton
-  MATCHING_UML_NAME=["Long"]
+  MATCHING_UML_NAME=["Long","longOrNull"]
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
     return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
@@ -226,7 +236,7 @@ class DatatypeMappingFile < DatatypeMapping
   MATCHING_UML_NAME=["file"]
   def appliesTo?(datatype)
     return false unless datatype.kind_of?(Muml_DataType)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #return datatype.struts_isBlob?
     #return ["image"].include?(datatype.java_qualifiedName)
   end
@@ -238,10 +248,10 @@ end
 
 class DatatypeMappingBoolean < DatatypeMapping
   include Singleton
-  MATCHING_UML_NAME=["Boolean","boolean"]
+  MATCHING_UML_NAME=["boolean"]
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #	return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -259,10 +269,10 @@ end
 #   Calendar and TimeStamp should be prefered.
 class DatatypeMappingTimeStamp < DatatypeMapping
   include Singleton
-  MATCHING_UML_NAME=["TimeStamp","Date"]
+  MATCHING_UML_NAME=["timestamp","date"]
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -283,10 +293,10 @@ end
 #   Calendar and TimeStamp are used instead
 class DatatypeMappingCalendar < DatatypeMapping
   include Singleton
-  MATCHING_UML_NAME=["Calendar"]
+  MATCHING_UML_NAME=["calendar"]
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -336,10 +346,10 @@ end
 
 class DatatypeMappingURL < DatatypeMappingText
   include Singleton
-  MATCHING_UML_NAME=["URL","URI"]
+  MATCHING_UML_NAME=["url","uri"]
   #MATCHING_JAVA_NAME=[]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     #return true if MATCHING_JAVA_NAME.include?(datatype.java_qualifiedName)
     return false
   end
@@ -351,9 +361,9 @@ end
 
 class DatatypeMappingBLOB < DatatypeMapping
   include Singleton
-  MATCHING_UML_NAME=["Blob"]
+  MATCHING_UML_NAME=["blob"]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
   def getHelp
@@ -362,9 +372,9 @@ class DatatypeMappingBLOB < DatatypeMapping
 end
 class DatatypeMappingIMG < DatatypeMappingBLOB
   include Singleton
-  MATCHING_UML_NAME=["Img","Image"]
+  MATCHING_UML_NAME=["img","image"]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
   def getHelp
@@ -374,9 +384,9 @@ end
 
 class DatatypeMappingGRAPHVIZ < DatatypeMappingLargeText
   include Singleton
-  MATCHING_UML_NAME=["Graphviz"]
+  MATCHING_UML_NAME=["graphviz"]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
   def getHelp
@@ -386,9 +396,9 @@ end
 
 class DatatypeMappingPassword < DatatypeMappingText
   include Singleton
-  MATCHING_UML_NAME=["Password"]
+  MATCHING_UML_NAME=["password"]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
   
@@ -399,9 +409,9 @@ end
 
 class DatatypeMappingEmailAddress < DatatypeMappingText
   include Singleton
-  MATCHING_UML_NAME=["EmailAdress"]
+  MATCHING_UML_NAME=["emailaddress","emailadress"]
   def appliesTo?(datatype)
-    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
     return false
   end
 
@@ -416,26 +426,45 @@ class DatatypeMappingEmailAddress < DatatypeMappingText
   end
 end
 
+class DatatypeMappingSimpleUnixPath < DatatypeMappingText
+  include Singleton
+  MATCHING_UML_NAME=["simpleunixpath"]
+  def appliesTo?(datatype)
+    return true if MATCHING_UML_NAME.include?(datatype.uml_name_one.downcase)
+    return false
+  end
 
+  def getValidationRegexp
+    # // not valid
+    # ok: /a/b/c a  a/b 
+    #nok: //a ./a/b
+    return /([a-zA-Z0-9_%+-]\/?)*/
+  end
+  
+  def getHelp
+    return "simple unix path (no relative, no space, no escape)"
+  end
+end
 
-DatatypeMappingGenericEnum.instance #register
-
-DatatypeMappingCalendar.instance #register
-DatatypeMappingText.instance #register
-DatatypeMappingLargeText.instance #register
-DatatypeMappingPassword.instance #register
-DatatypeMappingEmailAddress.instance #register
-DatatypeMappingURL.instance #register
-DatatypeMappingFile.instance #register
-DatatypeMappingBoolean.instance #register
-DatatypeMappingTimeStamp.instance #register
-DatatypeMappingGenericClass.instance #register
-DatatypeMappingLong.instance #register
-DatatypeMappingLongObject.instance #register
-DatatypeMappingInteger.instance #register
-DatatypeMappingBLOB.instance #register
-DatatypeMappingIMG.instance #register
-DatatypeMappingGRAPHVIZ.instance #register
-DatatypeMappingMimeType.instance #register
+DatatypeMappingGenericEnum.instance.register #register
+
+DatatypeMappingCalendar.instance.register #register
+DatatypeMappingText.instance.register #register
+DatatypeMappingLargeText.instance.register #register
+DatatypeMappingPassword.instance.register #register
+DatatypeMappingEmailAddress.instance.register #register
+DatatypeMappingSimpleUnixPath.instance.register #register
+DatatypeMappingURL.instance.register #register
+DatatypeMappingFile.instance.register #register
+DatatypeMappingBoolean.instance.register #register
+DatatypeMappingTimeStamp.instance.register #register
+DatatypeMappingGenericClass.instance.register #register
+DatatypeMappingLong.instance.register #register
+DatatypeMappingLongObject.instance.register #register
+DatatypeMappingInteger.instance.register #register
+DatatypeMappingBLOB.instance.register #register
+DatatypeMappingIMG.instance.register #register
+DatatypeMappingGRAPHVIZ.instance.register #register
+DatatypeMappingMimeType.instance.register #register
 
 

data/lib/ontomde-uml2/autoImplement.rb

@@ -11,6 +11,18 @@ module Mrdf_Repository
     }
   end
 end
+class String
+	def str_to_uri 
+		return self.tr(" <>:/","_")
+	end
+end
+module Muml_Element
+	def umlx_copyStereotypesFrom!(ia)
+		ia.uml_appliedStereotype.each { |s|
+			self.uml_appliedStereotype_add(s)
+		}
+	end
+end
 module Muml_Class
   rdf_safe_attr_reader_many :umlx_autoImplementComplete
   def umlx_autoImplementProperty!
@@ -29,9 +41,12 @@ module Muml_Class
       #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=self.umlx_createAndAddProperty(self.rdf_uri+ia.uml_name.to_s.str_to_uri)
         att.uml_name=ia.uml_name
         att.uml_type=ia.uml_type
+	att.umlx_copyStereotypesFrom!(ia)
+	att.uml_upperValue=ia.uml_upperValue unless ia.uml_upperValue.empty?
+	att.uml_lowerValue=ia.uml_lowerValue unless ia.uml_lowerValue.empty?
       else
         #puts "create and add ..."
         ms=ia.uml_association_one
@@ -40,12 +55,16 @@ module Muml_Class
         #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)
+        m,m1,m2=self.umlx_createAndAddAssociation(self.rdf_uri+ia.uml_name.to_s.str_to_uri,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
 
+	m.umlx_copyStereotypesFrom!(ms)
+	m1.umlx_copyStereotypesFrom!(ms1)
+	m2.umlx_copyStereotypesFrom!(ms2)
+
         ms1.umlx_copyToAttributeProperty(m1)
         ms2.umlx_copyToAttributeProperty(m2)
 
@@ -60,6 +79,7 @@ module Muml_Class
       gen.uml_general_one.umlx_ImplementedAttributesNames(ret)
     }
     uml_ownedAttribute.each { |oa|
+      next if oa.uml_isStatic? || (oa.respond_to?(:java_isFinal?) && oa.java_isFinal?)
       ret << oa.uml_name.to_s
     }
     return ret
@@ -116,12 +136,14 @@ module Muml_Class
     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);
+      c=umlx_createAndAddOperation(ia.rdf_uri+"_implem",ia.uml_name.to_s);
+      ia.umlx_autoImplementedBy_add(c) # used by javadoc
+      c.umlx_copyStereotypesFrom!(ia)
       (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
+        cp.umlx_copyStereotypesFrom!(p)
       }
       # the new method is considered business Method if the original method is one
       #NOTE: umlx_businessMethod? changed to umlx_businessMethod
@@ -173,7 +195,7 @@ end
 module Muml_Operation
   #operation this operation redefines.
   rdf_safe_attr_reader_many :umlx_redefinesMethod
-
+  rdf_safe_attr_reader_many :umlx_autoImplementedBy
   def umlx_signature
     #todo: take parameter into account
     r="#{uml_name}("

data/lib/ontomde-uml2/createAndAdd.rb

@@ -81,6 +81,21 @@ module Muml_Enumeration
     return g
   end
 end
+module Muml_Classifier
+  #Creates and add a new UML Enumeration.
+  #Return the newly created element.
+  #new_uri should be globaly unique.
+  def umlx_createAndAddEnumeration(new_uri,new_name=nil)
+    c=Cuml_Enumeration.new(rdf_Repository,new_uri)
+    #uml_nestedClassifier_add(c)
+    #puts "--------> #{self} #{new_name}"
+    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
+end
 module Muml_Package
   #Creates and add a new UML Enumeration.
   #Return the newly created element.

data/lib/ontomde-uml2/kb/protege.rb

@@ -151,7 +151,7 @@ module Muml_Classifier
   end
 end
 
-module Muml_PrimitiveType
+module Muml_DataType # and Muml_PrimitiveType and Muml_Enumeration
   #protege uri for a primitive type
   def prot_uri
     return	"#{NS_RDF_2000}rdf-schema#Literal"
@@ -294,20 +294,20 @@ module Muml_Property
 
     write("<#{o.prot_uri}> <#{NS_RDF_2000}rdf-schema#domain> <#{e.prot_uri}> .\n");
     append_comment
-    o.uml_type.each { |t|
-      if (t.kind_of?(Cuml_PrimitiveType))
-        write("<#{o.prot_uri}> <#{NS_RDF_2000}rdf-schema#range> <#{t.prot_uri}> .\n")
-        write(%{<#{o.prot_uri}> <http://protege.stanford.edu/system#range> "#{t.prot_primitive_type}" .\n})
-      elsif t.kind_of?(Cuml_Enumeration)
+    t=o.uml_type_one
+      if t.kind_of?(Cuml_Enumeration)
         write("<#{o.prot_uri}> <#{NS_RDF_2000}rdf-schema#range> <#{NS_RDF_2000}rdf-schema#Literal> .\n")
         write(%{<#{o.prot_uri}> <http://protege.stanford.edu/system#range> "symbol" .\n})
         t.uml_ownedLiteral.each {|c|
           write(%{<#{o.prot_uri}> <http://protege.stanford.edu/system#allowedValues> "#{c}" .\n})
         }
+      elsif (t.kind_of?(Muml_PrimitiveType)||t.kind_of?(Muml_DataType))
+        write("<#{o.prot_uri}> <#{NS_RDF_2000}rdf-schema#range> <#{t.prot_uri}> .\n")
+        write(%{<#{o.prot_uri}> <http://protege.stanford.edu/system#range> "#{t.prot_primitive_type}" .\n})
       else
       	write("<#{o.prot_uri}> <#{NS_RDF_2000}rdf-schema#range> <#{t.prot_uri}> .\n")
       end
-    }
+
     write("<#{o.prot_uri}> <#{NS_RDF_1999}22-rdf-syntax-ns#type> <http://protege.stanford.edu/kb#UML_SLOT> .\n")
     write("<#{o.prot_uri}> <http://protege.stanford.edu/kb#UML_LABEL> \"#{o.prot_label}\".\n")
     write("<#{o.prot_uri}> <#{NS_UML_CLASS}#UML_URI> \"#{UriNamespace.instance.unalias(o.rdf_uri)}\" .\n")

data/lib/ontomde-uml2/nocode.rb

@@ -0,0 +1,45 @@
+module Muml_Element
+	def umlx_addDependencies(s=Set.new)
+	end
+end
+
+module Mrdf_Repository
+	def umlx_removeNoCode!
+		s=Set.new
+	 	each { |k,v|
+			next unless v.kind_of?(Muml_Element)
+			next unless v.umlx_hasStereotype?('nocode')
+			v.umlx_addDependencies(s)
+		}	
+		s.each { |v|
+			puts "cleaning nocode --> #{v.class} #{v}"
+			puts "TODO: cleaning code not finalized"
+			self.delete(v.rdf_uri)	
+		}
+	end
+end
+module Muml_Package
+	def umlx_addDependencies(s=Set.new)
+		return if s.include?(self)
+		s.add(self)
+		uml_ownedMember.each { |v|
+			v.umlx_addDependencies(s)
+		}
+	end
+end
+module Muml_Operation
+	def umlx_addDependencies(s=Set.new)
+	end
+end
+module Muml_Class
+	def umlx_addDependencies(s=Set.new)
+	end
+end
+module Muml_Interface
+	def umlx_addDependencies(s=Set.new)
+	end
+end
+module Muml_Association
+	def umlx_addDependencies(s=Set.new)
+	end
+end

data/lib/ontomde-uml2/owner.rb

@@ -25,8 +25,18 @@ module Muml_Classifier
   end
   def umlx_owner=(p)
     old=umlx_owner_one
-    old.uml_ownedMember.delete(self) unless old.nil?
-    p.uml_ownedMember_add(self)
+    if old.nil?
+   	#
+    elsif old.kind_of?(Muml_Package)
+       old.uml_ownedMember.delete(self)
+    else
+       old.uml_nestedClassifier.delete(self)
+    end
+    if p.kind_of?(Muml_Package)
+	    p.uml_ownedMember_add(self)
+    else
+	    p.uml_nestedClassifier_add(self)
+    end
     ext_isReferencedBy_add(p)
   end
 end

data/lib/ontomde-uml2/uml2.rb

@@ -23,6 +23,35 @@ module Muml_Classifier
     }
     return s
   end
+  
+  # operation I own directly or indirectly  via inheritance
+  def umlx_ownedOperationHierarchical()
+	ret=Set.new
+	umlx_classifier_generalization_indirect.each { |i|
+	      i.uml_ownedOperation.each { |oo|
+		      ret.add(oo)
+	      }
+	}
+	self.uml_ownedOperation.each { |oo|
+	      ret.add(oo)
+	}
+	return ret
+  end
+
+   # attribute I own directly or indirectly  via inheritance
+  def umlx_ownedAttributeHierarchical()
+	ret=Set.new
+	umlx_classifier_generalization_indirect.each { |i|
+	      i.uml_ownedAttribute.each { |oo|
+		      ret.add(oo)
+	      }
+	}
+	self.uml_ownedAttribute.each { |oo|
+	      ret.add(oo)
+	}
+	return ret
+  end
+
 end
 
 module Muml_Namespace
@@ -32,6 +61,7 @@ module Muml_Namespace
   def umlx_package
     #TODO: utiliser relation inverse when available
     p=umlx_owner_one
+    p=uml_nestedClassifier_inv_one0 if p.nil? && !self.kind_of?(Muml_Package)
     return nil if p.kind_of?(Cuml_Model)
     return p
   end
@@ -62,6 +92,15 @@ module Muml_Namespace
   def umlx_isARootNamespace?
     return self.kind_of?(Muml_Model) || self.umlx_hasStereotype?("root")
   end
+  
+  # return root namespace for this element
+  def umlx_rootNamespace_one0
+	return self if umlx_isARootNamespace? 
+	root=umlx_package
+	return nil if root.nil?
+	return root.umlx_rootNamespace_one0
+  end
+  
   # Returns the chain of namespace owning this element including this element
   def umlx_hierarchy
     isarn=self.umlx_isARootNamespace?

data/lib/ontomde-uml2/umlx.rb

@@ -426,6 +426,22 @@ module Muml_Namespace
       ret
     }
   end
+ 
+  # Retrieves an interface from its qualified name.
+  # Class will be created if not present in model.
+  # Example:
+  # 	umlx_getOrCreateGeneric("java.util.Set")
+  def umlx_getOrCreateGeneric(qual_name,genericParams,startpoint=nil)
+    qual_name=%{#{qual_name}<#{genericParams}>}
+    return umlx_getOrCreateProc(qual_name,startpoint) { |owner,qual_name,c_name|
+      #TODO: duplication probable si plusieurs fois meme generic 
+      ret=owner.umlx_createAndAddInterface(qual_name,c_name)
+      #ret.uml_name="#{qual_name}<#{genericParams}>"
+      ret.umlx_external=RDF_TRUE
+      ret.java_isGeneric=RDF_TRUE
+      ret
+    }
+  end
 
   # Retrieves an enumeration from its qualified name.
   # Class will be created if not present in model.
@@ -595,15 +611,24 @@ end
 module Muml_Classifier
   #returns every type assignable to this classifier
   #(this includes self and any class deriving from it)
+  #Template parameter are filtered out
   def umlx_assignableClassifier(ret=Set.new)
     return ret if ret.include?(self)
     ret<< self
     uml_general_inv.each { |g|
       g.uml_generalization_inv.each {|c|
+	next if c.umlx_isTemplateParameter?
         c.umlx_assignableClassifier(ret)
       }}
     return ret
   end
+
+  # heuristique.
+  # If element has no owner, it is a root class
+  # class in root package is not supported anyway.
+  def umlx_isTemplateParameter?
+	  return umlx_owner_one.nil?
+  end
 end
 module Muml_Interface
   #returns every type assignable to this classifier

data/lib/ontomde-uml2/version.rb

@@ -1,5 +1,5 @@
 module Ontomde
   module Uml2
-    VERSION = '2.0.0'
+    VERSION = '2.0.4'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-uml2
 version: !ruby/object:Gem::Version 
-  version: 2.0.0
+  version: 2.0.4
 platform: ruby
 authors: 
 - Orange-labs BIZZ/CIL/SAM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-08 00:00:00 +02:00
+date: 2009-04-08 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.0
+        version: 2.0.4
     version: 
 description: "ontoMDE-uml2 contains UML2 meta-model and helper files to manipulate a UML2 model.    ontoMDE-uml2 uses ontoMDE-core which provides core fonctionalities for loading a model in RDF/RDFS format. ontoMDE-UML2 is used by ontoMDE-java which contains rules for generating java Code.  ontoMDE contains primitives for converting a UML2 model into a Prot\xE9g\xE9 2000 RDF/RDFS model. UML2 classes are converted into RDFS classes to allow data instances to be created. This feature is used heavily for providing editors for creating tests data for programs.  == FEATURES/PROBLEMS:  * UML2 meta-model definition in RDFS format * Ruby helper methods for handling a UML2 model. * UML Stereotype handling helpers. * UML predefined enumerations handling helper. * UML model manipulations helpers (add interface implementations, transform multiple inheritance into single inheritance, ...)  UML2 to Protege 2000 features: * single and incremental use. * transparent update of name changes from source to target mode. * class  * abstract class * interface * enumerated types * generalization links * implementation links * property, association, composition and aggregation * single and multivalued properties * mandatory fields (cardinaly=0 or >0) * UML documentation notes export to Protege 2000 for easy reference."
 email: stephanepierre.carrie -nospam- @orange-ftgroup.com
@@ -59,6 +59,7 @@ files:
 - lib/ontomde-uml2/kb/datatypeMapping.rb
 - lib/ontomde-uml2/kb/protege.rb
 - lib/ontomde-uml2/multipleInheritance.rb
+- lib/ontomde-uml2/nocode.rb
 - lib/ontomde-uml2/nt_old_to_nt_new.sh
 - lib/ontomde-uml2/owner.rb
 - lib/ontomde-uml2/salvageErrors.rb