ontomde-java 2.0.4 → 2.0.5

data/Manifest.txt

@@ -49,6 +49,7 @@ lib/ontomde-java/java/java_todo.rdoc
 lib/ontomde-java/java/javadoc.rb
 lib/ontomde-java/java/meta.rb
 lib/ontomde-java/java/operationAsClass.rb
+lib/ontomde-java/java/refactor.rb
 lib/ontomde-java/java/security.rb
 lib/ontomde-java/java/stateMachine.rb
 lib/ontomde-java/java/tenant.rb

data/lib/ontomde-java.rb

@@ -41,6 +41,7 @@ require 'ontomde-java/java/xsd.rb'
 require 'ontomde-java/java/xsdCollectionMapping.rb'
 require 'ontomde-java/java/xsdDatatypeMapping.rb'
 require 'ontomde-java/java/tenant.rb'
+require 'ontomde-java/java/refactor.rb'
 require 'ontomde-java/vmware/vso.rb'
 
 

data/lib/ontomde-java/frontend/command.rb

@@ -98,13 +98,15 @@ puts "# # # Begin of debug script"
 puts "# # # Move to original working directory"
 Dir.chdir(File.dirname(__FILE__))
 
-puts "# # # requesting ontomde-java version #{Ontomde::Java::VERSION}"
-gem("ontomde-java","#{Ontomde::Java::VERSION}")
-
-
 puts "# # # ARGV initialization"
 #{initARGV}
 
+if( ! ARGV.include?('--nogem'))
+	puts "# # # requesting ontomde-java version #{Ontomde::Java::VERSION}"
+	require 'rubygems'
+	gem("ontomde-java","#{Ontomde::Java::VERSION}")
+end
+
 puts "# # #loading ontomde-java command line script"
 require 'ontomde-java/frontend/command.rb'
 

data/lib/ontomde-java/frontend/defaultOptions.rb

@@ -45,6 +45,7 @@ def getDefaultOptions(options={})
   options[:script]=false
   options[:webservice]=false
   options[:javadoc]=true
+  options[:javaRefactorFile]=nil
   options[:statemachine]=false
   #options[:installRessources]=true
   options[:target_ejbconf] = nil

data/lib/ontomde-java/frontend/options.rb

@@ -441,6 +441,16 @@ def populateMisc(opts,options)
     options[:vsoTargetFile] = v
   end
 
+  opts.on("--javaRefactorFile JAVA_REFACTOR_FILE",": if sets, generate a file containing information on what was generated. This file is designed to be easy to diff in order to know what to refactor","default: -- #{options[:javaRefactorFile]}") do |v|
+    options[:javaRefactorFile] = v
+  end
+
+  opts.on("--nogem",": internal options. Used in core ontomde developer mode.") do |v|
+	  # do nothing.
+	  # just ignore the option
+  end
+
+
 end
 
 def populateDocumentation(opts,options)

data/lib/ontomde-java/frontend/steps.rb

@@ -237,6 +237,12 @@ def step_generate_java(model)
   end
   say "Generating/Updating java files"
   model.java_generateRepository
+
+  if !model.context[:javaRefactorFile,nil].nil?
+    say "Generating helper file javaRefactorFile"
+    model.java_generateRefactorFile
+    end
+
 end
 #write java files to disk
 def step_generate_xsd(model)

data/lib/ontomde-java/java/accessorSignature.rb

@@ -129,6 +129,10 @@ module Muml_Classifier
     m.uml_isStatic=oa.uml_isStatic
     m.java_use_Arrays=oa.java_use_Arrays
 
