ontomde-uml2-struts 1.0.4 → 1.0.6

data/Rakefile

@@ -1,10 +1,10 @@
 # -*- ruby -*-
 
 require 'rubygems'
-require 'hoe'
+require 'ontomde-hoe'
 require './lib/ontomde-uml2-struts/version.rb'
 
-Hoe.new('ontomde-uml2-struts', Ontomde::Uml2::Struts::VERSION) do |p|
+OntomdeHoe.new('ontomde-uml2-struts', Ontomde::Uml2::Struts::VERSION) do |p|
   p.rubyforge_name = 'ontomde'
   p.author = 'Stephane (Pierre) Carrie'
   p.email = 'stephanepierre.carrie@orange-ftgroup.com'

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

@@ -190,30 +190,6 @@ module Muml_Classifier
 		return false
 	end
 
-
-#	def struts_addDateFormater!(form)
-#		if struts_typeIsUsed?("date")
-#			df=form.umlx_createAndAddProperty("#{rdf_uri}_dfCalendar",STRUTS_DATE_FORMATER_INSTANCE);
-#			df.uml_type=form.umlx_getOrCreateClass('java.text.SimpleDateFormat');
-#			df.java_code='new java.text.SimpleDateFormat("yyyy/MM/dd",java.util.Locale.ENGLISH);'
-#			df.java_noAccessors=RDF_TRUE
-#                        df.uml_visibility=Cuml_VisibilityKind::Private
-#			df.uml_isStatic=RDF_TRUE #TODO : synchronized ??, (pb synchronisation)
-#			df.db_isTransient=RDF_TRUE
-#			df.java_isTransient=RDF_TRUE
-#		end
-#		if struts_typeIsUsed?("timestamp")
-#			df=form.umlx_createAndAddProperty("#{rdf_uri}_dfTimestamp",STRUTS_TIMESTAMP_FORMATER_INSTANCE);
-#			df.uml_type=form.umlx_getOrCreateClass('java.text.SimpleDateFormat');
-#			df.java_code='new java.text.SimpleDateFormat("yyyy/MM/dd HH:mm:ss",java.util.Locale.ENGLISH);'
-#			df.java_noAccessors=RDF_TRUE
-#                        df.uml_visibility=Cuml_VisibilityKind::Private
-#			df.uml_isStatic=RDF_TRUE #TODO : synchronized ??, (pb synchronisation)
-#			df.db_isTransient=RDF_TRUE
-#			df.java_isTransient=RDF_TRUE
-#		end
-#	end
-
 	def struts_addInitFrom!
 		form=struts_actionForm_one
 		inf=form.umlx_createAndAddOperation(form.rdf_uri+"_initFrom","initFrom")
@@ -307,7 +283,7 @@ module Muml_Property
 			struts_addActionFormAttributeReference!(form)
 
 		end
-			#TODO: ajouter autres propri�t�s
+			#TODO: ajouter autres proprietes
 	end
 
 
@@ -355,7 +331,6 @@ module Muml_Property
 //
 //	//#{self.umlx_manySide? ? "" : %{lvb=new #{STRUTS_LVB}("--","empty");
 //	//ret.add(lvb);}  }
