ontomde-java 2.0.0 → 2.0.4

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

@@ -1,11 +1,11 @@
 
 module Mrdf_Repository
-  def struts_header_generate
+  def struts_header_generate(element=nil)
     write <<END
 			<%-- ********  ENTETE ****************** --%>
 <div class="cadre">
 	<div class="AgLeft">
-		<a href="https://rubyforge.org/">
+		<a href="http://ontomde.rubyforge.org/">
 			<img src="#{css_path_model}/#{css_color_class}/image/logoMDE.gif" border="0"  alt="Home"/>
 		</a>
 	</div>
@@ -22,6 +22,10 @@ module Mrdf_Repository
 		<a href="#">
 			<img src="#{css_path_model}/#{css_color_class}/image/btnHelp.gif" width="25" height="25" border="0" alt="Help"/>
 		</a>
+		
+		#{(element.nil?  || context[:rsm6WebDocURI].empty?)  ? "" : 
+		%{<a target="rsm6doc" href="#{context[:rsm6WebDocURI]}/content/#{UriNamespace.instance.unalias(element.umlx_owner_one.rdf_uri).gsub(/http:\/\/kb#/,"")}-content.html"><img src="#{css_path_model}/#{css_color_class}/image/rsm6.gif" width="25" height="25" border="0" alt="Help"/></a>}
+		}
 	</div>
 </div>
 			<%-- ********  USER CONTEXT ************* --%>
@@ -31,7 +35,7 @@ end
 
 module Muml_Class
   def struts_header_generate
-    self.rdf_Repository.struts_header_generate;
+    self.rdf_Repository.struts_header_generate(self);
     return
   end
 end

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

@@ -16,6 +16,14 @@
 # SPS (String Property Single)
 # TPS (Timestamp Property Single)
 
+module Muml_Operation
+	# add _js to prevent javascript reserved name clash.
+	# example: "delete" 
+	def js_Name
+		return "#{java_Name}_js"
+	end
+end
+
 module Mrdf_Repository
   def struts_encloseWrite(before,after,&block)
     write(before)
@@ -143,6 +151,7 @@ module Muml_Class
         write("<%-- TPL:2 BEGIN --%>\n<tr>")
         struts_formAttribute.each { |a|
           next if a.uml_name_one=="id"
+          next if a.uml_name_one=="isLogicallyDeleted"
           write("<%-- UML PROPERTY: #{a.uml_name}--%>\n")
           write("<td>");
           write("</td>");
@@ -277,7 +286,7 @@ end
 def struts_jsp_writeTabBar
   return if struts_ownedTab.size <= 1
   write %{<div class="menu" id="menuDivId">\n}
-  cmpt =1;
+  #cmpt =1;
   onglet_actif=context[:struts_tab]
   struts_ownedTab.each { |tab|
     id=tab.java_Name
@@ -291,17 +300,17 @@ def struts_jsp_writeTabBar
 \n}
 
     else
-      if cmpt==1
-        write %{\n<div class="menuOptn" id="menuOptDivId#{id}" style="display:none;">
-<div class="menuLink"><html:link onclick="#{STRUTS_REFRESH_ACTION}('#{id}');return false;" page="">#{struts_writeMsg(label)}</html:link></div>
-</div>}
-      else
+#      if cmpt==1
+#        write %{\n<div class="menuOptn" id="menuOptDivId#{id}" style="display:none;">
+#<div class="menuLink"><html:link onclick="#{STRUTS_REFRESH_ACTION}('#{id}');return false;" page="">#{struts_writeMsg(label)}</html:link></div>
+#</div>}
+#      else
         write %{\n<div class="menuOptn" id="menuOptDivId#{id}">
 <div class="menuLink"><html:link onclick="#{STRUTS_REFRESH_ACTION}('#{id}');return false;" page="">#{struts_writeMsg(label)}</html:link></div>
 </div>}
-      end
-
-      cmpt=cmpt+1;
+#      end
+#
+#      cmpt=cmpt+1;
     end
   }
   write %{</div>\n}
@@ -447,10 +456,10 @@ def struts_jspEdit_write_Operation
     #	</a>
     #	}
     if context[:statemachine] && biz.java_isFsmOperation
