Git Repository Public Repository

RRRRHHHH_Artifacts

URLs

Copy to Clipboard

Diff Revisions b5ac56 ... vs 4816e0 ... for RH_Artifacts.mdj

Diff revisions: vs.
  @@ -20,23 +20,12 @@
20 20 "name": "RH_DomainModelDiagram",
21 21 "visible": true,
22 22 "defaultDiagram": true
23 - }
24 - ],
25 - "visibility": "public"
26 - },
27 - {
28 - "_type": "UMLModel",
29 - "_id": "AAAAAAFLwEPOeHaAPqY=",
30 - "_parent": {
31 - "$ref": "AAAAAAFF+h6SjaM2Hec="
32 - },
33 - "name": "Model1",
34 - "ownedElements": [
23 + },
35 24 {
36 25 "_type": "UMLUseCaseDiagram",
37 26 "_id": "AAAAAAFLwEPOeHaB+Q8=",
38 27 "_parent": {
39 - "$ref": "AAAAAAFLwEPOeHaAPqY="
28 + "$ref": "AAAAAAFF+qBWK6M3Z8Y="
40 29 },
41 30 "name": "RH_UseCaseDiagram",
42 31 "ownedElements": [
  @@ -107,7 +96,7 @@
107 96 "visibility": "public"
108 97 }
109 98 ],
110 - "documentation": "\n#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Register New House**.\n2. User enters town, number of bedrooms, bathrooms, kitchens and dining rooms, as well as the number of parking spaces. Additionally a general description of the house can be included.\n3. System saves created house and displays an **OK** message.\n\n#Alternative Flow\n\n2. a) User enters invalid formated data: System displays an error message.\n2. b) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
99 + "documentation": "\n#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Register New House**.\n* 2. User enters town, number of bedrooms, bathrooms, kitchens and dining rooms, as well as the number of parking spaces. Additionally a general description of the house can be included.\n* 3. System saves created house and displays an **OK** message.\n\n#Alternative Flow\n\n* 2.a) User enters invalid formated data: System displays an error message.\n* 2.b) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
111 100 "visibility": "public",
112 101 "isAbstract": false,
113 102 "isFinalSpecialization": false,
  @@ -136,7 +125,7 @@
136 125 "visibility": "public"
137 126 }
138 127 ],
139 - "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Modify House**.\n2. User picks a house from the list.\n3. User enters updated data into any modifiable field (all of them) or deletes house.\n3. System saves created house and displays an **OK** message.\n\n#Alternative Flow\n\n3. a) User enters invalid formated data: System displays an error message.\n3. b) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
128 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Modify House**.\n* 2. User picks a house from the list.\n* 3. User enters updated data into any modifiable field (all of them) or deletes house.\n* 4. System saves created house and displays an **OK** message.\n\n#Alternative Flow\n\n* 3.a) User enters invalid formated data: System displays an error message.\n* 3.b) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
140 129 "visibility": "public",
141 130 "isAbstract": false,
142 131 "isFinalSpecialization": false,
  @@ -179,7 +168,7 @@
179 168 "visibility": "public"
180 169 }
181 170 ],
182 - "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Set Offers**.\n2. User picks a house from the list.\n3. User enters starting date, ending date and the corresponding rate of the offer.\n4. System displays an **OK** message.\n\n\n#Alternative Flow\n\n2. a) User enters invalid formated data: System displays an error message.\n2. a) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
171 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Set Offers**.\n* 2. User picks a house from the list.\n* 3. User enters starting date, ending date and the corresponding rate of the offer.\n* 4. System displays an **OK** message.\n\n\n#Alternative Flow\n\n* 2.a) User enters invalid formated data: System displays an error message.\n* 2.a) User doesn't enter the minimun prerequisites established by the RHNR: System displays an error message.\n\n#Precondition\n\n* Being **logged** as an **Owner**.\n\n",
183 172 "visibility": "public",
184 173 "isAbstract": false,
185 174 "isFinalSpecialization": false,
  @@ -192,7 +181,7 @@
192 181 "$ref": "AAAAAAFLwEZuiXb1a3A="
193 182 },
194 183 "name": "Login",
195 - "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Login**.\n2. User enters his personal *Username* and *Password*\n3. System prompts user to a extended menu.\n\n#Alternative Flow\n\n2. a) User enters invalid formated data: System displays an error message.\n2. a) *Username* and *Password* don't match with database: Syste displays **Username does not exist or password does not match\n\n\n#Precondition\n\n* None\n\n",
184 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Login**.\n* 2. User enters his personal *Username* and *Password*\n* 3. System prompts user to a extended menu.\n\n#Alternative Flow\n\n* 2.a) User enters invalid formated data: System displays an error message.\n* 2.b) *Username* and *Password* don't match with database: Syste displays **Username does not exist or password does not match\n\n\n#Precondition\n\n* None\n\n",
196 185 "visibility": "public",
197 186 "isAbstract": false,
198 187 "isFinalSpecialization": false,
  @@ -232,7 +221,7 @@
