move some definition from model to view

still working on refactoring of the view and from

move some definition from model to view
still working on refactoring of the view and from
totoro
1 parent 546d5e5d
Showing 30 changed files with 207 additions and 381 deletions Show diff stats
ds_files/ds_types.anubis
model/display.anubis
model/types/hk_app.anubis
model/types/hk_app_name.anubis
model/types/hk_database.anubis
model/types/hk_datetime_field_attr.anubis
model/types/hk_help_text.anubis
model/types/hk_icon.anubis
model/types/hk_int_choice.anubis
model/types/hk_int_choices.anubis
model/types/hk_model.anubis
model/types/hk_model_attr.anubis
model/types/hk_model_column.anubis
model/types/hk_model_field.anubis
model/types/hk_table.anubis
model/types/hk_text_choice.anubis
model/types/hk_text_choices.anubis
model/types/hk_text_field_attr.anubis
model/types/hk_display.anubis → view/types/hk_display.anubis
model/types/hk_edit_view.anubis → view/types/hk_edit_view.anubis
@@ -51,8 +51,8 @@ public define List(DS_Type)  hayamiki_lib_types_description =
       alternative("hk_table", [
         component(string, "name",         comment("name of the table")),
         component(string, "short_name",   comment("table name without app_name in prefix")),
-        component(extern_type("HK_Model", model_types+"hk_model.anubis"),   "model"),
-        component(extern_type("HK_Display", model_types+"hk_display.anubis"), "display")
+        component(extern_type("HK_Model",   model_types+"hk_model.anubis"),   "model"),
+        component(extern_type("HK_Display", view_types+ "hk_display.anubis"), "display")
       ])
     ]),
@@ -71,7 +71,7 @@ public define List(DS_Type)  hayamiki_lib_types_description =
         component(      extern_type("HK_Help_Text",   model_types+"hk_help_text.anubis"),    "help")
       ])
     ]),
-   
+    
     ds_type("HK_Model_Field", [
       enum("p_key"),
       enum("boolean_field", comment("true or false")),
@@ -169,20 +169,13 @@ public define List(DS_Type)  hayamiki_lib_types_description =
       enum("not_null"),
     ]),
-    ds_type("HK_Model_Column", [
-      alternative("hk_column", [
-        component(string, "name",  comment("name of ordinary column (i.e. all but 'id')")),
-        component(extern_type("HK_Model_Field", model_types+"hk_model_field.anubis"), "type"), 
-        component(list, extern_type("HK_Model_Attr", model_types+"hk_model_attr.anubis"), "attributes"),
-        component(extern_type("HK_Help_Text",  model_types+"hk_help_text.anubis"), "help")
-      ])
-    ]),
+
     //HK_DISPLAY
     ds_type("HK_Display", [
       alternative("hk_display", [
-        component(list, extern_type("HK_List_View", model_types+"hk_list_view.anubis"), "list_views"),
-        component(list, extern_type("HK_Edit_View", model_types+"hk_edit_view.anubis"), "list_edits"),
+        component(list, extern_type("HK_List_View", view_types+"hk_list_view.anubis"), "list_views"),
+        component(list, extern_type("HK_Edit_View", view_types+"hk_edit_view.anubis"), "list_edits"),
       ])
     ]),
@@ -205,39 +198,43 @@ public define List(DS_Type)  hayamiki_lib_types_description =
       ])
     ]),