-
 //	return #{form.struts_getFormHelper.java_qualifiedName}.#{STRUTS_FORM_HELPER_ENUMTOLVB}(#{self.uml_type_one.java_qualifiedName}.class,(#{self.uml_type_one.java_qualifiedName})null,getReference().get#{self.java_NameBean}Sug());
 
 	for (#{self.uml_type_one.java_qualifiedName} item : getReference().get#{self.java_NameBean}Sug()) {
@@ -391,41 +366,23 @@ ENDJAVA
 
 end
 
-#module Muml_DataType
-	#contains regexp for string representation of corresponding type
-	#obsolete!
-	#STRUTS_PRIMITIVE_TYPE_REGEXP=Hash.new()
-#end
-
-
 module Muml_Element
 STRUTS_FORM_HELPER="xmda.struts.FormHelper"
 STRUTS_FORM_HELPER_ENUMTOLVB="enumToLvb"
 
 STRUTS_DATE_FORMATER_INSTANCE=STRUTS_FORM_HELPER+'.DfCalendar'
 STRUTS_TIMESTAMP_FORMATER_INSTANCE=STRUTS_FORM_HELPER+'.DfTimestamp'
-def struts_getFormHelper
-		helper=umlx_getOrCreateClass(STRUTS_FORM_HELPER)
-		if(helper.java_customCode.empty?)
-			helper.apaCom_addLogger!
-			helper.umlx_external=RDF_FALSE
-			#helper.java_import_add(STRUTS_LVB)
-			helper.db_isTransient=RDF_TRUE
-			helper.struts_isForm=RDF_FALSE
-			helper.java_customCode= %{
-
+                             
+STRUTS_FORM_HELPER_CODE= <<ENDCODE
      public static final java.text.SimpleDateFormat DfTimestamp=new java.text.SimpleDateFormat("yyyy/MM/dd HH:mm:ss",java.util.Locale.ENGLISH);
      public static final java.text.SimpleDateFormat DfCalendar=new java.text.SimpleDateFormat("yyyy/MM/dd",java.util.Locale.ENGLISH);
 
-
-
-
 	/**
 	 * Transform a timestamp date to its GMT equivalent date.
 	 *
 	 * @param fromTimeZone
 	 * @param timestampToTransform
-	 * @return
+	 * @return date in GMT
 	 */
 	public static java.util.Date transformFromCurrentTZToGMT(final java.util.TimeZone fromTimeZone,final  java.util.Date timestampToTransform) {
 		// the offset of this time zone from UTC.
@@ -474,9 +431,19 @@ public static java.util.List<#{STRUTS_LVB}> #{STRUTS_FORM_HELPER_ENUMTOLVB}(fina
 		throw(e);
 	}
 			}
-	}
-	end
-	return helper;
+ENDCODE
+  
+        def struts_getFormHelper
+		helper=umlx_getOrCreateClass(STRUTS_FORM_HELPER)
+		if(helper.java_customCode.empty?)
+			helper.apaCom_addLogger!
+			helper.umlx_external=RDF_FALSE
+			#helper.java_import_add(STRUTS_LVB)
+			helper.db_isTransient=RDF_TRUE
+			helper.struts_isForm=RDF_FALSE
+			helper.java_customCode= STRUTS_FORM_HELPER_CODE
+		end
+		return helper;
 	end
 end
 

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

@@ -429,7 +429,7 @@ def struts_jspEdit_write_Operation
     next unless biz.umlx_businessMethod?
     next if biz.struts_bizOperationReverse.empty?
 
-    #TODO:r�cuperer le nom MPC par navigation!
+    #TODO:recuperer le nom MPC par navigation!
 
     #<html:form action="/#{self.java_Name}#{biz.java_Name}MPC-new.do">
     #<html:id>
@@ -459,33 +459,6 @@ end
 
 end
 
-###moved to helpermodule Muml_Enumeration
-###moved to helper	def struts_edit_writeField(field,owner)
-###moved to helper#	write %{
-###moved to helper#<html:select property="#{field.java_Name}">
-###moved to helper# <html:optionsCollection property="#{field.java_Name}Sug"/>
-###moved to helper#</html:select>
-###moved to helper#	}
-###moved to helper#TODO: utiliser le suggester
-###moved to helperwrite %{<html:select property="#{field.java_Name}">\n}
-###moved to helperfield.uml_type_one.uml_ownedLiteral.each { |ol|
-###moved to helper	write %{ <html:option value="#{ol}" key="#{field.uml_type_one.java_qualifiedName}.#{ol}"/>\n}
-###moved to helper	}
-###moved to helperwrite %{</html:select>\n}
-###moved to helper
-###moved to helper#elt="#{field.java_Name}_eltSsug"
-###moved to helper#write %{
-###moved to helper#<%-- TODO  (retrieve label from ressource for localization)
-###moved to helper# <html:select property="#{field.java_Name}">
-###moved to helper# <logic:iterate id="#{elt}" name="org.apache.struts.taglib.html.BEAN" property="#{field.java_Name}Sug">
-###moved to helper#  <%= TagUtils.getInstance().message(pageContext, bundle, locale, key); %>
-###moved to helper#
-###moved to helper#  <html:option value="value">#{field.uml_type_one.java_qualifiedName}.<bean:write name="#{elt}" property="label"/></html:option>
-###moved to helper# </logic:iterate>
-###moved to helper#</html:select> --%>
-###moved to helper#		}
-###moved to helper	end
-###moved to helperend
 module Muml_DataType
 #error style used for form fields
 STRUTS_ERROR_STYLE=%{errorStyle="background-color: yellow"}