232 221 "visibility": "public"
233 222 }
234 223 ],
235 - "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Query Availability**.\n2. User enters his personal *Username* and *Password*\n3. System prompts user to a extended menu.\n\n#Alternative Flow\n\n2. a) User enters invalid formated data: System displays an error message.\n2. a) *Username* and *Password* don't match with database: Syste displays **Username does not exist or password does not match\n\n\n#Precondition\n\n* None",
224 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Query Availability**.\n* 2. User or system enters the code of a house.\n* 3. System shows the availability of the required house.\n\n#Alternative Flow\n\n* 2. a) User enters invalid formated data: System displays an error message.\n* 2. b) The entered house code does not exist: **System** displays warning message.\n* 2. c) There are not available offers for the required house : **System** displays warning message.\n\n\n#Precondition\n\n* None",
236 225 "visibility": "public",
237 226 "isAbstract": false,
238 227 "isFinalSpecialization": false,
  @@ -262,6 +251,7 @@
262 251 "visibility": "public"
263 252 }
264 253 ],
254 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Book Rural Houses**.\n* 2. User enters house code, entry date and nights.\n* 3. **System** shows the owner bank account and the amount to be transfered.\n* 4. User enters phone number.\n\n\n#Alternative Flow\n\n* 2.a) User enters invalid formated data: System displays an error message.\n* 2.b) User enters non existing offer parameters :**System** shows warning message.\n* 4.a) User enters invalid formated data: System displays an error message.\n\n#Precondition\n\n* None",
265 255 "visibility": "public",
266 256 "isAbstract": false,
267 257 "isFinalSpecialization": false,
  @@ -274,7 +264,7 @@
274 264 "$ref": "AAAAAAFLwFBPCYMWU6I="
275 265 },
276 266 "name": "Search Houses",
277 - "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n1. User clicks **Search Houses**.\n2. User enters either the \n3. System prompts user to a extended menu.\n\n#Alternative Flow\n\n2. a) User enters invalid formated data: System displays an error message.\n2. a) *Username* and *Password* don't match with database: Syste displays **Username does not exist or password does not match\n\n\n#Precondition\n\n* None",
267 + "documentation": "#Description\n\n##Flow of Events\n\n#Basic Flow\n\n* 1. User clicks **Search Houses**.\n* 2. User enters either the name of the town or the house code.\n* 2.1) **System** returns a list of all the rural houses in the specified town.\n* 2.2) **System** returns information about the specified house.\n\n#Alternative Flow\n\n* 2.a) User enters invalid formated data: System displays an error message.\n* 2.b) User enters inexistant house code: System displays warning message.\n* 2.c) User enters inexistant town name : System displays warning message.\n\n\n#Precondition\n\n* None",
278 268 "visibility": "public",
279 269 "isAbstract": false,
280 270 "isFinalSpecialization": false,
  @@ -1461,7 +1451,7 @@
1461 1451 "font": "Arial;13;0",
1462 1452 "showShadow": true,
1463 1453 "left": -600,
1464 - "top": -36,
1454 + "top": -60,
1465 1455 "width": 0,
1466 1456 "height": 13,
1467 1457 "autoResize": false,
  @@ -1483,7 +1473,7 @@
1483 1473 "font": "Arial;13;1",
1484 1474 "showShadow": true,
1485 1475 "left": 261.5,
1486 - "top": 151.5,
1476 + "top": 143.5,
1487 1477 "width": 126,
1488 1478 "height": 13,
1489 1479 "autoResize": false,
  @@ -1506,7 +1496,7 @@
1506 1496 "font": "Arial;13;0",
1507 1497 "showShadow": true,
1508 1498 "left": -600,
1509 - "top": -36,
1499 + "top": -60,
1510 1500 "width": 79,
1511 1501 "height": 13,
1512 1502 "autoResize": false,
  @@ -1529,7 +1519,7 @@
1529 1519 "font": "Arial;13;0",
1530 1520 "showShadow": true,
1531 1521 "left": -600,
1532 - "top": -36,
1522 + "top": -60,
1533 1523 "width": 0,
1534 1524 "height": 13,
1535 1525 "autoResize": false,
  @@ -1546,7 +1536,7 @@
