ontomde-java 2.0.0 → 2.0.4

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

@@ -9,7 +9,7 @@ class String
     # 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|
-      res.write("   * #{line}".tr("\n"," ").rstrip)
+      res.write("\t * #{line}".tr("\n"," ").rstrip)
       res.write("\n")
     }
   end
@@ -27,13 +27,13 @@ module Muml_Classifier
       sep="\n"
     }
     mtk_protected(Mrdf_Resource::NOREVERSE,"javadoc",context[:hasGlobalReverse]||context[:hideJavadocReverseTag]) {
-      write("    /**\n");
+      write("\t/**\n");
       c.java_writeJavadoc(self)
       #Note: RSM exports adds an extraneous http://
       #Note: TODO: This code is RSM 6 specific
       %{@see <a href="#{context[:rsm6WebDocURI]}#{UriNamespace.instance.unalias(rdf_uri).gsub(/http:\/\/kb#/,"")}-content.html">UML documentation.</a>}.java_writeJavadoc(self) unless context[:rsm6WebDocURI].empty?
 
-      write("    */\n")
+      write("\t */\n")
     }
   end
 end
@@ -64,13 +64,18 @@ module Muml_Property
       sep="\n"
     }
     mtk_protected(Mrdf_Resource::NOREVERSE,"javadoc",context[:hasGlobalReverse]||context[:hideJavadocReverseTag]) {
-      write("    /**\n");
+      s=mtk_stss {
       c.java_writeJavadoc(self)
       #Note: RSM exports adds an extraneous http://
       #Note: TODO: This code is RSM 6 specific
-      %{@see <a href="#{context[:rsm6WebDocURI]}#{UriNamespace.instance.unalias(rdf_uri).gsub(/http:\/\/kb#/,"")}-content.html">UML documentation.</a>}.java_writeJavadoc(self) unless context[:rsm6WebDocURI].empty?
+#      %{@see <a href="#{context[:rsm6WebDocURI]}#{UriNamespace.instance.unalias(rdf_uri).gsub(/http:\/\/kb#/,"")}-content.html">UML documentation.</a>}.java_writeJavadoc(self) unless context[:rsm6WebDocURI].empty?
 
-      write("    */\n")
+      }
+	if(!s.nil? && !s.empty?) 
+      write("\t/**\n");
+      write(s)
+      write("\t */\n")
+	end
     }
   end
 end
@@ -100,7 +105,6 @@ module Muml_Operation
   
   #internal write javadoc
   def java_writeJavadoc_internal
-    write("    /**\n");
     hasDoc=false
 
     #	if !java_getter_property.empty? && !java_getter_property_one.uml_isDerived?
@@ -109,7 +113,7 @@ module Muml_Operation
     #	if !java_setter_property.empty? && !java_setter_property_one.uml_isDerived?
     #		"setter for property {@link #{java_setter_property_one.java_javadocLink}}".java_writeJavadoc(self)
     #	end
