ontomde-java 2.0.0 → 2.0.4

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

@@ -2,6 +2,7 @@
 #
 module Muml_Element
 	JAVA_ENUM_INTERFACE_QNAME="xmda.java.JavaEnumSig"
+	JAVA_ENUM_ASSIGN_INTERFACE_QNAME="xmda.java.JavaEnumAssignSig"
 end
 
 
@@ -36,21 +37,45 @@ module Muml_Classifier
 
 
 	# String used to replace dot in enum literals
-	JAVA_MAGIC_DOT_STRING='_dot_'
+	#JAVA_MAGIC_DOT_STRING='_dot_'
 
 	# add an enum assignable for this model element
 	def java_addEnumAssignable!
+		return if self.java_qualifiedName.to_s==java_getJavaEnumInterface.java_qualifiedName.to_s
 		#log.debug { "java_addEnumAssignable! for #{self}::#{self.class.name}" }
-		p=umlx_owner_one
-		p=p.umlx_getOrCreatePackage(context[:enumAssignableSubPackage,"enumCreate"],p)
-
+		p=nil
+		#if self.kind_of?(Muml_Interface)
+		#then
+		#	p=umlx_owner_one
+		#	p=p.umlx_getOrCreatePackage(context[:enumAssignableSubPackage,"enumCreate"],p)
+		#else
+			p=self
+		#end
 		ret=p.umlx_createAndAddEnumeration(self.rdf_uri+"_enumAssignable","#{uml_name} Assignable")
 		ret.umlx_createAndAddImplementation(java_getJavaEnumInterface)
+		ret.umlx_createAndAddImplementation(java_getJavaEnumAssignInterface)
 		self.java_enumAssignableDataType=ret
+		ret.java_customCode= <<END
+\t\tClass<?> type;
+
+\t\tpublic Class<?> getType() {
+\t\t\treturn type;
+\t\t}
+
+\t\t#{ret.java_Name}(Class<?> _type) {
+\t\t\tthis.type = _type;
+\t\t}
+
+\t\t#{ret.java_Name}() {
+\t\t\tthis.type = null;
+\t\t}
+END
 
 		umlx_assignableClassifier.each { |c|
 			next if c.uml_isAbstract?
-			ret.umlx_createAndAddLiteral(c.java_qualifiedName.to_s.gsub(/\./,JAVA_MAGIC_DOT_STRING));
+			#lit=ret.umlx_createAndAddLiteral(c.java_qualifiedName.to_s.gsub(/\./,JAVA_MAGIC_DOT_STRING));
+			lit=ret.umlx_createAndAddLiteral(c.java_Name)
+			lit.java_initParameterValue_add("#{c.java_qualifiedName}.class")
 		}
 
 		return ret
@@ -68,6 +93,22 @@ module Muml_Classifier
 		end
 		return ret
 	end
+# return enum interface for this model element. (creates it if necessary).
+	def java_getJavaEnumAssignInterface
+		ret=umlx_getOrCreateInterface(JAVA_ENUM_ASSIGN_INTERFACE_QNAME)
+		if ret.uml_ownedOperation.empty?
+			ret.umlx_external="false"
+			op=ret.umlx_createAndAddOperation("#{ret.rdf_uri}_name}","name")
+			r=op.umlx_createAndAddReturnParameter("#{op.rdf_uri}_ret","return")
+			r.uml_type=umlx_dataType_string
+                        op.umlx_businessMethod=RDF_FALSE
+
+			op=ret.umlx_createAndAddOperation("#{ret.rdf_uri}_name}","getType")
+			r=op.umlx_createAndAddReturnParameter("#{op.rdf_uri}_ret","return")
+			r.uml_type=umlx_getOrCreateGeneric("java.lang.Class","?")
+		end
+		return ret
+	end
 
 
 end

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

@@ -8,10 +8,11 @@ module Mjava_Annotation
   def java_writeAnnotation
     mtk_protected(Mrdf_Resource::NOREVERSE,'annotations',context[:hasGlobalReverse]) {
       java_annotation.each {|a|
+        write("\t")
         write(a)
         write("\n")
       }
-      write("@Override\n") if (self.kind_of?(Muml_Operation) && !umlx_redefinesMethod.empty? && !umlx_redefinesMethod_one.umlx_owner_one.kind_of?(Muml_Interface) )
+      write("\t@Override\n") if (self.kind_of?(Muml_Operation) && !umlx_redefinesMethod.empty? && !umlx_redefinesMethod_one.umlx_owner_one.kind_of?(Muml_Interface) )
     }
   end
   