1546 1536 "font": "Arial;13;0",
1547 1537 "showShadow": true,
1548 1538 "left": 256.5,
1549 - "top": 144.5,
1539 + "top": 136.5,
1550 1540 "width": 137,
1551 1541 "height": 25,
1552 1542 "autoResize": false,
  @@ -1580,7 +1570,7 @@
1580 1570 "font": "Arial;13;0",
1581 1571 "showShadow": true,
1582 1572 "left": -400,
1583 - "top": -24,
1573 + "top": -40,
1584 1574 "width": 10,
1585 1575 "height": 10,
1586 1576 "autoResize": false
  @@ -1602,7 +1592,7 @@
1602 1592 "font": "Arial;13;0",
1603 1593 "showShadow": true,
1604 1594 "left": -400,
1605 - "top": -24,
1595 + "top": -40,
1606 1596 "width": 10,
1607 1597 "height": 10,
1608 1598 "autoResize": false
  @@ -1624,7 +1614,7 @@
1624 1614 "font": "Arial;13;0",
1625 1615 "showShadow": true,
1626 1616 "left": -400,
1627 - "top": -24,
1617 + "top": -40,
1628 1618 "width": 10,
1629 1619 "height": 10,
1630 1620 "autoResize": false
  @@ -1646,7 +1636,7 @@
1646 1636 "font": "Arial;13;0",
1647 1637 "showShadow": true,
1648 1638 "left": -400,
1649 - "top": -24,
1639 + "top": -40,
1650 1640 "width": 10,
1651 1641 "height": 10,
1652 1642 "autoResize": false
  @@ -1660,7 +1650,7 @@
1660 1650 "font": "Arial;13;0",
1661 1651 "showShadow": true,
1662 1652 "left": 228,
1663 - "top": 140,
1653 + "top": 132,
1664 1654 "width": 193,
1665 1655 "height": 35,
1666 1656 "autoResize": false,
  @@ -2506,7 +2496,7 @@
2506 2496 "font": "Arial;13;0",
2507 2497 "showShadow": true,
2508 2498 "left": 423,
2509 - "top": 172,
2499 + "top": 169,
2510 2500 "width": 0,
2511 2501 "height": 13,
2512 2502 "autoResize": false,
  @@ -2537,7 +2527,7 @@
2537 2527 "font": "Arial;13;0",
2538 2528 "showShadow": true,
2539 2529 "left": 400,
2540 - "top": 167,
2530 + "top": 163,
2541 2531 "width": 55,
2542 2532 "height": 13,
2543 2533 "autoResize": false,
  @@ -2569,7 +2559,7 @@
2569 2559 "font": "Arial;13;0",
2570 2560 "showShadow": true,
2571 2561 "left": 412,
2572 - "top": 201,
2562 + "top": 196,
2573 2563 "width": 0,
2574 2564 "height": 13,
2575 2565 "autoResize": false,
  @@ -2598,7 +2588,7 @@
2598 2588 "$ref": "AAAAAAFLwEauyHcTVPI="
2599 2589 },
2600 2590 "lineStyle": 1,
2601 - "points": "371.25:175;465.75:211",
2591 + "points": "366.525:167;470.475:211",
2602 2592 "stereotypeDisplay": "label",
2603 2593 "showVisibility": true,
2604 2594 "showProperty": true,
  @@ -2997,7 +2987,7 @@
2997 2987 "$ref": "AAAAAAFLwEauyHcTVPI="
2998 2988 },
2999 2989 "lineStyle": 1,
3000 - "points": "321.6774193548387:175;304:312;326.17391304347825:363",
2990 + "points": "321.7914110429448:167;304:312;326.17391304347825:363",
3001 2991 "stereotypeDisplay": "label",
3002 2992 "showVisibility": true,
3003 2993 "showProperty": true,
  @@ -3038,7 +3028,7 @@
3038 3028 "font": "Arial;13;0",
3039 3029 "showShadow": true,
3040 3030 "left": 372,
3041 - "top": 229,
3031 + "top": 225,
3042 3032 "width": 0,
3043 3033 "height": 13,
3044 3034 "autoResize": false,
  @@ -3069,7 +3059,7 @@
3069 3059 "font": "Arial;13;0",
3070 3060 "showShadow": true,
3071 3061 "left": 369,
3072 - "top": 248,
3062 + "top": 244,
3073 3063 "width": 53,
3074 3064 "height": 13,
3075 3065 "autoResize": false,
  @@ -3101,7 +3091,7 @@
