From 383cfb5963597e3a1dc033b48eca15e0c749dc0e Mon Sep 17 00:00:00 2001 From: anperederi Date: Thu, 11 Jan 2024 21:16:31 +0100 Subject: [PATCH] update diagrams --- .../tpJeuDeL_oie/DiagrammeOieIndice.mdj | 211 ++++++++++-------- 2A/Java/tp/JavaFX/tpjeude/.idea/misc.xml | 2 +- 2 files changed, 118 insertions(+), 95 deletions(-) diff --git a/2A/Java/tp/JavaFX/tpJeuDeL_oie/DiagrammeOieIndice.mdj b/2A/Java/tp/JavaFX/tpJeuDeL_oie/DiagrammeOieIndice.mdj index caf48da..8992a0b 100644 --- a/2A/Java/tp/JavaFX/tpJeuDeL_oie/DiagrammeOieIndice.mdj +++ b/2A/Java/tp/JavaFX/tpJeuDeL_oie/DiagrammeOieIndice.mdj @@ -437,30 +437,13 @@ "height": 13, "text": "-numero: int", "horizontalAlignment": 0 - }, - { - "_type": "UMLAttributeView", - "_id": "AAAAAAGM99lx4PSwvao=", - "_parent": { - "$ref": "AAAAAAGMgPHpCaYmpr8=" - }, - "model": { - "$ref": "AAAAAAGM99lxvPStZnE=" - }, - "font": "Arial;13;0", - "left": 613, - "top": 140, - "width": 230.87060546875, - "height": 13, - "text": "+Attribute1", - "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 608, "top": 105, "width": 240.87060546875, - "height": 53 + "height": 38 }, { "_type": "UMLOperationCompartmentView", @@ -483,7 +466,7 @@ }, "font": "Arial;13;0", "left": 613, - "top": 163, + "top": 148, "width": 230.87060546875, "height": 13, "text": "+getCurrentJoueur(): Joueur", @@ -500,7 +483,7 @@ }, "font": "Arial;13;0", "left": 613, - "top": 178, + "top": 163, "width": 230.87060546875, "height": 13, "text": "+setCurrentJoueur(joueur: Joueur): void", @@ -517,7 +500,7 @@ }, "font": "Arial;13;0", "left": 613, - "top": 193, + "top": 178, "width": 230.87060546875, "height": 13, "text": "+getNum(): int", @@ -526,7 +509,7 @@ ], "font": "Arial;13;0", "left": 608, - "top": 158, + "top": 143, "width": 240.87060546875, "height": 53 }, @@ -2133,13 +2116,30 @@ "height": 13, "text": "-valeur: int", "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAGM+WREbztknDU=", + "_parent": { + "$ref": "AAAAAAGMgRABYaqKVxQ=" + }, + "model": { + "$ref": "AAAAAAGM+WREMTtbCTg=" + }, + "font": "Arial;13;0", + "left": 485, + "top": 1181, + "width": 157.6376953125, + "height": 13, + "text": "-nbFaces: int", + "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 480, "top": 1161, "width": 167.6376953125, - "height": 23 + "height": 38 }, { "_type": "UMLOperationCompartmentView", @@ -2162,7 +2162,7 @@ }, "font": "Arial;13;0", "left": 485, - "top": 1189, + "top": 1204, "width": 157.6376953125, "height": 13, "text": "+De(nbFaces): De", @@ -2179,7 +2179,7 @@ }, "font": "Arial;13;0", "left": 485, - "top": 1204, + "top": 1219, "width": 157.6376953125, "height": 13, "text": "+getValeur(): int", @@ -2196,7 +2196,7 @@ }, "font": "Arial;13;0", "left": 485, - "top": 1219, + "top": 1234, "width": 157.6376953125, "height": 13, "text": "+setValeur(valeur: int): void", @@ -2205,7 +2205,7 @@ ], "font": "Arial;13;0", "left": 480, - "top": 1184, + "top": 1199, "width": 167.6376953125, "height": 53 }, @@ -2247,7 +2247,7 @@ "left": 480, "top": 1136, "width": 167.6376953125, - "height": 101, + "height": 116, "nameCompartment": { "$ref": "AAAAAAGMgRABXKqFBDg=" }, @@ -2284,7 +2284,7 @@ "$ref": "AAAAAAGMgRf7NczNm5I=" }, "font": "Arial;13;0", - "left": 608, + "left": 610, "top": 1103, "width": 49.12451171875, "height": 13, @@ -2307,8 +2307,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 656, - "top": 1079, + "left": 659, + "top": 1078, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -2328,7 +2328,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 618, + "left": 619, "top": 1056, "height": 13, "alpha": -1.5707963267948966, @@ -2349,7 +2349,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 668, + "left": 670, "top": 1028, "height": 13, "alpha": 0.5235987755982988, @@ -2370,7 +2370,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 679, + "left": 680, "top": 1037, "height": 13, "alpha": 0.7853981633974483, @@ -2391,7 +2391,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 647, + "left": 648, "top": 1011, "height": 13, "alpha": -0.5235987755982988, @@ -2412,8 +2412,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 619, - "top": 1114, + "left": 621, + "top": 1113, "height": 13, "alpha": -0.5235987755982988, "distance": 30, @@ -2432,7 +2432,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 631, + "left": 634, "top": 1118, "height": 13, "alpha": -0.7853981633974483, @@ -2452,7 +2452,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 593, + "left": 595, "top": 1104, "height": 13, "alpha": 0.5235987755982988, @@ -2498,7 +2498,7 @@ "$ref": "AAAAAAGMgPHSU6X2Ve4=" }, "lineStyle": 1, - "points": "669:1005;593:1135", + "points": "670:1005;596:1135", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGMgRf7OczSF+M=" @@ -2781,7 +2781,7 @@ "visible": false, "font": "Arial;13;0", "left": 548, - "top": 1271, + "top": 1278, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -2802,7 +2802,7 @@ "visible": null, "font": "Arial;13;0", "left": 533, - "top": 1271, + "top": 1278, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -2823,7 +2823,7 @@ "visible": false, "font": "Arial;13;0", "left": 577, - "top": 1272, + "top": 1279, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -2841,7 +2841,7 @@ "$ref": "AAAAAAGMgUgpEvuRn3c=" }, "lineStyle": 1, - "points": "564:1319;563:1237", + "points": "564:1319;563:1252", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGMgUhLMf8jXfc=" @@ -3053,7 +3053,7 @@ "top": 578, "width": 183.9169921875, "height": 13, - "text": "+next()", + "text": "+next(): Joueur", "horizontalAlignment": 0 } ], @@ -4009,7 +4009,7 @@ "font": "Arial;13;1", "left": 1261, "top": 919, - "width": 294.48681640625, + "width": 311.81591796875, "height": 13, "text": "DeplaceurJoueur" }, @@ -4044,7 +4044,7 @@ "font": "Arial;13;0", "left": 1256, "top": 912, - "width": 304.48681640625, + "width": 321.81591796875, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAGMgU2mb34NJfc=" @@ -4071,7 +4071,7 @@ "font": "Arial;13;0", "left": 1256, "top": 937, - "width": 304.48681640625, + "width": 321.81591796875, "height": 10 }, { @@ -4096,7 +4096,7 @@ "font": "Arial;13;0", "left": 1261, "top": 952, - "width": 294.48681640625, + "width": 311.81591796875, "height": 13, "text": "-verifierJoueur(): bool", "horizontalAlignment": 0 @@ -4113,7 +4113,7 @@ "font": "Arial;13;0", "left": 1261, "top": 967, - "width": 294.48681640625, + "width": 311.81591796875, "height": 13, "text": "-alternerJoueur(joueur1: Joueur, joueur2: Joueur)", "horizontalAlignment": 0 @@ -4130,16 +4130,16 @@ "font": "Arial;13;0", "left": 1261, "top": 982, - "width": 294.48681640625, + "width": 311.81591796875, "height": 13, - "text": "+deplacerJoueur(currentJoueur: Joueur)", + "text": "+deplacerJoueur(currentJoueur: Joueur, nbCases: int)", "horizontalAlignment": 0 } ], "font": "Arial;13;0", "left": 1256, "top": 947, - "width": 304.48681640625, + "width": 321.81591796875, "height": 53 }, { @@ -4179,7 +4179,7 @@ "containerChangeable": true, "left": 1256, "top": 912, - "width": 304.48681640625, + "width": 321.81591796875, "height": 88, "nameCompartment": { "$ref": "AAAAAAGMgU2mb34MaPw=" @@ -4218,7 +4218,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1389, + "left": 1394, "top": 540, "height": 13, "alpha": 1.5707963267948966, @@ -4239,7 +4239,7 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1374, + "left": 1379, "top": 540, "height": 13, "alpha": 1.5707963267948966, @@ -4260,7 +4260,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1418, + "left": 1423, "top": 539, "height": 13, "alpha": -1.5707963267948966, @@ -4279,7 +4279,7 @@ "$ref": "AAAAAAGMgU2mbn4LsOQ=" }, "lineStyle": 1, - "points": "1407:911;1402:181", + "points": "1415:911;1403:181", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGMgU8WeZFQQwo=" @@ -6094,8 +6094,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1243, - "top": 742, + "left": 1248, + "top": 741, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -6115,8 +6115,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1254, - "top": 732, + "left": 1259, + "top": 731, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -6136,8 +6136,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1220, - "top": 761, + "left": 1225, + "top": 762, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -6157,7 +6157,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1125, + "left": 1126, "top": 608, "height": 13, "alpha": 0.5235987755982988, @@ -6178,8 +6178,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1136, - "top": 601, + "left": 1137, + "top": 600, "height": 13, "alpha": 0.7853981633974483, "distance": 40, @@ -6199,7 +6199,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1101, + "left": 1103, "top": 623, "height": 13, "alpha": -0.5235987755982988, @@ -6220,7 +6220,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1362, + "left": 1369, "top": 875, "height": 13, "alpha": -0.5235987755982988, @@ -6240,7 +6240,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1370, + "left": 1377, "top": 865, "height": 13, "alpha": -0.7853981633974483, @@ -6260,7 +6260,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1344, + "left": 1352, "top": 897, "height": 13, "alpha": 0.5235987755982988, @@ -6306,7 +6306,7 @@ "$ref": "AAAAAAGM+D9d34b1LYY=" }, "lineStyle": 1, - "points": "1097:605;1368:911", + "points": "1098:605;1376:911", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGM+EBAxrzPpSw=" @@ -6540,8 +6540,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1181, - "top": 760, + "left": 1184, + "top": 759, "height": 13, "alpha": 1.5707963267948966, "distance": 15, @@ -6561,8 +6561,8 @@ }, "visible": null, "font": "Arial;13;0", - "left": 1190, - "top": 748, + "left": 1193, + "top": 747, "height": 13, "alpha": 1.5707963267948966, "distance": 30, @@ -6582,8 +6582,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1162, - "top": 783, + "left": 1167, + "top": 784, "height": 13, "alpha": -1.5707963267948966, "distance": 15, @@ -6646,7 +6646,7 @@ "visible": false, "font": "Arial;13;0", "left": 1005, - "top": 662, + "top": 661, "height": 13, "alpha": -0.5235987755982988, "distance": 25, @@ -6666,7 +6666,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1337, + "left": 1344, "top": 877, "height": 13, "alpha": -0.5235987755982988, @@ -6686,7 +6686,7 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1343, + "left": 1350, "top": 865, "height": 13, "alpha": -0.7853981633974483, @@ -6706,8 +6706,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1324, - "top": 901, + "left": 1331, + "top": 902, "height": 13, "alpha": 0.5235987755982988, "distance": 25, @@ -6752,7 +6752,7 @@ "$ref": "AAAAAAGM+EBNvb8xYeY=" }, "lineStyle": 1, - "points": "996:645;1349:911", + "points": "996:645;1356:911", "showVisibility": true, "nameLabel": { "$ref": "AAAAAAGM+EBpS8eeXhM=" @@ -7798,15 +7798,6 @@ "name": "numero", "visibility": "private", "type": "int" - }, - { - "_type": "UMLAttribute", - "_id": "AAAAAAGM99lxvPStZnE=", - "_parent": { - "$ref": "AAAAAAGMgPHpBqYe+IE=" - }, - "name": "Attribute1", - "type": "" } ], "operations": [ @@ -8180,6 +8171,16 @@ "name": "valeur", "visibility": "private", "type": "int" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAGM+WREMTtbCTg=", + "_parent": { + "$ref": "AAAAAAGMgRABXKqC/RI=" + }, + "name": "nbFaces", + "visibility": "private", + "type": "int" } ], "operations": [ @@ -8493,7 +8494,20 @@ "_parent": { "$ref": "AAAAAAGMgUip+Qft+Ik=" }, - "name": "next" + "name": "next", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAGM+XFqrElr0fM=", + "_parent": { + "$ref": "AAAAAAGMgUuZzEXeT7c=" + }, + "type": { + "$ref": "AAAAAAGMgPH4eaZIPEo=" + }, + "direction": "return" + } + ] } ] }, @@ -8664,6 +8678,15 @@ "type": { "$ref": "AAAAAAGMgPH4eaZIPEo=" } + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAGM+U7FKDVBGIY=", + "_parent": { + "$ref": "AAAAAAGMgU5pCoXO00M=" + }, + "name": "nbCases", + "type": "int" } ] } diff --git a/2A/Java/tp/JavaFX/tpjeude/.idea/misc.xml b/2A/Java/tp/JavaFX/tpjeude/.idea/misc.xml index 4bb5ffc..926387d 100644 --- a/2A/Java/tp/JavaFX/tpjeude/.idea/misc.xml +++ b/2A/Java/tp/JavaFX/tpjeude/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file