-
+    s=mtk_stss {
     p=java_getter_property_one0
     if !p.nil?
       oe=p.umlx_otherEnd
@@ -122,6 +126,10 @@ module Muml_Operation
     end
 
 
+    umlx_autoImplementedBy.each {|x|
+	 %{@see #{x.java_javadocLink(self)}}.java_writeJavadoc(self)
+    }
+
     if !uml_ownedComment.empty?
       #write("* @return the \n");
       uml_ownedComment.each { |comment|
@@ -140,26 +148,31 @@ module Muml_Operation
     #if(!hasDoc)
     #	"TODO: document this element in source UML model".java_writeJavadoc(self)
     #end
+    
+    if !java_setter_property.empty?
+      hasDoc=true
+      p=java_setter_property_one
+      if !p.java_AttributeGlobalGetter.empty?
+        "@see #{p.java_AttributeGlobalGetter_one.java_javadocLink}".java_writeJavadoc(self)
+      end
+    end
 
-    uml_ownedParameter.each { |p|
+    }
+    if(!s.nil? && !s.empty?) 
+	    write("\t/**\n");
+	    write(s)
+ uml_ownedParameter.each { |p|
       c=""
       p.uml_ownedComment.each { |comment|
         c="#{c} #{comment.uml_body_one}"
       }
       c=" self-explanatory"
       #next if c.empty? &&  p.uml_direction_one.isReturn?
-      "#{p.uml_direction_one.isReturn? ? %{@return} : %{@param}} #{p.java_Name unless p.uml_direction_one.isReturn?}#{c}".java_writeJavadoc(self)
+      "#{p.uml_direction_one.isReturn? ? %{@return}: %{@param }}#{p.java_Name unless p.uml_direction_one.isReturn?}#{c}".java_writeJavadoc(self)
     }
-
-    if !java_setter_property.empty?
-      hasDoc=true
-      p=java_setter_property_one
-      if !p.java_AttributeGlobalGetter.empty?
-        "@see #{p.java_AttributeGlobalGetter_one.java_javadocLink}".java_writeJavadoc(self)
-      end
+	    write("\t */\n")
     end
 
-    write("    */\n")
   end
 end
 
@@ -172,9 +185,9 @@ module Muml_EnumerationLiteral
     }
     mtk_protected(Mrdf_Resource::NOREVERSE,"javadoc",context[:hasGlobalReverse]||context[:hideJavadocReverseTag]) {
       unless c.empty?
-        write("    /**\n");
+        write("\t/**\n");
         c.java_writeJavadoc(self)
-        write("    */\n")
+        write("\t */\n")
       end
     }
   end
@@ -235,13 +248,13 @@ module Mrdf_Repository
         break
       }
       mtk_writeSession(fn) {
-        write("/**\n")
+        write("\t/**\n")
         packageSet.each { |package|
           package.uml_ownedComment.each { |comment|
             comment.uml_body_one.java_writeJavadoc(self)
           }
         }
-        write("**/\n\n")
+        write("\t */\n\n")
         write("package #{packageName};\n")
       }
     }

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

@@ -59,6 +59,9 @@ module Mrdf_Repository
         mpc.db_isTransient=RDF_TRUE
         mpc.java_addTenantField!
 
+	# propagate template parameters 
+	mpc.uml_ownedTemplateSignature=c.uml_ownedTemplateSignature unless c.uml_ownedTemplateSignature.empty?
+
         m=mpc.umlx_createAndAddOperation(mpc.rdf_uri+"merge","merge");
         #TODO merge referenced items
         m.java_code="return this; "
@@ -70,6 +73,16 @@ module Mrdf_Repository
       }}
   end
 end
+module Muml_Property
+	def java_isMethodToClassReturn?
+		return uml_name.to_s==Muml_Classifier::STRUTS_RESULT_PARAM_NAME
+	end
+	def java_isMethodToClassApplyToOrReturn?
+		s=uml_name.to_s
+		return (s==Muml_Classifier::STRUTS_APPLY_TO_PARAM || s==Muml_Classifier::STRUTS_RESULT_PARAM_NAME)
+	end
+
+end
 module Muml_Classifier
   # source business operation from which this class was generated.
   rdf_safe_attr_reader_many :struts_bizOperation

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