3101 3091 "font": "Arial;13;0",
3102 3092 "showShadow": true,
3103 3093 "left": 345,
3104 - "top": 240,
3094 + "top": 236,
3105 3095 "width": 0,
3106 3096 "height": 13,
3107 3097 "autoResize": false,
  @@ -3130,7 +3120,7 @@
3130 3120 "$ref": "AAAAAAFLwEauyHcTVPI="
3131 3121 },
3132 3122 "lineStyle": 1,
3133 - "points": "331.5:175;386.5:307",
3123 + "points": "331.15909090909093:167;386.8409090909091:307",
3134 3124 "stereotypeDisplay": "label",
3135 3125 "showVisibility": true,
3136 3126 "showProperty": true,
  @@ -4331,8 +4321,8 @@
4331 4321 "fontColor": "#000000",
4332 4322 "font": "Arial;13;0",
4333 4323 "showShadow": true,
4334 - "left": 192,
4335 - "top": 189,
4324 + "left": 193,
4325 + "top": 184,
4336 4326 "width": 0,
4337 4327 "height": 13,
4338 4328 "autoResize": false,
  @@ -4362,8 +4352,8 @@
4362 4352 "fontColor": "#000000",
4363 4353 "font": "Arial;13;0",
4364 4354 "showShadow": true,
4365 - "left": 186,
4366 - "top": 175,
4355 + "left": 187,
4356 + "top": 170,
4367 4357 "width": 0,
4368 4358 "height": 13,
4369 4359 "autoResize": false,
  @@ -4393,8 +4383,8 @@
4393 4383 "fontColor": "#000000",
4394 4384 "font": "Arial;13;0",
4395 4385 "showShadow": true,
4396 - "left": 203,
4397 - "top": 216,
4386 + "left": 206,
4387 + "top": 211,
4398 4388 "width": 0,
4399 4389 "height": 13,
4400 4390 "autoResize": false,
  @@ -4424,8 +4414,8 @@
4424 4414 "fontColor": "#000000",
4425 4415 "font": "Arial;13;0",
4426 4416 "showShadow": true,
4427 - "left": 134,
4428 - "top": 213.7404255319149,
4417 + "left": 133,
4418 + "top": 211.82127659574468,
4429 4419 "width": 0,
4430 4420 "height": 13,
4431 4421 "autoResize": false,
  @@ -4455,8 +4445,8 @@
4455 4445 "fontColor": "#000000",
4456 4446 "font": "Arial;13;0",
4457 4447 "showShadow": true,
4458 - "left": 131,
4459 - "top": 200.7404255319149,
4448 + "left": 130,
4449 + "top": 198.82127659574468,
4460 4450 "width": 0,
4461 4451 "height": 13,
4462 4452 "autoResize": false,
  @@ -4487,7 +4477,7 @@
4487 4477 "font": "Arial;13;0",
4488 4478 "showShadow": true,
4489 4479 "left": 140,
4490 - "top": 240.7404255319149,
4480 + "top": 238.82127659574468,
4491 4481 "width": 0,
4492 4482 "height": 13,
4493 4483 "autoResize": false,
  @@ -4517,8 +4507,8 @@
4517 4507 "fontColor": "#000000",
4518 4508 "font": "Arial;13;0",
4519 4509 "showShadow": true,
4520 - "left": 250.83673469387753,
4521 - "top": 165,
4510 + "left": 254.09433962264148,
4511 + "top": 158,
4522 4512 "width": 0,
4523 4513 "height": 13,
4524 4514 "autoResize": false,
  @@ -4548,8 +4538,8 @@
4548 4538 "fontColor": "#000000",
4549 4539 "font": "Arial;13;0",
4550 4540 "showShadow": true,
4551 - "left": 243.83673469387753,
4552 - "top": 153,
4541 + "left": 246.09433962264148,
4542 + "top": 146,
4553 4543 "width": 0,
4554 4544 "height": 13,
4555 4545 "autoResize": false,
  @@ -4579,8 +4569,8 @@
4579 4569 "fontColor": "#000000",
4580 4570 "font": "Arial;13;0",
4581 4571 "showShadow": true,
4582 - "left": 264.83673469387753,
4583 - "top": 188,
4572 + "left": 269.0943396226415,
4573 + "top": 181,
4584 4574 "width": 0,
4585 4575 "height": 13,
4586 4576 "autoResize": false,
  @@ -4653,7 +4643,7 @@