-    ds_type("HK_Form_Table_Cell", [
+    ds_type("HK_Form_Table_Cell", no_message, [
       alternative("hk_form_table_cell", [
         component(extern_type("HK_Form_Entry", view_types+"hk_form_entry.anubis"), "form_entry")
       ])
     ]),
-    ds_type("HK_Form_Table_Line", [
+    ds_type("HK_Form_Table_Line", no_message, [
       alternative("hk_form_table_line", [
         component(list, extern_type("HK_Form_Table_Cell", view_types+"hk_form_table_cell.anubis"), "form_table_cells")
       ])
     ]),
-    ds_type("HK_Form_Table", [
+    ds_type("HK_Form_Table", no_message, [
       alternative("hk_form_table", [
         component(list, extern_type("HK_Form_Table_Line", view_types+"hk_form_table_line.anubis"), "form_lines")
       ])
     ]),
     ds_type("HK_Edit_View_Table_Cell", [
-      alternative("cell", [
+      enum("empty"),
+      alternative("column", [
         component(string, "column_name")
+      ]),
+      alternative("label", [
+        component(string, "label")
       ])
     ]),
     ds_type("HK_Edit_View_Table_Line", [
       alternative("line", [
-        component(list, extern_type("HK_Edit_View_Table_Cell", model_types+"hk_edit_view_table_cell.anubis"), "cells")
+        component(list, extern_type("HK_Edit_View_Table_Cell", view_types+"hk_edit_view_table_cell.anubis"), "cells")
       ])
     ]),
     ds_type("HK_Edit_View_Table", [
       alternative("table", [
-        component(list, extern_type("HK_Edit_View_Table_Line", model_types+"hk_edit_view_table_line.anubis"), "lines")
+        component(list, extern_type("HK_Edit_View_Table_Line", view_types+"hk_edit_view_table_line.anubis"), "lines")
       ])
     ]),
@@ -246,15 +243,15 @@ public define List(DS_Type)  hayamiki_lib_types_description =
       alternative("edit_view_list_form", [
         component(string, "view_name"),
         component(list, string, "columns"),
-        component(list, extern_type("HK_FK_View", model_types+"hk_fk_view.anubis"), "fk_view")
+        component(list, extern_type("HK_FK_View", view_types+"hk_fk_view.anubis"), "fk_view")
       ]),
       alternative("edit_view_table_form", [
         component(string, "view_name"),
-        component(extern_type("HK_Edit_View_Table", model_types+"hk_edit_view_table.anubis"), "form_table")
+        component(extern_type("HK_Edit_View_Table", view_types+"hk_edit_view_table.anubis"), "form_table")
       ])
     ]),
-    ds_type("HK_Form_Tab", [
+    ds_type("HK_Form_Tab", no_message, [
       alternative("hk_form_tab", [
         component(string, "fk_table_name"),
         component(string, "fk_col_name"),
@@ -11,10 +11,10 @@ transmit tools/basis.anubis
 transmit calexium_lib/CXM_message_constants.anubis
 transmit calexium_lib/web/CXM_json.anubis
-transmit hayamiki_lib/model/types/hk_display.anubis
-transmit hayamiki_lib/model/types/hk_list_view.anubis
-transmit hayamiki_lib/model/types/hk_edit_view.anubis
-transmit hayamiki_lib/model/types/hk_fk_view.anubis
+transmit hayamiki_lib/view/types/hk_display.anubis
+transmit hayamiki_lib/view/types/hk_list_view.anubis
+transmit hayamiki_lib/view/types/hk_edit_view.anubis
+transmit hayamiki_lib/view/types/hk_fk_view.anubis
 transmit hayamiki_lib/model/types/hk_icon.anubis
 public define HK_List_View
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -63,18 +63,18 @@ public define Maybe(HK_App)
       //Alternative hk_app
       if __type_alt__ = "hk_app" then //Alternative hk_app
         // [type = String] hk_app.app_name
-        if find_string(_hk_app_message, "app_name") is {failure then failure,  success(app_name) then
+        if find_string(_hk_app_message, "app_name") is {failure then failure,  success(_app_name_) then
         // [type = HK_Icon] hk_app.icon
-        if find_message(_hk_app_message, "icon") is {failure then failure,  success(icon_msg) then
-          if (Maybe(HK_Icon))from_Message(icon_msg)  is {failure then failure,  success(icon) then
+        if find_message(_hk_app_message, "icon") is {failure then failure,  success(_icon__msg) then
+          if (Maybe(HK_Icon))from_Message(_icon__msg)  is {failure then failure,  success(_icon_) then
         // [type = HK_Help_Text] hk_app.help
-        if find_message(_hk_app_message, "help") is {failure then failure,  success(help_msg) then
-          if (Maybe(HK_Help_Text))from_Message(help_msg)  is {failure then failure,  success(help) then
+        if find_message(_hk_app_message, "help") is {failure then failure,  success(_help__msg) then
+          if (Maybe(HK_Help_Text))from_Message(_help__msg)  is {failure then failure,  success(_help_) then
         // [type = List(HK_Table)] hk_app.hk_tables
         with mb_hk_tables = map_escape(( Message msg ) |-> (Maybe(HK_Table)) from_Message(msg), find_messages(_hk_app_message, "hk_tables")),
           if mb_hk_tables is {failure then failure,  success(hk_tables) then
-        success(hk_app(app_name, icon, help, hk_tables))
+        success(hk_app(_app_name_, _icon_, _help_, _hk_tables_))
       }}}}}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -64,9 +64,9 @@ public define Maybe(HK_App_Name)
       else //Alternative app_name
       if __type_alt__ = "app_name" then //Alternative app_name
         // [type = String] app_name.name
-        if find_string(_hk_app_name_message, "name") is {failure then failure,  success(name) then
+        if find_string(_hk_app_name_message, "name") is {failure then failure,  success(_name_) then
-        success(app_name(name))
+        success(app_name(_name_))
       }
       else //Alternative none (NO TYPE)
       if __type_alt__ = "none" then
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -55,12 +55,12 @@ public define Maybe(HK_Database)
       //Alternative hk_database
       if __type_alt__ = "hk_database" then //Alternative hk_database
         // [type = String] hk_database.name
-        if find_string(_hk_database_message, "name") is {failure then failure,  success(name) then
+        if find_string(_hk_database_message, "name") is {failure then failure,  success(_name_) then
         // [type = List(HK_App)] hk_database.apps
         with mb_apps = map_escape(( Message msg ) |-> (Maybe(HK_App)) from_Message(msg), find_messages(_hk_database_message, "apps")),
           if mb_apps is {failure then failure,  success(apps) then
-        success(hk_database(name, apps))
+        success(hk_database(_name_, _apps_))
       }}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -68,16 +68,16 @@ public define Maybe(HK_Help_Text)
       else //Alternative help_text_TAG
       if __type_alt__ = "help_text_TAG" then //Alternative help_text_TAG
         // [type = String] help_text_TAG.h_text_tag
-        if find_string(_hk_help_text_message, "h_text_tag") is {failure then failure,  success(h_text_tag) then
+        if find_string(_hk_help_text_message, "h_text_tag") is {failure then failure,  success(_h_text_tag_) then
-        success(help_text_TAG(h_text_tag))
+        success(help_text_TAG(_h_text_tag_))
       }
       else //Alternative help_text
       if __type_alt__ = "help_text" then //Alternative help_text
         // [type = String] help_text.h_text
-        if find_string(_hk_help_text_message, "h_text") is {failure then failure,  success(h_text) then
+        if find_string(_hk_help_text_message, "h_text") is {failure then failure,  success(_h_text_) then
-        success(help_text(h_text))
+        success(help_text(_h_text_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -59,9 +59,9 @@ public define Maybe(HK_Icon)
       else //Alternative icon16
       if __type_alt__ = "icon16" then //Alternative icon16
         // [type = String] icon16.name
-        if find_string(_hk_icon_message, "name") is {failure then failure,  success(name) then
+        if find_string(_hk_icon_message, "name") is {failure then failure,  success(_name_) then
-        success(icon16(name))
+        success(icon16(_name_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -54,12 +54,12 @@ public define Maybe(HK_Int_Choice)
       //Alternative hk_int_choice
       if __type_alt__ = "hk_int_choice" then //Alternative hk_int_choice
         // [type = Int] hk_int_choice.value
-        if find_string(_hk_int_choice_message, "value") is {failure then failure,  success(_value) then
-          if decimal_scan(_value) is { failure then failure, success(value) then
+        if find_string(_hk_int_choice_message, "value") is {failure then failure,  success(__value_) then
+          if decimal_scan(__value_) is { failure then failure, success(_value_) then
         // [type = String] hk_int_choice.visible
-        if find_string(_hk_int_choice_message, "visible") is {failure then failure,  success(visible) then
+        if find_string(_hk_int_choice_message, "visible") is {failure then failure,  success(_visible_) then
-        success(hk_int_choice(value, visible))
+        success(hk_int_choice(_value_, _visible_))
       }}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -63,7 +63,7 @@ public define Maybe(HK_Int_Choices)
         with mb_hk_int_choice = map_escape(( Message msg ) |-> (Maybe(HK_Int_Choice)) from_Message(msg), find_messages(_hk_int_choices_message, "hk_int_choice")),
           if mb_hk_int_choice is {failure then failure,  success(hk_int_choice) then
-        success(int_choices(hk_int_choice))
+        success(int_choices(_hk_int_choice_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -58,9 +58,9 @@ public define Maybe(HK_Model)
         with mb_columns = map_escape(( Message msg ) |-> (Maybe(HK_Model_Column)) from_Message(msg), find_messages(_hk_model_message, "columns")),
           if mb_columns is {failure then failure,  success(columns) then
         // [type = String] hk_model.show_string
-        if find_string(_hk_model_message, "show_string") is {failure then failure,  success(show_string) then
+        if find_string(_hk_model_message, "show_string") is {failure then failure,  success(_show_string_) then
-        success(hk_model(columns, show_string))
+        success(hk_model(_columns_, _show_string_))
       }}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -64,9 +64,9 @@ public define Maybe(HK_Model_Attr)
       else //Alternative default
       if __type_alt__ = "default" then //Alternative default
         // [type = String] default.default_str
-        if find_string(_hk_model_attr_message, "default_str") is {failure then failure,  success(default_str) then
+        if find_string(_hk_model_attr_message, "default_str") is {failure then failure,  success(_default_str_) then
-        success(default(default_str))
+        success(default(_default_str_))
       }
       else //Alternative not_null (NO TYPE)
       if __type_alt__ = "not_null" then
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -63,18 +63,18 @@ public define Maybe(HK_Model_Column)
       //Alternative hk_column
       if __type_alt__ = "hk_column" then //Alternative hk_column
         // [type = String] hk_column.name
-        if find_string(_hk_model_column_message, "name") is {failure then failure,  success(name) then
+        if find_string(_hk_model_column_message, "name") is {failure then failure,  success(_name_) then
         // [type = HK_Model_Field] hk_column.type
-        if find_message(_hk_model_column_message, "type") is {failure then failure,  success(type_msg) then
-          if (Maybe(HK_Model_Field))from_Message(type_msg)  is {failure then failure,  success(type) then
+        if find_message(_hk_model_column_message, "type") is {failure then failure,  success(_type__msg) then
+          if (Maybe(HK_Model_Field))from_Message(_type__msg)  is {failure then failure,  success(_type_) then
         // [type = List(HK_Model_Attr)] hk_column.attributes
         with mb_attributes = map_escape(( Message msg ) |-> (Maybe(HK_Model_Attr)) from_Message(msg), find_messages(_hk_model_column_message, "attributes")),
           if mb_attributes is {failure then failure,  success(attributes) then
         // [type = HK_Help_Text] hk_column.help
-        if find_message(_hk_model_column_message, "help") is {failure then failure,  success(help_msg) then
-          if (Maybe(HK_Help_Text))from_Message(help_msg)  is {failure then failure,  success(help) then
+        if find_message(_hk_model_column_message, "help") is {failure then failure,  success(_help__msg) then
+          if (Maybe(HK_Help_Text))from_Message(_help__msg)  is {failure then failure,  success(_help_) then
-        success(hk_column(name, type, attributes, help))
+        success(hk_column(_name_, _type_, _attributes_, _help_))
       }}}}}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -157,45 +157,45 @@ public define Maybe(HK_Model_Field)
       else //Alternative date_field
       if __type_alt__ = "date_field" then //Alternative date_field
         // [type = HK_Datetime_Field_Attr] date_field.hk_dt_f_attr
-        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(hk_dt_f_attr_msg) then
-          if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg)  is {failure then failure,  success(hk_dt_f_attr) then
+        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(_hk_dt_f_attr__msg) then
+          if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg)  is {failure then failure,  success(_hk_dt_f_attr_) then
-        success(date_field(hk_dt_f_attr))
+        success(date_field(_hk_dt_f_attr_))
       }}
       else //Alternative time_field
       if __type_alt__ = "time_field" then //Alternative time_field
         // [type = HK_Datetime_Field_Attr] time_field.hk_dt_f_attr
-        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(hk_dt_f_attr_msg) then
-          if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg)  is {failure then failure,  success(hk_dt_f_attr) then
+        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(_hk_dt_f_attr__msg) then
+          if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg)  is {failure then failure,  success(_hk_dt_f_attr_) then
-        success(time_field(hk_dt_f_attr))
+        success(time_field(_hk_dt_f_attr_))
       }}
       else //Alternative datetime_field
       if __type_alt__ = "datetime_field" then //Alternative datetime_field
         // [type = HK_Datetime_Field_Attr] datetime_field.hk_dt_f_attr
-        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(hk_dt_f_attr_msg) then
-          if (Maybe(HK_Datetime_Field_Attr))from_Message(hk_dt_f_attr_msg)  is {failure then failure,  success(hk_dt_f_attr) then
+        if find_message(_hk_model_field_message, "hk_dt_f_attr") is {failure then failure,  success(_hk_dt_f_attr__msg) then
+          if (Maybe(HK_Datetime_Field_Attr))from_Message(_hk_dt_f_attr__msg)  is {failure then failure,  success(_hk_dt_f_attr_) then
-        success(datetime_field(hk_dt_f_attr))
+        success(datetime_field(_hk_dt_f_attr_))
       }}
       else //Alternative foreign_key
       //foreign key to 'id' in another (or same) table and column_name for choice selector)
       if __type_alt__ = "foreign_key" then //Alternative foreign_key
         // [type = HK_App_Name] foreign_key.app_name
-        if find_message(_hk_model_field_message, "app_name") is {failure then failure,  success(app_name_msg) then
-          if (Maybe(HK_App_Name))from_Message(app_name_msg)  is {failure then failure,  success(app_name) then
+        if find_message(_hk_model_field_message, "app_name") is {failure then failure,  success(_app_name__msg) then
+          if (Maybe(HK_App_Name))from_Message(_app_name__msg)  is {failure then failure,  success(_app_name_) then
         // [type = String] foreign_key.table_name
-        if find_string(_hk_model_field_message, "table_name") is {failure then failure,  success(table_name) then
+        if find_string(_hk_model_field_message, "table_name") is {failure then failure,  success(_table_name_) then
-        success(foreign_key(app_name, table_name))
+        success(foreign_key(_app_name_, _table_name_))
       }}}
       else //Alternative integer_field
       if __type_alt__ = "integer_field" then //Alternative integer_field
         // [type = HK_Int_Choices] integer_field.choices
-        if find_message(_hk_model_field_message, "choices") is {failure then failure,  success(choices_msg) then
-          if (Maybe(HK_Int_Choices))from_Message(choices_msg)  is {failure then failure,  success(choices) then
+        if find_message(_hk_model_field_message, "choices") is {failure then failure,  success(_choices__msg) then
+          if (Maybe(HK_Int_Choices))from_Message(_choices__msg)  is {failure then failure,  success(_choices_) then
-        success(integer_field(choices))
+        success(integer_field(_choices_))
       }}
       else //Alternative float_field (NO TYPE)
       if __type_alt__ = "float_field" then
@@ -203,30 +203,30 @@ public define Maybe(HK_Model_Field)
       else //Alternative char_field
       if __type_alt__ = "char_field" then //Alternative char_field
         // [type = HK_Text_Choices] char_field.choices
-        if find_message(_hk_model_field_message, "choices") is {failure then failure,  success(choices_msg) then
-          if (Maybe(HK_Text_Choices))from_Message(choices_msg)  is {failure then failure,  success(choices) then
+        if find_message(_hk_model_field_message, "choices") is {failure then failure,  success(_choices__msg) then
+          if (Maybe(HK_Text_Choices))from_Message(_choices__msg)  is {failure then failure,  success(_choices_) then
         // [type = Int] char_field.size
-        if find_string(_hk_model_field_message, "size") is {failure then failure,  success(_size) then
-          if decimal_scan(_size) is { failure then failure, success(size) then
+        if find_string(_hk_model_field_message, "size") is {failure then failure,  success(__size_) then
+          if decimal_scan(__size_) is { failure then failure, success(_size_) then
-        success(char_field(choices, size))
+        success(char_field(_choices_, _size_))
       }}}}
       else //Alternative password_field
       if __type_alt__ = "password_field" then //Alternative password_field
         // [type = Int] password_field.min_size
-        if find_string(_hk_model_field_message, "min_size") is {failure then failure,  success(_min_size) then
-          if decimal_scan(_min_size) is { failure then failure, success(min_size) then
+        if find_string(_hk_model_field_message, "min_size") is {failure then failure,  success(__min_size_) then
+          if decimal_scan(__min_size_) is { failure then failure, success(_min_size_) then
-        success(password_field(min_size))
+        success(password_field(_min_size_))
       }}
       else //Alternative text_field
       //text of variable size
       if __type_alt__ = "text_field" then //Alternative text_field
         // [type = HK_Text_Field_Attr] text_field.hk_text_field_attr
-        if find_message(_hk_model_field_message, "hk_text_field_attr") is {failure then failure,  success(hk_text_field_attr_msg) then
-          if (Maybe(HK_Text_Field_Attr))from_Message(hk_text_field_attr_msg)  is {failure then failure,  success(hk_text_field_attr) then
+        if find_message(_hk_model_field_message, "hk_text_field_attr") is {failure then failure,  success(_hk_text_field_attr__msg) then
+          if (Maybe(HK_Text_Field_Attr))from_Message(_hk_text_field_attr__msg)  is {failure then failure,  success(_hk_text_field_attr_) then
-        success(text_field(hk_text_field_attr))
+        success(text_field(_hk_text_field_attr_))
       }}
       else //Alternative color_field (NO TYPE)
       if __type_alt__ = "color_field" then
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -10,7 +10,7 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/model/types/hk_display.anubis
+transmit hayamiki_lib/view/types/hk_display.anubis
 transmit hayamiki_lib/model/types/hk_model.anubis
 public type HK_Table:
@@ -62,17 +62,17 @@ public define Maybe(HK_Table)
       //Alternative hk_table
       if __type_alt__ = "hk_table" then //Alternative hk_table
         // [type = String] hk_table.name
-        if find_string(_hk_table_message, "name") is {failure then failure,  success(name) then
+        if find_string(_hk_table_message, "name") is {failure then failure,  success(_name_) then
         // [type = String] hk_table.short_name
-        if find_string(_hk_table_message, "short_name") is {failure then failure,  success(short_name) then
+        if find_string(_hk_table_message, "short_name") is {failure then failure,  success(_short_name_) then
         // [type = HK_Model] hk_table.model
-        if find_message(_hk_table_message, "model") is {failure then failure,  success(model_msg) then
-          if (Maybe(HK_Model))from_Message(model_msg)  is {failure then failure,  success(model) then
+        if find_message(_hk_table_message, "model") is {failure then failure,  success(_model__msg) then
+          if (Maybe(HK_Model))from_Message(_model__msg)  is {failure then failure,  success(_model_) then
         // [type = HK_Display] hk_table.display
-        if find_message(_hk_table_message, "display") is {failure then failure,  success(display_msg) then
-          if (Maybe(HK_Display))from_Message(display_msg)  is {failure then failure,  success(display) then
+        if find_message(_hk_table_message, "display") is {failure then failure,  success(_display__msg) then
+          if (Maybe(HK_Display))from_Message(_display__msg)  is {failure then failure,  success(_display_) then
-        success(hk_table(name, short_name, model, display))
+        success(hk_table(_name_, _short_name_, _model_, _display_))
       }}}}}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -54,11 +54,11 @@ public define Maybe(HK_Text_Choice)
       //Alternative hk_text_choice
       if __type_alt__ = "hk_text_choice" then //Alternative hk_text_choice
         // [type = String] hk_text_choice.value
-        if find_string(_hk_text_choice_message, "value") is {failure then failure,  success(value) then
+        if find_string(_hk_text_choice_message, "value") is {failure then failure,  success(_value_) then
         // [type = String] hk_text_choice.visible
-        if find_string(_hk_text_choice_message, "visible") is {failure then failure,  success(visible) then
+        if find_string(_hk_text_choice_message, "visible") is {failure then failure,  success(_visible_) then
-        success(hk_text_choice(value, visible))
+        success(hk_text_choice(_value_, _visible_))
       }}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -63,7 +63,7 @@ public define Maybe(HK_Text_Choices)
         with mb_hk_text_choice = map_escape(( Message msg ) |-> (Maybe(HK_Text_Choice)) from_Message(msg), find_messages(_hk_text_choices_message, "hk_text_choice")),
           if mb_hk_text_choice is {failure then failure,  success(hk_text_choice) then
-        success(text_choices(hk_text_choice))
+        success(text_choices(_hk_text_choice_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -10,8 +10,8 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/model/types/hk_edit_view.anubis
-transmit hayamiki_lib/model/types/hk_list_view.anubis
+transmit hayamiki_lib/view/types/hk_edit_view.anubis
+transmit hayamiki_lib/view/types/hk_list_view.anubis
 public type HK_Display:
   hk_display(
@@ -62,7 +62,7 @@ public define Maybe(HK_Display)
         with mb_list_edits = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View)) from_Message(msg), find_messages(_hk_display_message, "list_edits")),
           if mb_list_edits is {failure then failure,  success(list_edits) then
-        success(hk_display(list_views, list_edits))
+        success(hk_display(_list_views_, _list_edits_))
       }}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -10,8 +10,8 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/model/types/hk_edit_view_table.anubis
-transmit hayamiki_lib/model/types/hk_fk_view.anubis
+transmit hayamiki_lib/view/types/hk_edit_view_table.anubis
+transmit hayamiki_lib/view/types/hk_fk_view.anubis
 public type HK_Edit_View:
   edit_view_all,                          
@@ -79,24 +79,24 @@ public define Maybe(HK_Edit_View)
       else //Alternative edit_view_list_form
       if __type_alt__ = "edit_view_list_form" then //Alternative edit_view_list_form
         // [type = String] edit_view_list_form.view_name
-        if find_string(_hk_edit_view_message, "view_name") is {failure then failure,  success(view_name) then
+        if find_string(_hk_edit_view_message, "view_name") is {failure then failure,  success(_view_name_) then
         // [type = List(String)] edit_view_list_form.columns
         with columns = find_string_list(_hk_edit_view_message, "columns"),
         // [type = List(HK_FK_View)] edit_view_list_form.fk_view
         with mb_fk_view = map_escape(( Message msg ) |-> (Maybe(HK_FK_View)) from_Message(msg), find_messages(_hk_edit_view_message, "fk_view")),
           if mb_fk_view is {failure then failure,  success(fk_view) then
-        success(edit_view_list_form(view_name, columns, fk_view))
+        success(edit_view_list_form(_view_name_, _columns_, _fk_view_))
       }}
       else //Alternative edit_view_table_form
       if __type_alt__ = "edit_view_table_form" then //Alternative edit_view_table_form
         // [type = String] edit_view_table_form.view_name
-        if find_string(_hk_edit_view_message, "view_name") is {failure then failure,  success(view_name) then
+        if find_string(_hk_edit_view_message, "view_name") is {failure then failure,  success(_view_name_) then
         // [type = HK_Edit_View_Table] edit_view_table_form.form_table
-        if find_message(_hk_edit_view_message, "form_table") is {failure then failure,  success(form_table_msg) then
-          if (Maybe(HK_Edit_View_Table))from_Message(form_table_msg)  is {failure then failure,  success(form_table) then
+        if find_message(_hk_edit_view_message, "form_table") is {failure then failure,  success(_form_table__msg) then
+          if (Maybe(HK_Edit_View_Table))from_Message(_form_table__msg)  is {failure then failure,  success(_form_table_) then
-        success(edit_view_table_form(view_name, form_table))
+        success(edit_view_table_form(_view_name_, _form_table_))
       }}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -10,7 +10,7 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/model/types/hk_edit_view_table_line.anubis
+transmit hayamiki_lib/view/types/hk_edit_view_table_line.anubis
 public type HK_Edit_View_Table:
   table(
@@ -55,7 +55,7 @@ public define Maybe(HK_Edit_View_Table)
         with mb_lines = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Line)) from_Message(msg), find_messages(_hk_edit_view_table_message, "lines")),
           if mb_lines is {failure then failure,  success(lines) then
-        success(table(lines))
+        success(table(_lines_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -12,8 +12,12 @@ transmit tools/basis.anubis
 public type HK_Edit_View_Table_Cell:
-  cell(
+  empty,               
+  column(
     String  column_name 
+  ),
+  label(
+    String  label      
   )
 .
@@ -30,12 +34,22 @@ public define Message
   forget(add_string(_hk_edit_view_table_cell_message, "__TYPE__", "HK_Edit_View_Table_Cell"));
   if _hk_edit_view_table_cell is
   {
-    //Alternative cell
-    cell(_column_name) then 
-      forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "cell"));
-      // [type = String] cell.column_name
+    //Alternative empty (NO TYPE)
+    empty then 
+      forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "empty")),
+
+    //Alternative column
+    column(_column_name) then 
+      forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "column"));
+      // [type = String] column.column_name
       forget(add_string(_hk_edit_view_table_cell_message, "column_name", _column_name)),
+    //Alternative label
+    label(_label) then 
+      forget(add_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__", "label"));
+      // [type = String] label.label
+      forget(add_string(_hk_edit_view_table_cell_message, "label", _label)),
+
   };
   _hk_edit_view_table_cell_message
 .
@@ -48,12 +62,22 @@ public define Maybe(HK_Edit_View_Table_Cell)
   if find_string(_hk_edit_view_table_cell_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
   if find_string(_hk_edit_view_table_cell_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
     if __type__ = "HK_Edit_View_Table_Cell" then 
-      //Alternative cell
-      if __type_alt__ = "cell" then //Alternative cell
-        // [type = String] cell.column_name
-        if find_string(_hk_edit_view_table_cell_message, "column_name") is {failure then failure,  success(column_name) then
+      //Alternative empty (NO TYPE)
+      if __type_alt__ = "empty" then
+        success(empty)
+      else //Alternative column
+      if __type_alt__ = "column" then //Alternative column
+        // [type = String] column.column_name
+        if find_string(_hk_edit_view_table_cell_message, "column_name") is {failure then failure,  success(_column_name_) then
+
+        success(column(_column_name_))
+      }
+      else //Alternative label
+      if __type_alt__ = "label" then //Alternative label
+        // [type = String] label.label
+        if find_string(_hk_edit_view_table_cell_message, "label") is {failure then failure,  success(_label_) then
-        success(cell(column_name))
+        success(label(_label_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -10,7 +10,7 @@ transmit system/muscle.anubis
 transmit system/convert.anubis
 transmit tools/basis.anubis
-transmit hayamiki_lib/model/types/hk_edit_view_table_cell.anubis
+transmit hayamiki_lib/view/types/hk_edit_view_table_cell.anubis
 public type HK_Edit_View_Table_Line:
   line(
@@ -55,7 +55,7 @@ public define Maybe(HK_Edit_View_Table_Line)
         with mb_cells = map_escape(( Message msg ) |-> (Maybe(HK_Edit_View_Table_Cell)) from_Message(msg), find_messages(_hk_edit_view_table_line_message, "cells")),
           if mb_cells is {failure then failure,  success(cells) then
-        success(line(cells))
+        success(line(_cells_))
       }
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -58,14 +58,14 @@ public define Maybe(HK_FK_View)
       //Alternative fk_view
       if __type_alt__ = "fk_view" then //Alternative fk_view
         // [type = HK_App_Name] fk_view.app_name
-        if find_message(_hk_fk_view_message, "app_name") is {failure then failure,  success(app_name_msg) then
-          if (Maybe(HK_App_Name))from_Message(app_name_msg)  is {failure then failure,  success(app_name) then
+        if find_message(_hk_fk_view_message, "app_name") is {failure then failure,  success(_app_name__msg) then
+          if (Maybe(HK_App_Name))from_Message(_app_name__msg)  is {failure then failure,  success(_app_name_) then
         // [type = String] fk_view.table_name
-        if find_string(_hk_fk_view_message, "table_name") is {failure then failure,  success(table_name) then
+        if find_string(_hk_fk_view_message, "table_name") is {failure then failure,  success(_table_name_) then
         // [type = String] fk_view.fk_col_name
-        if find_string(_hk_fk_view_message, "fk_col_name") is {failure then failure,  success(fk_col_name) then
+        if find_string(_hk_fk_view_message, "fk_col_name") is {failure then failure,  success(_fk_col_name_) then
-        success(fk_view(app_name, table_name, fk_col_name))
+        success(fk_view(_app_name_, _table_name_, _fk_col_name_))
       }}}}
       else 
         failure  //No valid Alternative found !
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:26:31
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:26:31
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -18,57 +18,3 @@ public type HK_Form_Tab:
     String  list_view_name 
   )
 .
-
-  HK_Form_Tab message format
-  ==========================
-
-
-public define Message
-  to_Message
-  (
-    HK_Form_Tab _hk_form_tab
-  )=
-  with _hk_form_tab_message = message((Word32)0),  //
-  forget(add_string(_hk_form_tab_message, "__TYPE__", "HK_Form_Tab"));
-  if _hk_form_tab is
-  {
-    //Alternative hk_form_tab
-    hk_form_tab(_fk_table_name, _fk_col_name, _list_view_name) then 
-      forget(add_string(_hk_form_tab_message, "__TYPE_ALT__", "hk_form_tab"));
-      // [type = String] hk_form_tab.fk_table_name
-      forget(add_string(_hk_form_tab_message, "fk_table_name", _fk_table_name));
-      // [type = String] hk_form_tab.fk_col_name
-      forget(add_string(_hk_form_tab_message, "fk_col_name", _fk_col_name));
-      // [type = String] hk_form_tab.list_view_name
-      forget(add_string(_hk_form_tab_message, "list_view_name", _list_view_name)),
-
-  };
-  _hk_form_tab_message
-.
-
-public define Maybe(HK_Form_Tab)
-  from_Message
-  (
-    Message _hk_form_tab_message
-  )=
-  if find_string(_hk_form_tab_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
-  if find_string(_hk_form_tab_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
-    if __type__ = "HK_Form_Tab" then 
-      //Alternative hk_form_tab
-      if __type_alt__ = "hk_form_tab" then //Alternative hk_form_tab
-        // [type = String] hk_form_tab.fk_table_name
-        if find_string(_hk_form_tab_message, "fk_table_name") is {failure then failure,  success(fk_table_name) then
-        // [type = String] hk_form_tab.fk_col_name
-        if find_string(_hk_form_tab_message, "fk_col_name") is {failure then failure,  success(fk_col_name) then
-        // [type = String] hk_form_tab.list_view_name
-        if find_string(_hk_form_tab_message, "list_view_name") is {failure then failure,  success(list_view_name) then
-
-        success(hk_form_tab(fk_table_name, fk_col_name, list_view_name))
-      }}}
-      else 
-        failure  //No valid Alternative found !
-    else
-      failure    //Type not found in message !
-  }}
-.
-
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:26:31
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -17,50 +17,3 @@ public type HK_Form_Table:
     List(HK_Form_Table_Line)  form_lines 
   )
 .
-
-  HK_Form_Table message format
-  ============================
-
-
-public define Message
-  to_Message
-  (
-    HK_Form_Table _hk_form_table
-  )=
-  with _hk_form_table_message = message((Word32)0),  //
-  forget(add_string(_hk_form_table_message, "__TYPE__", "HK_Form_Table"));
-  if _hk_form_table is
-  {
-    //Alternative hk_form_table
-    hk_form_table(__form_lines) then 
-      forget(add_string(_hk_form_table_message, "__TYPE_ALT__", "hk_form_table"));
-      // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines
-      map_forget((HK_Form_Table_Line _form_lines) |-> add_message(_hk_form_table_message, "form_lines", to_Message(_form_lines)), __form_lines),
-
-  };
-  _hk_form_table_message
-.
-
-public define Maybe(HK_Form_Table)
-  from_Message
-  (
-    Message _hk_form_table_message
-  )=
-  if find_string(_hk_form_table_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
-  if find_string(_hk_form_table_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
-    if __type__ = "HK_Form_Table" then 
-      //Alternative hk_form_table
-      if __type_alt__ = "hk_form_table" then //Alternative hk_form_table
-        // [type = List(HK_Form_Table_Line)] hk_form_table.form_lines
-        with mb_form_lines = map_escape(( Message msg ) |-> (Maybe(HK_Form_Table_Line)) from_Message(msg), find_messages(_hk_form_table_message, "form_lines")),
-          if mb_form_lines is {failure then failure,  success(form_lines) then
-
-        success(hk_form_table(form_lines))
-      }
-      else 
-        failure  //No valid Alternative found !
-    else
-      failure    //Type not found in message !
-  }}
-.
-
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:26:31
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -17,50 +17,3 @@ public type HK_Form_Table_Cell:
     HK_Form_Entry  form_entry 
   )
 .
-
-  HK_Form_Table_Cell message format
-  =================================
-
-
-public define Message
-  to_Message
-  (
-    HK_Form_Table_Cell _hk_form_table_cell
-  )=
-  with _hk_form_table_cell_message = message((Word32)0),  //
-  forget(add_string(_hk_form_table_cell_message, "__TYPE__", "HK_Form_Table_Cell"));
-  if _hk_form_table_cell is
-  {
-    //Alternative hk_form_table_cell
-    hk_form_table_cell(_form_entry) then 
-      forget(add_string(_hk_form_table_cell_message, "__TYPE_ALT__", "hk_form_table_cell"))
-      // [type = HK_Form_Entry] hk_form_table_cell.form_entry
-      //forget(add_message(_hk_form_table_cell_message, "form_entry", to_Message(_form_entry))),
-
-  };
-  _hk_form_table_cell_message
-.
-
-public define Maybe(HK_Form_Table_Cell)
-  from_Message
-  (
-    Message _hk_form_table_cell_message
-  )=
-  if find_string(_hk_form_table_cell_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
-  if find_string(_hk_form_table_cell_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
-    if __type__ = "HK_Form_Table_Cell" then 
-      //Alternative hk_form_table_cell
-      if __type_alt__ = "hk_form_table_cell" then //Alternative hk_form_table_cell
-        // [type = HK_Form_Entry] hk_form_table_cell.form_entry
-        //if find_message(_hk_form_table_cell_message, "form_entry") is {failure then failure,  success(form_entry_msg) then
-        //  if (Maybe(HK_Form_Entry))from_Message(form_entry_msg)  is {failure then failure,  success(form_entry) then
-
-        success(hk_form_table_cell(form_entry))
-      }}
-      else 
-        failure  //No valid Alternative found !
-    else
-      failure    //Type not found in message !
-  }}
-.
-
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:26:31
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -17,50 +17,3 @@ public type HK_Form_Table_Line:
     List(HK_Form_Table_Cell)  form_table_cells 
   )
 .
-
-  HK_Form_Table_Line message format
-  =================================
-
-
-public define Message
-  to_Message
-  (
-    HK_Form_Table_Line _hk_form_table_line
-  )=
-  with _hk_form_table_line_message = message((Word32)0),  //
-  forget(add_string(_hk_form_table_line_message, "__TYPE__", "HK_Form_Table_Line"));
-  if _hk_form_table_line is
-  {
-    //Alternative hk_form_table_line
-    hk_form_table_line(__form_table_cells) then 
-      forget(add_string(_hk_form_table_line_message, "__TYPE_ALT__", "hk_form_table_line"));
-      // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells
-      map_forget((HK_Form_Table_Cell _form_table_cells) |-> add_message(_hk_form_table_line_message, "form_table_cells", to_Message(_form_table_cells)), __form_table_cells),
-
-  };
-  _hk_form_table_line_message
-.
-
-public define Maybe(HK_Form_Table_Line)
-  from_Message
-  (
-    Message _hk_form_table_line_message
-  )=
-  if find_string(_hk_form_table_line_message, "__TYPE__")     is  {failure then failure,  success(__type__)     then
-  if find_string(_hk_form_table_line_message, "__TYPE_ALT__") is  {failure then failure,  success(__type_alt__) then
-    if __type__ = "HK_Form_Table_Line" then 
-      //Alternative hk_form_table_line
-      if __type_alt__ = "hk_form_table_line" then //Alternative hk_form_table_line
-        // [type = List(HK_Form_Table_Cell)] hk_form_table_line.form_table_cells
-        with mb_form_table_cells = map_escape(( Message msg ) |-> (Maybe(HK_Form_Table_Cell)) from_Message(msg), find_messages(_hk_form_table_line_message, "form_table_cells")),
-          if mb_form_table_cells is {failure then failure,  success(form_table_cells) then
-
-        success(hk_form_table_line(form_table_cells))
-      }
-      else 
-        failure  //No valid Alternative found !
-    else
-      failure    //Type not found in message !
-  }}
-.
-
 /*
  * Created by 伝作 (Densaku).
  * Types & Messages generator written by フランスのトトロ aka (David RENÉ)
- * Date: 2017-04-04
- * Time: 17:12:46
+ * Date: 2017-04-09
+ * Time: 00:57:36
  * 
  */
@@ -66,14 +66,14 @@ public define Maybe(HK_List_View)
       else //Alternative list_view
       if __type_alt__ = "list_view" then //Alternative list_view
         // [type = String] list_view.view_name
-        if find_string(_hk_list_view_message, "view_name") is {failure then failure,  success(view_name) then
+        if find_string(_hk_list_view_message, "view_name") is {failure then failure,  success(_view_name_) then
         // [type = List(String)] list_view.columns
         with columns = find_string_list(_hk_list_view_message, "columns"),
         // [type = WEB_Action_Name] list_view.link_id_action
-        if find_message(_hk_list_view_message, "link_id_action") is {failure then failure,  success(link_id_action_msg) then
-          if (Maybe(WEB_Action_Name))from_Message(link_id_action_msg)  is {failure then failure,  success(link_id_action) then
+        if find_message(_hk_list_view_message, "link_id_action") is {failure then failure,  success(_link_id_action__msg) then
+          if (Maybe(WEB_Action_Name))from_Message(_link_id_action__msg)  is {failure then failure,  success(_link_id_action_) then
-        success(list_view(view_name, columns, link_id_action))
+        success(list_view(_view_name_, _columns_, _link_id_action_))
       }}}
       else 
         failure  //No valid Alternative found !