-      write(%{<xmdafsm:FsmZoneTag methodName="#{biz.java_Name}" state="$\{#{self.struts_actionForm_one.java_Name}.persistedState\}">\n})
+      write(%{<xmdafsm:FsmZoneTag methodName="#{biz.java_Name}" state="$\{#{self.struts_actionForm_one.java_Name}.reference.persistedState\}">\n})
     end
     write %{
-<html:submit styleClass="boutonForm" onclick="#{biz.java_Name}();return false;">#{struts_writeMsg("#{biz.umlx_owner_one.java_qualifiedName}.#{biz.java_Name}")}</html:submit>
+<html:submit styleClass="boutonForm" onclick="#{biz.js_Name}();return false;">#{struts_writeMsg("#{biz.umlx_owner_one.java_qualifiedName}.#{biz.java_Name}")}</html:submit>
     }
     if context[:statemachine] && biz.java_isFsmOperation
       write(%{</xmdafsm:FsmZoneTag>\n})
@@ -464,6 +473,7 @@ end
 def struts_edit_writeFields
   context[:struts_tab].struts_ownedAttribute.each { |a|
     next if a.uml_name_one=="id"
+    next if a.uml_name_one=="isLogicallyDeleted"
     a.struts_edit_writeFieldProp(self)
   }
 end
@@ -513,20 +523,28 @@ def struts_edit_writeFieldMany(field,owner)
   struts_edit_writeSelectAndAdd(field,owner)
 end
 
-#add label 
-#use every property stereotpyed Label.
-#if none found, use every field
-def struts_editWriteSelectAndAddLabel(field,elt,withLabelOnly=true)
+def struts_eachLabelField(field,withLabelOnly=true,&block)
   emptySelection=true
   field.uml_type_one.struts_formAttribute.each { |a|
           #next if a.uml_name_one=="id"
           next if a.uml_name_one=="owner"
+          next if a.uml_name_one=="isLogicallyDeleted"
           next if a.uml_type_one.kind_of?(Muml_Class)
           next if withLabelOnly && !(a.umlx_hasStereotype?("label"))
+	  next if a.umlx_hasStereotype?("noLabel")
           emptySelection=false
-          write %{<bean:write name="#{elt}" property="#{a.java_Name}"/>,  }
+	  yield(a)
         }
-   struts_editWriteSelectAndAddLabel(field,elt,false) if emptySelection && withLabelOnly
+   struts_eachLabelField(field,false) { |a| yield(a) } if emptySelection && withLabelOnly
+end
+
+#add label 
+#use every property stereotpyed Label.
+#if none found, use every field
+def struts_editWriteSelectAndAddLabel(field,elt,withLabelOnly=true)
+	struts_eachLabelField(field,withLabelOnly) { |a|
+          write %{<bean:write name="#{elt}" property="#{a.java_Name}"/>,  }
+	}
 end
 
 def struts_edit_writeSelectAndAdd(field,owner)
@@ -552,12 +570,18 @@ end
 
 def struts_edit_writeFieldGenericIsCompo(field,owner,isMany,isCompo)
   return unless isCompo
-  before=""
-  after=""
+  before=''
+  after=''
+  beforeIsEmpty=''
+  afterIsEmpty=''
+  b=%{<logic:empty name="#{owner.java_Name}StrutsForm" property="reference.#{field.java_Name}">\n}
+  a=%{</logic:empty>\n}
   if !isMany
     # only display creater if adding one more is ok.
-    before=%{<logic:empty name="#{owner.java_Name}StrutsForm" property="reference.#{field.java_Name}">\n}
-    after=%{</logic:empty>\n}
+    before,after=b,a
+  else
+	  # display no element to display, only when collection is empty
+    beforeIsEmpty,afterIsEmpty=b,a
   end
 
   struts_encloseWrite( before,after) {
@@ -606,7 +630,8 @@ def struts_edit_writeFieldGenericIsCompo(field,owner,isMany,isCompo)
 	<div  style="color:#FF5400;background-color:#FAFCEB;" id='add#{field.java_NameBean}'>
 <a  onClick="javascript:hide_sel('#{field.java_Name}_createAndAdd');document.getElementById('Popup#{field.java_NameBean}').style.display='block';document.getElementById('add#{field.java_NameBean}').style.display='none';" >
 <img src="res//orange/image/plus.gif" alt="Add"  border="0" />
-</a>&nbsp;&nbsp;&nbsp;<bean:message key="label.helper.none"/>
+</a>
+#{beforeIsEmpty} &nbsp;&nbsp;&nbsp;<bean:message key="label.helper.none"/>#{afterIsEmpty}
 	</div>
 
 END
@@ -653,6 +678,8 @@ def struts_edit_writeFieldGeneric_DisplayTable(field,owner,isMany,isCompo)
   }
 end
 