4653 4643 "$ref": "AAAAAAFLwETGiHavFWM="
4654 4644 },
4655 4645 "lineStyle": 1,
4656 - "points": "116:243.7404255319149;280.83673469387753:175",
4646 + "points": "116:242.82127659574468;284.0943396226415:167",
4657 4647 "stereotypeDisplay": "label",
4658 4648 "showVisibility": true,
4659 4649 "showProperty": true,
  @@ -4884,7 +4874,7 @@
4884 4874 "fontColor": "#000000",
4885 4875 "font": "Arial;13;0",
4886 4876 "showShadow": true,
4887 - "left": -216,
4877 + "left": -228,
4888 4878 "top": 168,
4889 4879 "width": 0,
4890 4880 "height": 13,
  @@ -4906,7 +4896,7 @@
4906 4896 "fontColor": "#000000",
4907 4897 "font": "Arial;13;1",
4908 4898 "showShadow": true,
4909 - "left": 330.5,
4899 + "left": 326.5,
4910 4900 "top": 567.5,
4911 4901 "width": 112,
4912 4902 "height": 13,
  @@ -4929,7 +4919,7 @@
4929 4919 "fontColor": "#000000",
4930 4920 "font": "Arial;13;0",
4931 4921 "showShadow": true,
4932 - "left": -216,
4922 + "left": -228,
4933 4923 "top": 168,
4934 4924 "width": 79,
4935 4925 "height": 13,
  @@ -4952,7 +4942,7 @@
4952 4942 "fontColor": "#000000",
4953 4943 "font": "Arial;13;0",
4954 4944 "showShadow": true,
4955 - "left": -216,
4945 + "left": -228,
4956 4946 "top": 168,
4957 4947 "width": 0,
4958 4948 "height": 13,
  @@ -4969,7 +4959,7 @@
4969 4959 "fontColor": "#000000",
4970 4960 "font": "Arial;13;0",
4971 4961 "showShadow": true,
4972 - "left": 325.5,
4962 + "left": 321.5,
4973 4963 "top": 560.5,
4974 4964 "width": 123,
4975 4965 "height": 25,
  @@ -5003,7 +4993,7 @@
5003 4993 "fontColor": "#000000",
5004 4994 "font": "Arial;13;0",
5005 4995 "showShadow": true,
5006 - "left": -144,
4996 + "left": -152,
5007 4997 "top": 112,
5008 4998 "width": 10,
5009 4999 "height": 10,
  @@ -5025,7 +5015,7 @@
5025 5015 "fontColor": "#000000",
5026 5016 "font": "Arial;13;0",
5027 5017 "showShadow": true,
5028 - "left": -144,
5018 + "left": -152,
5029 5019 "top": 112,
5030 5020 "width": 10,
5031 5021 "height": 10,
  @@ -5047,7 +5037,7 @@
5047 5037 "fontColor": "#000000",
5048 5038 "font": "Arial;13;0",
5049 5039 "showShadow": true,
5050 - "left": -144,
5040 + "left": -152,
5051 5041 "top": 112,
5052 5042 "width": 10,
5053 5043 "height": 10,
  @@ -5069,7 +5059,7 @@
5069 5059 "fontColor": "#000000",
5070 5060 "font": "Arial;13;0",
5071 5061 "showShadow": true,
5072 - "left": -144,
5062 + "left": -152,
5073 5063 "top": 112,
5074 5064 "width": 10,
5075 5065 "height": 10,
  @@ -5083,7 +5073,7 @@
5083 5073 "fontColor": "#000000",
5084 5074 "font": "Arial;13;0",
5085 5075 "showShadow": true,
5086 - "left": 300,
5076 + "left": 296,
5087 5077 "top": 556,
5088 5078 "width": 173,
5089 5079 "height": 35,
  @@ -5403,8 +5393,8 @@
5403 5393 "fontColor": "#000000",
5404 5394 "font": "Arial;13;0",
5405 5395 "showShadow": true,
5406 - "left": 388,
5407 - "top": 618,
5396 + "left": 386,
5397 + "top": 614,
5408 5398 "width": 178,
5409 5399 "height": 13,
5410 5400 "autoResize": false,
  @@ -5435,8 +5425,8 @@
5435 5425 "fontColor": "#000000",
5436 5426 "font": "Arial;13;0",
5437 5427 "showShadow": true,
5438 - "left": 324,
5439 - "top": 625,
5428 + "left": 322,
5429 + "top": 627,
5440 5430 "width": 53,
5441 5431 "height": 13,
5442 5432 "autoResize": false,
  @@ -5467,8 +5457,8 @@