@@ -77,7 +78,7 @@ module Muml_Parameter
     write("final ") if uml_direction_one.isIn? # the best we can do with java
     write("#{java_propertyAssociationType} ")
     #write(" /* #{uml_lowerValue}..#{uml_upperValue}*/ ")
-    write(" #{java_Name}") unless uml_direction_one.isReturn?
+    write("#{java_Name}") unless uml_direction_one.isReturn?
   end
 end
 
@@ -254,11 +255,22 @@ END
 
   end
 
+#  JAVA_NAME_ALIAS={ 
+#	  /Virtual/=> 'Virt' , 
+#	  /Resource/ => 'Res' }
+
   #Returns this element uml_name after applying java_safeName on it.
   @java_Name_cache=nil
   def java_Name
     return @java_Name_cache unless @java_Name_cache.nil?
     s=java_safeName(uml_name.to_s)
+
+#    JAVA_NAME_ALIAS.each { |k,v|
+#	    ps=s
+#	    s=s.gsub(k,v)
+#	    #puts "#{ps} -> #{s}" if s!=ps
+#    }
+
     b=context[:java_fixNameCase,true]
     if !b
       # do nothing
@@ -330,17 +342,41 @@ should begin with a #{isDowncase ? "downcase": "upcase"} character.
 end
 
 module Muml_Namespace
+  def java_getContextJavaFilePath()
+    d=context[:javaDir,nil]
+    return d unless d.nil?
 
-  def java_getContextJavaFilePath(default=nil)
     n=java_qualifiedName.to_s
+    #root namespace name
+    rns=nil
+    rnso=umlx_rootNamespace_one0
+    #puts "rnso=#{rnso}" unless rnso.nil?
+    rns=rnso.uml_name.to_s+'/' unless rnso.nil?
+    rns=context[:defaultRootDir]+"/" if rns.nil? 
+
+    #Hack Override package name for some generated elements
+    rns='webapp/' if n.include?('struts')
+
+    mappingPathHash=context[:javaMappingPathForRootContainer, {} ]
+    if ! mappingPathHash.nil?
+	    override_rns=mappingPathHash[rns]
+	    rns=override_rns unless override_rns.nil?
+    end
+
+    rel=context[:javaRelativeDir,""]
+    
+    # override javaRelative
     jfp=context[:javaFilePathRegexp,nil]
-    return default if jfp.nil?
     jfp.each { |mapping|
-      if n =~ mapping[0]
-        return context[:targetDir]+"/"+mapping[1]
-      end
+      next unless n =~ mapping[0]
+      rel= "/"+mapping[1]
+      break
     }
-    return default
+    
+    #puts "rns=#{rns}"
+    #puts "rel=#{rel}"
+    #puts "td rns+rel=#{context[:targetDir]}|#{rns}|#{rel}|"
+    return context[:targetDir]+rns+rel
   end
   # Returns the path where to generate file for this object.
   #
@@ -351,7 +387,7 @@ module Muml_Namespace
   # * build/package1/package2
   # * build/package1/package2/UneClasse.java
   def java_FilePath
-    return java_getContextJavaFilePath(context[:javaDir])+java_InternalFilePath
+    return java_getContextJavaFilePath()+java_InternalFilePath
   end
 
   # Returns the internal path where to generate file for this object.
@@ -454,6 +490,11 @@ module Muml_Enumeration
     write("enum #{java_Name}")
   end
 
+  #returns literals in a controlled ordered
+  def java_ownedLiteral
+	  return  uml_ownedLiteral.sort { |a,b| a.java_Name.to_s <=> b.java_Name.to_s }
+  end
+
   #write enum body (list of litterals) using java_writeClassComment, java_writeClassModifiers, java_writeMetaClassName.
   #
   #Example:
@@ -462,13 +503,13 @@ module Muml_Enumeration
     java_writeClassComment
     java_writeJavadoc
     java_writeAnnotation
-    java_writeMdatkAnno(['imports','javadoc','annotations']) if context[:hasGlobalReverse]
+    java_writeMdatkAnno(['imports','javadoc','annotations','custom_code']) if context[:hasGlobalReverse]
     java_writeClassModifiers
     java_writeMetaClassName
     java_writeImplements
-    write("{\n")
+    write(" {\n")
     sep=""
-    uml_ownedLiteral.sort { |a,b| a.java_Name.to_s <=> b.java_Name.to_s }.each { |c|
+   java_ownedLiteral.each { |c|
       write(sep);
       c.java_write
       sep=",\n"
@@ -529,7 +570,9 @@ module Muml_Class
     #java_implements_add("java.io.Serializable");
     s=umlx_getOrCreateClass("java.io.Serializable")
     umlx_createAndAddImplementation(s)
-
+    java_addSerialVersionUID!
+  end
+  def java_addSerialVersionUID!
     p=umlx_createAndAddProperty(rdf_uri+"_serialVersionUID","serialVersionUID");
     p.uml_visibility=::Cuml_VisibilityKind::Private
     p.uml_isStatic=RDF_TRUE
@@ -580,8 +623,8 @@ module Muml_Class
   #
   #TODO: associations, et filtrer attributs static
   def java_writeConstructors
-    write("  public #{java_Name}() {\n")
-    write("  }\n")
+    write("public #{java_Name}() {\n")
+    write("}\n")
     #TODO: associations ??, filtrer static
     if (!uml_ownedAttribute.empty?)
       parameters = ""
@@ -596,13 +639,13 @@ module Muml_Class
       if (!parameters.empty?)
         write("\n")
         parameters = parameters.slice(1, parameters.length)
-        write("  public #{java_Name}(#{parameters}) {\n")
+        write("public #{java_Name}(#{parameters}) {\n")
         uml_ownedAttribute.each { |o|
           if o.umlx_isAttribute?
             write("    set#{o.java_NameBean}(#{o.java_NameProperty});\n")
           end
         }
-        write("  }\n")
+        write("\t}\n")
       end
     end
   end
@@ -750,7 +793,7 @@ module Muml_Classifier
     java_writeClassComment
     java_writeJavadoc
     java_writeAnnotation
-    java_writeMdatkAnno(['imports','javadoc','annotations']) if context[:hasGlobalReverse]
+    java_writeMdatkAnno(['imports','javadoc','annotations','custom_code']) if context[:hasGlobalReverse]
     java_writeClassModifiers
     java_writeMetaClassName
     java_writeTemplateParameter
@@ -768,7 +811,7 @@ module Muml_Classifier
 
     mtk_context(:innerClass=>true) {
       uml_nestedClassifier.each { |c|
-        next unless c.kind_of?(Muml_Class) 
+        next unless c.kind_of?(Muml_Class) || c.kind_of?(Muml_Enumeration)
         #filter out Collaboration 
         c.java_write
       }
@@ -780,9 +823,8 @@ module Muml_Classifier
   #add add a custom code zone
   #that is usefull for out of model code.
   def java_writeCustomCode
-    mtk_protected(Mrdf_Resource::NOREVERSE,'custom_code') {
+    mtk_protected(Mrdf_Resource::NOREVERSE,'custom_code',true) {
       write !java_customCode.empty? ? java_customCode : <<END
-// Please use this area for out-of-model code.
 END
     }
     write("\n\n")
@@ -827,6 +869,11 @@ END
   #Example:
   #   extends Class2,Class3
   def java_writeExtends(isTemplateParameter=false)
+    #HACK for handling of faulty EA models
+    if (!uml_name.to_s.index('FIX_UML_MODEL_unknown_exception',0).nil?)
+	java_extends_add('java.lang.Exception')
+    end
+
     ext=Set.new
     nbrInterface=0;
 
@@ -917,11 +964,18 @@ END
   #default java imports
   JAVA_DEFAULT_IMPORTS=[  ];
 
-  #iterate java_write on operations
-  def java_writeOperations
+  def java_ownedOperation 
     #sort has been added because ownedOperation order is random
     #which is cause false change detection on versionned file
-    uml_ownedOperation.sort { |a,b| a.java_Name.to_s <=> b.java_Name.to_s }.each { |o| o.java_write}
+    #
+    # uri has been added because of method overloading
+    # ' ' is added to preserve natural order (ex: xxx, xxxSug)
+	  return uml_ownedOperation.sort { |a,b| (a.java_Name.to_s+' '+a.rdf_uri) <=> (b.java_Name.to_s+' '+b.rdf_uri) }
+  end 
+  
+  #iterate java_write on operations
+  def java_writeOperations
+	    java_ownedOperation.each { |o| o.java_write}
   end
 
   #iterate java_write on attributes
@@ -964,23 +1018,41 @@ module Muml_Operation
   #is operation synchronised
   rdf_safe_attr_reader_many :java_isSynchronised
 
+  #writes a static initializer bloc from eclipse
+  def java_writeStaticInitializer
+     #java_writeJavadoc
+     #java_writeAnnotation
+     #java_writeMethodParameters 
+     #java_writeMethodModifiers (do not want public to popup)
+     java_writeStaticModifier
+     #write("static ")
+     #java_writeMethodThrows 
+     mtk_protected(Mrdf_Resource::NOREVERSE,'static_init') {
+     	java_writeMethodBody(true)
+     }
+  end
+
+
   #write java operation skeleton.
   # (Uses java_writeMethodModifiers, java_writeMethodReturnType, java_writeMethodParameters, java_writeMethodThrows, java_writeMethodBody)
   def java_write
     write("\n")
+    return java_writeStaticInitializer if umlx_isConstructor? && uml_isStatic?
+
     java_writeJavadoc
     java_writeAnnotation
     java_writeMdatkAnno(!(uml_isAbstract? || context[:java_interface])?['javadoc','annotations','annoparam0','0']:['javadoc','annotations','annoparam0']) if context[:hasGlobalReverse]
+    write("\t")
     java_writeMethodModifiers
 
-    if(umlx_isConstructor?)
+    if( umlx_isConstructor?)
       write("#{umlx_class_one.java_Name}")
     else
       java_writeMethodReturnType
       write("#{java_Name}")
     end
-    java_writeMethodParameters
-    java_writeMethodThrows
+    java_writeMethodParameters 
+    java_writeMethodThrows 
     java_writeMethodBody
   end
 
@@ -991,8 +1063,6 @@ module Muml_Operation
   #* abstract public
   #* public static
   def java_writeMethodModifiers
-
-
     if !umlx_class_one.kind_of?(Muml_Interface)
       uml_visibility.each { |v|
         write(v.java_visibilityModifiers)
@@ -1040,28 +1110,28 @@ module Muml_Operation
   #NOTE:
   #* The default generated operation throws a RuntimeException
   #* mtk_protected is used to allow inline java code modification (with Eclipse)
-  def java_writeMethodBody
+  def java_writeMethodBody(skipNotImplemented=false)
     if uml_isAbstract? || context[:java_interface]
       write(";\n")
     else
-      write("{\n");
+      write(" {\n");
       mtk_protected(Mrdf_Resource::NOREVERSE,'0',context[:hasGlobalReverse]) {
         if ! java_code_one0.nil?
           write java_code
         else
-          java_writeMethodBodyNotImplemented
+          java_writeMethodBodyNotImplemented unless skipNotImplemented
         end
         write("\n")
       }
-      write("}\n");
+      write("\t}\n");
     end
   end
 
   #writes default code for a method not implemented
   def java_writeMethodBodyNotImplemented
     write <<END
-  //TODO: implement method body
-  throw new java.lang.RuntimeException("[operation \\"#{java_Name}\\"not implemented]");
+\t\t//TODO: implement method body
+\t\tthrow new java.lang.RuntimeException("[operation \\"#{java_Name}\\"not implemented]");
 END
   end
 
@@ -1136,21 +1206,22 @@ module Muml_Property
   #NOTE:
   #* getter/setter/... methods are handled by model transformation
   def java_write
+     write("\n")
     if !uml_isDerived?
       java_writePropertyComment
       java_writeJavadoc
       java_writeAnnotation
       java_writeMdatkAnno(['javadoc','annotations']) if context[:hasGlobalReverse]
-      write("  ");
+      write("\t");
       java_writePropertyModifiers
       write("#{java_propertyAssociationType}")
       write(" #{java_NameProperty}")
 
       if !java_code.empty?
-        write"= #{java_code}"
+        write" = #{java_code}"
       elsif(context[:java_generateSetAttributeInitializer])
         if (!umlx_upperValueIsOne?) && uml_qualifier.empty? && java_use_Arrays?
-          write("= new ");
+          write(" = new ");
           write(uml_type_one.java_qualifiedName)
           write("[1]")
         elsif (!umlx_upperValueIsOne?) && uml_qualifier.empty?
@@ -1158,11 +1229,11 @@ module Muml_Property
           write(java_propertyAssociationConcreteType)
           write("()")
         elsif umlx_upperValueIsOne? && !uml_qualifier.empty?
-          write("= new ");
+          write(" = new ");
           write(java_propertyAssociationConcreteType)
           write("()")
         elsif !umlx_upperValueIsOne? && !uml_qualifier.empty?
-          #write("= new ");
+          #write(" = new ");
           #write(java_propertyAssociationConcreteType)
           #write("()")
         end

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

@@ -4,11 +4,34 @@ class DatatypeMapping
     log.error %{java_getType not implemented for #{self.class}}
     return %{/* TODO: implement ruby java_getType for #{self.class}*/}
   end
+  def java_getUndefinedValue
+    return "null /* undefined */" 
+  end
 end
 class DatatypeMappingText < DatatypeMapping
   def java_getType
     return "java.lang.String"
   end
+  def java_getUndefinedValue
+    return %{""}
+  end
+
+  def getFormCopyTo(field)
+    if field.umlx_oneSide?
+	  super
+    else
+  	return %{_to.set#{field.java_NameBean}(xmda.struts.FormHelper.toBean(this.get#{field.java_NameBean}(),_to.get#{field.java_NameBean}()));\n}
+    end
+  end
+  def getFormInitFrom(field)
+    if field.umlx_oneSide?
+	  super
+    else 
+#    return %{this.set#{field.java_NameBean}(_from.get#{field.java_NameBean}().toArray(new #{java_getType}[_from.get#{field.java_NameBean}().size()]));\n}
+     return %{this.set#{field.java_NameBean}(xmda.struts.FormHelper.toFormArrayAsStringLine(_from.get#{field.java_NameBean}()));\n}
+    toFormArrayAsStringLine
+    end
+  end
 end
 
 class DatatypeMappingLargeText < DatatypeMappingText
@@ -18,6 +41,9 @@ class DatatypeMappingMimeType < DatatypeMappingText
 end
 
 class DatatypeMappingOrdinal < DatatypeMappingText
+  def java_getUndefinedValue
+    return "-1"
+  end
 end
 
 class DatatypeMappingInteger < DatatypeMappingOrdinal
@@ -36,6 +62,9 @@ class DatatypeMappingLongObject < DatatypeMappingOrdinal
   def java_getType
     return "Long"
   end
+  def java_getUndefinedValue
+    return %{null}
+  end
 end
 class DatatypeMappingFile < DatatypeMapping
   def java_getType
@@ -51,6 +80,9 @@ class DatatypeMappingBoolean < DatatypeMapping
   def java_getType
     return "boolean"
   end
+  def java_getUndefinedValue
+    return %{false}
+  end
 end
 
 class DatatypeMappingTimeStamp < DatatypeMapping
@@ -145,6 +177,9 @@ class DatatypeMappingIMG < DatatypeMappingBLOB
 end
 
 class DatatypeMappingGRAPHVIZ < DatatypeMappingLargeText
+  def java_getUndefinedValue
+    return %{"digraph {\\n u1 [label=\\"graphviz script generation method\\"]\\n u2[label=\\"is not yet\\"]\\n u3[label=\\"implemented in this project\\"] \\n u1->u2->u3\\n}"}
+  end
 end
 
 class DatatypeMappingPassword < DatatypeMappingText
@@ -153,4 +188,3 @@ end
 class DatatypeMappingEmailAddress < DatatypeMappingText
 end
 
-