+USE_PAGINATION=false
+
 def struts_edit_writeFieldGeneric_DisplayTable_displayTag(field,owner,isMany,isCompo)
   elt="elt_#{field.java_Name}"
   struts_encloseWrite(%{
@@ -674,10 +701,13 @@ def struts_edit_writeFieldGeneric_DisplayTable_displayTag(field,owner,isMany,isC
 		</a>
 	</display:column>
     },
-    %{</display:table>\n </div>
+    %{</display:table>\n 
+     #{%{<html:text property="#{field.java_Name}_strutsPage" size="40%" maxlength="2" />\n} if isMany && USE_PAGINATION} 
+</div>
 
     }) {
-    field.uml_type_one.struts_formAttribute.each { |a|
+    struts_eachLabelField(field) { |a|
+    #field.uml_type_one.struts_formAttribute.each { |a|
       next if a.uml_name_one=="id"
       next if a.uml_name_one=="owner"
       t=a.uml_type_one

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

@@ -30,7 +30,7 @@ END
       next unless biz.umlx_businessMethod?
       f=biz.java_Name
       write(%{
-function #{f}() {
+function #{biz.js_Name}() {
  document.forms[0].#{Muml_Class::STRUTS_DISPATCH_FIELD_NAME}.value="#{f}";
         document.forms[0].submit();
  }

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

@@ -24,8 +24,10 @@ module Mrdf_Repository
 <title>Index -- Generated with XMDA</title>
 </head>
 #{%{
-<%
-  #{java_getTenantClass.java_qualifiedName}  #{Muml_Classifier::TENANT_FIELD_NAME}=null;
+<%!
+  public #{java_getTenantClass.java_qualifiedName}  get#{Muml_Classifier::TENANT_FIELD_BEAN_NAME}() {
+      return null;
+  }
 %>} if context[:multiTenant] }
 
 <body >
@@ -75,12 +77,12 @@ END
 		pkg[p] << c
 		}
 	write %{<table border="1" style="border-style: ; border: gray; border-spacing:0px">}
-	write %{<tr bgcolor="#EEEEEE" width="10%"><td valign="center"><a name="index"/><h3>Package index</h3></td><td><ul>}
+	write %{<tr bgcolor="#EEEEEE"><td valign="center" width="10%"><a name="index"/><h3>Package index</h3></td><td><ul>}
 	pkg.keys.sort {|a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |p|
 		write %{<li><a href="##{p.java_qualifiedName}">#{p.java_qualifiedName}</a></li>  }
 		}
 	write "</ul></td></tr>"
-	pkg.keys.sort {|a,b| a.uml_name.to_s <=> b.uml_name.to_s }.each { |p|
+	pkg.keys.sort {|a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |p|
 		write %{<tr><td valign="center"><h3><a name="#{p.java_qualifiedName}"/><a href="#index">#{p.java_qualifiedName.gsub(/\./," .")}</a></h3></td><td><ul>}
 		pkg[p].sort { |a,b| a.uml_name.to_s <=> b.uml_name.to_s }.each {|c|
 			write <<END

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

@@ -19,7 +19,11 @@ end
 class DatatypeMappingText < DatatypeMapping
   def getJSP(datatype,field,owner)
     n=datatype.java_Name.downcase #TODO
-    return %{<html:text property="#{field.java_Name}" size="20%" maxlength="#{self.maxStringLength}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>}
+    if field.umlx_oneSide?
+	    return %{<html:text property="#{field.java_Name}" size="40%" maxlength="#{self.maxStringLength}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>}
+    else
+    	return %{<%-- one line per element in array --%><html:textarea cols="60" property="#{field.java_Name}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>}
+    end
   end
 end
 
@@ -27,7 +31,7 @@ class DatatypeMappingLargeText < DatatypeMappingText
   def getJSP(datatype,field,owner)
     n=datatype.java_Name.downcase #TODO
     #maxlength not supported by textarea
-    return %{<html:textarea property="#{field.java_Name}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>}
+    return %{<html:textarea cols="60" property="#{field.java_Name}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>}
   end
 end
 
@@ -36,7 +40,7 @@ class DatatypeMappingURL < DatatypeMappingText
     # cf: http://www.osix.net/modules/article/?id=586
     n=datatype.java_Name.downcase #TODO
     return <<END
-		 <html:text property="#{field.java_Name}" size="20%" maxlength="#{self.maxStringLength}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}  disabled="true"/>
+		 <html:text property="#{field.java_Name}" size="40%" maxlength="#{self.maxStringLength}" styleId="#{n}" #{::Muml_DataType::STRUTS_ERROR_STYLE}  disabled="true"/>
 
 		<a onclick="javascript:document.getElementById('#{n}').disabled=false;document.getElementById('#{n}').value='';;">
 		<img  src="res//orange/image/edit.gif" />
@@ -93,7 +97,7 @@ class DatatypeMappingTimeStamp < DatatypeMapping
     return <<END
  <xmda:dateText property="#{field.java_Name}" size="20%" maxlength="30" styleId="#{field.java_Name}Id" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>
  <script type="text/javascript">
-    function formatDate(cal) {
+    function formatDate_#{field.java_Name}(cal) {
         var date = cal.date;
         var field = document.getElementById("#{field.java_Name}");
         var locale = document.getElementById("#{field.java_Name}Locale").value;
@@ -105,7 +109,7 @@ class DatatypeMappingTimeStamp < DatatypeMapping
 		 localeField	  :	   "#{field.java_Name}Locale", //field containing locale (hidden)
 		 showsTime      :    true,
 		 timeFormat     :    "24",
-		 onUpdate       :    formatDate
+		 onUpdate       :    formatDate_#{field.java_Name}
 	 \});
  </script>
 END
@@ -121,7 +125,7 @@ class DatatypeMappingCalendar < DatatypeMapping
     return <<END
  <xmda:dateText isCalendar="true" property="#{field.java_Name}" size="20%" maxlength="#{self.maxStringLength}" styleId="#{field.java_Name}Id" #{::Muml_DataType::STRUTS_ERROR_STYLE}/>
  <script type="text/javascript">
-  function formatDate(cal) {
+  function formatDate_#{field.java_Name}(cal) {
         var date = cal.date;
         var field = document.getElementById("#{field.java_Name}");
         var locale = document.getElementById("#{field.java_Name}Locale").value;
@@ -130,7 +134,7 @@ class DatatypeMappingCalendar < DatatypeMapping
 	 Calendar.setup(\{
 		 inputField     :    "#{field.java_Name}Id",  // id of the input field
 		 localeField    :	   "#{field.java_Name}Locale", //field containing locale (hidden)
-		 onUpdate       :    formatDate
+		 onUpdate       :    formatDate_#{field.java_Name}
 	 \});
  </script>
 END

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

@@ -50,6 +50,17 @@ public #{java_getType} parse(final String str,final #{java_getType} nullCast ) {
 	}
 }
 
+public String getValidationRegexp() {
+	#{if !respond_to?(:getValidationRegexp)
+		%{throw new java.lang.RuntimeException("Method not implemented");}
+	elsif getValidationRegexp.nil?
+		%{return null;}
+	else
+	 	%{return "#{getValidationRegexp.source.java_stringEscape}";}
+	end
+	}
+}
+
 public String toString(final #{java_getType} elt) {
 	#{if respond_to?(:java_getJavaToString)
 	 	"return #{java_getJavaToString("elt")};"
@@ -61,7 +72,6 @@ public String toString(final #{java_getType} elt) {
 
 END
 	end
-
 	def java_helper_addMethods!(c)
 		return
 		m=c.umlx_createAndAddOperation(self.rdf_uri+"_parse","parse")
@@ -84,4 +94,8 @@ end
 
 class DatatypeMapping
 end
-
+class String
+	def java_stringEscape
+		return self.gsub(/\\/,'\\\\\\\\')
+	end
+end

data/lib/ontomde-java/version.rb

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

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

@@ -0,0 +1,329 @@
+# vmware vso integration 
+
+
+module Mrdf_Repository
+def vso_generateMapping
+	return if context[:vsoTargetFile,nil].nil?
+	mtk_context(:hideJavadocReverseTag => true,:reversedFiles=>[],:requireReverseExtensions=>[],:reverseGlobalMap=>{} ) {
+	mtk_writeSession(context[:vsoTargetFile]) {
+		vso_writeMapping
+	}}
+end
+
+def vso_writeMapping(tab="")
+	tab2=tab.tab
+	before=<<END 
+#{tab}<module 
+#{tab2}xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+#{tab2}xsi:noNamespaceSchemaLocation="http://vs-o.dunes.ch/plugin-3-2.xsd"
+#{tab2}name="#{context[:vsoPluginName,%{undefinedPluginName}]}" 
+#{tab2}version="#{context[:vsoPluginVersion,%{0000}]}" 
+#{tab2}build-number="#{Time.new().to_i() / 60 / 60}" 
+#{tab2}image="training-logo-32x32.png">
+#{tab2}<description>#{context[:vsoPluginDescription,%{no description available}]}\n(generated by ontomde v.#{Ontomde::Java::VERSION})</description>
+END
+	after=<<END
+#{tab}</module>
+#{tab}<!-- end of file -->
+END
+	encloseWrite(before,after) {
+		vso_writeFinderDataSources(tab2)
+		vso_writeInventory(tab2)
+		vso_writeFinders(tab2)
+		vso_writeScriptingObjects(tab2)
+		vso_writeEnumerations(tab2)
+	}
+
+end
+
+def vso_writeFinderDataSources(tab)
+	before="#{tab}<finder-datasources>\n"
+	after="#{tab}</finder-datasources>\n"
+	tab2=tab.tab
+	found=encloseWrite(before,after,true) {
+		vso_scriptingObjects.each { |so|
+			next unless  so.umlx_hasStereotype?('TFINDER')
+			write(%{#{tab2}<finder-datasource name="#{so.vso_DataSourceName}" adaptor-class="#{so.java_qualifiedName}" debug="true"/>\n})
+		}
+	}
+	write("<!-- WARNING: no finder-datasources found in model (ie: stereotype TFINDER) -->\n") unless found
+end
+
+def vso_writeInventory(tab)
+	found=encloseWrite(%{#{tab}<inventory type="},%{"/>\n},true) {
+		vso_scriptingObjects.each { |so|
+			next unless  so.umlx_hasStereotype?('TROOT')
+			write(so.java_Name)
+		}
+	}
+	write("<!-- WARNING: no inventory root found model (ie: stereotype TROOT) -->\n") unless found
+end
+
+def vso_writeFinders(tab)
+	before="#{tab}<finders>\n"
+	after="#{tab}</finders>\n"
+	tab2=tab.tab
+	encloseWrite(before,after) {
+		vso_scriptingObjects.sort { |a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |so|
+			so.vso_writeFinder(tab2)
+		}
+	}
+end
+
+def vso_writeScriptingObjects(tab)
+	before="#{tab}<scripting-objects>\n"
+	after="#{tab}</scripting-objects>\n"
+	tab2=tab.tab
+	encloseWrite(before,after) {
+		vso_scriptingObjects.sort { |a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |so|
+			so.vso_writeObjectMapping(tab2)
+		}
+	}
+end
+
+def vso_writeEnumerations(tab)
+	tab2=tab.tab
+	before="#{tab}<enumerations>\n"
+	after="#{tab}</enumerations>\n"
+	encloseWrite(before,after) {
+		write("#{tab2}<!-- dynamic enumeration(s) section -->\n")
+		write("#{tab2}<!-- static enumeration(s) section -->\n")
+		vso_enumerations.each { |so|
+			so.vso_writeEnumerationMapping(tab2)
+		}
+	}
+end
+
+#return a set of scripting objects
+def vso_scriptingObjects
+	ret=Set.new
+	uml_Class_all.each { |c|
+		next unless c.kind_of?(Muml_Class)
+		next if c.kind_of?(Muml_DataType)
+		#next unless
+		ret.add(c)	
+	}
+	return ret 
+end
+
+#
+def vso_enumerations 
+	ret=Set.new
+	uml_Class_all.each { |c|
+		# inner enumeration ??
+		if c.kind_of?(Muml_Enumeration)
+			ret.add(c)	
+		elsif c.kind_of?(Muml_Class)
+			c.uml_nestedClassifier.each { |c2|
+				if c2.kind_of?(Muml_Enumeration)
+					ret.add(c2) 
+				end
+			}
+		end
+		#next unless
+	}
+	return ret 
+end
+
+end
+module Muml_Element
+	def vso_writeJavadoc(tab)
+		m=mtk_stss { java_writeJavadoc }
+
+		uml_raisedException.each { |exception|
+			m=m+"\nthrows:#{exception.java_qualifiedName}"
+ 			} if respond_to?(:uml_raisedException)
+
+		if (!m.nil? && !m.empty?)
+		  m=m.gsub(/[ \t]*@.*$/,'').gsub(/^[\t *\/]*/,'').gsub(/\n\n*/,"\n").strip
+		end
+		if m.nil? || m.empty? || m=="\n"
+			write "#{tab}<description/>\n"
+		else
+			write "#{tab}<description>#{m}</description>\n"
+		end
+	end
+	def vso_writeObject(tab,params,&block) 
+		write(%{#{tab}<object script-name="#{java_Name}" java-class="#{java_qualifiedName}"#{" " unless params.empty?}#{params}#{%{ create="false"} if uml_isAbstract?}>\n})
+		tab2=tab.tab
+		vso_writeJavadoc(tab2)
+		yield(tab2)
+		write(%{#{tab}</object>\n})
+	end
+end
+module Muml_Class
+	def vso_ownedOperation
+		s=Set.new
+		umlx_ownedOperationHierarchical.each { |op|
+			s.add(op)	
+		}
+		return s
+	end
+
+	def vso_ownedAttribute
+		s=Set.new
+		umlx_ownedAttributeHierarchical.each { |op|
+			s.add(op)	
+		}
+		return s
+	end
+
+	def vso_writeObjectMapping(tab)
+		vso_writeObject(tab,"") { |tab2|
+			vso_writeConstructors(tab2)
+			vso_writeMethods(tab2)
+		}
+	end
+	def vso_writeConstructors(tab)
+		found=false
+		java_ownedOperation.sort { |a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |o| 
+				next unless o.umlx_isConstructor?
+				found=true
+		}
+		return unless found
+		tab2=tab.tab
+		tab3=tab2.tab
+		before="#{tab}<constructors>\n"
+		after="#{tab}</constructors>\n"
+		encloseWrite(before,after) {
+			java_ownedOperation.sort { |a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |o| 
+				next unless o.umlx_isConstructor?
+				encloseWrite("#{tab2}<constructor>\n","#{tab2}</constructor>\n") {
+					o.vso_writeJavadoc(tab3)
+					o.vso_writeOperationParameters(tab3)
+				}
+			}
+		}
+	end
+	def vso_writeMethods(tab)
+		tab2=tab.tab
+		before="#{tab}<methods>\n"
+		after="#{tab}</methods>\n"
+		encloseWrite(before,after) {
+			java_ownedOperation.sort { |a,b| a.java_qualifiedName.to_s <=> b.java_qualifiedName.to_s }.each { |o| 
+				next if o.umlx_isConstructor?
+				o.java_writeOperationMapping(tab2)
+			}	
+		}
+	end
+	def vso_writeFinder(tab)
+		tab2=tab.tab
+		isInventoryRoot=umlx_hasStereotype?('TROOT')
+		before=%{#{tab}<finder type="#{java_Name}" image="images/#{java_Name}.png" datasource="#{vso_DataSourceName}" script-object="#{java_Name}" hidden="#{isInventoryRoot ? 'true' : 'false'}">\n}
+		after="#{tab}</finder>\n"
+		encloseWrite(before,after) {
+			write(%{#{tab2}<id accessor="getId()"/>\n}) unless isInventoryRoot
+			vso_writeFinderInventoryChildren(tab2)
+			vso_writeFinderRelations(tab2)
+			vso_writeFinderProperties(tab2)
+		}
+
+	end
+	def vso_writeFinderInventoryChildren(tab)
+		tab2=tab.tab
+		before=%{#{tab}<inventory-children>\n}
+		after=%{#{tab}</inventory-children>\n}
+		encloseWrite(before,after,true) {
+			vso_ownedAttribute.each {|p|
+				next unless p.umlx_hasStereotype?("TCHILD")
+				write(%{#{tab2}<relation-link name="#{p.java_Name}"/>\n})
+			}
+		}
+	end
+	def vso_writeFinderRelations(tab)
+		tab2=tab.tab
+		before=%{#{tab}<relations>\n}
+		after=%{#{tab}</relations>\n}
+		encloseWrite(before,after,true) {
+			vso_ownedAttribute.each {|p|
+				next unless p.umlx_hasStereotype?("TCHILD")
+				write(%{#{tab2}<relation name="#{p.java_Name}" type="#{p.uml_type_one.java_Name}"/>\n})
+			}
+		}
+	end
+	def vso_writeFinderProperties(tab)
+		tab2=tab.tab
+		before=%{#{tab}<properties>\n}
+		after=%{#{tab}</properties>\n}
+		encloseWrite(before,after,true) {
+			vso_ownedAttribute.each {|p|
+				next unless p.umlx_hasStereotype?("TLABEL")
+				write(%{#{tab2}<property name="#{p.java_Name}" display-name="#{p.uml_name}" bean-property="#{p.java_Name}"/>\n})
+			}
+		}
+	end
+	def vso_DataSourceName
+		return "DS-DRASS"
+	end
+end
+
+module Muml_TypedElement
+	def vso_TypeName
+		return %{#{"[" unless self.umlx_upperValueIsOne?}#{self.uml_type_one.java_Name}}
+	end
+end
+
+module Muml_Operation
+	def java_writeOperationMapping(tab)
+		tab2=tab.tab
+		params=""
+		rt=umlx_returnResult_one0
+		params=%{return-type="#{rt.vso_TypeName}"} unless rt.nil?
+		before=%{#{tab}<method script-name="#{java_Name}" java-name="#{java_Name}"#{" " unless params.empty?}#{params}#{%{ static="true"} if uml_isStatic?}>\n} 
+		after=%{#{tab}</method>\n}
+		encloseWrite(before,after) {
+			vso_writeJavadoc(tab2)
+			vso_writeOperationParameters(tab2)
+		}
+
+	end
+	def vso_writeOperationParameters(tab)
+		tab2=tab.tab
+		before="#{tab}<parameters>\n"
+		after="#{tab}</parameters>\n"
+		notEmpty=encloseWrite(before,after,true) {
+			uml_ownedParameter.each { |p|
+					next if p.uml_direction_one.isReturn?
+					#array
+					write(%{#{tab2}<parameter type="#{p.vso_TypeName}" name="#{p.java_Name}"/>\n})
+			}
+		}
+		write("#{tab}<parameters/>\n") unless notEmpty 
+	end
+end
+
+module Muml_Interface
+	def vso_writeObjectMapping(tab2)
+		vso_writeObject(tab,"") { |tab2|
+			vso_writeConstructors(tab2)
+			vso_writeMethods(tab2)
+		}
+	end
+end
+class String
+	def tab
+		return self+'  '
+	end
+end
+
+module Muml_Enumeration
+	def vso_writeEnumerationMapping(tab)
+		tab2=tab.tab
+		tab3=tab2.tab
+		encloseWrite(
+			%{#{tab}<enumeration type="#{self.java_qualifiedName}">\n},
+			%{#{tab}</enumeration>\n}) {
+			
+			vso_writeJavadoc(tab2)
+			#write(%#{tab2}<url></url>\n})	
+			encloseWrite(%{#{tab2}<entries>\n},%{#{tab2}</entries>\n}) {
+				i=0
+				java_ownedLiteral.each {|e|
+					i=i+1
+					write(%{#{tab3}<entry id="#{i}" name="#{e.java_Name}"/>\n})
+					#TODO: comment ?
+				}
+			}
+		}
+	end
+end