@@ -528,18 +501,31 @@ def struts_edit_writeFieldMany(field,owner)
   struts_edit_writeFieldGeneric(field,owner,true,false)
   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)
+  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_type_one.kind_of?(Muml_Class)
+          next if withLabelOnly && !(a.umlx_hasStereotype?("label"))
+          emptySelection=false
+          write %{<bean:write name="#{elt}" property="#{a.java_Name}"/>,  }
+        }
+   struts_editWriteSelectAndAddLabel(field,elt,false) if emptySelection && withLabelOnly
+end
+
 def struts_edit_writeSelectAndAdd(field,owner)
   return if field.uml_isReadOnly?
   elt="#{field.java_Name}_add"
   struts_encloseWrite( %{<select name="#{field.java_Name}_add" onchange="add#{field.java_NameBean}(value);"> \n<option>--</option>\n} ,%{</select>\n}) {
     struts_encloseWrite( %{<logic:iterate id="#{elt}" name="#{owner.java_Name}StrutsForm" property="reference.#{field.java_Name}Sug" >\n} ,%{</logic:iterate>}) {
       struts_encloseWrite( %{ <option value="<bean:write name="#{elt}" property="id"/>">\n},%{ </option> \n}) {
-        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_type_one.kind_of?(Muml_Class)
-          write %{<bean:write name="#{elt}" property="#{a.java_Name}"/>,  }
-        }}}}
+        struts_editWriteSelectAndAddLabel(field,elt)
+      }}}
 end
 
 def struts_edit_writeFieldManyCompo(field,owner)
@@ -805,7 +791,6 @@ def struts_edit_writeHelpToggle
   if uml_ownedComment.empty?
     write %{<img src="#{css_path_model}/#{css_color_class}/image/vide.gif" width="25" height="25" border="0" alt="" />\n}
   else
-
     write %{<img src="#{css_path_model}/#{css_color_class}/image/btnHelp.gif" width="25" height="25" border="0" alt="help" onclick='togglehelp("#{java_Name}")' />\n}
   end
 
@@ -854,6 +839,7 @@ def struts_edit_writeFieldGeneric_DisplayTable_displayTag_column(prop)
   prop.write %{<display:column property="#{prop.java_Name}" titleKey="#{prop.umlx_owner_one.java_qualifiedName}.#{prop.java_Name}" decorator="xmda.displayTag.extensions.I18nCalendarColumnDecorator" />\n}
 end
 end
+
 class JavaMappingTimeStamp < JavaMapping
 def struts_edit_writeFieldGeneric_DisplayTable_displayTag_column(prop)
   #Note: Because Calendar and TimeStamp share the same java type (java.util.Date)
@@ -862,5 +848,12 @@ def struts_edit_writeFieldGeneric_DisplayTable_displayTag_column(prop)
 end
 end
 
+class JavaMappingGRAPHVIZ < JavaMappingLargeText
+  def struts_edit_writeFieldGeneric_DisplayTable_displayTag_column(prop)
+    #we don't display graphviz into table (but we could)
+    prop.write %{<%-- skip graphviz field #{prop.java_Name} --%>\n}
+  end
+end
+
 
 

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

@@ -36,7 +36,7 @@ class JavaMappingURL < JavaMappingText
     # 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}  value="http://www.exemple.com"  disabled="true"/>
+		 <html:text property="#{field.java_Name}" size="20%" 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" />

data/lib/ontomde-uml2-struts/version.rb

@@ -1,7 +1,7 @@
 module Ontomde
   module Uml2
     module Struts
-      VERSION = '1.0.4'
+      VERSION = '1.0.6'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ontomde-uml2-struts
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors: 
 - Stephane (Pierre) Carrie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-03 00:00:00 +01:00
+date: 2008-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
+        version: 1.0.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: ontomde-uml2-apaCom
@@ -28,16 +28,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.0.6
     version: 
 description: "ontomde-uml2-struts is library for generating a struts application.  == SYNOPSIS:  use commande line provided in ontomde-uml2-javaFrontEnd.  == INSTALL:"
 email: stephanepierre.carrie@orange-ftgroup.com