Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cpp: add support for generation of ODB options file

  • Loading branch information...
commit 7eaaaf96c502263bf47a99267ec6cacaf2e86f96 1 parent 050b916
@mcraveiro mcraveiro authored
Showing with 2,389 additions and 309 deletions.
  1. +0 −1  diagrams/CMakeLists.txt
  2. +548 −282 diagrams/cpp.dia
  3. +1 −1  projects/all_primitives/CMakeLists.txt
  4. +33 −0 projects/all_primitives/src/options.odb
  5. +1 −1  projects/boost_model/CMakeLists.txt
  6. +33 −0 projects/boost_model/src/options.odb
  7. +1 −1  projects/class_in_a_package/CMakeLists.txt
  8. +33 −0 projects/class_in_a_package/src/options.odb
  9. +1 −1  projects/class_without_attributes/CMakeLists.txt
  10. +33 −0 projects/class_without_attributes/src/options.odb
  11. +1 −1  projects/class_without_package/CMakeLists.txt
  12. +33 −0 projects/class_without_package/src/options.odb
  13. +1 −1  projects/classes_in_a_package/CMakeLists.txt
  14. +33 −0 projects/classes_in_a_package/src/options.odb
  15. +1 −1  projects/classes_inout_package/CMakeLists.txt
  16. +33 −0 projects/classes_inout_package/src/options.odb
  17. +1 −1  projects/classes_without_package/CMakeLists.txt
  18. +33 −0 projects/classes_without_package/src/options.odb
  19. +1 −1  projects/comments/CMakeLists.txt
  20. +33 −0 projects/comments/src/options.odb
  21. +1 −1  projects/compressed/CMakeLists.txt
  22. +33 −0 projects/compressed/src/options.odb
  23. +1 −0  projects/cpp/include/dogen/cpp/hash/all_hash.hpp
  24. +53 −0 projects/cpp/include/dogen/cpp/hash/view_models/odb_options_view_model_hash.hpp
  25. +1 −0  projects/cpp/include/dogen/cpp/io/all_io.hpp
  26. +41 −0 projects/cpp/include/dogen/cpp/io/view_models/odb_options_view_model_io.hpp
  27. +1 −0  projects/cpp/include/dogen/cpp/serialization/all_ser.hpp
  28. +41 −0 projects/cpp/include/dogen/cpp/serialization/view_models/odb_options_view_model_fwd_ser.hpp
  29. +43 −0 projects/cpp/include/dogen/cpp/serialization/view_models/odb_options_view_model_ser.hpp
  30. +1 −0  projects/cpp/include/dogen/cpp/test_data/all_td.hpp
  31. +54 −0 projects/cpp/include/dogen/cpp/test_data/view_models/odb_options_view_model_td.hpp
  32. +2 −0  projects/cpp/include/dogen/cpp/types/all.hpp
  33. +0 −1  projects/cpp/include/dogen/cpp/types/formatters/include_cmakelists.hpp
  34. +61 −0 projects/cpp/include/dogen/cpp/types/formatters/odb_options.hpp
  35. +36 −0 projects/cpp/include/dogen/cpp/types/formatters/odb_options_fwd.hpp
  36. +1 −0  projects/cpp/include/dogen/cpp/types/generator.hpp
  37. +118 −0 projects/cpp/include/dogen/cpp/types/view_models/odb_options_view_model.hpp
  38. +36 −0 projects/cpp/include/dogen/cpp/types/view_models/odb_options_view_model_fwd.hpp
  39. +50 −0 projects/cpp/src/hash/view_models/odb_options_view_model_hash.cpp
  40. +49 −0 projects/cpp/src/io/view_models/odb_options_view_model_io.cpp
  41. +87 −0 projects/cpp/src/serialization/view_models/odb_options_view_model_ser.cpp
  42. +74 −0 projects/cpp/src/test_data/view_models/odb_options_view_model_td.cpp
  43. +1 −1  projects/cpp/src/types/formatters/include_cmakelists.cpp
  44. +94 −0 projects/cpp/src/types/formatters/odb_options.cpp
  45. +29 −0 projects/cpp/src/types/generator.cpp
  46. +149 −0 projects/cpp/src/types/view_models/odb_options_view_model.cpp
  47. +1 −1  projects/database/CMakeLists.txt
  48. +1 −2  projects/database/{ → src}/options.odb
  49. +33 −0 projects/disable_cmakelists/src/options.odb
  50. +1 −1  projects/disable_facet_folders/CMakeLists.txt
  51. +33 −0 projects/disable_facet_folders/src/options.odb
  52. +1 −1  projects/disable_full_ctor/CMakeLists.txt
  53. +33 −0 projects/disable_full_ctor/src/options.odb
  54. +1 −1  projects/dmp/CMakeLists.txt
  55. +33 −0 projects/dmp/src/options.odb
  56. +1 −1  projects/entity_service_value/CMakeLists.txt
  57. +33 −0 projects/entity_service_value/src/options.odb
  58. +1 −1  projects/enumeration/CMakeLists.txt
  59. +33 −0 projects/enumeration/src/options.odb
  60. +1 −1  projects/exception/CMakeLists.txt
  61. +33 −0 projects/exception/src/options.odb
  62. +33 −0 projects/split_project/source/split_project/options.odb
  63. +1 −1  projects/stand_alone_class/CMakeLists.txt
  64. +33 −0 projects/stand_alone_class/src/options.odb
  65. +1 −1  projects/std_model/CMakeLists.txt
  66. +33 −0 projects/std_model/src/options.odb
  67. +1 −1  projects/trivial_association/CMakeLists.txt
  68. +33 −0 projects/trivial_association/src/options.odb
  69. +1 −1  projects/trivial_inheritance/CMakeLists.txt
  70. +33 −0 projects/trivial_inheritance/src/options.odb
  71. +1 −1  projects/two_layers_with_objects/CMakeLists.txt
  72. +33 −0 projects/two_layers_with_objects/src/options.odb
  73. +36 −0 test_data/dia_sml/expected/class_in_a_package_stdout.txt