5467 5457 "fontColor": "#000000",
5468 5458 "font": "Arial;13;0",
5469 5459 "showShadow": true,
5470 - "left": 400,
5471 - "top": 617,
5460 + "left": 398,
5461 + "top": 616,
5472 5462 "width": 0,
5473 5463 "height": 13,
5474 5464 "autoResize": false,
  @@ -5497,7 +5487,7 @@
5497 5487 "$ref": "AAAAAAFLwFHuipI4DQI="
5498 5488 },
5499 5489 "lineStyle": 1,
5500 - "points": "386.82:655;386.18:591",
5490 + "points": "386.1:655;382.9:591",
5501 5491 "stereotypeDisplay": "label",
5502 5492 "showVisibility": true,
5503 5493 "showProperty": true,
  @@ -5537,7 +5527,7 @@
5537 5527 "fontColor": "#000000",
5538 5528 "font": "Arial;13;0",
5539 5529 "showShadow": true,
5540 - "left": 210,
5530 + "left": 208,
5541 5531 "top": 545,
5542 5532 "width": 0,
5543 5533 "height": 13,
  @@ -5568,7 +5558,7 @@
5568 5558 "fontColor": "#000000",
5569 5559 "font": "Arial;13;0",
5570 5560 "showShadow": true,
5571 - "left": 211,
5561 + "left": 209,
5572 5562 "top": 530,
5573 5563 "width": 0,
5574 5564 "height": 13,
  @@ -5599,7 +5589,7 @@
5599 5589 "fontColor": "#000000",
5600 5590 "font": "Arial;13;0",
5601 5591 "showShadow": true,
5602 - "left": 209,
5592 + "left": 207,
5603 5593 "top": 574,
5604 5594 "width": 0,
5605 5595 "height": 13,
  @@ -5631,7 +5621,7 @@
5631 5621 "font": "Arial;13;0",
5632 5622 "showShadow": true,
5633 5623 "left": 148,
5634 - "top": 542.8965517241379,
5624 + "top": 542.9090909090909,
5635 5625 "width": 0,
5636 5626 "height": 13,
5637 5627 "autoResize": false,
  @@ -5662,7 +5652,7 @@
5662 5652 "font": "Arial;13;0",
5663 5653 "showShadow": true,
5664 5654 "left": 151,
5665 - "top": 529.8965517241379,
5655 + "top": 529.9090909090909,
5666 5656 "width": 0,
5667 5657 "height": 13,
5668 5658 "autoResize": false,
  @@ -5693,7 +5683,7 @@
5693 5683 "font": "Arial;13;0",
5694 5684 "showShadow": true,
5695 5685 "left": 143,
5696 - "top": 570.8965517241379,
5686 + "top": 570.9090909090909,
5697 5687 "width": 0,
5698 5688 "height": 13,
5699 5689 "autoResize": false,
  @@ -5723,8 +5713,8 @@
5723 5713 "fontColor": "#000000",
5724 5714 "font": "Arial;13;0",
5725 5715 "showShadow": true,
5726 - "left": 273,
5727 - "top": 548,
5716 + "left": 269,
5717 + "top": 547.9580419580419,
5728 5718 "width": 0,
5729 5719 "height": 13,
5730 5720 "autoResize": false,
  @@ -5754,8 +5744,8 @@
5754 5744 "fontColor": "#000000",
5755 5745 "font": "Arial;13;0",
5756 5746 "showShadow": true,
5757 - "left": 271,
5758 - "top": 534,
5747 + "left": 267,
5748 + "top": 533.9580419580419,
5759 5749 "width": 0,
5760 5750 "height": 13,
5761 5751 "autoResize": false,
  @@ -5785,8 +5775,8 @@
5785 5775 "fontColor": "#000000",
5786 5776 "font": "Arial;13;0",
5787 5777 "showShadow": true,
5788 - "left": 276,
5789 - "top": 575,
5778 + "left": 272,
5779 + "top": 574.9580419580419,
5790 5780 "width": 0,
5791 5781 "height": 13,
5792 5782 "autoResize": false,
  @@ -5859,7 +5849,7 @@
5859 5849 "$ref": "AAAAAAFLwEShF3aJrGU="
5860 5850 },
5861 5851 "lineStyle": 1,
5862 - "points": "122:563.8965517241379;299:570",
5852 + "points": "122:563.9090909090909;295:569.9580419580419",
5863 5853 "stereotypeDisplay": "label",
5864 5854 "showVisibility": true,
5865 5855 "showProperty": true,
  @@ -6319,7 +6309,7 @@
