diff --git a/Documentation/docPrepaAppli-IHM/Capture d’écran 2023-06-05 à 17.26.56.png b/Documentation/docPrepaAppli-IHM/Capture d’écran 2023-06-05 à 17.26.56.png deleted file mode 100644 index a1af740..0000000 Binary files a/Documentation/docPrepaAppli-IHM/Capture d’écran 2023-06-05 à 17.26.56.png and /dev/null differ diff --git a/Documentation/docPrepaAppli-IHM/DiagramClass.pdf b/Documentation/docPrepaAppli-IHM/DiagramClass.pdf new file mode 100644 index 0000000..a9888c2 Binary files /dev/null and b/Documentation/docPrepaAppli-IHM/DiagramClass.pdf differ diff --git a/Documentation/docPrepaAppli-IHM/DiagramClass.png b/Documentation/docPrepaAppli-IHM/DiagramClass.png new file mode 100644 index 0000000..02d0f55 Binary files /dev/null and b/Documentation/docPrepaAppli-IHM/DiagramClass.png differ diff --git a/Documentation/docPrepaAppli-IHM/Diagramme_de_Classes.mdj b/Documentation/docPrepaAppli-IHM/Diagramme_de_Classes.mdj index 77fd245..f44bc7e 100644 --- a/Documentation/docPrepaAppli-IHM/Diagramme_de_Classes.mdj +++ b/Documentation/docPrepaAppli-IHM/Diagramme_de_Classes.mdj @@ -20,6 +20,31 @@ "name": "Main", "defaultDiagram": true, "ownedViews": [ + { + "_type": "RectangleView", + "_id": "AAAAAAGIj86bS+EeWqk=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "font": "Arial;13;0", + "left": 184, + "top": 152, + "width": 2273, + "height": 1705 + }, + { + "_type": "RectangleView", + "_id": "AAAAAAGIj9C4wRXIRHQ=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "lineColor": "#ff0000", + "font": "Arial;13;0", + "left": 224, + "top": 968, + "width": 1473, + "height": 841 + }, { "_type": "UMLClassView", "_id": "AAAAAAGIHoWVAr35E+c=", @@ -47,6 +72,7 @@ "$ref": "AAAAAAGIHoWVAr36lLA=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 528, "top": 480, @@ -58,6 +84,7 @@ "_parent": { "$ref": "AAAAAAGIHoWVAr36lLA=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 325, "top": 423, @@ -72,6 +99,7 @@ "$ref": "AAAAAAGIHoWVAr36lLA=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 528, "top": 480, @@ -86,6 +114,7 @@ "$ref": "AAAAAAGIHoWVAr36lLA=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 528, "top": 480, @@ -93,6 +122,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 320, "top": 416, @@ -130,6 +160,7 @@ "model": { "$ref": "AAAAAAGIHog08L4yqug=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 446, @@ -147,6 +178,7 @@ "model": { "$ref": "AAAAAAGIHoXoZb4ivtM=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 461, @@ -164,6 +196,7 @@ "model": { "$ref": "AAAAAAGIHoeQ5b4q9e4=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 476, @@ -181,6 +214,7 @@ "model": { "$ref": "AAAAAAGIHog4Yb44It8=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 491, @@ -199,6 +233,7 @@ "$ref": "AAAAAAGIHog7XL4+Umw=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 589, "top": 746, @@ -208,6 +243,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 320, "top": 441, @@ -233,6 +269,7 @@ "model": { "$ref": "AAAAAAGIHojY1L5IuEY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 514, @@ -250,6 +287,7 @@ "model": { "$ref": "AAAAAAGIQqFhqZidBCo=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 325, "top": 529, @@ -259,6 +297,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 320, "top": 509, @@ -275,6 +314,7 @@ "$ref": "AAAAAAGIHoWVAr33oyk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -291,6 +331,7 @@ "$ref": "AAAAAAGIHoWVAr33oyk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -298,6 +339,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 320, @@ -347,6 +389,7 @@ "$ref": "AAAAAAGIHo06rr5aRtc=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1104, "top": 32, @@ -358,6 +401,7 @@ "_parent": { "$ref": "AAAAAAGIHo06rr5aRtc=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 757, "top": 447, @@ -372,6 +416,7 @@ "$ref": "AAAAAAGIHo06rr5aRtc=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1104, "top": 32, @@ -386,6 +431,7 @@ "$ref": "AAAAAAGIHo06rr5aRtc=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1104, "top": 32, @@ -393,6 +439,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 440, @@ -430,6 +477,7 @@ "model": { "$ref": "AAAAAAGIQpG79GACCco=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 757, "top": 470, @@ -439,6 +487,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 465, @@ -464,6 +513,7 @@ "model": { "$ref": "AAAAAAGIHo7/f76bkwo=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 757, "top": 493, @@ -473,6 +523,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 488, @@ -489,6 +540,7 @@ "$ref": "AAAAAAGIHo06rb5Xk/g=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 552, "top": 16, @@ -505,6 +557,7 @@ "$ref": "AAAAAAGIHo06rb5Xk/g=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 552, "top": 16, @@ -512,6 +565,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 752, @@ -561,6 +615,7 @@ "$ref": "AAAAAAGIHpOZKL6rK3I=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 2128, "top": -496, @@ -572,6 +627,7 @@ "_parent": { "$ref": "AAAAAAGIHpOZKL6rK3I=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 1237, "top": 431, @@ -586,6 +642,7 @@ "$ref": "AAAAAAGIHpOZKL6rK3I=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 2128, "top": -496, @@ -600,6 +657,7 @@ "$ref": "AAAAAAGIHpOZKL6rK3I=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 2128, "top": -496, @@ -607,6 +665,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1232, "top": 424, @@ -644,6 +703,7 @@ "model": { "$ref": "AAAAAAGIHpR6377SNaY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 454, @@ -661,6 +721,7 @@ "model": { "$ref": "AAAAAAGIHpS12r7a+No=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 469, @@ -678,6 +739,7 @@ "model": { "$ref": "AAAAAAGIHpTSvL7i93I=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 484, @@ -687,6 +749,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1232, "top": 449, @@ -712,6 +775,7 @@ "model": { "$ref": "AAAAAAGIHpUDir7q9Xk=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 507, @@ -729,6 +793,7 @@ "model": { "$ref": "AAAAAAGIQqJiXaLNR0g=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 522, @@ -746,6 +811,7 @@ "model": { "$ref": "AAAAAAGIQqK/66Ngw9o=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 537, @@ -763,6 +829,7 @@ "model": { "$ref": "AAAAAAGIQqldJLAsyg8=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1237, "top": 552, @@ -772,6 +839,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1232, "top": 502, @@ -788,6 +856,7 @@ "$ref": "AAAAAAGIHpOZJ76ocws=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1064, "top": -264, @@ -804,6 +873,7 @@ "$ref": "AAAAAAGIHpOZJ76ocws=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1064, "top": -264, @@ -811,6 +881,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 1232, @@ -860,6 +931,7 @@ "$ref": "AAAAAAGIHpWTG7773DM=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 3456, "top": -800, @@ -871,6 +943,7 @@ "_parent": { "$ref": "AAAAAAGIHpWTG7773DM=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 1893, "top": 447, @@ -885,6 +958,7 @@ "$ref": "AAAAAAGIHpWTG7773DM=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 3456, "top": -800, @@ -899,6 +973,7 @@ "$ref": "AAAAAAGIHpWTG7773DM=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 3456, "top": -800, @@ -906,6 +981,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1888, "top": 440, @@ -943,6 +1019,7 @@ "model": { "$ref": "AAAAAAGIHpYIRL8qPro=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 470, @@ -960,6 +1037,7 @@ "model": { "$ref": "AAAAAAGIHpYuvL8ykiU=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 485, @@ -977,6 +1055,7 @@ "model": { "$ref": "AAAAAAGIHpZ6m786BQI=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 500, @@ -994,6 +1073,7 @@ "model": { "$ref": "AAAAAAGIdzaGjIaQoa4=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 515, @@ -1003,6 +1083,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1888, "top": 465, @@ -1028,6 +1109,7 @@ "model": { "$ref": "AAAAAAGIHqVOub9Xf1c=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 538, @@ -1045,6 +1127,7 @@ "model": { "$ref": "AAAAAAGIQqriQ7a5XjA=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1893, "top": 553, @@ -1054,6 +1137,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1888, "top": 533, @@ -1070,6 +1154,7 @@ "$ref": "AAAAAAGIHpWTGr74dEI=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1728, "top": -400, @@ -1086,6 +1171,7 @@ "$ref": "AAAAAAGIHpWTGr74dEI=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1728, "top": -400, @@ -1093,6 +1179,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 1888, @@ -1142,6 +1229,7 @@ "$ref": "AAAAAAGIHqeu5b/U5Tw=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1024, "top": -736, @@ -1153,6 +1241,7 @@ "_parent": { "$ref": "AAAAAAGIHqeu5b/U5Tw=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 757, "top": 255, @@ -1167,6 +1256,7 @@ "$ref": "AAAAAAGIHqeu5b/U5Tw=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1024, "top": -736, @@ -1181,6 +1271,7 @@ "$ref": "AAAAAAGIHqeu5b/U5Tw=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1024, "top": -736, @@ -1188,6 +1279,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 248, @@ -1225,6 +1317,7 @@ "model": { "$ref": "AAAAAAGIHr5U28AByOM=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 757, "top": 278, @@ -1234,6 +1327,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 273, @@ -1259,6 +1353,7 @@ "model": { "$ref": "AAAAAAGIHsF3tsAKe0k=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 757, "top": 301, @@ -1268,6 +1363,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 752, "top": 296, @@ -1284,6 +1380,7 @@ "$ref": "AAAAAAGIHqeu5b/RSGs=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 512, "top": -368, @@ -1300,6 +1397,7 @@ "$ref": "AAAAAAGIHqeu5b/RSGs=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 512, "top": -368, @@ -1307,6 +1405,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 752, @@ -1403,6 +1502,7 @@ "edgePosition": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHoWVAr35E+c=" @@ -1444,8 +1544,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 473, - "top": 985, + "left": 502, + "top": 281, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -1465,8 +1565,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 458, - "top": 985, + "left": 517, + "top": 281, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -1486,8 +1586,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 502, - "top": 986, + "left": 473, + "top": 282, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -1497,6 +1597,7 @@ "edgePosition": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHoWVAr35E+c=" @@ -1505,7 +1606,7 @@ "$ref": "AAAAAAGIHqeu5b/TIyM=" }, "lineStyle": 1, - "points": "908:334;488:992;490:547", + "points": "751:289;488:288;489:415", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGIHstR4cBVAg0=" @@ -1536,6 +1637,7 @@ "model": { "$ref": "AAAAAAGIHswqEsBjCPQ=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1136, "top": 472, @@ -1724,6 +1826,7 @@ "$ref": "AAAAAAGIHswqEsBkmq4=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 256, "top": 440, @@ -1740,6 +1843,7 @@ "$ref": "AAAAAAGIHswqEsBl71A=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 256, "top": 440, @@ -1747,6 +1851,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHpOZJ76qovs=" @@ -1811,6 +1916,7 @@ "model": { "$ref": "AAAAAAGIHsw52cD3xzs=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1775, "top": 480, @@ -1999,6 +2105,7 @@ "$ref": "AAAAAAGIHsw52cD4hSc=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -2015,6 +2122,7 @@ "$ref": "AAAAAAGIHsw52cD5ACE=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -2022,6 +2130,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHpWTGr76MLU=" @@ -2094,6 +2203,7 @@ "$ref": "AAAAAAGIdz98hhHKWsk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 592, "top": -384, @@ -2105,6 +2215,7 @@ "_parent": { "$ref": "AAAAAAGIdz98hhHKWsk=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 1389, "top": 247, @@ -2119,6 +2230,7 @@ "$ref": "AAAAAAGIdz98hhHKWsk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 592, "top": -384, @@ -2133,6 +2245,7 @@ "$ref": "AAAAAAGIdz98hhHKWsk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 592, "top": -384, @@ -2140,6 +2253,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1384, "top": 240, @@ -2177,6 +2291,7 @@ "model": { "$ref": "AAAAAAGIdz+c0RJpYRU=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1389, "top": 270, @@ -2194,6 +2309,7 @@ "model": { "$ref": "AAAAAAGIdz+uMhKrZFI=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1389, "top": 285, @@ -2203,6 +2319,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1384, "top": 265, @@ -2218,6 +2335,7 @@ "model": { "$ref": "AAAAAAGIdz98hRHHa9s=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1384, "top": 303, @@ -2234,6 +2352,7 @@ "$ref": "AAAAAAGIdz98hRHHa9s=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 296, "top": -192, @@ -2250,6 +2369,7 @@ "$ref": "AAAAAAGIdz98hRHHa9s=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 296, "top": -192, @@ -2257,6 +2377,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 1384, @@ -2298,13 +2419,14 @@ "model": { "$ref": "AAAAAAGId0BAWhnj6zU=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 1239, + "left": 1279, "top": 256, "width": 92.1298828125, "height": 13, - "alpha": 0.40122869005546036, - "distance": 35.84689665786984, + "alpha": 0.18948013254178414, + "distance": 74.33034373659252, "hostEdge": { "$ref": "AAAAAAGId0BAWxnnmpQ=" }, @@ -2486,6 +2608,7 @@ "$ref": "AAAAAAGId0BAWhnkrro=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -2502,6 +2625,7 @@ "$ref": "AAAAAAGId0BAWhnlJvY=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 264, "top": 240, @@ -2509,6 +2633,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIdz98hhHJFQ4=" @@ -2580,9 +2705,11 @@ "$ref": "AAAAAAGId0CsFiCVANY=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 672, - "top": 1120, + "left": 176, + "top": 928, "height": 13 }, { @@ -2591,9 +2718,11 @@ "_parent": { "$ref": "AAAAAAGId0CsFiCVANY=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 1005, - "top": 1199, + "left": 757, + "top": 1103, "width": 307.455078125, "height": 13, "text": "IPersistenceManager" @@ -2605,9 +2734,11 @@ "$ref": "AAAAAAGId0CsFiCVANY=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 672, - "top": 1120, + "left": 176, + "top": 928, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -2619,16 +2750,20 @@ "$ref": "AAAAAAGId0CsFiCVANY=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 672, - "top": 1120, + "left": 176, + "top": 928, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1000, - "top": 1192, + "left": 752, + "top": 1096, "width": 317.455078125, "height": 25, "stereotypeLabel": { @@ -2653,9 +2788,11 @@ "model": { "$ref": "AAAAAAGId0CsFSCSASs=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1000, - "top": 1217, + "left": 752, + "top": 1121, "width": 317.455078125, "height": 10 }, @@ -2678,9 +2815,11 @@ "model": { "$ref": "AAAAAAGId0FLRSM6THQ=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1005, - "top": 1232, + "left": 757, + "top": 1136, "width": 307.455078125, "height": 13, "text": "+DataLoad(): (List, Consultant)", @@ -2695,18 +2834,22 @@ "model": { "$ref": "AAAAAAGId0GppiQhIMI=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1005, - "top": 1247, + "left": 757, + "top": 1151, "width": 307.455078125, "height": 13, "text": "+DataSave(cu: List, co: Consultant): void", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1000, - "top": 1227, + "left": 752, + "top": 1131, "width": 317.455078125, "height": 38 }, @@ -2720,9 +2863,11 @@ "$ref": "AAAAAAGId0CsFSCSASs=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 336, - "top": 560, + "left": 88, + "top": 464, "width": 10, "height": 10 }, @@ -2736,17 +2881,21 @@ "$ref": "AAAAAAGId0CsFSCSASs=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 336, - "top": 560, + "left": 88, + "top": 464, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 1000, - "top": 1192, + "left": 752, + "top": 1096, "width": 317.455078125, "height": 89, "nameCompartment": { @@ -2792,6 +2941,7 @@ "$ref": "AAAAAAGId0o4Sy+MoM0=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 992, "top": 160, @@ -2803,6 +2953,7 @@ "_parent": { "$ref": "AAAAAAGId0o4Sy+MoM0=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;1", "left": 765, "top": 655, @@ -2817,6 +2968,7 @@ "$ref": "AAAAAAGId0o4Sy+MoM0=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 992, "top": 160, @@ -2831,6 +2983,7 @@ "$ref": "AAAAAAGId0o4Sy+MoM0=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 992, "top": 160, @@ -2838,6 +2991,7 @@ "horizontalAlignment": 1 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 760, "top": 648, @@ -2876,6 +3030,7 @@ "$ref": "AAAAAAGId09GxTFt5Zk=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 773, "top": 686, @@ -2894,6 +3049,7 @@ "$ref": "AAAAAAGId0+o0TMBZCA=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 773, "top": 688, @@ -2911,6 +3067,7 @@ "model": { "$ref": "AAAAAAGId1ArRjPY+Bg=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 680, @@ -2928,6 +3085,7 @@ "model": { "$ref": "AAAAAAGId1Gc9TUb3Go=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 695, @@ -2945,6 +3103,7 @@ "model": { "$ref": "AAAAAAGId1KX6zYEpP4=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 710, @@ -2963,6 +3122,7 @@ "$ref": "AAAAAAGId1MWuTcI7Go=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 725, @@ -2972,6 +3132,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 760, "top": 673, @@ -2997,6 +3158,7 @@ "model": { "$ref": "AAAAAAGId1N7rjfxbB8=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 733, @@ -3014,6 +3176,7 @@ "model": { "$ref": "AAAAAAGId1RL9jqUA9U=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 748, @@ -3031,6 +3194,7 @@ "model": { "$ref": "AAAAAAGId1u+4T3A6Ys=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 763, @@ -3048,6 +3212,7 @@ "model": { "$ref": "AAAAAAGId1xSPz8tces=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 765, "top": 778, @@ -3057,6 +3222,7 @@ "horizontalAlignment": 0 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 760, "top": 728, @@ -3073,6 +3239,7 @@ "$ref": "AAAAAAGId0o4Si+JZ6A=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 496, "top": 80, @@ -3089,6 +3256,7 @@ "$ref": "AAAAAAGId0o4Si+JZ6A=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 496, "top": 80, @@ -3096,6 +3264,7 @@ "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "containerChangeable": true, "left": 760, @@ -3137,13 +3306,14 @@ "model": { "$ref": "AAAAAAGId2CE49tuBfQ=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 911, - "top": 549, - "width": 189.6552734375, + "left": 919, + "top": 535, + "width": 105, "height": 13, - "alpha": -1.266795248789483, - "distance": 106.90182411914213, + "alpha": -0.9760369708941283, + "distance": 82.09750300709517, "hostEdge": { "$ref": "AAAAAAGId2CE5NtyeiM=" }, @@ -3325,6 +3495,7 @@ "$ref": "AAAAAAGId2CE5NtvvVE=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "width": 10, "height": 10 @@ -3339,11 +3510,13 @@ "$ref": "AAAAAAGId2CE5NtwVkQ=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "width": 10, "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHo06rr5ZC8o=" @@ -3407,13 +3580,14 @@ "model": { "$ref": "AAAAAAGId2HiQPPNFMs=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 793, - "top": 444, + "left": 848, + "top": 192, "width": 85.115234375, "height": 13, - "alpha": 0.9364134209494841, - "distance": 65.80273550544841, + "alpha": 0.027685231778134013, + "distance": 650.2491830060227, "hostEdge": { "$ref": "AAAAAAGId2HiQfPRYO4=" }, @@ -3431,8 +3605,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 858, - "top": 483, + "left": 240, + "top": 180, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -3452,8 +3626,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 903, - "top": 484, + "left": 240, + "top": 225, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -3473,8 +3647,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 873, - "top": 616, + "left": 734, + "top": 656, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -3494,8 +3668,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 859, - "top": 613, + "left": 731, + "top": 670, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -3515,8 +3689,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 900, - "top": 620, + "left": 738, + "top": 629, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -3536,8 +3710,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 873, - "top": 352, + "left": 951, + "top": 216, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -3556,8 +3730,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 859, - "top": 355, + "left": 964, + "top": 213, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -3576,8 +3750,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 900, - "top": 348, + "left": 923, + "top": 220, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -3595,6 +3769,7 @@ "$ref": "AAAAAAGId2HiQPPOarQ=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": -8, "width": 10, @@ -3610,12 +3785,14 @@ "$ref": "AAAAAAGId2HiQPPPDQ0=" }, "visible": false, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": -8, "width": 10, "height": 10 } ], + "fillColor": "#d8f2ff", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGIHqeu5b/TIyM=" @@ -3623,7 +3800,7 @@ "tail": { "$ref": "AAAAAAGId0o4Sy+Le4o=" }, - "points": "888:648;888:333", + "points": "760:648;240:648;240:216;936:216;936:248", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGId2HiQfPSa9Y=" @@ -3687,9 +3864,11 @@ "$ref": "AAAAAAGId2QsV21Dp9w=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -944, - "top": 2496, + "left": -560, + "top": 1776, "height": 13 }, { @@ -3698,9 +3877,11 @@ "_parent": { "$ref": "AAAAAAGId2QsV21Dp9w=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 1117, - "top": 1463, + "left": 1309, + "top": 1103, "width": 317.56689453125, "height": 13, "text": "Stub" @@ -3712,9 +3893,11 @@ "$ref": "AAAAAAGId2QsV21Dp9w=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -944, - "top": 2496, + "left": -560, + "top": 1776, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -3726,16 +3909,20 @@ "$ref": "AAAAAAGId2QsV21Dp9w=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -944, - "top": 2496, + "left": -560, + "top": 1776, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1112, - "top": 1456, + "left": 1304, + "top": 1096, "width": 327.56689453125, "height": 25, "stereotypeLabel": { @@ -3760,9 +3947,11 @@ "model": { "$ref": "AAAAAAGId2QsVm1A3JM=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1112, - "top": 1481, + "left": 1304, + "top": 1121, "width": 327.56689453125, "height": 10 }, @@ -3785,9 +3974,11 @@ "model": { "$ref": "AAAAAAGId2XUAqdLsGI=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1117, - "top": 1496, + "left": 1309, + "top": 1136, "width": 317.56689453125, "height": 13, "text": "+DataLoad(): (List, Consultant)", @@ -3802,18 +3993,22 @@ "model": { "$ref": "AAAAAAGId2XjLagFgaw=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1117, - "top": 1511, + "left": 1309, + "top": 1151, "width": 317.56689453125, "height": 13, "text": "+DataSave(cu: List, co: Consultant): void", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1112, - "top": 1491, + "left": 1304, + "top": 1131, "width": 327.56689453125, "height": 38 }, @@ -3827,9 +4022,11 @@ "$ref": "AAAAAAGId2QsVm1A3JM=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -472, - "top": 1248, + "left": -280, + "top": 888, "width": 10, "height": 10 }, @@ -3843,17 +4040,21 @@ "$ref": "AAAAAAGId2QsVm1A3JM=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -472, - "top": 1248, + "left": -280, + "top": 888, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 1112, - "top": 1456, + "left": 1304, + "top": 1096, "width": 327.56689453125, "height": 89, "nameCompartment": { @@ -3891,13 +4092,15 @@ "model": { "$ref": "AAAAAAGId2/CzyR7P6Q=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1041, - "top": 1060, + "left": 920, + "top": 1071, "width": 75.51171875, "height": 13, - "alpha": 0.3392925529155939, - "distance": 54.08326913195984, + "alpha": 0.38515750621757583, + "distance": 119.77478866606278, "hostEdge": { "$ref": "AAAAAAGId2/C0CR/gxU=" }, @@ -3915,8 +4118,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1091, - "top": 1008, + "left": 942, + "top": 960, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -3936,8 +4139,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1046, - "top": 1009, + "left": 897, + "top": 961, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -3957,7 +4160,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1076, + "left": 927, "top": 857, "height": 13, "alpha": 0.5235987755982988, @@ -3978,7 +4181,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1089, + "left": 940, "top": 860, "height": 13, "alpha": 0.7853981633974483, @@ -3999,7 +4202,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1048, + "left": 899, "top": 853, "height": 13, "alpha": -0.5235987755982988, @@ -4020,8 +4223,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1076, - "top": 1160, + "left": 927, + "top": 1064, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -4040,8 +4243,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1089, - "top": 1157, + "left": 940, + "top": 1061, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -4060,8 +4263,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1048, - "top": 1164, + "left": 899, + "top": 1068, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -4079,6 +4282,8 @@ "$ref": "AAAAAAGId2/CzyR85jc=" }, "visible": false, + "fillColor": "#d8f2ff", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "left": 8, "width": 10, @@ -4094,12 +4299,16 @@ "$ref": "AAAAAAGId2/CzyR9AZ8=" }, "visible": false, + "fillColor": "#d8f2ff", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "left": 8, "width": 10, "height": 10 } ], + "fillColor": "#d8f2ff", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId0CsFiCUtUc=" @@ -4107,7 +4316,7 @@ "tail": { "$ref": "AAAAAAGId0o4Sy+Le4o=" }, - "points": "1061:838;1061:1192", + "points": "912:838;912:1096", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGId2/C0CSAEvI=" @@ -4171,8 +4380,10 @@ "$ref": "AAAAAAGId3JKh8hZF14=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -2480, + "left": -2112, "top": 1152, "height": 13 }, @@ -4182,8 +4393,10 @@ "_parent": { "$ref": "AAAAAAGId3JKh8hZF14=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 589, + "left": 773, "top": 1431, "width": 307.455078125, "height": 13, @@ -4196,8 +4409,10 @@ "$ref": "AAAAAAGId3JKh8hZF14=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -2480, + "left": -2112, "top": 1152, "width": 73.67724609375, "height": 13, @@ -4210,15 +4425,19 @@ "$ref": "AAAAAAGId3JKh8hZF14=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -2480, + "left": -2112, "top": 1152, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 584, + "left": 768, "top": 1424, "width": 317.455078125, "height": 25, @@ -4254,8 +4473,10 @@ "model": { "$ref": "AAAAAAGId3L59s1P+3o=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 589, + "left": 773, "top": 1454, "width": 307.455078125, "height": 13, @@ -4271,8 +4492,10 @@ "model": { "$ref": "AAAAAAGId3MIns4tBYc=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 589, + "left": 773, "top": 1469, "width": 307.455078125, "height": 13, @@ -4280,8 +4503,10 @@ "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 584, + "left": 768, "top": 1449, "width": 317.455078125, "height": 38 @@ -4305,8 +4530,10 @@ "model": { "$ref": "AAAAAAGId3LHA8yVkKg=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 589, + "left": 773, "top": 1492, "width": 307.455078125, "height": 13, @@ -4322,8 +4549,10 @@ "model": { "$ref": "AAAAAAGId3XEadVH/9M=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 589, + "left": 773, "top": 1507, "width": 307.455078125, "height": 13, @@ -4331,8 +4560,10 @@ "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 584, + "left": 768, "top": 1487, "width": 317.455078125, "height": 38 @@ -4347,8 +4578,10 @@ "$ref": "AAAAAAGId3JKhshWaKY=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -1240, + "left": -1056, "top": 576, "width": 10, "height": 10 @@ -4363,16 +4596,20 @@ "$ref": "AAAAAAGId3JKhshWaKY=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -1240, + "left": -1056, "top": 576, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 584, + "left": 768, "top": 1424, "width": 317.455078125, "height": 113, @@ -4413,8 +4650,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1617, - "top": 1361, + "left": 1185, + "top": 1149, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -4434,8 +4671,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1602, - "top": 1361, + "left": 1185, + "top": 1164, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -4455,8 +4692,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1647, - "top": 1362, + "left": 1186, + "top": 1119, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -4466,6 +4703,8 @@ "edgePosition": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId0CsFiCUtUc=" @@ -4473,7 +4712,7 @@ "tail": { "$ref": "AAAAAAGId2QsV21CemQ=" }, - "points": "1439:1500;1632:1500;1632:1236;1316:1236", + "points": "1304:1140;1068:1140", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGId4D/KNwAqjw=" @@ -4506,8 +4745,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1647, - "top": 841, + "left": 897, + "top": 1297, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -4527,8 +4766,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1662, - "top": 841, + "left": 882, + "top": 1297, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -4548,8 +4787,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1617, - "top": 842, + "left": 927, + "top": 1298, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -4559,6 +4798,8 @@ "edgePosition": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId0CsFiCUtUc=" @@ -4566,7 +4807,7 @@ "tail": { "$ref": "AAAAAAGId3JKh8hY5bU=" }, - "points": "742:1424;742:848;1632:848;1632:1236;1316:1236", + "points": "912:1424;912:1184", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGId4GEQu1zOj8=" @@ -4605,9 +4846,11 @@ "$ref": "AAAAAAGId4LWwD8zG+4=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -3200, - "top": 1568, + "left": -2784, + "top": 1648, "height": 13 }, { @@ -4616,9 +4859,11 @@ "_parent": { "$ref": "AAAAAAGId4LWwD8zG+4=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 637, - "top": 1655, + "left": 845, + "top": 1695, "width": 160.037109375, "height": 13, "text": "DataToPersist" @@ -4630,9 +4875,11 @@ "$ref": "AAAAAAGId4LWwD8zG+4=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -3200, - "top": 1568, + "left": -2784, + "top": 1648, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -4644,16 +4891,20 @@ "$ref": "AAAAAAGId4LWwD8zG+4=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -3200, - "top": 1568, + "left": -2784, + "top": 1648, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 632, - "top": 1648, + "left": 840, + "top": 1688, "width": 170.037109375, "height": 25, "stereotypeLabel": { @@ -4688,9 +4939,11 @@ "model": { "$ref": "AAAAAAGId4MkckRHr24=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 637, - "top": 1678, + "left": 845, + "top": 1718, "width": 160.037109375, "height": 13, "text": "+customer: List", @@ -4705,18 +4958,22 @@ "model": { "$ref": "AAAAAAGId4M3QUUBiQg=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 637, - "top": 1693, + "left": 845, + "top": 1733, "width": 160.037109375, "height": 13, "text": "+consultant: Consultant", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 632, - "top": 1673, + "left": 840, + "top": 1713, "width": 170.037109375, "height": 38 }, @@ -4729,9 +4986,11 @@ "model": { "$ref": "AAAAAAGId4LWvz8wYIQ=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 632, - "top": 1711, + "left": 840, + "top": 1751, "width": 170.037109375, "height": 10 }, @@ -4745,9 +5004,11 @@ "$ref": "AAAAAAGId4LWvz8wYIQ=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -1600, - "top": 784, + "left": -1392, + "top": 824, "width": 10, "height": 10 }, @@ -4761,17 +5022,21 @@ "$ref": "AAAAAAGId4LWvz8wYIQ=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -1600, - "top": 784, + "left": -1392, + "top": 824, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 632, - "top": 1648, + "left": 840, + "top": 1688, "width": 170.037109375, "height": 73, "nameCompartment": { @@ -4796,9 +5061,10 @@ "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 848, - "top": 344, + "left": 904, + "top": 216, "width": 17.22998046875, "height": 25, "text": "1" @@ -4809,6 +5075,7 @@ "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 864, "top": 536, @@ -4822,9 +5089,10 @@ "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 1336, - "top": 296, + "left": 1344, + "top": 280, "width": 26.25, "height": 25, "text": "1.*" @@ -4835,6 +5103,7 @@ "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", "left": 1200, "top": 504, @@ -4848,8 +5117,9 @@ "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, + "fillColor": "#d8f2ff", "font": "Arial;13;0", - "left": 1720, + "left": 1856, "top": 512, "width": 26.25, "height": 25, @@ -4882,9 +5152,11 @@ "$ref": "AAAAAAGIfH6a/ZYVl+o=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1056, + "left": -1584, + "top": 1008, "height": 13 }, { @@ -4893,9 +5165,11 @@ "_parent": { "$ref": "AAAAAAGIfH6a/ZYVl+o=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 1685, - "top": 1455, + "left": 1245, + "top": 1431, "width": 314.68505859375, "height": 13, "text": "DataContractPersJSON" @@ -4907,9 +5181,11 @@ "$ref": "AAAAAAGIfH6a/ZYVl+o=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1056, + "left": -1584, + "top": 1008, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -4921,16 +5197,20 @@ "$ref": "AAAAAAGIfH6a/ZYVl+o=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1056, + "left": -1584, + "top": 1008, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1680, - "top": 1448, + "left": 1240, + "top": 1424, "width": 324.68505859375, "height": 25, "stereotypeLabel": { @@ -4965,9 +5245,11 @@ "model": { "$ref": "AAAAAAGIfH7hR6A7uug=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1685, - "top": 1478, + "left": 1245, + "top": 1454, "width": 314.68505859375, "height": 13, "text": "+FilePath: string", @@ -4982,18 +5264,22 @@ "model": { "$ref": "AAAAAAGIfH7r8qD1RXY=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1685, - "top": 1493, + "left": 1245, + "top": 1469, "width": 314.68505859375, "height": 13, "text": "+FileName: string", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1680, - "top": 1473, + "left": 1240, + "top": 1449, "width": 324.68505859375, "height": 38 }, @@ -5016,9 +5302,11 @@ "model": { "$ref": "AAAAAAGIfH9LYqO94gg=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1685, - "top": 1516, + "left": 1245, + "top": 1492, "width": 314.68505859375, "height": 13, "text": "+DataLoad(): (List, Consultant)", @@ -5033,18 +5321,22 @@ "model": { "$ref": "AAAAAAGIfH9koaUrAAM=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1685, - "top": 1531, + "left": 1245, + "top": 1507, "width": 314.68505859375, "height": 13, "text": "+DataSave(cu: List, co: Consultant): void", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 1680, - "top": 1511, + "left": 1240, + "top": 1487, "width": 324.68505859375, "height": 38 }, @@ -5058,9 +5350,11 @@ "$ref": "AAAAAAGIfH6a/ZYSmYA=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -352, - "top": 528, + "left": -792, + "top": 504, "width": 10, "height": 10 }, @@ -5074,17 +5368,21 @@ "$ref": "AAAAAAGIfH6a/ZYSmYA=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -352, - "top": 528, + "left": -792, + "top": 504, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 1680, - "top": 1448, + "left": 1240, + "top": 1424, "width": 324.68505859375, "height": 113, "nameCompartment": { @@ -5130,9 +5428,11 @@ "$ref": "AAAAAAGIfICErMADYxE=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1136, + "left": -4384, + "top": 992, "height": 13 }, { @@ -5141,9 +5441,11 @@ "_parent": { "$ref": "AAAAAAGIfICErMADYxE=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;1", - "left": 2141, - "top": 1503, + "left": 301, + "top": 1431, "width": 314.6787109375, "height": 13, "text": "DataContractPersLINQ" @@ -5155,9 +5457,11 @@ "$ref": "AAAAAAGIfICErMADYxE=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1136, + "left": -4384, + "top": 992, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -5169,16 +5473,20 @@ "$ref": "AAAAAAGIfICErMADYxE=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -704, - "top": 1136, + "left": -4384, + "top": 992, "height": 13, "horizontalAlignment": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2136, - "top": 1496, + "left": 296, + "top": 1424, "width": 324.6787109375, "height": 25, "stereotypeLabel": { @@ -5213,9 +5521,11 @@ "model": { "$ref": "AAAAAAGIfIDMYctIjrQ=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2141, - "top": 1526, + "left": 301, + "top": 1454, "width": 314.6787109375, "height": 13, "text": "+FilePath: string", @@ -5230,18 +5540,22 @@ "model": { "$ref": "AAAAAAGIfIDZa8wCFig=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2141, - "top": 1541, + "left": 301, + "top": 1469, "width": 314.6787109375, "height": 13, "text": "+FileName: string", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2136, - "top": 1521, + "left": 296, + "top": 1449, "width": 324.6787109375, "height": 38 }, @@ -5264,9 +5578,11 @@ "model": { "$ref": "AAAAAAGIfIDlY8y8G7k=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2141, - "top": 1564, + "left": 301, + "top": 1492, "width": 314.6787109375, "height": 13, "text": "+DataLoad(): (List, Consultant)", @@ -5281,18 +5597,22 @@ "model": { "$ref": "AAAAAAGIfIDuGM12dQ0=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2141, - "top": 1579, + "left": 301, + "top": 1507, "width": 314.6787109375, "height": 13, "text": "+DataSave(cu: List, co: Consultant): void", "horizontalAlignment": 0 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 2136, - "top": 1559, + "left": 296, + "top": 1487, "width": 324.6787109375, "height": 38 }, @@ -5306,9 +5626,11 @@ "$ref": "AAAAAAGIfICErMAACpo=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -352, - "top": 568, + "left": -2192, + "top": 496, "width": 10, "height": 10 }, @@ -5322,17 +5644,21 @@ "$ref": "AAAAAAGIfICErMAACpo=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": -352, - "top": 568, + "left": -2192, + "top": 496, "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "containerChangeable": true, - "left": 2136, - "top": 1496, + "left": 296, + "top": 1424, "width": 324.6787109375, "height": 105, "nameCompartment": { @@ -5372,8 +5698,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2111, - "top": 841, + "left": 1215, + "top": 1289, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -5393,8 +5719,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 2111, - "top": 856, + "left": 1215, + "top": 1304, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5414,8 +5740,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2112, - "top": 811, + "left": 1216, + "top": 1259, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5425,6 +5751,8 @@ "edgePosition": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId0CsFiCUtUc=" @@ -5432,7 +5760,7 @@ "tail": { "$ref": "AAAAAAGIfH6a/ZYUJeg=" }, - "points": "1841:1448;1841:868;2112:868;2112:832;1736:832;1736:1236;1316:1236", + "points": "1400:1424;1400:1280;1032:1280;1032:1184", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGIfIPflOQ0XT8=" @@ -5465,8 +5793,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2423, - "top": 1245, + "left": 624, + "top": 1259, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -5486,8 +5814,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 2423, - "top": 1260, + "left": 624, + "top": 1244, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5507,8 +5835,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 2424, - "top": 1215, + "left": 624, + "top": 1289, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5518,6 +5846,8 @@ "edgePosition": 1 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId0CsFiCUtUc=" @@ -5525,7 +5855,7 @@ "tail": { "$ref": "AAAAAAGIfICErMACRAY=" }, - "points": "2424:1496;2424:1236;1316:1236", + "points": "457:1424;457:1280;792:1280;792:1184", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGIfIWGjmtVXHM=" @@ -5556,13 +5886,15 @@ "model": { "$ref": "AAAAAAGIi3B4tGVJV9k=" }, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", - "left": 724, - "top": 1667, + "left": 929, + "top": 1639, "width": 75.51171875, "height": 13, - "alpha": 0.5205347734974526, - "distance": 88.20430828479978, + "alpha": 0.8986577035503744, + "distance": 53.03772242470448, "hostEdge": { "$ref": "AAAAAAGIi3B4tWVNoTk=" }, @@ -5580,8 +5912,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 757, - "top": 1589, + "left": 954, + "top": 1606, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -5601,8 +5933,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 713, - "top": 1584, + "left": 910, + "top": 1605, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -5622,8 +5954,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 746, - "top": 1558, + "left": 940, + "top": 1557, "height": 13, "alpha": 0.5235987755982988, "distance": 30, @@ -5643,8 +5975,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 759, - "top": 1562, + "left": 953, + "top": 1559, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -5664,8 +5996,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 719, - "top": 1550, + "left": 913, + "top": 1552, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -5685,8 +6017,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 739, - "top": 1617, + "left": 939, + "top": 1655, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -5705,8 +6037,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 752, - "top": 1616, + "left": 952, + "top": 1653, "height": 13, "alpha": -0.7853981633974483, "distance": 40, @@ -5725,8 +6057,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 711, - "top": 1617, + "left": 911, + "top": 1659, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -5744,6 +6076,8 @@ "$ref": "AAAAAAGIi3B4tGVK/nA=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "width": 10, "height": 10 @@ -5758,11 +6092,15 @@ "$ref": "AAAAAAGIi3B4tGVLlrI=" }, "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "width": 10, "height": 10 } ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", "font": "Arial;13;0", "head": { "$ref": "AAAAAAGId4LWwD8yiQE=" @@ -5771,7 +6109,7 @@ "$ref": "AAAAAAGId3JKh8hY5bU=" }, "lineStyle": 1, - "points": "735:1537;721:1647", + "points": "926:1537;924:1687", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGIi3B4tWVOodI=" @@ -5807,166 +6145,732 @@ "headQualifiersCompartment": { "$ref": "AAAAAAGIi3B4tWVY4UM=" } - } - ] - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGIHoUoGr2MsDg=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Per" - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGIHoVeFr3OX0c=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Class1" - }, - { - "_type": "UMLClass", - "_id": "AAAAAAGIHoWVAr33oyk=", - "_parent": { - "$ref": "AAAAAAFF+qBWK6M3Z8Y=" - }, - "name": "Person", - "ownedElements": [ - { - "_type": "UMLGeneralization", - "_id": "AAAAAAGIHssi6cAo7rA=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "source": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "target": { - "$ref": "AAAAAAGIHo06rb5Xk/g=" - } - } - ], - "attributes": [ - { - "_type": "UMLAttribute", - "_id": "AAAAAAGIHog08L4yqug=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "name": "Id", - "visibility": "private", - "type": "string" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGIHoXoZb4ivtM=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "name": "Name", - "visibility": "private", - "type": "string" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGIHoeQ5b4q9e4=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "name": "FirstName", - "visibility": "private", - "type": "string" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGIHog4Yb44It8=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "name": "Password", - "visibility": "private", - "type": "string" }, { - "_type": "UMLAttribute", - "_id": "AAAAAAGIHog7XL4+Umw=", + "_type": "UMLAssociationView", + "_id": "AAAAAAGIj8irxC1sjIA=", "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" + "$ref": "AAAAAAFF+qBtyKM79qY=" }, - "name": "Attribute3", - "type": "" - } - ], - "operations": [ - { - "_type": "UMLOperation", - "_id": "AAAAAAGIHojY1L5IuEY=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" + "model": { + "$ref": "AAAAAAGIj8irwi1oWdk=" }, - "name": "Person", - "parameters": [ + "subViews": [ { - "_type": "UMLParameter", - "_id": "AAAAAAGIHolkar5PFjs=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1tKjE=", "_parent": { - "$ref": "AAAAAAGIHojY1L5IuEY=" + "$ref": "AAAAAAGIj8irxC1sjIA=" }, - "name": "name", - "type": "string" + "model": { + "$ref": "AAAAAAGIj8irwi1oWdk=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1399, + "top": 1736, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 1 }, { - "_type": "UMLParameter", - "_id": "AAAAAAGIHolkar5QyXQ=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1u+No=", "_parent": { - "$ref": "AAAAAAGIHojY1L5IuEY=" + "$ref": "AAAAAAGIj8irxC1sjIA=" }, - "name": "firstName", - "type": "string" + "model": { + "$ref": "AAAAAAGIj8irwi1oWdk=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 1399, + "top": 1751, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 1 }, { - "_type": "UMLParameter", - "_id": "AAAAAAGIHolkar5RdfY=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1vOPE=", "_parent": { - "$ref": "AAAAAAGIHojY1L5IuEY=" + "$ref": "AAAAAAGIj8irxC1sjIA=" }, - "name": "password", - "type": "string" - } - ] - }, - { - "_type": "UMLOperation", - "_id": "AAAAAAGIQqFhqZidBCo=", - "_parent": { - "$ref": "AAAAAAGIHoWVAr33oyk=" - }, - "name": "LogIn", - "visibility": "protected", - "parameters": [ - { - "_type": "UMLParameter", - "_id": "AAAAAAGIQqFp6ZjazPM=", - "_parent": { - "$ref": "AAAAAAGIQqFhqZidBCo=" + "model": { + "$ref": "AAAAAAGIj8irwi1oWdk=" }, - "name": "id", - "type": "string" + "visible": false, + "font": "Arial;13;0", + "left": 1400, + "top": 1707, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 1 }, { - "_type": "UMLParameter", - "_id": "AAAAAAGIQqFp6ZjbzpI=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1wtNA=", "_parent": { - "$ref": "AAAAAAGIQqFhqZidBCo=" + "$ref": "AAAAAAGIj8irxC1sjIA=" }, - "name": "password", - "type": "string" + "model": { + "$ref": "AAAAAAGIj8irwi1pvVY=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1415, + "top": 1557, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 2 }, { - "_type": "UMLParameter", - "_id": "AAAAAAGIQqFp6Zjc9+0=", + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1xZjc=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1pvVY=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1429, + "top": 1559, + "height": 13, + "alpha": 0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1yfxA=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1pvVY=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1388, + "top": 1552, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC1zv48=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1qr2g=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1035, + "top": 1734, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC109DA=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1qr2g=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1038, + "top": 1747, + "height": 13, + "alpha": -0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8irxC11eAY=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1qr2g=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 1031, + "top": 1706, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + } + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGIj8irxC12nyo=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1pvVY=" + }, + "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGIj8irxC13AC0=", + "_parent": { + "$ref": "AAAAAAGIj8irxC1sjIA=" + }, + "model": { + "$ref": "AAAAAAGIj8irwi1qr2g=" + }, + "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGId4LWwD8yiQE=" + }, + "tail": { + "$ref": "AAAAAAGIfH6a/ZYUJeg=" + }, + "lineStyle": 1, + "points": "1401:1537;1400:1728;1010:1725", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIj8irxC1tKjE=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIj8irxC1u+No=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIj8irxC1vOPE=" + }, + "showEndOrder": "hide", + "tailRoleNameLabel": { + "$ref": "AAAAAAGIj8irxC1wtNA=" + }, + "tailPropertyLabel": { + "$ref": "AAAAAAGIj8irxC1xZjc=" + }, + "tailMultiplicityLabel": { + "$ref": "AAAAAAGIj8irxC1yfxA=" + }, + "headRoleNameLabel": { + "$ref": "AAAAAAGIj8irxC1zv48=" + }, + "headPropertyLabel": { + "$ref": "AAAAAAGIj8irxC109DA=" + }, + "headMultiplicityLabel": { + "$ref": "AAAAAAGIj8irxC11eAY=" + }, + "tailQualifiersCompartment": { + "$ref": "AAAAAAGIj8irxC12nyo=" + }, + "headQualifiersCompartment": { + "$ref": "AAAAAAGIj8irxC13AC0=" + } + }, + { + "_type": "UMLAssociationView", + "_id": "AAAAAAGIj8jda0VxqZE=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "subViews": [ + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jda0VyNLw=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 456, + "top": 1699, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jda0VzgaY=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "visible": null, + "font": "Arial;13;0", + "left": 456, + "top": 1684, + "height": 13, + "alpha": 1.5707963267948966, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV00Pc=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 455, + "top": 1728, + "height": 13, + "alpha": -1.5707963267948966, + "distance": 15, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 1 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV1eWY=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vu+ak=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 471, + "top": 1549, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV2y38=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vu+ak=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 485, + "top": 1551, + "height": 13, + "alpha": 0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV3l58=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vu+ak=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 444, + "top": 1544, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "edgePosition": 2 + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV4AgI=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vvijc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 813, + "top": 1701, + "height": 13, + "alpha": -0.5235987755982988, + "distance": 30, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV5tNs=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vvijc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 810, + "top": 1688, + "height": 13, + "alpha": -0.7853981633974483, + "distance": 40, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + } + }, + { + "_type": "EdgeLabelView", + "_id": "AAAAAAGIj8jdbEV6ylY=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vvijc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 817, + "top": 1729, + "height": 13, + "alpha": 0.5235987755982988, + "distance": 25, + "hostEdge": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + } + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGIj8jdbEV7x48=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vu+ak=" + }, + "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "width": 10, + "height": 10 + }, + { + "_type": "UMLQualifierCompartmentView", + "_id": "AAAAAAGIj8jdbEV8Si0=", + "_parent": { + "$ref": "AAAAAAGIj8jda0VxqZE=" + }, + "model": { + "$ref": "AAAAAAGIj8jda0Vvijc=" + }, + "visible": false, + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "width": 10, + "height": 10 + } + ], + "fillColor": "#eddddd", + "fontColor": "#ff2b2b", + "font": "Arial;13;0", + "head": { + "$ref": "AAAAAAGId4LWwD8yiQE=" + }, + "tail": { + "$ref": "AAAAAAGIfICErMACRAY=" + }, + "lineStyle": 1, + "points": "457:1529;456:1720;839:1723", + "showVisibility": true, + "nameLabel": { + "$ref": "AAAAAAGIj8jda0VyNLw=" + }, + "stereotypeLabel": { + "$ref": "AAAAAAGIj8jda0VzgaY=" + }, + "propertyLabel": { + "$ref": "AAAAAAGIj8jdbEV00Pc=" + }, + "showEndOrder": "hide", + "tailRoleNameLabel": { + "$ref": "AAAAAAGIj8jdbEV1eWY=" + }, + "tailPropertyLabel": { + "$ref": "AAAAAAGIj8jdbEV2y38=" + }, + "tailMultiplicityLabel": { + "$ref": "AAAAAAGIj8jdbEV3l58=" + }, + "headRoleNameLabel": { + "$ref": "AAAAAAGIj8jdbEV4AgI=" + }, + "headPropertyLabel": { + "$ref": "AAAAAAGIj8jdbEV5tNs=" + }, + "headMultiplicityLabel": { + "$ref": "AAAAAAGIj8jdbEV6ylY=" + }, + "tailQualifiersCompartment": { + "$ref": "AAAAAAGIj8jdbEV7x48=" + }, + "headQualifiersCompartment": { + "$ref": "AAAAAAGIj8jdbEV8Si0=" + } + }, + { + "_type": "UMLTextView", + "_id": "AAAAAAGIj9Fqkzt59uA=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "fontColor": "#ff0000", + "font": "Arial;28;0", + "left": 240, + "top": 976, + "width": 156.2890625, + "height": 40, + "text": "Persistance" + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGIHoUoGr2MsDg=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Per" + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGIHoVeFr3OX0c=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Class1" + }, + { + "_type": "UMLClass", + "_id": "AAAAAAGIHoWVAr33oyk=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Person", + "ownedElements": [ + { + "_type": "UMLGeneralization", + "_id": "AAAAAAGIHssi6cAo7rA=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "source": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "target": { + "$ref": "AAAAAAGIHo06rb5Xk/g=" + } + } + ], + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAGIHog08L4yqug=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "Id", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGIHoXoZb4ivtM=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "Name", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGIHoeQ5b4q9e4=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "FirstName", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGIHog4Yb44It8=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "Password", + "visibility": "private", + "type": "string" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGIHog7XL4+Umw=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "Attribute3", + "type": "" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAGIHojY1L5IuEY=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "Person", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIHolkar5PFjs=", + "_parent": { + "$ref": "AAAAAAGIHojY1L5IuEY=" + }, + "name": "name", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIHolkar5QyXQ=", + "_parent": { + "$ref": "AAAAAAGIHojY1L5IuEY=" + }, + "name": "firstName", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIHolkar5RdfY=", + "_parent": { + "$ref": "AAAAAAGIHojY1L5IuEY=" + }, + "name": "password", + "type": "string" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAGIQqFhqZidBCo=", + "_parent": { + "$ref": "AAAAAAGIHoWVAr33oyk=" + }, + "name": "LogIn", + "visibility": "protected", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGIQqFp6ZjazPM=", + "_parent": { + "$ref": "AAAAAAGIQqFhqZidBCo=" + }, + "name": "id", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIQqFp6ZjbzpI=", + "_parent": { + "$ref": "AAAAAAGIQqFhqZidBCo=" + }, + "name": "password", + "type": "string" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGIQqFp6Zjc9+0=", "_parent": { "$ref": "AAAAAAGIQqFhqZidBCo=" }, @@ -7316,6 +8220,34 @@ "target": { "$ref": "AAAAAAGId0CsFSCSASs=" } + }, + { + "_type": "UMLAssociation", + "_id": "AAAAAAGIj8irwi1oWdk=", + "_parent": { + "$ref": "AAAAAAGIfH6a/ZYSmYA=" + }, + "end1": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGIj8irwi1pvVY=", + "_parent": { + "$ref": "AAAAAAGIj8irwi1oWdk=" + }, + "reference": { + "$ref": "AAAAAAGIfH6a/ZYSmYA=" + } + }, + "end2": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGIj8irwi1qr2g=", + "_parent": { + "$ref": "AAAAAAGIj8irwi1oWdk=" + }, + "reference": { + "$ref": "AAAAAAGId4LWvz8wYIQ=" + }, + "navigable": "navigable" + } } ], "attributes": [ @@ -7419,6 +8351,34 @@ "target": { "$ref": "AAAAAAGId0CsFSCSASs=" } + }, + { + "_type": "UMLAssociation", + "_id": "AAAAAAGIj8jda0Vt2tM=", + "_parent": { + "$ref": "AAAAAAGIfICErMAACpo=" + }, + "end1": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGIj8jda0Vu+ak=", + "_parent": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "reference": { + "$ref": "AAAAAAGIfICErMAACpo=" + } + }, + "end2": { + "_type": "UMLAssociationEnd", + "_id": "AAAAAAGIj8jda0Vvijc=", + "_parent": { + "$ref": "AAAAAAGIj8jda0Vt2tM=" + }, + "reference": { + "$ref": "AAAAAAGId4LWvz8wYIQ=" + }, + "navigable": "navigable" + } } ], "attributes": [ diff --git a/Documentation/docPrepaAppli-IHM/Main.png b/Documentation/docPrepaAppli-IHM/Main.png deleted file mode 100644 index 6f51de9..0000000 Binary files a/Documentation/docPrepaAppli-IHM/Main.png and /dev/null differ diff --git a/Documentation/docPrepaAppli-IHM/PackageDiagram.png b/Documentation/docPrepaAppli-IHM/PackageDiagram.png new file mode 100644 index 0000000..5497d1f Binary files /dev/null and b/Documentation/docPrepaAppli-IHM/PackageDiagram.png differ