View
1  diagrams/CMakeLists.txt
@@ -121,7 +121,6 @@ add_custom_target(codegen_${target}
--ignore-files-matching-regex .*/spec/.*
--ignore-files-matching-regex .*sql
--ignore-files-matching-regex .*-odb.*
- --ignore-files-matching-regex .*options.odb
-v -d -p dogen)
add_dependencies(codegen_${target} driver)
add_dependencies(codegen codegen_${target})
View
830 diagrams/cpp.dia
@@ -106,7 +106,7 @@
<dia:point val="-24,43"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-24.05,41.95;88.3926,140.392"/>
+ <dia:rectangle val="-24.05,41.95;103.818,140.392"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -115,7 +115,7 @@
<dia:point val="-24,43"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="112.3426"/>
+ <dia:real val="127.76780000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="97.341666666666669"/>
@@ -150,7 +150,7 @@
<dia:point val="-2,78"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="32.840000000000003"/>
+ <dia:real val="32.839999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="13.200000000000003"/>
@@ -1214,7 +1214,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:point val="45.1075,83.2"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="44.3575,82.45;52.9362,95.8"/>
+ <dia:rectangle val="44.3575,82.45;52.9363,95.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -1437,7 +1437,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:point val="17,54"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="27.065000000000001"/>
+ <dia:real val="27.064999999999998"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="12.400000000000002"/>
@@ -2624,7 +2624,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:point val="-9.925,103.51"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="32.840000000000003"/>
+ <dia:real val="32.839999999999996"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="5.2000000000000011"/>
@@ -3322,79 +3322,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
</dia:connections>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O19">
- <dia:attribute name="name">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="direction">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="show_direction">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="assoc_type">
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="role_a">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multipicity_a">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility_a">
- <dia:enum val="3"/>
- </dia:attribute>
- <dia:attribute name="show_arrow_a">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="role_b">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="multipicity_b">
- <dia:string>##</dia:string>
- </dia:attribute>
- <dia:attribute name="visibility_b">
- <dia:enum val="3"/>
- </dia:attribute>
- <dia:attribute name="show_arrow_b">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="obj_pos">
- <dia:point val="30.5325,66.4"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="29.7825,65.65;77.9926,78.7375"/>
- </dia:attribute>
- <dia:attribute name="meta">
- <dia:composite type="dict"/>
- </dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="30.5325,66.4"/>
- <dia:point val="30.5325,72"/>
- <dia:point val="77.7926,72"/>
- <dia:point val="77.7926,77.9375"/>
- </dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- <dia:enum val="1"/>
- </dia:attribute>
- <dia:attribute name="orth_autoroute">
- <dia:boolean val="false"/>
- </dia:attribute>
- <dia:attribute name="text_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="line_colour">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O8" connection="6"/>
- <dia:connection handle="1" to="O3" connection="1"/>
- </dia:connections>
- <dia:childnode parent="O1"/>
- </dia:object>
- <dia:object type="UML - Class" version="0" id="O20">
+ <dia:object type="UML - Class" version="0" id="O19">
<dia:attribute name="obj_pos">
<dia:point val="56.6875,86.5625"/>
</dia:attribute>
@@ -3575,7 +3503,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O21">
+ <dia:object type="UML - Association" version="2" id="O20">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3643,11 +3571,11 @@ descend from it. Names are in identifiable name format.#</dia:string>
</dia:attribute>
<dia:connections>
<dia:connection handle="0" to="O8" connection="6"/>
- <dia:connection handle="1" to="O20" connection="1"/>
+ <dia:connection handle="1" to="O19" connection="1"/>
</dia:connections>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O22">
+ <dia:object type="UML - Class" version="0" id="O21">
<dia:attribute name="obj_pos">
<dia:point val="52,54"/>
</dia:attribute>
@@ -3758,7 +3686,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O23">
+ <dia:object type="UML - Class" version="0" id="O22">
<dia:attribute name="obj_pos">
<dia:point val="70,54"/>
</dia:attribute>
@@ -3869,7 +3797,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O24">
+ <dia:object type="UML - Association" version="2" id="O23">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3936,12 +3864,12 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O22" connection="6"/>
- <dia:connection handle="1" to="O23" connection="6"/>
+ <dia:connection handle="0" to="O21" connection="6"/>
+ <dia:connection handle="1" to="O22" connection="6"/>
</dia:connections>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O25">
+ <dia:object type="UML - Association" version="2" id="O24">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -3982,7 +3910,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:point val="52,54"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="44.015,48.6687;52.75,54.8"/>
+ <dia:rectangle val="44.015,48.7187;52.75,54.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -4008,12 +3936,12 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O22" connection="0"/>
+ <dia:connection handle="0" to="O21" connection="0"/>
<dia:connection handle="1" to="O8" connection="2"/>
</dia:connections>
<dia:childnode parent="O1"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O26">
+ <dia:object type="UML - Class" version="0" id="O25">
<dia:attribute name="obj_pos">
<dia:point val="37.0625,-14.875"/>
</dia:attribute>
@@ -4250,7 +4178,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O27">
+ <dia:object type="UML - Class" version="0" id="O26">
<dia:attribute name="obj_pos">
<dia:point val="67.875,2.75"/>
</dia:attribute>
@@ -4261,7 +4189,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:point val="67.875,2.75"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.664999999999999"/>
+ <dia:real val="11.665000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="34.000000000000021"/>
@@ -5258,7 +5186,7 @@ descend from it. Names are in identifiable name format.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O28">
+ <dia:object type="UML - Association" version="2" id="O27">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -5325,11 +5253,11 @@ descend from it. Names are in identifiable name format.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O26" connection="6"/>
- <dia:connection handle="1" to="O27" connection="1"/>
+ <dia:connection handle="0" to="O25" connection="6"/>
+ <dia:connection handle="1" to="O26" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O29">
+ <dia:object type="UML - Class" version="0" id="O28">
<dia:attribute name="obj_pos">
<dia:point val="-49,-15.125"/>
</dia:attribute>
@@ -5561,7 +5489,7 @@ components a facet has, which we choose to call @e aspects.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O30">
+ <dia:object type="UML - Class" version="0" id="O29">
<dia:attribute name="obj_pos">
<dia:point val="-33.875,-14.9375"/>
</dia:attribute>
@@ -5718,7 +5646,7 @@ components a facet has, which we choose to call @e aspects.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O31">
+ <dia:object type="UML - Class" version="0" id="O30">
<dia:attribute name="obj_pos">
<dia:point val="-10.1875,15.75"/>
</dia:attribute>
@@ -5829,7 +5757,7 @@ given type.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O32">
+ <dia:object type="UML - Class" version="0" id="O31">
<dia:attribute name="obj_pos">
<dia:point val="-64.9375,18.875"/>
</dia:attribute>
@@ -5940,7 +5868,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O33">
+ <dia:object type="UML - Class" version="0" id="O32">
<dia:attribute name="obj_pos">
<dia:point val="-57,2"/>
</dia:attribute>
@@ -6212,7 +6140,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O34">
+ <dia:object type="UML - Association" version="2" id="O33">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -6279,11 +6207,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O29" connection="6"/>
- <dia:connection handle="1" to="O33" connection="0"/>
+ <dia:connection handle="0" to="O28" connection="6"/>
+ <dia:connection handle="1" to="O32" connection="0"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O35">
+ <dia:object type="UML - Association" version="2" id="O34">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -6350,11 +6278,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O30" connection="6"/>
- <dia:connection handle="1" to="O33" connection="2"/>
+ <dia:connection handle="0" to="O29" connection="6"/>
+ <dia:connection handle="1" to="O32" connection="2"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O36">
+ <dia:object type="UML - Class" version="0" id="O35">
<dia:attribute name="obj_pos">
<dia:point val="-20,-15.125"/>
</dia:attribute>
@@ -6695,7 +6623,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O37">
+ <dia:object type="UML - Association" version="2" id="O36">
<dia:attribute name="name">
<dia:string>#processes &gt;#</dia:string>
</dia:attribute>
@@ -6762,11 +6690,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O32" connection="1"/>
- <dia:connection handle="1" to="O33" connection="6"/>
+ <dia:connection handle="0" to="O31" connection="1"/>
+ <dia:connection handle="1" to="O32" connection="6"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O38">
+ <dia:object type="UML - Class" version="0" id="O37">
<dia:attribute name="obj_pos">
<dia:point val="-5.4375,1.875"/>
</dia:attribute>
@@ -6777,7 +6705,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-5.4375,1.875"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="10.56"/>
+ <dia:real val="10.559999999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -6876,7 +6804,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O39">
+ <dia:object type="UML - Association" version="2" id="O38">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -6943,11 +6871,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O36" connection="6"/>
- <dia:connection handle="1" to="O38" connection="1"/>
+ <dia:connection handle="0" to="O35" connection="6"/>
+ <dia:connection handle="1" to="O37" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O40">
+ <dia:object type="UML - Class" version="0" id="O39">
<dia:attribute name="obj_pos">
<dia:point val="11.9375,-15"/>
</dia:attribute>
@@ -7280,7 +7208,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O41">
+ <dia:object type="UML - Class" version="0" id="O40">
<dia:attribute name="obj_pos">
<dia:point val="12.8125,1.8125"/>
</dia:attribute>
@@ -8012,7 +7940,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O42">
+ <dia:object type="UML - Association" version="2" id="O41">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -8079,11 +8007,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O40" connection="6"/>
- <dia:connection handle="1" to="O41" connection="1"/>
+ <dia:connection handle="0" to="O39" connection="6"/>
+ <dia:connection handle="1" to="O40" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O43">
+ <dia:object type="UML - Association" version="2" id="O42">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -8150,11 +8078,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O31" connection="1"/>
- <dia:connection handle="1" to="O38" connection="6"/>
+ <dia:connection handle="0" to="O30" connection="1"/>
+ <dia:connection handle="1" to="O37" connection="6"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O44">
+ <dia:object type="UML - Class" version="0" id="O43">
<dia:attribute name="obj_pos">
<dia:point val="-32.2648,26.9158"/>
</dia:attribute>
@@ -8264,7 +8192,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O45">
+ <dia:object type="UML - Association" version="2" id="O44">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -8331,11 +8259,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O32" connection="8"/>
- <dia:connection handle="1" to="O44" connection="0"/>
+ <dia:connection handle="0" to="O31" connection="8"/>
+ <dia:connection handle="1" to="O43" connection="0"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O46">
+ <dia:object type="UML - Association" version="2" id="O45">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -8402,11 +8330,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O31" connection="6"/>
- <dia:connection handle="1" to="O44" connection="2"/>
+ <dia:connection handle="0" to="O30" connection="6"/>
+ <dia:connection handle="1" to="O43" connection="2"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O47">
+ <dia:object type="UML - Association" version="2" id="O46">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -8473,11 +8401,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O44" connection="6"/>
- <dia:connection handle="1" to="O22" connection="2"/>
+ <dia:connection handle="0" to="O43" connection="6"/>
+ <dia:connection handle="1" to="O21" connection="2"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O48">
+ <dia:object type="UML - Class" version="0" id="O47">
<dia:attribute name="obj_pos">
<dia:point val="-111,84"/>
</dia:attribute>
@@ -8588,7 +8516,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O49">
+ <dia:object type="UML - Class" version="0" id="O48">
<dia:attribute name="obj_pos">
<dia:point val="-79,84"/>
</dia:attribute>
@@ -8699,7 +8627,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O50">
+ <dia:object type="UML - Class" version="0" id="O49">
<dia:attribute name="obj_pos">
<dia:point val="-126,96"/>
</dia:attribute>
@@ -8710,7 +8638,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-126,96"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.9975"/>
+ <dia:real val="11.997499999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -8810,7 +8738,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O51">
+ <dia:object type="UML - Class" version="0" id="O50">
<dia:attribute name="obj_pos">
<dia:point val="-124,73"/>
</dia:attribute>
@@ -8821,7 +8749,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-124,73"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="7.4024999999999999"/>
+ <dia:real val="7.4025000000000007"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -8921,7 +8849,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O52">
+ <dia:object type="UML - Class" version="0" id="O51">
<dia:attribute name="obj_pos">
<dia:point val="-110,52"/>
</dia:attribute>
@@ -9032,7 +8960,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O53">
+ <dia:object type="UML - Generalization" version="1" id="O52">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -9069,12 +8997,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O72" connection="2"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O71" connection="2"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O54">
+ <dia:object type="UML - Class" version="0" id="O53">
<dia:attribute name="obj_pos">
<dia:point val="-82,73"/>
</dia:attribute>
@@ -9185,7 +9113,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O55">
+ <dia:object type="UML - Generalization" version="1" id="O54">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -9222,12 +9150,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O54" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O53" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O56">
+ <dia:object type="UML - Class" version="0" id="O55">
<dia:attribute name="obj_pos">
<dia:point val="-180,99"/>
</dia:attribute>
@@ -9338,7 +9266,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O57">
+ <dia:object type="UML - Class" version="0" id="O56">
<dia:attribute name="obj_pos">
<dia:point val="-145,91"/>
</dia:attribute>
@@ -9449,7 +9377,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O58">
+ <dia:object type="UML - Class" version="0" id="O57">
<dia:attribute name="obj_pos">
<dia:point val="-134,84"/>
</dia:attribute>
@@ -9460,7 +9388,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-134,84"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="10.442500000000001"/>
+ <dia:real val="10.442499999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -9560,7 +9488,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O59">
+ <dia:object type="UML - Class" version="0" id="O58">
<dia:attribute name="obj_pos">
<dia:point val="-142,73"/>
</dia:attribute>
@@ -9671,7 +9599,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O60">
+ <dia:object type="UML - Class" version="0" id="O59">
<dia:attribute name="obj_pos">
<dia:point val="-56,65"/>
</dia:attribute>
@@ -9682,7 +9610,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-56,65"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="13.595000000000001"/>
+ <dia:real val="13.594999999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -9782,7 +9710,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O61">
+ <dia:object type="UML - Generalization" version="1" id="O60">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -9819,12 +9747,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O59" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O58" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O62">
+ <dia:object type="UML - Generalization" version="1" id="O61">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -9861,12 +9789,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O60" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O59" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O63">
+ <dia:object type="UML - Class" version="0" id="O62">
<dia:attribute name="obj_pos">
<dia:point val="-134,65"/>
</dia:attribute>
@@ -9977,7 +9905,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O64">
+ <dia:object type="UML - Class" version="0" id="O63">
<dia:attribute name="obj_pos">
<dia:point val="-104,73"/>
</dia:attribute>
@@ -10088,7 +10016,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O65">
+ <dia:object type="UML - Class" version="0" id="O64">
<dia:attribute name="obj_pos">
<dia:point val="-105,65"/>
</dia:attribute>
@@ -10099,7 +10027,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-105,65"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.2175000000000002"/>
+ <dia:real val="6.2174999999999994"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -10199,7 +10127,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O66">
+ <dia:object type="UML - Class" version="0" id="O65">
<dia:attribute name="obj_pos">
<dia:point val="-165,99"/>
</dia:attribute>
@@ -10310,7 +10238,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O67">
+ <dia:object type="UML - Class" version="0" id="O66">
<dia:attribute name="obj_pos">
<dia:point val="-49,96"/>
</dia:attribute>
@@ -10421,7 +10349,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O68">
+ <dia:object type="UML - Class" version="0" id="O67">
<dia:attribute name="obj_pos">
<dia:point val="-180,84"/>
</dia:attribute>
@@ -10532,7 +10460,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O69">
+ <dia:object type="UML - Class" version="0" id="O68">
<dia:attribute name="obj_pos">
<dia:point val="-166,89"/>
</dia:attribute>
@@ -10643,7 +10571,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O70">
+ <dia:object type="UML - Class" version="0" id="O69">
<dia:attribute name="obj_pos">
<dia:point val="-62,73"/>
</dia:attribute>
@@ -10654,7 +10582,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-62,73"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11.619999999999999"/>
+ <dia:real val="11.620000000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -10754,7 +10682,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O71">
+ <dia:object type="UML - Class" version="0" id="O70">
<dia:attribute name="obj_pos">
<dia:point val="-116,65"/>
</dia:attribute>
@@ -10865,7 +10793,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O72">
+ <dia:object type="UML - Class" version="0" id="O71">
<dia:attribute name="obj_pos">
<dia:point val="-45,73"/>
</dia:attribute>
@@ -10976,7 +10904,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O73">
+ <dia:object type="UML - Class" version="0" id="O72">
<dia:attribute name="obj_pos">
<dia:point val="-106,96"/>
</dia:attribute>
@@ -11087,7 +11015,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O74">
+ <dia:object type="UML - Class" version="0" id="O73">
<dia:attribute name="obj_pos">
<dia:point val="-70,96"/>
</dia:attribute>
@@ -11198,7 +11126,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O75">
+ <dia:object type="UML - Class" version="0" id="O74">
<dia:attribute name="obj_pos">
<dia:point val="-152,99"/>
</dia:attribute>
@@ -11309,7 +11237,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O76">
+ <dia:object type="UML - Class" version="0" id="O75">
<dia:attribute name="obj_pos">
<dia:point val="-167,84"/>
</dia:attribute>
@@ -11420,7 +11348,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O77">
+ <dia:object type="UML - Association" version="2" id="O76">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -11461,7 +11389,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-103.323,52"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-104.073,35.2;17.2,54.8"/>
+ <dia:rectangle val="-104.073,35.25;17.2,54.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -11487,11 +11415,11 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="2"/>
+ <dia:connection handle="0" to="O51" connection="2"/>
<dia:connection handle="1" to="O8" connection="0"/>
</dia:connections>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O78">
+ <dia:object type="UML - Class" version="0" id="O77">
<dia:attribute name="obj_pos">
<dia:point val="-180,94"/>
</dia:attribute>
@@ -11602,7 +11530,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O79">
+ <dia:object type="UML - Class" version="0" id="O78">
<dia:attribute name="obj_pos">
<dia:point val="-149,65"/>
</dia:attribute>
@@ -11613,7 +11541,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-149,65"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="6.9574999999999996"/>
+ <dia:real val="6.9575000000000005"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -11713,7 +11641,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O80">
+ <dia:object type="UML - Class" version="0" id="O79">
<dia:attribute name="obj_pos">
<dia:point val="-180,89"/>
</dia:attribute>
@@ -11824,7 +11752,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O81">
+ <dia:object type="UML - Class" version="0" id="O80">
<dia:attribute name="obj_pos">
<dia:point val="-71,65"/>
</dia:attribute>
@@ -11935,7 +11863,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O82">
+ <dia:object type="UML - Class" version="0" id="O81">
<dia:attribute name="obj_pos">
<dia:point val="-176,73"/>
</dia:attribute>
@@ -12046,7 +11974,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O83">
+ <dia:object type="UML - Class" version="0" id="O82">
<dia:attribute name="obj_pos">
<dia:point val="-166,65"/>
</dia:attribute>
@@ -12057,7 +11985,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-166,65"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="9.6225000000000005"/>
+ <dia:real val="9.6224999999999987"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -12157,7 +12085,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O84">
+ <dia:object type="UML - Class" version="0" id="O83">
<dia:attribute name="obj_pos">
<dia:point val="-160,73"/>
</dia:attribute>
@@ -12168,7 +12096,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-160,73"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="13.602499999999999"/>
+ <dia:real val="13.602500000000001"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -12268,7 +12196,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O85">
+ <dia:object type="UML - Class" version="0" id="O84">
<dia:attribute name="obj_pos">
<dia:point val="-49,86"/>
</dia:attribute>
@@ -12279,7 +12207,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-49,86"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="7.0274999999999999"/>
+ <dia:real val="7.0275000000000007"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -12379,7 +12307,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O86">
+ <dia:object type="UML - Class" version="0" id="O85">
<dia:attribute name="obj_pos">
<dia:point val="-166,94"/>
</dia:attribute>
@@ -12490,7 +12418,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O87">
+ <dia:object type="UML - Class" version="0" id="O86">
<dia:attribute name="obj_pos">
<dia:point val="-143,52"/>
</dia:attribute>
@@ -12601,7 +12529,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O88">
+ <dia:object type="UML - Class" version="0" id="O87">
<dia:attribute name="obj_pos">
<dia:point val="-165,52"/>
</dia:attribute>
@@ -12712,7 +12640,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O89">
+ <dia:object type="UML - Generalization" version="1" id="O88">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -12749,12 +12677,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O79" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O78" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O90">
+ <dia:object type="UML - Generalization" version="1" id="O89">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -12791,12 +12719,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O64" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O63" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O91">
+ <dia:object type="UML - Class" version="0" id="O90">
<dia:attribute name="obj_pos">
<dia:point val="-179,65"/>
</dia:attribute>
@@ -12907,7 +12835,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O92">
+ <dia:object type="UML - Generalization" version="1" id="O91">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -12944,12 +12872,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O63" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O62" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O93">
+ <dia:object type="UML - Generalization" version="1" id="O92">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -12986,12 +12914,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O65" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O64" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O94">
+ <dia:object type="UML - Generalization" version="1" id="O93">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13028,12 +12956,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O100" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O99" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O95">
+ <dia:object type="UML - Generalization" version="1" id="O94">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13070,12 +12998,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O71" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O70" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O96">
+ <dia:object type="UML - Generalization" version="1" id="O95">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13112,12 +13040,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O51" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O50" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O97">
+ <dia:object type="UML - Generalization" version="1" id="O96">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13154,12 +13082,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O81" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O80" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O98">
+ <dia:object type="UML - Generalization" version="1" id="O97">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13196,12 +13124,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O84" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O83" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O99">
+ <dia:object type="UML - Generalization" version="1" id="O98">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13238,12 +13166,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O83" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O82" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O100">
+ <dia:object type="UML - Class" version="0" id="O99">
<dia:attribute name="obj_pos">
<dia:point val="-94,65"/>
</dia:attribute>
@@ -13354,7 +13282,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O101">
+ <dia:object type="UML - Generalization" version="1" id="O100">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13391,12 +13319,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O82" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O81" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O102">
+ <dia:object type="UML - Generalization" version="1" id="O101">
<dia:attribute name="obj_pos">
<dia:point val="-106.661,55"/>
</dia:attribute>
@@ -13433,12 +13361,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O52" connection="6"/>
- <dia:connection handle="1" to="O91" connection="1"/>
+ <dia:connection handle="0" to="O51" connection="6"/>
+ <dia:connection handle="1" to="O90" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O103">
+ <dia:object type="UML - Association" version="2" id="O102">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -13479,7 +13407,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-138.265,52"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-139.015,46.2;-109.8,52.8"/>
+ <dia:rectangle val="-139.015,46.25;-109.8,52.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -13505,12 +13433,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O87" connection="2"/>
- <dia:connection handle="1" to="O52" connection="0"/>
+ <dia:connection handle="0" to="O86" connection="2"/>
+ <dia:connection handle="1" to="O51" connection="0"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O104">
+ <dia:object type="UML - Association" version="2" id="O103">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -13551,7 +13479,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-143,52"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="-160.671,46.2;-142.25,52.8"/>
+ <dia:rectangle val="-160.671,46.25;-142.25,52.8"/>
</dia:attribute>
<dia:attribute name="meta">
<dia:composite type="dict"/>
@@ -13577,12 +13505,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O87" connection="0"/>
- <dia:connection handle="1" to="O88" connection="1"/>
+ <dia:connection handle="0" to="O86" connection="0"/>
+ <dia:connection handle="1" to="O87" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O105">
+ <dia:object type="UML - Generalization" version="1" id="O104">
<dia:attribute name="obj_pos">
<dia:point val="-106.871,87"/>
</dia:attribute>
@@ -13619,12 +13547,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O48" connection="6"/>
- <dia:connection handle="1" to="O73" connection="1"/>
+ <dia:connection handle="0" to="O47" connection="6"/>
+ <dia:connection handle="1" to="O72" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O106">
+ <dia:object type="UML - Generalization" version="1" id="O105">
<dia:attribute name="obj_pos">
<dia:point val="-106.871,87"/>
</dia:attribute>
@@ -13661,12 +13589,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O48" connection="6"/>
- <dia:connection handle="1" to="O50" connection="2"/>
+ <dia:connection handle="0" to="O47" connection="6"/>
+ <dia:connection handle="1" to="O49" connection="2"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O107">
+ <dia:object type="UML - Generalization" version="1" id="O106">
<dia:attribute name="obj_pos">
<dia:point val="-73.8588,87"/>
</dia:attribute>
@@ -13703,12 +13631,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O49" connection="6"/>
- <dia:connection handle="1" to="O74" connection="1"/>
+ <dia:connection handle="0" to="O48" connection="6"/>
+ <dia:connection handle="1" to="O73" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O108">
+ <dia:object type="UML - Class" version="0" id="O107">
<dia:attribute name="obj_pos">
<dia:point val="-89,96"/>
</dia:attribute>
@@ -13719,7 +13647,7 @@ pre-processor includes.#</dia:string>
<dia:point val="-89,96"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="14.022500000000001"/>
+ <dia:real val="14.022499999999999"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -13819,7 +13747,7 @@ pre-processor includes.#</dia:string>
<dia:attribute name="templates"/>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Generalization" version="1" id="O109">
+ <dia:object type="UML - Generalization" version="1" id="O108">
<dia:attribute name="obj_pos">
<dia:point val="-73.8588,87"/>
</dia:attribute>
@@ -13856,12 +13784,12 @@ pre-processor includes.#</dia:string>
<dia:string>##</dia:string>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O49" connection="6"/>
- <dia:connection handle="1" to="O108" connection="1"/>
+ <dia:connection handle="0" to="O48" connection="6"/>
+ <dia:connection handle="1" to="O107" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O110">
+ <dia:object type="UML - Association" version="2" id="O109">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -13928,12 +13856,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O54" connection="5"/>
- <dia:connection handle="1" to="O108" connection="0"/>
+ <dia:connection handle="0" to="O53" connection="5"/>
+ <dia:connection handle="1" to="O107" connection="0"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O111">
+ <dia:object type="UML - Association" version="2" id="O110">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14000,12 +13928,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O54" connection="7"/>
- <dia:connection handle="1" to="O74" connection="2"/>
+ <dia:connection handle="0" to="O53" connection="7"/>
+ <dia:connection handle="1" to="O73" connection="2"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O112">
+ <dia:object type="UML - Association" version="2" id="O111">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14072,12 +14000,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O51" connection="6"/>
- <dia:connection handle="1" to="O73" connection="2"/>
+ <dia:connection handle="0" to="O50" connection="6"/>
+ <dia:connection handle="1" to="O72" connection="2"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O113">
+ <dia:object type="UML - Association" version="2" id="O112">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14144,12 +14072,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O51" connection="6"/>
- <dia:connection handle="1" to="O50" connection="1"/>
+ <dia:connection handle="0" to="O50" connection="6"/>
+ <dia:connection handle="1" to="O49" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O114">
+ <dia:object type="UML - Association" version="2" id="O113">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14216,12 +14144,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O72" connection="6"/>
- <dia:connection handle="1" to="O70" connection="7"/>
+ <dia:connection handle="0" to="O71" connection="6"/>
+ <dia:connection handle="1" to="O69" connection="7"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O115">
+ <dia:object type="UML - Association" version="2" id="O114">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14288,12 +14216,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O49" connection="7"/>
- <dia:connection handle="1" to="O70" connection="5"/>
+ <dia:connection handle="0" to="O48" connection="7"/>
+ <dia:connection handle="1" to="O69" connection="5"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O116">
+ <dia:object type="UML - Association" version="2" id="O115">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14360,12 +14288,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O51" connection="6"/>
- <dia:connection handle="1" to="O58" connection="1"/>
+ <dia:connection handle="0" to="O50" connection="6"/>
+ <dia:connection handle="1" to="O57" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O117">
+ <dia:object type="UML - Association" version="2" id="O116">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14432,12 +14360,12 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O51" connection="6"/>
- <dia:connection handle="1" to="O57" connection="1"/>
+ <dia:connection handle="0" to="O50" connection="6"/>
+ <dia:connection handle="1" to="O56" connection="1"/>
</dia:connections>
<dia:childnode parent="O0"/>
</dia:object>
- <dia:object type="UML - Class" version="0" id="O118">
+ <dia:object type="UML - Class" version="0" id="O117">
<dia:attribute name="obj_pos">
<dia:point val="-29.1816,2.025"/>
</dia:attribute>
@@ -14547,7 +14475,7 @@ pre-processor includes.#</dia:string>
</dia:attribute>
<dia:attribute name="templates"/>
</dia:object>
- <dia:object type="UML - Association" version="2" id="O119">
+ <dia:object type="UML - Association" version="2" id="O118">
<dia:attribute name="name">
<dia:string>##</dia:string>
</dia:attribute>
@@ -14614,9 +14542,347 @@ pre-processor includes.#</dia:string>
<dia:color val="#000000"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O44" connection="1"/>
- <dia:connection handle="1" to="O118" connection="6"/>
+ <dia:connection handle="0" to="O43" connection="1"/>
+ <dia:connection handle="1" to="O117" connection="6"/>
</dia:connections>
</dia:object>
+ <dia:object type="UML - Class" version="0" id="O119">
+ <dia:attribute name="obj_pos">
+ <dia:point val="88.3552,77.8281"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="88.3052,77.7781;102.38,83.8781"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="88.3552,77.8281"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="13.975"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="6"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#odb_options_view_model#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="wrap_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="wrap_after_char">
+ <dia:int val="40"/>
+ </dia:attribute>
+ <dia:attribute name="comment_line_length">
+ <dia:int val="17"/>
+ </dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="0.69999999999999996"/>
+ </dia:attribute>
+ <dia:attribute name="attributes">
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#model_name#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#std::string#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#product_name#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#std::string#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#file_path#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#boost::filesystem::path#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#file_name#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#std::string#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ <dia:composite type="umlattribute">
+ <dia:attribute name="name">
+ <dia:string>#odb_folder#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="type">
+ <dia:string>#std::string#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="value">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="visibility">
+ <dia:enum val="0"/>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="class_scope">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ </dia:composite>
+ </dia:attribute>
+ <dia:attribute name="operations"/>
+ <dia:attribute name="template">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="templates"/>
+ <dia:childnode parent="O1"/>
+ </dia:object>
+ <dia:object type="UML - Class" version="0" id="O120">
+ <dia:attribute name="obj_pos">
+ <dia:point val="-155.113,83.8906"/>
+ </dia:attribute>
+ <dia:attribute name="obj_bb">
+ <dia:rectangle val="-155.163,83.8406;-149.093,86.9406"/>
+ </dia:attribute>
+ <dia:attribute name="elem_corner">
+ <dia:point val="-155.113,83.8906"/>
+ </dia:attribute>
+ <dia:attribute name="elem_width">
+ <dia:real val="5.9700000000000006"/>
+ </dia:attribute>
+ <dia:attribute name="elem_height">
+ <dia:real val="3"/>
+ </dia:attribute>
+ <dia:attribute name="name">
+ <dia:string>#odb_options#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="stereotype">
+ <dia:string>#service#</dia:string>
+ </dia:attribute>
+ <dia:attribute name="comment">
+ <dia:string>##</dia:string>
+ </dia:attribute>
+ <dia:attribute name="abstract">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_attributes">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="suppress_operations">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="visible_attributes">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="visible_comments">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="wrap_operations">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="wrap_after_char">
+ <dia:int val="40"/>
+ </dia:attribute>
+ <dia:attribute name="comment_line_length">
+ <dia:int val="17"/>
+ </dia:attribute>
+ <dia:attribute name="comment_tagging">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="line_width">
+ <dia:real val="0.10000000000000001"/>
+ </dia:attribute>
+ <dia:attribute name="line_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="fill_color">
+ <dia:color val="#ffffff"/>
+ </dia:attribute>
+ <dia:attribute name="text_color">
+ <dia:color val="#000000"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font">
+ <dia:font family="monospace" style="0" name="Courier"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font">
+ <dia:font family="monospace" style="88" name="Courier-BoldOblique"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font">
+ <dia:font family="monospace" style="8" name="Courier-Oblique"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font">
+ <dia:font family="sans" style="80" name="Helvetica-Bold"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font">
+ <dia:font family="sans" style="88" name="Helvetica-BoldOblique"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font">
+ <dia:font family="sans" style="8" name="Helvetica-Oblique"/>
+ </dia:attribute>
+ <dia:attribute name="normal_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="polymorphic_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_font_height">
+ <dia:real val="0.80000000000000004"/>
+ </dia:attribute>
+ <dia:attribute name="classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="abstract_classname_font_height">
+ <dia:real val="1"/>
+ </dia:attribute>
+ <dia:attribute name="comment_font_height">
+ <dia:real val="0.69999999999999996"/>
+ </dia:attribute>
+ <dia:attribute name="attributes"/>
+ <dia:attribute name="operations"/>
+ <dia:attribute name="template">
+ <dia:boolean val="false"/>
+ </dia:attribute>
+ <dia:attribute name="templates"/>
+ <dia:childnode parent="O0"/>
+ </dia:object>
</dia:layer>
</dia:diagram>
View
2  projects/all_primitives/CMakeLists.txt
@@ -58,7 +58,7 @@ foreach(odb_file ${all_odb_files})
add_custom_target(${target_name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND odb
- --options-file ${CMAKE_CURRENT_SOURCE_DIR}/options.odb
+ --options-file ${CMAKE_CURRENT_SOURCE_DIR}/src/options.odb
--std c++11
--output-dir ${CMAKE_CURRENT_SOURCE_DIR}/include/dogen/all_primitives/odb/
--odb-epilogue '\#include \"dogen/all_primitives/odb/${odb_file}\"'
View
33 projects/all_primitives/src/options.odb
@@ -0,0 +1,33 @@
+# -*- mode: sh; tab-width: 4; indent-tabs-mode: nil -*-
+
+# enable C++11. FIXME: causes ODB crash in options file.
+# --std c++11
+
+# target postgres
+--database pgsql
+
+# use the boost profile
+--profile boost
+
+# generate queries and embedded schemas
+--generate-query
+--generate-schema
+--schema-format embedded
+
+# use extensions similar to the dogen ones
+# --ixx-suffix .ipp
+# --hxx-suffix .hpp
+--cxx-suffix .cpp
+
+# fix domain includes
+--include-regex '%(.*).hpp%dogen/all_primitives/types/$1.hpp%'
+
+# fix odb generated includes
+--include-regex '%(^[a-zA-Z0-9_]+)-odb.(.*)%dogen/all_primitives/odb/$1-odb.$2%'
+--include-regex '%dogen/all_primitives/types/(.*)-odb.(.*)%dogen/all_primitives/odb/$1-odb.$2%'
+
+# debug regexes
+# --include-regex-trace
+
+# make the header guards similar to dogen ones
+--guard-prefix DOGEN_ALL_PRIMITIVES_ODB
View
2  projects/boost_model/CMakeLists.txt
@@ -58,7 +58,7 @@ foreach(odb_file ${all_odb_files})
add_custom_target(${target_name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND odb
- --options-file ${CMAKE_CURRENT_SOURCE_DIR}/options.odb
+ --options-file ${CMAKE_CURRENT_SOURCE_DIR}/src/options.odb
--std c++11
--output-dir ${CMAKE_CURRENT_SOURCE_DIR}/include/dogen/boost_model/odb/
--odb-epilogue '\#include \"dogen/boost_model/odb/${odb_file}\"'
View
33 projects/boost_model/src/options.odb
@@ -0,0 +1,33 @@
+# -*- mode: sh; tab-width: 4; indent-tabs-mode: nil -*-
+
+# enable C++11. FIXME: causes ODB crash in options file.
+# --std c++11
+
+# target postgres
+--database pgsql
+
+# use the boost profile
+--profile boost
+
+# generate queries and embedded schemas
+--generate-query
+--generate-schema
+--schema-format embedded
+
+# use extensions similar to the dogen ones
+# --ixx-suffix .ipp
+# --hxx-suffix .hpp
+--cxx-suffix .cpp
+
+# fix domain includes
+--include-regex '%(.*).hpp%dogen/boost_model/types/$1.hpp%'
+
+# fix odb generated includes
+--include-regex '%(^[a-zA-Z0-9_]+)-odb.(.*)%dogen/boost_model/odb/$1-odb.$2%'
+--include-regex '%dogen/boost_model/types/(.*)-odb.(.*)%dogen/boost_model/odb/$1-odb.$2%'
+
+# debug regexes
+# --include-regex-trace
+
+# make the header guards similar to dogen ones
+--guard-prefix DOGEN_BOOST_MODEL_ODB
View
2  projects/class_in_a_package/CMakeLists.txt
@@ -58,7 +58,7 @@ foreach(odb_file ${all_odb_files})
add_custom_target(${target_name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND odb
- --options-file ${CMAKE_CURRENT_SOURCE_DIR}/options.odb
+ --options-file ${CMAKE_CURRENT_SOURCE_DIR}/src/options.odb
--std c++11
--output-dir ${CMAKE_CURRENT_SOURCE_DIR}/include/dogen/class_in_a_package/odb/
--odb-epilogue '\#include \"dogen/class_in_a_package/odb/${odb_file}\"'
View
33 projects/class_in_a_package/src/options.odb
@@ -0,0 +1,33 @@
+# -*- mode: sh; tab-width: 4; indent-tabs-mode: nil -*-
+
+# enable C++11. FIXME: causes ODB crash in options file.
+# --std c++11
+
+# target postgres
+--database pgsql
+
+# use the boost profile
+--profile boost
+
+# generate queries and embedded schemas
+--generate-query
+--generate-schema
+--schema-format embedded
+
+# use extensions similar to the dogen ones
+# --ixx-suffix .ipp
+# --hxx-suffix .hpp
+--cxx-suffix .cpp
+
+# fix domain includes
+--include-regex '%(.*).hpp%dogen/class_in_a_package/types/$1.hpp%'
+
+# fix odb generated includes
+--include-regex '%(^[a-zA-Z0-9_]+)-odb.(.*)%dogen/class_in_a_package/odb/$1-odb.$2%'
+--include-regex '%dogen/class_in_a_package/types/(.*)-odb.(.*)%dogen/class_in_a_package/odb/$1-odb.$2%'
+
+# debug regexes
+# --include-regex-trace
+
+# make the header guards similar to dogen ones
+--guard-prefix DOGEN_CLASS_IN_A_PACKAGE_ODB
View
2  projects/class_without_attributes/CMakeLists.txt
@@ -58,7 +58,7 @@ foreach(odb_file ${all_odb_files})
add_custom_target(${target_name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND odb
- --options-file ${CMAKE_CURRENT_SOURCE_DIR}/options.odb
+ --options-file ${CMAKE_CURRENT_SOURCE_DIR}/src/options.odb
--std c++11
--output-dir ${CMAKE_CURRENT_SOURCE_DIR}/include/dogen/class_without_attributes/odb/
--odb-epilogue '\#include \"dogen/class_without_attributes/odb/${odb_file}\"'
View
33 projects/class_without_attributes/src/options.odb
@@ -0,0 +1,33 @@
+# -*- mode: sh; tab-width: 4; indent-tabs-mode: nil -*-
+
+# enable C++11. FIXME: causes ODB crash in options file.
+# --std c++11
+
+# target postgres
+--database pgsql
+
+# use the boost profile
+--profile boost
+
+# generate queries and embedded schemas
+--generate-query
+--generate-schema
+--schema-format embedded
+
+# use extensions similar to the dogen ones
+# --ixx-suffix .ipp
+# --hxx-suffix .hpp
+--cxx-suffix .cpp
+
+# fix domain includes
+--include-regex '%(.*).hpp%dogen/class_without_attributes/types/$1.hpp%'
+
+# fix odb generated includes
+--include-regex '%(^[a-zA-Z0-9_]+)-odb.(.*)%dogen/class_without_attributes/odb/$1-odb.$2%'
+--include-regex '%dogen/class_without_attributes/types/(.*)-odb.(.*)%dogen/class_without_attributes/odb/$1-odb.$2%'
+
+# debug regexes
+# --include-regex-trace
+
+# make the header guards similar to dogen ones
+--guard-prefix DOGEN_CLASS_WITHOUT_ATTRIBUTES_ODB
View
2  projects/class_without_package/CMakeLists.txt
@@ -58,7 +58,7 @@ foreach(odb_file ${all_odb_files})
add_custom_target(${target_name}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND odb
- --options-file ${CMAKE_CURRENT_SOURCE_DIR}/options.odb
+ --options-file ${CMAKE_CURRENT_SOURCE_DIR}/src/options.odb
--std c++11
--output-dir ${CMAKE_CURRENT_SOURCE_DIR}/include/dogen/class_without_package/odb/
--odb-epilogue '\#include \"dogen/class_without_package/odb/${odb_file}\"'
View
33 projects/class_without_package/src/options.odb
@@ -0,0 +1,33 @@
+# -*- mode: sh; tab-width: 4; indent-tabs-mode: nil -*-
+
+# enable C++11. FIXME: causes ODB crash in options file.
+# --std c++11
+
+# target postgres
+--database pgsql
+
+# use the boost profile
+--profile boost
+
+# generate queries and embedded schemas
+--generate-query
+--generate-schema
+--schema-format embedded
+
+# use extensions similar to the dogen ones
+# --ixx-suffix .ipp
+# --hxx-suffix .hpp
+--cxx-suffix .cpp
+
+# fix domain includes
+--include-regex '%(.*).hpp%dogen/class_without_package/types/$1.hpp%'
+
+# fix odb generated includes