6319 6309 "font": "Arial;13;0",
6320 6310 "showShadow": true,
6321 6311 "left": -252,
6322 - "top": -96,
6312 + "top": -192,
6323 6313 "width": 0,
6324 6314 "height": 13,
6325 6315 "autoResize": false,
  @@ -6341,7 +6331,7 @@
6341 6331 "font": "Arial;13;1",
6342 6332 "showShadow": true,
6343 6333 "left": 335,
6344 - "top": 495.5,
6334 + "top": 463.5,
6345 6335 "width": 93,
6346 6336 "height": 13,
6347 6337 "autoResize": false,
  @@ -6364,7 +6354,7 @@
6364 6354 "font": "Arial;13;0",
6365 6355 "showShadow": true,
6366 6356 "left": -252,
6367 - "top": -96,
6357 + "top": -192,
6368 6358 "width": 79,
6369 6359 "height": 13,
6370 6360 "autoResize": false,
  @@ -6387,7 +6377,7 @@
6387 6377 "font": "Arial;13;0",
6388 6378 "showShadow": true,
6389 6379 "left": -252,
6390 - "top": -96,
6380 + "top": -192,
6391 6381 "width": 0,
6392 6382 "height": 13,
6393 6383 "autoResize": false,
  @@ -6404,7 +6394,7 @@
6404 6394 "font": "Arial;13;0",
6405 6395 "showShadow": true,
6406 6396 "left": 330,
6407 - "top": 488.5,
6397 + "top": 456.5,
6408 6398 "width": 104,
6409 6399 "height": 25,
6410 6400 "autoResize": false,
  @@ -6438,7 +6428,7 @@
6438 6428 "font": "Arial;13;0",
6439 6429 "showShadow": true,
6440 6430 "left": -168,
6441 - "top": -64,
6431 + "top": -128,
6442 6432 "width": 10,
6443 6433 "height": 10,
6444 6434 "autoResize": false
  @@ -6460,7 +6450,7 @@
6460 6450 "font": "Arial;13;0",
6461 6451 "showShadow": true,
6462 6452 "left": -168,
6463 - "top": -64,
6453 + "top": -128,
6464 6454 "width": 10,
6465 6455 "height": 10,
6466 6456 "autoResize": false
  @@ -6482,7 +6472,7 @@
6482 6472 "font": "Arial;13;0",
6483 6473 "showShadow": true,
6484 6474 "left": -168,
6485 - "top": -64,
6475 + "top": -128,
6486 6476 "width": 10,
6487 6477 "height": 10,
6488 6478 "autoResize": false
  @@ -6504,7 +6494,7 @@
6504 6494 "font": "Arial;13;0",
6505 6495 "showShadow": true,
6506 6496 "left": -168,
6507 - "top": -64,
6497 + "top": -128,
6508 6498 "width": 10,
6509 6499 "height": 10,
6510 6500 "autoResize": false
  @@ -6518,7 +6508,7 @@
6518 6508 "font": "Arial;13;0",
6519 6509 "showShadow": true,
6520 6510 "left": 308,
6521 - "top": 484,
6511 + "top": 452,
6522 6512 "width": 147,
6523 6513 "height": 35,
6524 6514 "autoResize": false,
  @@ -6574,8 +6564,8 @@
6574 6564 "fontColor": "#000000",
6575 6565 "font": "Arial;13;0",
6576 6566 "showShadow": true,
6577 - "left": 210,
6578 - "top": 516,
6567 + "left": 219,
6568 + "top": 499,
6579 6569 "width": 0,
6580 6570 "height": 13,
6581 6571 "autoResize": false,
  @@ -6605,8 +6595,8 @@
6605 6595 "fontColor": "#000000",
6606 6596 "font": "Arial;13;0",
6607 6597 "showShadow": true,
6608 - "left": 207,
6609 - "top": 501,
6598 + "left": 214,
6599 + "top": 485,
6610 6600 "width": 0,
6611 6601 "height": 13,
6612 6602 "autoResize": false,
  @@ -6636,8 +6626,8 @@
6636 6626 "fontColor": "#000000",
6637 6627 "font": "Arial;13;0",
6638 6628 "showShadow": true,
6639 - "left": 217,
6640 - "top": 545,
6629 + "left": 228,
6630 + "top": 528,
6641 6631 "width": 0,
6642 6632 "height": 13,
6643 6633 "autoResize": false,
  @@ -6667,8 +6657,8 @@