+    # propagate deprecated stereotype
+    deprec=oa.umlx_returnStereotypeIfHas("deprecated")
+    m.uml_appliedStereotype_add(deprec) unless deprec.nil?
+
     if withQualifier
       oa.uml_qualifier.each { |qual|
         ip_qual=m.umlx_createAndAddParameter(m.rdf_uri+qual.rdf_uri)

data/lib/ontomde-java/java/enumAssignable.rb

@@ -103,7 +103,7 @@ END
 			r.uml_type=umlx_dataType_string
                         op.umlx_businessMethod=RDF_FALSE
 
-			op=ret.umlx_createAndAddOperation("#{ret.rdf_uri}_name}","getType")
+			op=ret.umlx_createAndAddOperation("#{ret.rdf_uri}_getType}","getType")
 			r=op.umlx_createAndAddReturnParameter("#{op.rdf_uri}_ret","return")
 			r.uml_type=umlx_getOrCreateGeneric("java.lang.Class","?")
 		end

data/lib/ontomde-java/java/java.rb

@@ -12,6 +12,7 @@ module Mjava_Annotation
         write(a)
         write("\n")
       }
+      write("\t@Deprecated\n") if (self.umlx_hasStereotype?("deprecated"))
       write("\t@Override\n") if (self.kind_of?(Muml_Operation) && !umlx_redefinesMethod.empty? && !umlx_redefinesMethod_one.umlx_owner_one.kind_of?(Muml_Interface) )
     }
   end
@@ -137,10 +138,10 @@ module Mrdf_Repository
     each { |k,c|
       next if c.kind_of?(Muml_Stereotype)
       next unless c.kind_of?(Muml_Class) || c.kind_of?(Muml_Interface)||c.kind_of?(Muml_Enumeration)
-      a << c
+      a << c unless c.java_ignoreMe?
     }
     a.each {|c|
-      c.java_transform! unless c.java_ignoreMe?
+      c.java_transform! 
     }
 
     #java_addPersistence!
@@ -159,6 +160,7 @@ end
 module Muml_Model
   def java_generateModel
     mtk_default_context(:java_generateSetAttributeInitializer=>true) {
+      a=Array.new
       uml_Class_all.each {|c|
         #next if c.kind_of?(Muml_Stereotype)
         next unless c.kind_of?(Muml_Class) || c.kind_of?(Muml_Interface)||c.kind_of?(Muml_Enumeration)
@@ -166,13 +168,16 @@ module Muml_Model
         # usefull for generating separtely tests dans model
         next if c.java_isATestFile? && !context[:includeTestFiles]
         next if (!c.java_isATestFile?) && context[:excludeNonTestFiles]
-        c.java_generateClassifier
+	a.push(c) 
       }
       if context[:generateComponent]
         uml_Component_all.each  { |c|
-          c.java_generateClassifier
+          a.push(c)
         }
       end
+    a.eachInThread(self) { |cl|
+	cl.java_generateClassifier
+    }
     }
   end
 end