@@ -31,6 +31,9 @@ module Mrdf_Repository
     uml_Class_all.each {|c|
       next unless c.umlx_businessMethod?
       next if c.kind_of?(Muml_Interface)
+      rns=c.umlx_rootNamespace_one0
+      next if (!rns.nil?)&& (rns.java_Name.to_s!='domain')
+
       cn="#{c.java_qualifiedName}.class"
       c.uml_ownedOperation.each  {|op|
         next unless op.umlx_businessMethod?
@@ -139,6 +142,10 @@ ENDHELP
       
       next if c.kind_of?(Muml_Interface)
       cn="#{c.java_qualifiedName}.class"
+
+      rns=c.umlx_rootNamespace_one0
+      next if (!rns.nil?)&& (rns.java_Name.to_s!='domain')
+
       c.uml_ownedAttribute.each  {|op|
         #next unless op.umlx_businessMethod?
         #operation was generated from an interface
@@ -205,6 +212,7 @@ END
     uml_Class_all.each {|c|
       #sec=false
       next if c.kind_of?(Muml_Interface) || c.kind_of?(Muml_Enumeration)
+      next if c.umlx_hasStereotype?('DTO')
       c.uml_ownedOperation.each {|o|
         next unless o.umlx_isSecured? 
         o.java_annotation_add(JAVA_SECURE_ANNOTATION)
@@ -234,8 +242,8 @@ ENDHELP
   
   #method default implementation
   JAVA_GETSTATIC_ROLE_CODE=<<ENDROLECODE
-//return empty list (every static role are denied)
-return new java.util.HashSet<#{Mrdf_Repository::JAVA_GLOBAL_ACCESS_CONTROL_ENUM}>();
+		//return empty list (every static role are denied)
+		return new java.util.HashSet<#{Mrdf_Repository::JAVA_GLOBAL_ACCESS_CONTROL_ENUM}>();
 ENDROLECODE
   
   # Adds methods which returns computed grants to user.

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

@@ -33,59 +33,67 @@ module Muml_Classifier
   rdf_safe_attr_reader_many :java_FSMContext
   #State of the StateMachine
   rdf_safe_attr_reader_many :java_FSMState
-  
+  #list of states
+  rdf_safe_attr_reader_many :java_enumState
+   
   def java_addStateManagement
     
       fsmState = self.java_FSMState_one
       fsmContext = self.java_FSMContext_one
-      
+     
+
+
       #TODO Corriger le bug avec JPA qui emp�che de rajouter cette interface
 #      typecomp=umlx_getOrCreateInterface("xmda.fsm.FsmComponent<#{fsmContext.java_qualifiedName}>")
 #      typecomp.java_isGeneric=RDF_TRUE
 #      umlx_createAndAddImplementation(typecomp)
       
-      fsm=umlx_createAndAddProperty(rdf_uri+"_fsm", "fsmCtx")
+      fsm=umlx_createAndAddProperty(rdf_uri+'_fsm', 'fsmCtx')
       fsm.uml_type=java_FSMContext_one
       fsm.db_isTransient=RDF_TRUE
       fsm.uml_visibility=::Cuml_VisibilityKind::Private
-      fsm.java_annotation_add("@javax.persistence.Transient")
+      fsm.java_annotation_add('@javax.persistence.Transient')
+
       get=java_addGlobalGetter!(fsm)
       get.java_code=<<CODE
-      if (fsmCtx==null || getPersistedState().compareToIgnoreCase(fsmCtx.getState().getName()) != 0) {
-        saasAdministration.fsm.MDAaasApplicationInstanceState currentState = saasAdministration.fsm.MDAaasApplicationInstanceState.findStateByName(getPersistedState());
-        fsmCtx = new saasAdministration.fsm.MDAaasApplicationInstanceFSMContext(this, currentState);
+      if (fsmCtx==null || getPersistedState().toString().compareToIgnoreCase(fsmCtx.getState().getName()) != 0) {
+        #{fsmState.java_qualifiedName} currentState = #{fsmState.java_qualifiedName}.findStateByName(getPersistedState().toString());
+        fsmCtx = new #{fsmContext.java_qualifiedName}(this, currentState);
       }
       return fsmCtx;
 
 CODE
   
-      persState=umlx_createAndAddProperty(rdf_uri+"_state", "persistedState")
-      persState.uml_type=umlx_dataType_string
+      persState=umlx_createAndAddProperty(rdf_uri+'_state', 'persistedState')
+      persState.uml_type=fsmContext.java_enumState_one#umlx_dataType_string
       persState.uml_visibility=::Cuml_VisibilityKind::Private
+
+      java_addAccessorsFor!(persState)
       java_addGlobalSetter!(persState)
       getState=java_addGlobalGetter!(persState)
       getState.java_code=<<CODE
-      if (persistedState==null || persistedState.length()<=0) {
-          fsmCtx = new saasAdministration.fsm.MDAaasApplicationInstanceFSMContext(this);
-          setPersistedState(fsmCtx.getState().getName());
+      if (persistedState==null) {
+          fsmCtx = new #{fsmContext.java_qualifiedName}(this);
+          setPersistedState(#{fsmContext.java_enumState_one.java_qualifiedName}.valueOf(fsmCtx.getState().getName()));
       }
       return persistedState;
 CODE
   
     
        # Gestion de la synchronisation du champ persistedState et fsmCtx transient   
-       ent=umlx_getOrCreateInterface("java.beans.PropertyChangeListener")
+       ent=umlx_getOrCreateInterface('java.beans.PropertyChangeListener')
        umlx_createAndAddImplementation(ent)
-       m=umlx_createAndAddOperation(rdf_uri+"_prop","propertyChange")
+       m=umlx_createAndAddOperation(rdf_uri+'_prop','propertyChange')
        m.uml_visibility=Cuml_VisibilityKind::Public
-       arg1=m.umlx_createAndAddParameter(m.rdf_uri+"_evt","evt")
+       arg1=m.umlx_createAndAddParameter(m.rdf_uri+'_evt','evt')
        arg1.uml_direction=Cuml_ParameterDirectionKind::In
        arg1.uml_upperValue=umlx_literal(1)
        arg1.uml_lowerValue=umlx_literal(1)    
-       arg1.uml_type=umlx_getOrCreateInterface("java.beans.PropertyChangeEvent")
+       arg1.uml_type=umlx_getOrCreateInterface('java.beans.PropertyChangeEvent')
        m.java_code=<<CODE
         #{fsmState.java_qualifiedName} newState = (#{fsmState.java_qualifiedName}) evt.getNewValue();
-        setPersistedState(newState.getName());
+        setPersistedState(#{fsmContext.java_enumState_one.java_qualifiedName}.valueOf(newState.getName()));
+        //setPersistedState(newState.getName());
 CODE
 
   end
@@ -100,11 +108,11 @@ CODE
   def java_getOrCreateOperationForTransition(t)
     opForT = findOperationByName("#{t.uml_name}")
     if opForT.nil?
-         opForT=umlx_createAndAddOperation(rdf_uri+"_#{t.uml_name}","#{t.uml_name}")
+         opForT=umlx_createAndAddOperation(rdf_uri+"_#{t.rdf_uri.str_to_uri}","#{t.uml_name}")
          opForT.uml_visibility=Cuml_VisibilityKind::Public
          opForT.umlx_businessMethod=RDF_TRUE
     end
-    opForT.java_annotation_add("@xmda.fsm.StateMachineTransition")
+    opForT.java_annotation_add('@xmda.fsm.StateMachineTransition')
     opForT.java_isFsmOperation=true
     opForT.java_code=<<CODE
          getFsmCtx().#{opForT.java_Name}();
@@ -114,7 +122,7 @@ end
 module Muml_FinalState
   def fsm_name
     n=uml_name_one0
-    return n.nil? ? "Final" : n
+    return n.nil? ? 'Final' : n
   end
 end
 module Muml_Pseudostate
@@ -125,10 +133,10 @@ module Muml_Pseudostate
       self.uml_outgoing.each { |t|
          fsmState = myClazz.java_FSMState_one
          fsmContext = myClazz.java_FSMContext_one
-         construct=fsmContext.umlx_createAndAddOperation(fsmState.rdf_uri+"_constructor","constructor")
-         construct.uml_appliedStereotype_add(fsmContext.umlx_getOrCreateStereotype("Create"))
+         construct=fsmContext.umlx_createAndAddOperation(fsmState.rdf_uri+'_constructor','constructor')
+         construct.uml_appliedStereotype_add(fsmContext.umlx_getOrCreateStereotype('Create'))
          construct.uml_visibility=Cuml_VisibilityKind::Public
-         arg1=construct.umlx_createAndAddParameter(construct.rdf_uri+"_owner","owner")
+         arg1=construct.umlx_createAndAddParameter(construct.rdf_uri+'_owner','owner')
          arg1.uml_direction=Cuml_ParameterDirectionKind::In
          arg1.uml_upperValue=fsmState.umlx_literal(1)
          arg1.uml_lowerValue=fsmState.umlx_literal(1)    
@@ -140,15 +148,15 @@ module Muml_Pseudostate
         #{fsmState.java_qualifiedName}.#{t.uml_target_one.java_Name.downcase}state.Entry(this);
 CODE
 
-         construct2=fsmContext.umlx_createAndAddOperation(fsmState.rdf_uri+"_constructor2","constructor2")
-         construct2.uml_appliedStereotype_add(fsmContext.umlx_getOrCreateStereotype("Create"))
+         construct2=fsmContext.umlx_createAndAddOperation(fsmState.rdf_uri+'_constructor2','constructor2')
+         construct2.uml_appliedStereotype_add(fsmContext.umlx_getOrCreateStereotype('Create'))
          construct2.uml_visibility=Cuml_VisibilityKind::Public
-         arg3=construct2.umlx_createAndAddParameter(construct2.rdf_uri+"_owner","owner")
+         arg3=construct2.umlx_createAndAddParameter(construct2.rdf_uri+'_owner','owner')
          arg3.uml_direction=Cuml_ParameterDirectionKind::In
          arg3.uml_upperValue=fsmState.umlx_literal(1)
          arg3.uml_lowerValue=fsmState.umlx_literal(1)    
          arg3.uml_type=myClazz
-         arg2=construct2.umlx_createAndAddParameter(construct2.rdf_uri+"_initState","initState")
+         arg2=construct2.umlx_createAndAddParameter(construct2.rdf_uri+'_initState','initState')
          arg2.uml_direction=Cuml_ParameterDirectionKind::In
          arg2.uml_upperValue=fsmState.umlx_literal(1)
          arg2.uml_lowerValue=fsmState.umlx_literal(1)    
@@ -161,8 +169,9 @@ CODE
       
       }
     else
-      raise Warning.new,"PseudState not managed except ::Cuml_PseudostateKind::Initial"
+      raise Warning.new,'PseudState not managed except ::Cuml_PseudostateKind::Initial'
     end
+    return nil
   end
   
   def fsm_name
@@ -178,35 +187,50 @@ module Muml_Signal
 end
 module Muml_SignalTrigger
 end
+
+module Muml_Class
+  def getFSMPackage
+    myClazz=self
+    p=myClazz.umlx_package
+    p=p.umlx_getOrCreatePackage(myClazz.java_Name+'_fsm',p)
+    return p 
+  end
+end
+
 module Muml_State
   def processVertex(myClazz)
     # Generate the class for this state
-    p=myClazz.umlx_package
-    p=p.umlx_getOrCreatePackage("fsm",p)
+    p=myClazz.getFSMPackage
 
     fsmState = myClazz.java_FSMState_one
     fsmContext = myClazz.java_FSMContext_one
     
-    state=p.umlx_createAndAddClass(self.rdf_uri+"_State")
+    state=p.umlx_createAndAddClass(self.rdf_uri+'_State')
+    state.java_addSerialVersionUID!
     state.uml_name="#{self.java_Name}State"
     state.db_isTransient=RDF_TRUE    
     state.umlx_createAndAddGeneralization(fsmState)
-    construct=state.umlx_createAndAddOperation(state.rdf_uri+"_constructor","constructor")
-    construct.uml_appliedStereotype_add(state.umlx_getOrCreateStereotype("Create"))
+
+    enumState=fsmContext.java_enumState_one
+    lit=enumState.umlx_createAndAddLiteral(state.java_Name)
+    lit.java_initParameterValue_add("#{state.java_qualifiedName}.class")
+
+    construct=state.umlx_createAndAddOperation(state.rdf_uri+'_constructor','constructor')
+    construct.uml_appliedStereotype_add(state.umlx_getOrCreateStereotype('Create'))
     construct.uml_visibility=Cuml_VisibilityKind::Public
     construct.java_code=<<CODE
-          super("#{state.java_qualifiedName}");
+          super(#{enumState.java_qualifiedName}.#{lit.java_Name}.toString());
 CODE
 
-    pconst=fsmState.umlx_createAndAddProperty(state.rdf_uri+"_Const", "#{state.java_Name.downcase}")
-    pconst.java_noAccessors="true"
+    pconst=fsmState.umlx_createAndAddProperty(state.rdf_uri+'_Const', "#{state.java_Name.downcase}")
+    pconst.java_noAccessors=RDF_TRUE
     pconst.uml_type=state
     pconst.uml_visibility=Cuml_VisibilityKind::Public
     pconst.uml_isStatic=RDF_TRUE
-    pconst.java_isFinal="true"
-    pconst.java_code=<<CODE
-    new #{state.java_qualifiedName}();
-CODE
+#    pconst.java_isFinal="true"
+#    pconst.java_code=<<CODE
+#    new #{state.java_qualifiedName}();
+#CODE
 
     # Ajouter les m�thodes � la super classe State et au State concern�
     # Ajouter ou retrouver la m�thode de la classe m�re
@@ -214,9 +238,9 @@ CODE
           m = fsmState.findOperationByName("#{t.uml_name}")
           # Faire une seule fois (cas ou on a plusieurs transitions de m�me nom)
           if m.nil?
-              m=fsmState.umlx_createAndAddOperation(fsmState.rdf_uri+"_#{t.uml_name}","#{t.uml_name}")
+              m=fsmState.umlx_createAndAddOperation(fsmState.rdf_uri+"_#{t.rdf_uri}","#{t.uml_name}")
               m.uml_visibility=Cuml_VisibilityKind::Public
-              em=m.umlx_createAndAddParameter(m.rdf_uri+"_ctx","ctx")
+              em=m.umlx_createAndAddParameter(m.rdf_uri+'_ctx','ctx')
               em.uml_type=fsmContext
               em.uml_direction=Cuml_ParameterDirectionKind::In
               em.uml_upperValue=fsmState.umlx_literal(1)
@@ -225,20 +249,20 @@ CODE
           defaultBehavior(ctx);
 CODE
 
-              m3=fsmContext.umlx_createAndAddOperation(fsmContext.rdf_uri+"_#{t.uml_name}","#{t.uml_name}")
+              m3=fsmContext.umlx_createAndAddOperation(fsmContext.rdf_uri+"_#{t.rdf_uri.str_to_uri}","#{t.uml_name}")
               m3.uml_visibility=Cuml_VisibilityKind::Public
               m3.java_code=<<CODE
-            _transition = "#{t.uml_name}";
-            getState().#{t.uml_name}(this);
+            _transition = "#{m3.java_Name}";
+            getState().#{m3.java_Name}(this);
             _transition = null;
 CODE
               
              myClazz.java_getOrCreateOperationForTransition(t) 
 
           end
-          m2=state.umlx_createAndAddOperation(state.rdf_uri+"_#{t.uml_name}","#{t.uml_name}")
+          m2=state.umlx_createAndAddOperation(state.rdf_uri+"_#{t.rdf_uri.str_to_uri}","#{t.uml_name}")
           m2.uml_visibility=Cuml_VisibilityKind::Public
-          em2=m2.umlx_createAndAddParameter(m2.rdf_uri+"_ctx","ctx")
+          em2=m2.umlx_createAndAddParameter(m2.rdf_uri+'_ctx','ctx')
           em2.uml_type=fsmContext
           em2.uml_direction=Cuml_ParameterDirectionKind::In
           em2.uml_upperValue=state.umlx_literal(1)
@@ -250,7 +274,7 @@ CODE
 CODE
           
     }
-    
+    return state
   end
   def fsm_name
     n=uml_name_one0
@@ -265,22 +289,26 @@ module Muml_StateMachine
     muml=mrdf.umlx_reserved_model
     myClazz=mrdf.java_getClassWithQualifiedName("#{self.java_qualifiedName}")
     raise Warning.new,"No Class with the same bame as ths StateMachine #{self.java_qualifiedName} !!!!" if myClazz.nil?
-    p=myClazz.umlx_package
-    p=p.umlx_getOrCreatePackage("fsm",p)
+
+    p=myClazz.getFSMPackage
+
+    #p=myClazz.umlx_package
+    #p=p.umlx_getOrCreatePackage('fsm',p)
     
-    fsmCtx=umlx_getOrCreateClass("xmda.fsm.FSMContext")
-    fsmCtx.umlx_external="true"
-    fsmState=umlx_getOrCreateClass("xmda.fsm.State")
-    fsmState.umlx_external="true"
+    fsmCtx=umlx_getOrCreateClass('xmda.fsm.FSMContext')
+    fsmCtx.umlx_external=RDF_TRUE
+    fsmState=umlx_getOrCreateClass('xmda.fsm.State')
+    fsmState.umlx_external=RDF_TRUE
     
-    appFsmState=p.umlx_createAndAddClass(myClazz.rdf_uri+"_FSMState")
+    appFsmState=p.umlx_createAndAddClass(myClazz.rdf_uri+'_FSMState')
+    appFsmState.java_addSerialVersionUID!
     appFsmState.uml_name="#{myClazz.java_Name}State"
     appFsmState.db_isTransient=RDF_TRUE
     appFsmState.umlx_createAndAddGeneralization(fsmState)
     myClazz.java_FSMState = appFsmState
-    construct=appFsmState.umlx_createAndAddOperation(fsmCtx.rdf_uri+"_constructor","constructor")
-    construct.uml_appliedStereotype_add(appFsmState.umlx_getOrCreateStereotype("Create"))
-    arg1=construct.umlx_createAndAddParameter(construct.rdf_uri+"_name","name")
+    construct=appFsmState.umlx_createAndAddOperation(fsmCtx.rdf_uri+'_constructor','constructor')
+    construct.uml_appliedStereotype_add(appFsmState.umlx_getOrCreateStereotype('Create'))
+    arg1=construct.umlx_createAndAddParameter(construct.rdf_uri+'_name','name')
     arg1.uml_direction=Cuml_ParameterDirectionKind::In
     arg1.uml_upperValue=umlx_literal(1)
     arg1.uml_lowerValue=umlx_literal(1)    
@@ -290,26 +318,26 @@ module Muml_StateMachine
           super(name);
           allStates.put(getName(), this);
 CODE
-    pconst=appFsmState.umlx_createAndAddProperty(appFsmState.rdf_uri+"_AllConst", "allStates")
-    pconst.java_noAccessors="true"
-    typeconst=appFsmState.umlx_getOrCreateInterface("java.util.HashMap<String, #{appFsmState.java_qualifiedName}>")
-    typeconst.java_isGeneric=RDF_TRUE
+    pconst=appFsmState.umlx_createAndAddProperty(appFsmState.rdf_uri+'_AllConst', 'allStates')
+    pconst.java_noAccessors=RDF_TRUE
+    typeconst=appFsmState.umlx_getOrCreateGeneric("java.util.HashMap","String,#{appFsmState.java_qualifiedName}")
+    #typeconst.java_isGeneric=RDF_TRUE
     pconst.uml_type=typeconst
     pconst.uml_visibility=Cuml_VisibilityKind::Private
     pconst.uml_isStatic=RDF_TRUE
-    pconst.java_isFinal="true"
-    pconst.java_code=<<CODE
-    new #{typeconst.java_qualifiedName}();
-CODE
-    mfind=appFsmState.umlx_createAndAddOperation(appFsmState.rdf_uri+"_find","findStateByName")
+#    pconst.java_isFinal="true"
+#    pconst.java_code=<<CODE
+#    new #{typeconst.java_qualifiedName}();
+#CODE
+    mfind=appFsmState.umlx_createAndAddOperation(appFsmState.rdf_uri+'_find','findStateByName')
     mfind.uml_visibility=Cuml_VisibilityKind::Public
     mfind.uml_isStatic=RDF_TRUE
-    argfind=mfind.umlx_createAndAddParameter(mfind.rdf_uri+"_name","name")
+    argfind=mfind.umlx_createAndAddParameter(mfind.rdf_uri+'_name','name')
     argfind.uml_direction=Cuml_ParameterDirectionKind::In
     argfind.uml_upperValue=umlx_literal(1)
     argfind.uml_lowerValue=umlx_literal(1)    
     argfind.uml_type=umlx_dataType_string
-    rp=mfind.umlx_createAndAddParameter(mfind.rdf_uri+"_ret_param","return")
+    rp=mfind.umlx_createAndAddParameter(mfind.rdf_uri+'_ret_param','return')
     rp.uml_direction=Cuml_ParameterDirectionKind::Return
     rp.uml_upperValue=umlx_literal(1)
     rp.uml_lowerValue=umlx_literal(1)    
@@ -319,14 +347,31 @@ CODE
 CODE
 
      
-    appFsmCtx=p.umlx_createAndAddClass(myClazz.rdf_uri+"_FSMContext")
+    appFsmCtx=p.umlx_createAndAddClass(myClazz.rdf_uri+'_FSMContext')
+    appFsmCtx.java_addSerialVersionUID!
     appFsmCtx.uml_name="#{myClazz.java_Name}FSMContext"
     appFsmCtx.db_isTransient=RDF_TRUE
     appFsmCtx.umlx_createAndAddGeneralization(fsmCtx)
     myClazz.java_FSMContext = appFsmCtx
-    m=appFsmCtx.umlx_createAndAddOperation(fsmCtx.rdf_uri+"_ret","getState")
+    enumState=appFsmCtx.umlx_owner_one.umlx_createAndAddEnumeration(appFsmCtx.rdf_uri+"_fsmStateEnum",myClazz.uml_name_one.to_s+"_fsmStates")
+    enumState.umlx_createAndAddImplementation(enumState.java_getJavaEnumInterface)
+    enumState.umlx_createAndAddImplementation(umlx_getOrCreateInterface('xmda.fsm.FsmStateEnum'))
+    
+    enumState.java_customCode=<<ENDCUSTOM
+       	public Class<?> getStateClass() { 
+		return stateClass ;
+		}
+	Class<?> stateClass=null;
+	#{enumState.java_Name}(Class<?> x) {
+		stateClass=x;
+		}
+ENDCUSTOM
+    
+    appFsmCtx.java_enumState=enumState
+
+    m=appFsmCtx.umlx_createAndAddOperation(fsmCtx.rdf_uri+'_ret','getState')
     m.uml_visibility=Cuml_VisibilityKind::Public
-    rp=m.umlx_createAndAddParameter(m.rdf_uri+"_ret_param","return")
+    rp=m.umlx_createAndAddParameter(m.rdf_uri+'_ret_param','return')
     rp.uml_direction=Cuml_ParameterDirectionKind::Return
     rp.uml_upperValue=umlx_literal(1)
     rp.uml_lowerValue=umlx_literal(1)    
@@ -334,18 +379,32 @@ CODE
           m.java_code=<<CODE
           return (#{appFsmState.java_qualifiedName})_state;
 CODE
-    p2=appFsmCtx.umlx_createAndAddProperty(fsmState.rdf_uri+"_prop_owner", "owner")
+    p2=appFsmCtx.umlx_createAndAddProperty(fsmState.rdf_uri+'_prop_owner', 'owner')
     p2.uml_type=myClazz
     p2.uml_visibility=::Cuml_VisibilityKind::Private
     appFsmCtx.java_addGlobalGetter!(p2)
     appFsmCtx.java_addGlobalSetter!(p2)
 
+    codeBlocStatic = <<CODE
+    allStates = new #{typeconst.java_qualifiedName}();\n
+CODE
     uml_region.each { |reg|
       reg.uml_subvertex.each { |v|
-         v.processVertex(myClazz)
+         state = v.processVertex(myClazz)
+         if !state.nil?
+           # Ajouter l'initalisation de la propri�t� dans le bloc statique
+           codeBlocStatic << "#{state.java_Name.downcase} = new #{state.java_qualifiedName}();\n"
+         end
       }
     }
 
+    blocstatic=appFsmState.umlx_createAndAddOperation(appFsmState.rdf_uri+'_static','static_for_fsm')
+    blocstatic.uml_visibility=Cuml_VisibilityKind::Public
+    blocstatic.uml_isStatic=RDF_TRUE
+    blocstatic.java_code=codeBlocStatic
+    stereo = p.umlx_createAndAddStereotype(rdf_uri+'Create', 'Create')
+    blocstatic.uml_appliedStereotype = stereo
+    
     # Rajouter le contexte dans la classe
     myClazz.java_addStateManagement
     #Chercher ou la g�n�rer pour chaque transition
@@ -407,8 +466,12 @@ module Muml_VisibilityKind
 end
 module Mrdf_Repository
   def java_addStateMachine!()
+    s=Set.new
     each_value { |sm|
       next unless sm.kind_of?(Muml_StateMachine)
+      s.add(sm)
+    }
+    s.each  { |sm|
       sm.processStateMachine
     }
   end