6667 6657 "fontColor": "#000000",
6668 6658 "font": "Arial;13;0",
6669 6659 "showShadow": true,
6670 - "left": 144,
6671 - "top": 530.3438596491228,
6660 + "left": 141,
6661 + "top": 525.4245614035087,
6672 6662 "width": 0,
6673 6663 "height": 13,
6674 6664 "autoResize": false,
  @@ -6698,8 +6688,8 @@
6698 6688 "fontColor": "#000000",
6699 6689 "font": "Arial;13;0",
6700 6690 "showShadow": true,
6701 - "left": 143,
6702 - "top": 517.3438596491228,
6691 + "left": 140,
6692 + "top": 512.4245614035087,
6703 6693 "width": 0,
6704 6694 "height": 13,
6705 6695 "autoResize": false,
  @@ -6729,8 +6719,8 @@
6729 6719 "fontColor": "#000000",
6730 6720 "font": "Arial;13;0",
6731 6721 "showShadow": true,
6732 - "left": 145,
6733 - "top": 558.3438596491228,
6722 + "left": 146,
6723 + "top": 553.4245614035087,
6734 6724 "width": 0,
6735 6725 "height": 13,
6736 6726 "autoResize": false,
  @@ -6760,8 +6750,8 @@
6760 6750 "fontColor": "#000000",
6761 6751 "font": "Arial;13;0",
6762 6752 "showShadow": true,
6763 - "left": 278,
6764 - "top": 501.09824561403514,
6753 + "left": 296.4255319148936,
6754 + "top": 474,
6765 6755 "width": 0,
6766 6756 "height": 13,
6767 6757 "autoResize": false,
  @@ -6791,8 +6781,8 @@
6791 6781 "fontColor": "#000000",
6792 6782 "font": "Arial;13;0",
6793 6783 "showShadow": true,
6794 - "left": 273,
6795 - "top": 489.09824561403514,
6784 + "left": 290.4255319148936,
6785 + "top": 462,
6796 6786 "width": 0,
6797 6787 "height": 13,
6798 6788 "autoResize": false,
  @@ -6822,8 +6812,8 @@
6822 6812 "fontColor": "#000000",
6823 6813 "font": "Arial;13;0",
6824 6814 "showShadow": true,
6825 - "left": 288,
6826 - "top": 527.0982456140351,
6815 + "left": 309.4255319148936,
6816 + "top": 499,
6827 6817 "width": 0,
6828 6818 "height": 13,
6829 6819 "autoResize": false,
  @@ -6896,7 +6886,7 @@
6896 6886 "$ref": "AAAAAAFLwEShF3aJrGU="
6897 6887 },
6898 6888 "lineStyle": 1,
6899 - "points": "122:557.3438596491228;307:517.0982456140351",
6889 + "points": "122:554.4245614035087;326.4255319148936:487",
6900 6890 "stereotypeDisplay": "label",
6901 6891 "showVisibility": true,
6902 6892 "showProperty": true,
  @@ -6961,8 +6951,8 @@
6961 6951 "fontColor": "#000000",
6962 6952 "font": "Arial;13;0",
6963 6953 "showShadow": true,
6964 - "left": 368,
6965 - "top": 531,
6954 + "left": 366,
6955 + "top": 514,
6966 6956 "width": 0,
6967 6957 "height": 13,
6968 6958 "autoResize": false,
  @@ -6992,8 +6982,8 @@
6992 6982 "fontColor": "#000000",
6993 6983 "font": "Arial;13;0",
6994 6984 "showShadow": true,
6995 - "left": 327,
6996 - "top": 532,
6985 + "left": 325,
6986 + "top": 514,
6997 6987 "width": 53,
6998 6988 "height": 13,
6999 6989 "autoResize": false,
  @@ -7024,8 +7014,8 @@
7024 7014 "fontColor": "#000000",
7025 7015 "font": "Arial;13;0",
7026 7016 "showShadow": true,
7027 - "left": 397,
7028 - "top": 530,
7017 + "left": 395,
7018 + "top": 515,
7029 7019 "width": 0,
7030 7020 "height": 13,
7031 7021 "autoResize": false,
  @@ -7054,7 +7044,7 @@
7054 7044 "$ref": "AAAAAAFLwFG89pFBqOA="
7055 7045 },
7056 7046 "lineStyle": 1,
7057 - "points": "384.75:555;382.25:519",
7047 + "points": "381.8269230769231:555;381.1730769230769:487",
7058 7048 "stereotypeDisplay": "label",
7059 7049 "showVisibility": true,
7060 7050 "showProperty": true,