@@ -543,6 +548,7 @@ module Muml_Enumeration
   def java_writeImplements
     imp=Set.new
     uml_implementation.each { |g|
+      next if (g.umlx_hasStereotype?("private") )
       imp.add(g.uml_supplier_one.java_qualifiedName)
     }
     java_implements.each { |g|
@@ -602,6 +608,7 @@ module Muml_Class
   def java_writeImplements
     imp=Set.new
     uml_implementation.each { |g|
+      next if (g.umlx_hasStereotype?("private") )
       imp.add(g.uml_supplier_one.java_qualifiedName)
     }
     java_implements.each { |g|

data/lib/ontomde-java/java/javadoc.rb

@@ -8,7 +8,7 @@ class String
   def java_writeJavadoc(res)
     # replace escaped carriage return by true carriage return
     # remove java comments (we are already inside a javadoc)
-    self.gsub(/\\r\\n/,"\n").gsub(/\*\//,'--').gsub(/\/\*/,'--').each { |line|
+    self.gsub(/\\r/,"").gsub(/\\n/,"\n").gsub(/\*\//,'--').gsub(/\/\*/,'--').each { |line|
       res.write("\t * #{line}".tr("\n"," ").rstrip)
       res.write("\n")
     }

data/lib/ontomde-java/java/refactor.rb

@@ -0,0 +1,109 @@
+
+# refactor generates a single file that contains a report
+# of what java code was generated.
+# This file is designed to be easy to diff.
+#
+# In order to know what to refactor, version this file
+# and run a diff on it. You will know what has changed.
+class String
+	def mtk_xml
+		return self.tr('<','_').tr('>','_')
+	end
+end
+module Mrdf_Repository
+def java_generateRefactorFile
+	s=Set.new	
+	p=Set.new
+	uml_Class_all.each {|c|
+		next unless c.kind_of?(Muml_Class) || c.kind_of?(Muml_Interface)||c.kind_of?(Muml_Enumeration)
+		# only generate if requested to do so
+		# usefull for generating separtely tests dans model
+		next if c.java_isATestFile? && !context[:includeTestFiles]
+		next if (!c.java_isATestFile?) && context[:excludeNonTestFiles]
+		s.add(c)	
+		p.add(c.umlx_owner_one) if c.umlx_owner_one.kind_of?(Muml_Package)
+	}
+
+	mtk_writeSession(context[:javaRefactorFile]) {
+		write <<END
+<?xml version="1.0" encoding="UTF-8"?>
+<refactor>
+  <!-- 
+
+  Although ontomde tries to behave nicely
+  when generating over existing code with
+  a modified UML model, it is not always
+  possible to handle all cases transparently.
+
+  Therefore, it is sometime best to perform
+  Eclipse code refactoring (or such), prior
+  to running generation with the new model.
+
+  The question is now, what should I refactor ?
+
+  This file is here to help you in this task.
+
+  When processed with diff (such as TortoiseSVN),
+  this file will tell you what to refactor. You
+  will now deleted or modified elements (as well
+  as neewly created elements).
+
+  Please note that you should versionned this file 
+  after running generator on a new model.
+
+  This file has been designed to behave nicely 
+  with diff and avoid false change information.
+
+  -->
+END
+		#sort is on rdf_uri because uri does not change
+		#sorting on label is KO
+		s.sort { |a,b| a.rdf_uri <=> b.rdf_uri }.each { |cc|
+		cc.java_writeRefactorData
+		} 
+		p.sort { |a,b| a.rdf_uri <=> b.rdf_uri }.each { |cc|
+		cc.java_writeRefactorData
+		} 
+		write(%{</refactor>\n})
+	}
+	end
+end
+
+module Muml_Package
+def java_writeRefactorData
+	write(%{<#{self.class}\n})
+	write(%{  uri=\"#{rdf_uri}"\n})
+	#write(%{  class="#{self.class}"\n})
+	write(%{  path="#{java_qualifiedName.mtk_xml}"\n})
+	write(%{/>\n})
+end
+end
+
+module Muml_Classifier
+def java_writeRefactorData
+	write(%{<#{self.class}\n})
+	write(%{  uri=\"#{rdf_uri}"\n})
+	#write(%{  class="#{self.class}"\n})
+	write(%{  package="#{umlx_owner_one.rdf_uri}"\n})
+	write(%{  name="#{java_Name.mtk_xml}"\n})
+	write(%{>\n})
+	uml_ownedAttribute.sort {|a,b| a.rdf_uri<=>b.rdf_uri}.each {|a|
+		write(%{  <attribute\n})
+		write(%{    uri=\"#{a.rdf_uri}"\n})
+		# uri is used for type because we track here a change
+		# of parameter type, not a change of type itself.
+		#write(%{    type="#{a.uml_type_one.rdf_uri}"\n})
+		write(%{    name="#{a.java_Name.mtk_xml}"\n})
+		write(%{  />\n})
+	}
+	uml_ownedOperation.sort {|a,b| a.rdf_uri<=>b.rdf_uri}.each {|a|
+		write(%{  <operation\n})
+		write(%{    uri=\"#{a.rdf_uri}"\n})
+		write(%{    name="#{a.java_Name.mtk_xml}"\n})
+		#write(%{    returnType="#{a.umlx_returnResult_one0.rdf_uri}"\n}) unless a.umlx_returnResult_one0.nil?
+		write(%{  />\n})
+	}
+	write(%{</#{self.class}>\n})
+end
+end
+

data/lib/ontomde-java/java/xsd.rb

@@ -18,6 +18,7 @@ module Mxsd_Schema
     types=Set.new
     xsd_types.each { |clazz|
       clazz.uml_ownedAttribute.each { |param|
+	next if param.xsd_ignoreMe?
         types.merge(param.uml_type)
       }
     }
@@ -25,11 +26,14 @@ module Mxsd_Schema
   end
 
   def xsd_writeImports
+    empty=true
     xsd_dependencies.each {|dep|
+      empty=false
       base=Pathname.new(File.dirname(self.xsd_SchemaName))
       target=Pathname.new(dep.xsd_SchemaName)
       write(%{  <xsd:include schemaLocation="#{target.relative_path_from(base)}"/>\n})
     }
+    write("\n") unless empty 
   end
   #compute xsd dependencies from file
   def xsd_computeDependencies!(defaultXSD)
@@ -182,20 +186,30 @@ module Mrdf_Repository
   
   #parse model and generate file objects for elements 
   def xsd_generateSchemaElements!
+	  
+    #compute set of packages with elements of interest
     packages=Set.new
     uml_Class_all.each { |c|
+      next if c.xsd_ignoreMe?
       packages.add(c.umlx_owner_one)
     }
+
+    #
     global=Cxsd_Schema.new(self,"uri://globalXSD")
+   
+    #Create one xsd schema for each package
     xsdFiles=Set.new
     packages.each { |p|
       f=Cxsd_Schema.new(self,"#{p.rdf_uri}_xsdFile")
       xsdFiles.add(f)
       f.xsd_baseName=p
       p.uml_Class_all.each {|oe|
+        next if oe.xsd_ignoreMe?
         f.xsd_types_add(oe)
       }
     }
+
+    #
     d=global.nil? ? Cxsd_Schema.new(self,"defaultXSD") : global
     xsdFiles.each {  |xsd|
       xsd.xsd_computeDependencies!(d)
@@ -251,6 +265,7 @@ module Muml_Parameter
     #write(" /* #{uml_lowerValue}..#{uml_upperValue}*/ ")
     write(" #{xsd_Name}") unless uml_direction_one.isReturn?
   end
+
 end
 
 
@@ -451,7 +466,7 @@ module Muml_Namespace
   #Example:
   #* build/package1/package2/NomDeLaClasse.xsd
   def xsd_SchemaName
-    return "#{xsd_SchemaPath}#{xsd_Name}.xsd"
+    return "#{xsd_SchemaPath}#{xsd_Name}Rec.xsd"
   end
 
 
@@ -475,7 +490,8 @@ module Muml_Namespace
   # * build/package1/package2
   # * build/package1/package2/UneClasse.xsd
   def xsd_SchemaPath
-    return xsd_getContextJavaFilePath(context[:javaDir])+xsd_InternalFilePath
+
+    return xsd_getContextJavaFilePath(context[:javaRelativeDir])+xsd_InternalFilePath
   end
 
   # Returns the internal path where to generate file for this object.
@@ -527,13 +543,8 @@ module Muml_Namespace
   #* returns true if this class name is in JAVA_IGNORE_ROOT_PACKAGE_NAME
   def xsd_ignoreMe?(ignoreExternal=true)
     #puts "ignore=#{self.class} #{self.uml_name}"
-    qn=xsd_qualifiedName
-    return true if umlx_hasStereotype?("nocode")
-    return true if umlx_external? && ignoreExternal 
-    JAVA_IGNORE_NAMESPACE.each { |ns|
-      return true if qn.index(ns)==0
-    }
-    return false;
+    return true if java_ignoreMe?(ignoreExternal)
+    return struts_isStruts?
   end
 end
 
@@ -575,9 +586,9 @@ module Muml_Enumeration
   #Example:
   #* enum Colors
   def xsd_writeMetaClassName(&block)
-    write(%{<xsd:simpleType name="#{xsd_qualifiedName}" >\n})
+    write(%{    <xsd:simpleType name="#{xsd_qualifiedName}" >\n})
     yield
-    write(%{</xsd:simpleType>\n})
+    write(%{    </xsd:simpleType>\n})
   end
 
   #write enum body (list of litterals) using xsd_writeClassComment, xsd_writeClassModifiers, xsd_writeMetaClassName.
@@ -943,7 +954,7 @@ END
   def xsd_writeAttributes
     return if kind_of?(Muml_Interface)
     #sort has been added because ownedAttribute order is random
-    #which is cause false change detection on versionned file
+    #which causes false change detection on versionned file
     write(%{    <xsd:sequence>\n})
     uml_ownedAttribute.sort { |a,b| a.xsd_Name.to_s <=> b.xsd_Name.to_s }.each { |o| o.xsd_writeProperty}
     write(%{    </xsd:sequence>\n})
@@ -1167,6 +1178,7 @@ module Muml_Property
   #NOTE:
   #* getter/setter/... methods are handled by model transformation
   def xsd_writeProperty
+    return if xsd_ignoreMe?
     write(%{      <xsd:element name="#{xsd_Name}" type="#{uml_type_one.xsd_qualifiedName}"})
     xsd_writeMinOccurs
     xsd_writeMaxOccurs
@@ -1231,6 +1243,12 @@ module Muml_Property
     write("transient ")
   end
 
+  def xsd_ignoreMe?
+	  return true if java_ignoreMe?
+	  n=java_Name.to_s
+	  return true if (n=="isLogicallyDeleted") || (n=="objectVersion")
+  end
+
 end
 
 

data/lib/ontomde-java/kbjava/rdfToJava.rb

@@ -37,8 +37,8 @@ class Crdf_ProtegeDataModel < Crdf_Repository
 
     #mtk_protected("converter") {
     umlDataClass.java_customCode= <<END
- private static java.text.SimpleDateFormat dfCalendar= new java.text.SimpleDateFormat("yyyy/MM/dd",java.util.Locale.ENGLISH);
- private static java.text.SimpleDateFormat dfTimestamp= new java.text.SimpleDateFormat("yyyy/MM/dd",java.util.Locale.ENGLISH);
+ private static java.text.SimpleDateFormat dfCalendar= new java.text.SimpleDateFormat("yyyy-MM-dd",java.util.Locale.ENGLISH);
+ private static java.text.SimpleDateFormat dfTimestamp= new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss",java.util.Locale.ENGLISH);
   public java.util.Date convertCalendar(final String s) {
 	try  {
 	return dfCalendar.parse(s) ;
@@ -76,6 +76,9 @@ END
 
       n=p.umlx_createAndAddClass("#{c.rdf_uri}_junit","junit#{c.kb_UML_DATA_SET_NAME}")
 
+      #propagate use case documentation to test class
+      n.uml_ownedComment=uml_type.uml_ownedComment unless uml_type.uml_ownedComment.empty? 
+
       #Provide a Gui
       n.umlx_businessMethod=RDF_TRUE
       #puts "n=#{n.uml_name} busniess=#{n.umlx_businessMethod?}"
@@ -208,6 +211,11 @@ class ::Crdfs_Class
       p=self.kbjava_property_one
       #i=self.kbjava_initMethod_one
       i=p.java_AttributeGlobalGetter_one
+
+      if kbjava_aliasName.nil?
+	#no alias, getter is private
+      	p.java_AttributeGlobalGetter_one.uml_visibility= Cuml_VisibilityKind::Protected      
+      end
       #write "private #{uml_type.java_qualifiedName} #{kbjava_varName}=null;\n"
       #write "#{kbjava_public ? "public" : "private"} #{uml_type.java_qualifiedName} get#{kbjava_varName}() {"
       #p=self.kbjava_property_one

data/lib/ontomde-java/struts/form.rb

@@ -313,7 +313,7 @@ module Muml_Property
 		a2.uml_type=form.umlx_dataType_string
 		#a2.uml_type=form.umlx_getOrCreateClass("java.lang.Integer")
 
-		sug=form.umlx_createAndAddOperation(form.rdf_uri+"_sug","get#{self.java_NameBean}Sug")
+		sug=form.umlx_createAndAddOperation(form.rdf_uri+"_sug_"+self.rdf_uri,"get#{self.java_NameBean}Sug")
 		ret=sug.umlx_createAndAddReturnParameter(sug.rdf_uri+"_return")
 		ret.uml_type=form.umlx_getOrCreateClass("#{STRUTS_LVB}")
 		ret.uml_upperValue=form.umlx_literal(-1)
@@ -330,7 +330,7 @@ module Muml_Property
 		a2.uml_type=form.umlx_dataType_string
 
 		if ! uml_isReadOnly?
-			sug=form.umlx_createAndAddOperation(form.rdf_uri+"_sug","get#{self.java_NameBean}Sug")
+			sug=form.umlx_createAndAddOperation(form.rdf_uri+"_sug_"+self.rdf_uri,"get#{self.java_NameBean}Sug")
 			ret=sug.umlx_createAndAddReturnParameter(sug.rdf_uri+"_return")
 			ret.uml_type=form.umlx_getOrCreateClass("#{STRUTS_LVB}")
 			ret.uml_upperValue=form.umlx_literal(-1)

data/lib/ontomde-java/struts/jsp_edit.rb

@@ -60,7 +60,7 @@ module Mrdf_Repository
   end
 
   def struts_edit_generate
-    uml_Class_all.each { |c|
+    uml_Class_all.eachInThread(self) { |c|
       next if c.kind_of?(Muml_Enumeration)
       next if c.kind_of?(Muml_Interface)
       next if c.java_ignoreMe?

data/lib/ontomde-java/version.rb

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

data/test/test_export_unitTests.rb

@@ -948,7 +948,18 @@ module TestsStereotypes
   def test_stereotypeOnTargetAssociation
     hasStereotype(p=find("withQualifierBiNav",Cuml_Property),"teST")
   end
-  
+
+  def test_stereotypeOnImplements
+	 c=getComponent
+	 found=nil
+         c.uml_implementation.each {|r|
+    		return if r.umlx_hasStereotype?("stereotypeOnImplement")
+		found=r
+	 }
+	fail "missing implements link on component while looking for stereotypeOnImplement" if found.nil?
+	fail "stereotypeOnImplement not found \n(id=#{found.rdf_uri})"
+  end
+
 end
 module TestAggregationKind
   def test_compositeAssocIsComposition 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-java
 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-java is a full-featured UML2 to Java5 code generator library.   A sample raw UML2 source model is available here: http://ontomde.rubyforge.org/website/demo/java5/index.html. This model is included in a running demonstration available from this page: http://ontomde.rubyforge.org/website/demonstration.html  == FEATURES/PROBLEMS:  Managed class modifiers  * interface implements * single class inheritance * attribute  * association * method * inner class"
 email: stephanepierre.carrie -nospam- @orange-ftgroup.com
@@ -84,6 +84,7 @@ files:
 - lib/ontomde-java/java/javadoc.rb
 - lib/ontomde-java/java/meta.rb
 - lib/ontomde-java/java/operationAsClass.rb
+- lib/ontomde-java/java/refactor.rb
 - lib/ontomde-java/java/security.rb
 - lib/ontomde-java/java/stateMachine.rb
 - lib/ontomde-java/java/tenant.rb