ontomde-uml2 2.0.4 → 2.0.5

data/lib/ontomde-uml2/autoImplement.rb

@@ -41,12 +41,13 @@ 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(self.rdf_uri+ia.uml_name.to_s.str_to_uri)
+        att=self.umlx_createAndAddProperty(self.rdf_uri+ia.rdf_uri.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?
+	att.uml_ownedComment=ia.uml_ownedComment unless ia.uml_ownedComment.empty?
       else
         #puts "create and add ..."
         ms=ia.uml_association_one
@@ -55,7 +56,7 @@ 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.str_to_uri,ia.uml_type)
+        m,m1,m2=self.umlx_createAndAddAssociation(self.rdf_uri+ia.rdf_uri.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
@@ -68,6 +69,9 @@ module Muml_Class
         ms1.umlx_copyToAttributeProperty(m1)
         ms2.umlx_copyToAttributeProperty(m2)
 
+	m1.uml_ownedComment=ms1.uml_ownedComment unless ms1.uml_ownedComment.empty?
+	m2.uml_ownedComment=ms2.uml_ownedComment unless ms2.uml_ownedComment.empty?
+
         #puts "m=#{m}"
         #puts "m1=#{m1} #{m1.uml_type}"
         #puts "m2=#{m2} #{m2.uml_type}"
@@ -137,6 +141,7 @@ module Muml_Class
     umlx_operationIShouldImplement.each { |sig,ia|
       next if impOper.keys.include?(ia.umlx_signature)
       c=umlx_createAndAddOperation(ia.rdf_uri+"_implem",ia.uml_name.to_s);
+      c.uml_ownedComment=ia.uml_ownedComment unless ia.uml_ownedComment.empty?
       ia.umlx_autoImplementedBy_add(c) # used by javadoc
       c.umlx_copyStereotypesFrom!(ia)
       (ia.uml_ownedParameter+ia.uml_returnResult).each { |p|

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

@@ -95,8 +95,43 @@ module Muml_Element
   end
 end
 
+module Mrdf_Resource
+  def prot_ignorePackage?
+	  return (!kind_of?(Muml_Package)) || rdf_uri=="http://xmda-reserved"
+  end
+end
+
+module Muml_Package
+	def prot_writePackage
+		 e=self
+    write("<#{e.prot_uri}> <#{RDF_TYPE_URI}> <#{RDF_METACLASS_URI}> .\n")
+    write("<#{e.prot_uri}> <#{NS_RDF_2000}rdf-schema#label> \"[#{e.uml_name.to_s.nt_escape}]\" .\n")
+    write("<#{e.prot_uri}> <http://protege.stanford.edu/system#role> \"abstract\" .\n")
+    e.append_comment
+    e.prot_writeSubClassOf
 
-module Muml_Classifier
+    write("<#{e.prot_uri}> <#{NS_UML_CLASS}#UML_LABEL> \"[#{prot_label}]\" .\n")
+    write("<#{e.prot_uri}> <#{NS_UML_CLASS}#UML_URI> \"#{UriNamespace.instance.unalias(e.rdf_uri)}\" .\n")
+
+	end
+def mainSubClassOfURI
+    return  "#{NS_UML_CLASS}#UML_PACKAGE"
+  end
+
+
+  #writes sub class of rdf instructions
+  def prot_writeSubClassOf
+    t=umlx_owner_one
+    if t.nil? || t.prot_ignorePackage?
+      write("<#{prot_uri}> <#{RDF_SUBCLASSOF_URI}> <#{mainSubClassOfURI}> .\n")
+    else
+      write("<#{prot_uri}> <#{RDF_SUBCLASSOF_URI}> <#{t.prot_uri}> .\n")
+    end
+  end
+end
+
+
+module Muml_Namespace
   ProtegeURI=Hash.new
 
   #label used in protege 2000
@@ -144,8 +179,16 @@ module Muml_Classifier
     e.append_comment
     e.prot_writeSubClassOf
 
+    prefix= ''
+    prefix='UC: ' if e.kind_of?(Muml_UseCase) 
+    prefix='I: ' if e.kind_of?(Muml_Interface) 
+
+    # Place element in its package hierarchy
+    o=umlx_owner_one
+    write("<#{prot_uri}> <#{RDF_SUBCLASSOF_URI}> <#{o.prot_uri}> .\n") unless o.nil? || o.prot_ignorePackage?
+
     write("<#{e.prot_uri}> <#{RDF_SUBCLASSOF_URI}> <#{mainSubClassOfURI}> .\n")
-    write("<#{e.prot_uri}> <#{NS_UML_CLASS}#UML_LABEL> \"#{prot_label}\" .\n")
+    write("<#{e.prot_uri}> <#{NS_UML_CLASS}#UML_LABEL> \"#{prefix}#{prot_label}\" .\n")
     write("<#{e.prot_uri}> <#{NS_UML_CLASS}#UML_URI> \"#{UriNamespace.instance.unalias(e.rdf_uri)}\" .\n")
 
   end
@@ -426,6 +469,14 @@ module Mrdf_Repository
     }
   end
 
+  # add package and its parent hierarchy
+  def addPackageHierarchy(usedPackage,package)
+	  return unless package.kind_of?(Muml_Package)
+	  return if usedPackage.include?(package)
+	  return if package.prot_ignorePackage?
+	  usedPackage.add(package)
+	  addPackageHierarchy(usedPackage,package.umlx_owner_one)
+  end
 
   #generates Protege 2000 RDFS file of a knowledge base project.
   def generateProtegeKbRDFS(targetFile)
@@ -435,12 +486,15 @@ module Mrdf_Repository
     #mark temporary file for deletion
     mtk_addTempFileToDelete(targetFileRDFS)
 
+    usedPackage=Set.new
+
     mtk_writeSession(targetFileRDFS) {
       write(kbRDFS_header)
       uml_Model_all.each { |m|
         m.uml_Class_all.each {|c|
           next if c.kind_of?(Muml_Enumeration)
           c.prot_writeNTriple
+          addPackageHierarchy(usedPackage,c.umlx_owner_one) 
           c.uml_ownedAttribute.each {|a|
             a.prot_writeNTriple
           }
@@ -451,9 +505,15 @@ module Mrdf_Repository
             }
           }
         }
+
         m.uml_UseCase_all.each {|uc|
+          addPackageHierarchy(usedPackage,uc.umlx_owner_one) 
           uc.prot_writeNTriple
         }
+
+        usedPackage.each { |p|
+          p.prot_writePackage
+        }
       }
       kbRDFS_writeComponents
       write(kbRDFS_footer)
@@ -495,7 +555,7 @@ module Mrdf_Repository
   # Protege 2000 RDFS knowledge base file header
   def kbRDFS_header  
     nt_top='# debut\n'
-    ['UML_CLASS','UML_TEST_DATA_SET'].each {|c|
+    ['UML_CLASS','UML_TEST_DATA_SET','UML_PACKAGE'].each {|c|
       nt_top=nt_top+<<END2
 <#{NS_UML_CLASS}##{c}> <http://protege.stanford.edu/system#role> "abstract" .
 <#{NS_UML_CLASS}##{c}> <#{NS_RDF_2000}rdf-schema#label> "" .
@@ -632,12 +692,12 @@ END
 <#{NS_UML_CLASS}##{k}> <#{NS_RDF_1999}22-rdf-syntax-ns#type> <#{NS_RDF_1999}22-rdf-syntax-ns#Property> .
 <#{NS_UML_CLASS}##{k}> <#{NS_RDF_2000}rdf-schema#label> "#{k}" .
 <#{NS_UML_CLASS}##{k}> <#{NS_RDF_2000}rdf-schema#range> <#{NS_UML_CLASS}#UML_TEST_DATA_SET> .
-<#{NS_UML_CLASS}##{k}> <#{NS_RDF_2000}rdf-schema#domain> <#{NS_UML_CLASS}#UML_CLASS> .
+<#{NS_UML_CLASS}##{k}> <#{NS_RDF_2000}rdf-schema#domain> <#{NS_UML_CLASS}#UML_PACKAGE> .
 <#{NS_UML_CLASS}##{k}> <http://protege.stanford.edu/system#inverseProperty> <#{NS_UML_CLASS}##{inv}> .
 <#{NS_UML_CLASS}##{inv}> <#{NS_RDF_1999}22-rdf-syntax-ns#type> <#{NS_RDF_1999}22-rdf-syntax-ns#Property> .
 <#{NS_UML_CLASS}##{inv}> <#{NS_RDF_2000}rdf-schema#label> "{k}" .
 <#{NS_UML_CLASS}##{inv}> <http://protege.stanford.edu/system#inverseProperty> <#{NS_UML_CLASS}##{k}> .
-<#{NS_UML_CLASS}##{inv}> <#{NS_RDF_2000}rdf-schema#range> <#{NS_UML_CLASS}#UML_CLASS> .
+<#{NS_UML_CLASS}##{inv}> <#{NS_RDF_2000}rdf-schema#range> <#{NS_UML_CLASS}#UML_PACKAGE> .
 <#{NS_UML_CLASS}##{inv}> <#{NS_RDF_2000}rdf-schema#domain> <#{NS_UML_CLASS}#UML_TEST_DATA_SET> .
 END
     }

data/lib/ontomde-uml2/umlx.rb

@@ -214,11 +214,14 @@ module Muml_Element
   #returns true if element has an applied stereotype named stereotype_name
   #test is not case sensitive
   def umlx_hasStereotype?(stereotype_name)
+     return !(umlx_returnStereotypeIfHas(stereotype_name).nil?)
+  end
+  def umlx_returnStereotypeIfHas(stereotype_name)
     uml_appliedStereotype.each { |s|
       next unless s.uml_name.to_s.casecmp(stereotype_name.to_s)==0
-      return true
+      return s
     }
-    return false
+    return nil
   end
 end
 

data/lib/ontomde-uml2/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-uml2
 version: !ruby/object:Gem::Version 
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors: 
 - Orange-labs BIZZ/CIL/SAM
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 +02:00
+date: 2009-04-23 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.4
+        version: 2.0.5
     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