From d5cf03d109d764ac978a09c7922de9cb416f098e Mon Sep 17 00:00:00 2001 From: hbarbi <hugo.barbi@etu.unistra.fr> Date: Thu, 3 Dec 2020 16:56:43 +0100 Subject: [PATCH] Packages created --- .idea/workspace.xml | 11 +- src/dcc.mdj | 1964 ++++++++++++++++++++++++------ src/puissance4/Main.java | 2 + src/puissance4/model/Grille.java | 6 + 4 files changed, 1635 insertions(+), 348 deletions(-) create mode 100644 src/puissance4/model/Grille.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 016328d..8635d4b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -33,19 +33,21 @@ <property name="RunOnceActivity.ShowReadmeOnStart" value="true" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> - <property name="project.structure.last.edited" value="Project" /> + <property name="project.structure.last.edited" value="Modules" /> <property name="project.structure.proportion" value="0.15" /> <property name="project.structure.side.proportion" value="0.2" /> <property name="settings.editor.selected.configurable" value="configurable.group.appearance" /> </component> <component name="RunManager"> - <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true"> + <configuration default="true" type="ArquillianTestNG" factoryName="" nameIsGenerated="true"> <option name="arquillianRunConfiguration"> <value> <option name="containerStateName" value="" /> </value> </option> - <option name="TEST_OBJECT" value="class" /> + <option name="TEST_OBJECT" value="CLASS" /> + <properties /> + <listeners /> <method v="2"> <option name="Make" enabled="true" /> </method> @@ -64,7 +66,8 @@ <workItem from="1606914293705" duration="3199000" /> <workItem from="1606917997099" duration="113000" /> <workItem from="1606918163106" duration="94000" /> - <workItem from="1607006873797" duration="1035000" /> + <workItem from="1607006873797" duration="2810000" /> + <workItem from="1607010556720" duration="433000" /> </task> <servers /> </component> diff --git a/src/dcc.mdj b/src/dcc.mdj index a9458a7..1efa78f 100644 --- a/src/dcc.mdj +++ b/src/dcc.mdj @@ -176,7 +176,7 @@ "top": 566, "width": 543, "height": 13, - "text": "Controller" + "text": "controller" }, { "_type": "LabelView", @@ -228,14 +228,6 @@ "containerView": { "$ref": "AAAAAAF2KRdKDCab3zI=" }, - "containedViews": [ - { - "$ref": "AAAAAAF2KRlHiyd0d1E=" - }, - { - "$ref": "AAAAAAF2KRtIKihFjTU=" - } - ], "font": "Arial;13;0", "containerChangeable": true, "left": 32, @@ -274,8 +266,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1080, - "top": -792, + "left": 1064, + "top": -40, "height": 13 }, { @@ -285,11 +277,11 @@ "$ref": "AAAAAAF2KRgHQybVzbU=" }, "font": "Arial;13;1", - "left": 621, - "top": 78, + "left": 613, + "top": 566, "width": 575, "height": 13, - "text": "Vue" + "text": "vue" }, { "_type": "LabelView", @@ -299,8 +291,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1080, - "top": -792, + "left": 1064, + "top": -40, "width": 104.0380859375, "height": 13, "text": "(from puissance4)" @@ -313,15 +305,15 @@ }, "visible": false, "font": "Arial;13;0", - "left": 1080, - "top": -792, + "left": 1064, + "top": -40, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 616, - "top": 71, + "left": 608, + "top": 559, "width": 585, "height": 25, "stereotypeLabel": { @@ -341,12 +333,17 @@ "containerView": { "$ref": "AAAAAAF2KRdKDCab3zI=" }, + "containedViews": [ + { + "$ref": "AAAAAAF2KRq44ygVKIc=" + } + ], "font": "Arial;13;0", "containerChangeable": true, - "left": 616, - "top": 56, + "left": 608, + "top": 544, "width": 585, - "height": 473, + "height": 361, "nameCompartment": { "$ref": "AAAAAAF2KRgHQybVzbU=" } @@ -380,7 +377,7 @@ "visible": false, "font": "Arial;13;0", "left": -256, - "top": -168, + "top": -184, "height": 13 }, { @@ -391,10 +388,10 @@ }, "font": "Arial;13;1", "left": 29, - "top": 70, - "width": 551, + "top": 62, + "width": 1151, "height": 13, - "text": "Model" + "text": "model" }, { "_type": "LabelView", @@ -405,7 +402,7 @@ "visible": false, "font": "Arial;13;0", "left": -256, - "top": -168, + "top": -184, "width": 104.0380859375, "height": 13, "text": "(from puissance4)" @@ -419,15 +416,15 @@ "visible": false, "font": "Arial;13;0", "left": -256, - "top": -168, + "top": -184, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", "left": 24, - "top": 63, - "width": 561, + "top": 55, + "width": 1161, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAF2KRfmACa81kY=" @@ -449,13 +446,16 @@ "containedViews": [ { "$ref": "AAAAAAF2KRjA1icYrXQ=" + }, + { + "$ref": "AAAAAAF2KRlHiyd0d1E=" } ], "font": "Arial;13;0", "containerChangeable": true, "left": 24, - "top": 48, - "width": 561, + "top": 40, + "width": 1161, "height": 481, "nameCompartment": { "$ref": "AAAAAAF2KRfmACa7xE8=" @@ -489,8 +489,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -168, - "top": -104, + "left": -184, + "top": -120, "height": 13 }, { @@ -500,9 +500,9 @@ "$ref": "AAAAAAF2KRjA1icZp8Q=" }, "font": "Arial;13;1", - "left": 45, - "top": 111, - "width": 127.92431640625, + "left": 37, + "top": 103, + "width": 159, "height": 13, "text": "Grille" }, @@ -514,11 +514,11 @@ }, "visible": false, "font": "Arial;13;0", - "left": -168, - "top": -104, - "width": 73.67724609375, + "left": -184, + "top": -120, + "width": 80.9072265625, "height": 13, - "text": "(from Model)" + "text": "(from model)" }, { "_type": "LabelView", @@ -528,16 +528,16 @@ }, "visible": false, "font": "Arial;13;0", - "left": -168, - "top": -104, + "left": -184, + "top": -120, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 40, - "top": 104, - "width": 137.92431640625, + "left": 32, + "top": 96, + "width": 169, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAF2KRjA1icaCSE=" @@ -572,9 +572,9 @@ "$ref": "AAAAAAF2KRvZiShyrOA=" }, "font": "Arial;13;0", - "left": 45, - "top": 134, - "width": 127.92431640625, + "left": 37, + "top": 126, + "width": 159, "height": 13, "text": "-nbCases: int {unique}", "horizontalAlignment": 0 @@ -589,9 +589,9 @@ "$ref": "AAAAAAF2KRzx8yh+S70=" }, "font": "Arial;13;0", - "left": 45, - "top": 149, - "width": 127.92431640625, + "left": 37, + "top": 141, + "width": 159, "height": 13, "text": "-grille: int[][]", "horizontalAlignment": 0 @@ -606,9 +606,9 @@ "$ref": "AAAAAAF2KR7EDiiH39A=" }, "font": "Arial;13;0", - "left": 45, - "top": 164, - "width": 127.92431640625, + "left": 37, + "top": 156, + "width": 159, "height": 13, "text": "-ligne: int", "horizontalAlignment": 0 @@ -623,18 +623,18 @@ "$ref": "AAAAAAF2KR8IoSiOdjM=" }, "font": "Arial;13;0", - "left": 45, - "top": 179, - "width": 127.92431640625, + "left": 37, + "top": 171, + "width": 159, "height": 13, "text": "-colonne: int", "horizontalAlignment": 0 } ], "font": "Arial;13;0", - "left": 40, - "top": 129, - "width": 137.92431640625, + "left": 32, + "top": 121, + "width": 169, "height": 68 }, { @@ -646,11 +646,132 @@ "model": { "$ref": "AAAAAAF2KRjA1ScWNd8=" }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSLKXyicHqI=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSLKVSiZHsk=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 194, + "width": 159, + "height": 13, + "text": "+Grille()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSP5+CijUZU=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSP57Sig1DY=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 209, + "width": 159, + "height": 13, + "text": "+getLigne(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSRUCCiqUOw=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSRUAyinLQ4=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 224, + "width": 159, + "height": 13, + "text": "+getColonne(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSSCASixETQ=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSSB/SiuOT8=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 239, + "width": 159, + "height": 13, + "text": "+setLigne(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSSRWyi4xQc=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSSRVii1Y4M=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 254, + "width": 159, + "height": 13, + "text": "+setColonne(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSV4nyjOS+Y=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSV4kSjLufM=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 269, + "width": 159, + "height": 13, + "text": "+estVide(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KSdDQSjtXqc=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ycf3bY=" + }, + "model": { + "$ref": "AAAAAAF2KSdDPSjqh3g=" + }, + "font": "Arial;13;0", + "left": 37, + "top": 284, + "width": 159, + "height": 13, + "text": "+estPleine(): int", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 40, - "top": 197, - "width": 137.92431640625, - "height": 10 + "left": 32, + "top": 189, + "width": 169, + "height": 113 }, { "_type": "UMLReceptionCompartmentView", @@ -663,8 +784,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -112, - "top": -80, + "left": -120, + "top": -96, "width": 10, "height": 10 }, @@ -679,8 +800,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -112, - "top": -80, + "left": -120, + "top": -96, "width": 10, "height": 10 } @@ -690,10 +811,10 @@ }, "font": "Arial;13;0", "containerChangeable": true, - "left": 40, - "top": 104, - "width": 137.92431640625, - "height": 209, + "left": 32, + "top": 96, + "width": 169, + "height": 305, "nameCompartment": { "$ref": "AAAAAAF2KRjA1icZp8Q=" }, @@ -738,7 +859,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -16, + "left": -32, + "top": -16, "height": 13 }, { @@ -748,9 +870,9 @@ "$ref": "AAAAAAF2KRjtNSdGCvs=" }, "font": "Arial;13;1", - "left": 221, - "top": 111, - "width": 127, + "left": 221.58935546875, + "top": 103, + "width": 190.41064453125, "height": 13, "text": "Case" }, @@ -762,7 +884,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -16, + "left": -32, + "top": -16, "width": 73.67724609375, "height": 13, "text": "(from Model)" @@ -775,15 +898,16 @@ }, "visible": false, "font": "Arial;13;0", - "left": -16, + "left": -32, + "top": -16, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 216, - "top": 104, - "width": 137, + "left": 216.58935546875, + "top": 96, + "width": 200.41064453125, "height": 25, "stereotypeLabel": { "$ref": "AAAAAAF2KRjtNSdHtJE=" @@ -807,11 +931,65 @@ "model": { "$ref": "AAAAAAF2KRjtNCdDrwk=" }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KSpO7Cj4zLY=", + "_parent": { + "$ref": "AAAAAAF2KRjtNSdLxO8=" + }, + "model": { + "$ref": "AAAAAAF2KSpO5yj1CME=" + }, + "font": "Arial;13;0", + "left": 221.58935546875, + "top": 126, + "width": 190.41064453125, + "height": 13, + "text": "-posLigne: int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KTEgOykAT0I=", + "_parent": { + "$ref": "AAAAAAF2KRjtNSdLxO8=" + }, + "model": { + "$ref": "AAAAAAF2KTEgMSj9GTU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 189, + "top": 133, + "width": 143, + "height": 13, + "text": "-couleur: Color", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KTOmXykQFOc=", + "_parent": { + "$ref": "AAAAAAF2KRjtNSdLxO8=" + }, + "model": { + "$ref": "AAAAAAF2KTOmWSkN3I0=" + }, + "font": "Arial;13;0", + "left": 221.58935546875, + "top": 141, + "width": 190.41064453125, + "height": 13, + "text": "-posColonne: int", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 216, - "top": 129, - "width": 137, - "height": 10 + "left": 216.58935546875, + "top": 121, + "width": 200.41064453125, + "height": 38 }, { "_type": "UMLOperationCompartmentView", @@ -822,11 +1000,47 @@ "model": { "$ref": "AAAAAAF2KRjtNCdDrwk=" }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KTRX5CkgG3Q=", + "_parent": { + "$ref": "AAAAAAF2KRjtNSdMT7Q=" + }, + "model": { + "$ref": "AAAAAAF2KTRX4CkdjjM=" + }, + "font": "Arial;13;0", + "left": 221.58935546875, + "top": 164, + "width": 190.41064453125, + "height": 13, + "text": "+Case()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KTUamikp/A4=", + "_parent": { + "$ref": "AAAAAAF2KRjtNSdMT7Q=" + }, + "model": { + "$ref": "AAAAAAF2KTUalikmmXw=" + }, + "font": "Arial;13;0", + "left": 221.58935546875, + "top": 179, + "width": 190.41064453125, + "height": 13, + "text": "+Remplir(posLigne, posColonne)", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 216, - "top": 139, - "width": 137, - "height": 10 + "left": 216.58935546875, + "top": 159, + "width": 200.41064453125, + "height": 38 }, { "_type": "UMLReceptionCompartmentView", @@ -839,7 +1053,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -8, + "left": -16, + "top": -8, "width": 10, "height": 10 }, @@ -854,17 +1069,18 @@ }, "visible": false, "font": "Arial;13;0", - "left": -8, + "left": -16, + "top": -8, "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 216, - "top": 104, - "width": 137, - "height": 209, + "left": 216.58935546875, + "top": 96, + "width": 200.41064453125, + "height": 305, "nameCompartment": { "$ref": "AAAAAAF2KRjtNSdGCvs=" }, @@ -883,141 +1099,651 @@ }, { "_type": "UMLClassView", - "_id": "AAAAAAF2KRlHiyd0d1E=", + "_id": "AAAAAAF2KRmqRyegw78=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAF2KRlHiidyrPI=" + "$ref": "AAAAAAF2KRmqRiee4ZY=" }, "subViews": [ { "_type": "UMLNameCompartmentView", - "_id": "AAAAAAF2KRlHiyd1zEU=", + "_id": "AAAAAAF2KRmqRyeh5qI=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd0d1E=" + "$ref": "AAAAAAF2KRmqRyegw78=" }, "model": { - "$ref": "AAAAAAF2KRlHiidyrPI=" + "$ref": "AAAAAAF2KRmqRiee4ZY=" }, "subViews": [ { "_type": "LabelView", - "_id": "AAAAAAF2KRlHiyd2Gos=", + "_id": "AAAAAAF2KRmqRyei5Xg=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd1zEU=" + "$ref": "AAAAAAF2KRmqRyeh5qI=" }, "visible": false, "font": "Arial;13;0", - "left": -1032, - "top": 1448, + "left": 96, + "top": -16, "height": 13 }, { "_type": "LabelView", - "_id": "AAAAAAF2KRlHiyd3On4=", + "_id": "AAAAAAF2KRmqRyejQbY=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd1zEU=" + "$ref": "AAAAAAF2KRmqRyeh5qI=" }, "font": "Arial;13;1", - "left": 53, - "top": 599, + "left": 437, + "top": 103, "width": 175, "height": 13, - "text": "Joueur" + "text": "Pion" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRlHiyd4STM=", + "_id": "AAAAAAF2KRmqRyekqBY=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd1zEU=" + "$ref": "AAAAAAF2KRmqRyeh5qI=" }, "visible": false, "font": "Arial;13;0", - "left": -1032, - "top": 1448, - "width": 94.62451171875, + "left": 96, + "top": -16, + "width": 73.67724609375, "height": 13, - "text": "(from Controller)" + "text": "(from Model)" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRlHiyd5+8g=", + "_id": "AAAAAAF2KRmqRyeli78=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd1zEU=" + "$ref": "AAAAAAF2KRmqRyeh5qI=" }, "visible": false, "font": "Arial;13;0", - "left": -1032, - "top": 1448, + "left": 96, + "top": -16, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 48, - "top": 592, + "left": 432, + "top": 96, "width": 185, "height": 25, "stereotypeLabel": { - "$ref": "AAAAAAF2KRlHiyd2Gos=" + "$ref": "AAAAAAF2KRmqRyei5Xg=" }, "nameLabel": { - "$ref": "AAAAAAF2KRlHiyd3On4=" + "$ref": "AAAAAAF2KRmqRyejQbY=" }, "namespaceLabel": { - "$ref": "AAAAAAF2KRlHiyd4STM=" + "$ref": "AAAAAAF2KRmqRyekqBY=" }, "propertyLabel": { - "$ref": "AAAAAAF2KRlHiyd5+8g=" + "$ref": "AAAAAAF2KRmqRyeli78=" } }, { "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAF2KRlHiyd6Wfw=", - "_parent": { - "$ref": "AAAAAAF2KRlHiyd0d1E=" - }, - "model": { - "$ref": "AAAAAAF2KRlHiidyrPI=" - }, - "font": "Arial;13;0", - "left": 48, - "top": 617, - "width": 185, - "height": 10 - }, - { - "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAF2KRlHjCd7D+g=", - "_parent": { - "$ref": "AAAAAAF2KRlHiyd0d1E=" - }, - "model": { - "$ref": "AAAAAAF2KRlHiidyrPI=" - }, - "font": "Arial;13;0", - "left": 48, - "top": 627, - "width": 185, - "height": 10 - }, - { - "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAF2KRlHjCd8qCY=", + "_id": "AAAAAAF2KRmqRyemRDs=", "_parent": { - "$ref": "AAAAAAF2KRlHiyd0d1E=" + "$ref": "AAAAAAF2KRmqRyegw78=" }, "model": { - "$ref": "AAAAAAF2KRlHiidyrPI=" + "$ref": "AAAAAAF2KRmqRiee4ZY=" }, - "visible": false, - "font": "Arial;13;0", - "left": -688, - "top": 960, - "width": 10, - "height": 10 - }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KTLXjykIXyQ=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyemRDs=" + }, + "model": { + "$ref": "AAAAAAF2KTLXhikFVYU=" + }, + "font": "Arial;13;0", + "left": 437, + "top": 126, + "width": 175, + "height": 13, + "text": "-couleur: Color", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KTyXwimtdJk=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyemRDs=" + }, + "model": { + "$ref": "AAAAAAF2KTyXtymqxoI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 437, + "top": 141, + "width": 175, + "height": 13, + "text": "+Attribute1", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KT5yqSnOzxQ=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyemRDs=" + }, + "model": { + "$ref": "AAAAAAF2KT5yoinLNbk=" + }, + "font": "Arial;13;0", + "left": 437, + "top": 141, + "width": 175, + "height": 13, + "text": "-enplacement: Case", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 432, + "top": 121, + "width": 185, + "height": 38 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF2KRmqRyenog8=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyegw78=" + }, + "model": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KTtvpSmP0uA=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "model": { + "$ref": "AAAAAAF2KTtvmymM/Ms=" + }, + "font": "Arial;13;0", + "left": 437, + "top": 164, + "width": 175, + "height": 13, + "text": "+Pion()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KTzXYym0J1I=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "model": { + "$ref": "AAAAAAF2KTzXXCmx5m8=" + }, + "font": "Arial;13;0", + "left": 437, + "top": 179, + "width": 175, + "height": 13, + "text": "+getCouleur()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KTzyhim7QgI=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "model": { + "$ref": "AAAAAAF2KTzygSm4OfA=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 437, + "top": 179, + "width": 175, + "height": 13, + "text": "+setCouleur()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KT5A2ynHVJ0=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "model": { + "$ref": "AAAAAAF2KT5A0CnEE/Q=" + }, + "font": "Arial;13;0", + "left": 437, + "top": 194, + "width": 175, + "height": 13, + "text": "+getCase()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KT+HfinZ8As=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "model": { + "$ref": "AAAAAAF2KT+HeinW4pc=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 437, + "top": 209, + "width": 175, + "height": 13, + "text": "+Operation1()", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 432, + "top": 159, + "width": 185, + "height": 53 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF2KRmqRyeoOO0=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyegw78=" + }, + "model": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 48, + "top": -8, + "width": 10, + "height": 10 + }, + { + "_type": "UMLTemplateParameterCompartmentView", + "_id": "AAAAAAF2KRmqRyepUws=", + "_parent": { + "$ref": "AAAAAAF2KRmqRyegw78=" + }, + "model": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 48, + "top": -8, + "width": 10, + "height": 10 + } + ], + "font": "Arial;13;0", + "containerChangeable": true, + "left": 432, + "top": 96, + "width": 185, + "height": 305, + "nameCompartment": { + "$ref": "AAAAAAF2KRmqRyeh5qI=" + }, + "attributeCompartment": { + "$ref": "AAAAAAF2KRmqRyemRDs=" + }, + "operationCompartment": { + "$ref": "AAAAAAF2KRmqRyenog8=" + }, + "receptionCompartment": { + "$ref": "AAAAAAF2KRmqRyeoOO0=" + }, + "templateParameterCompartment": { + "$ref": "AAAAAAF2KRmqRyepUws=" + } + }, + { + "_type": "UMLClassView", + "_id": "AAAAAAF2KRlHiyd0d1E=", + "_parent": { + "$ref": "AAAAAAFF+qBtyKM79qY=" + }, + "model": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "subViews": [ + { + "_type": "UMLNameCompartmentView", + "_id": "AAAAAAF2KRlHiyd1zEU=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd0d1E=" + }, + "model": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "subViews": [ + { + "_type": "LabelView", + "_id": "AAAAAAF2KRlHiyd2Gos=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd1zEU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 304, + "top": 216, + "height": 13 + }, + { + "_type": "LabelView", + "_id": "AAAAAAF2KRlHiyd3On4=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd1zEU=" + }, + "font": "Arial;13;1", + "left": 645, + "top": 103, + "width": 167, + "height": 13, + "text": "Joueur" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF2KRlHiyd4STM=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd1zEU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 304, + "top": 216, + "width": 94.62451171875, + "height": 13, + "text": "(from model)" + }, + { + "_type": "LabelView", + "_id": "AAAAAAF2KRlHiyd5+8g=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd1zEU=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 304, + "top": 216, + "height": 13, + "horizontalAlignment": 1 + } + ], + "font": "Arial;13;0", + "left": 640, + "top": 96, + "width": 177, + "height": 25, + "stereotypeLabel": { + "$ref": "AAAAAAF2KRlHiyd2Gos=" + }, + "nameLabel": { + "$ref": "AAAAAAF2KRlHiyd3On4=" + }, + "namespaceLabel": { + "$ref": "AAAAAAF2KRlHiyd4STM=" + }, + "propertyLabel": { + "$ref": "AAAAAAF2KRlHiyd5+8g=" + } + }, + { + "_type": "UMLAttributeCompartmentView", + "_id": "AAAAAAF2KRlHiyd6Wfw=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd0d1E=" + }, + "model": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KUIluSo21IE=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd6Wfw=" + }, + "model": { + "$ref": "AAAAAAF2KUIlsiozZCo=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 126, + "width": 167, + "height": 13, + "text": "+nom: String", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KUJZ4io9exE=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd6Wfw=" + }, + "model": { + "$ref": "AAAAAAF2KUJZ3So6i8U=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 141, + "width": 167, + "height": 13, + "text": "+nbPions: int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KUKE1ipIyD4=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd6Wfw=" + }, + "model": { + "$ref": "AAAAAAF2KUKE0SpFzfA=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 156, + "width": 167, + "height": 13, + "text": "+couleurPion: Color", + "horizontalAlignment": 0 + }, + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KUKdXipPYfo=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd6Wfw=" + }, + "model": { + "$ref": "AAAAAAF2KUKdWSpMp9Y=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 171, + "width": 167, + "height": 13, + "text": "+score: int", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 640, + "top": 121, + "width": 177, + "height": 68 + }, + { + "_type": "UMLOperationCompartmentView", + "_id": "AAAAAAF2KRlHjCd7D+g=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd0d1E=" + }, + "model": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KULTOipe/JQ=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KULTMCpblSU=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 194, + "width": 167, + "height": 13, + "text": "+Joueur()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUMT3Splaoo=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KUMT1ypiGL0=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 209, + "width": 167, + "height": 13, + "text": "+getCouleur(): Color", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUNOJipuYmw=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KUNOICprjgQ=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 224, + "width": 167, + "height": 13, + "text": "+setCouleur()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUO3Xip1aU0=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KUO3WCpydZc=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 239, + "width": 167, + "height": 13, + "text": "+getNom(): String", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUP7fip+Kdk=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KUP7eSp72pU=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 254, + "width": 167, + "height": 13, + "text": "+setNom()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KURC2SqG6C4=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KURC1CqDec4=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 269, + "width": 167, + "height": 13, + "text": "+getScore(): int", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUR15iqPeY4=", + "_parent": { + "$ref": "AAAAAAF2KRlHjCd7D+g=" + }, + "model": { + "$ref": "AAAAAAF2KUR14CqMptQ=" + }, + "font": "Arial;13;0", + "left": 645, + "top": 284, + "width": 167, + "height": 13, + "text": "+setScore()", + "horizontalAlignment": 0 + } + ], + "font": "Arial;13;0", + "left": 640, + "top": 189, + "width": 177, + "height": 113 + }, + { + "_type": "UMLReceptionCompartmentView", + "_id": "AAAAAAF2KRlHjCd8qCY=", + "_parent": { + "$ref": "AAAAAAF2KRlHiyd0d1E=" + }, + "model": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "visible": false, + "font": "Arial;13;0", + "left": 64, + "top": 224, + "width": 10, + "height": 10 + }, { "_type": "UMLTemplateParameterCompartmentView", "_id": "AAAAAAF2KRlHjCd9zyA=", @@ -1029,21 +1755,21 @@ }, "visible": false, "font": "Arial;13;0", - "left": -688, - "top": 960, + "left": 64, + "top": 224, "width": 10, "height": 10 } ], "containerView": { - "$ref": "AAAAAAF2KRgSmybuyUU=" + "$ref": "AAAAAAF2KRfmACa6yvI=" }, "font": "Arial;13;0", "containerChangeable": true, - "left": 48, - "top": 592, - "width": 185, - "height": 129, + "left": 640, + "top": 96, + "width": 177, + "height": 305, "nameCompartment": { "$ref": "AAAAAAF2KRlHiyd1zEU=" }, @@ -1062,173 +1788,178 @@ }, { "_type": "UMLClassView", - "_id": "AAAAAAF2KRmqRyegw78=", + "_id": "AAAAAAF2KTkvVilYQxA=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "subViews": [ { "_type": "UMLNameCompartmentView", - "_id": "AAAAAAF2KRmqRyeh5qI=", + "_id": "AAAAAAF2KTkvVilZxzs=", "_parent": { - "$ref": "AAAAAAF2KRmqRyegw78=" + "$ref": "AAAAAAF2KTkvVilYQxA=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "subViews": [ { "_type": "LabelView", - "_id": "AAAAAAF2KRmqRyei5Xg=", + "_id": "AAAAAAF2KTkvVilazcI=", "_parent": { - "$ref": "AAAAAAF2KRmqRyeh5qI=" + "$ref": "AAAAAAF2KTkvVilZxzs=" }, "visible": false, "font": "Arial;13;0", - "left": 16, + "left": -32, + "top": 16, "height": 13 }, { "_type": "LabelView", - "_id": "AAAAAAF2KRmqRyejQbY=", + "_id": "AAAAAAF2KTkvVilbS7A=", "_parent": { - "$ref": "AAAAAAF2KRmqRyeh5qI=" + "$ref": "AAAAAAF2KTkvVilZxzs=" }, "font": "Arial;13;1", - "left": 397, - "top": 111, - "width": 127, + "left": 173, + "top": 615, + "width": 263, "height": 13, - "text": "Pion" + "text": "Puissance4Controller" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRmqRyekqBY=", + "_id": "AAAAAAF2KTkvVilczYQ=", "_parent": { - "$ref": "AAAAAAF2KRmqRyeh5qI=" + "$ref": "AAAAAAF2KTkvVilZxzs=" }, "visible": false, "font": "Arial;13;0", - "left": 16, + "left": -32, + "top": 16, "width": 73.67724609375, "height": 13, "text": "(from Model)" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRmqRyeli78=", + "_id": "AAAAAAF2KTkvVildT5U=", "_parent": { - "$ref": "AAAAAAF2KRmqRyeh5qI=" + "$ref": "AAAAAAF2KTkvVilZxzs=" }, "visible": false, "font": "Arial;13;0", - "left": 16, + "left": -32, + "top": 16, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 392, - "top": 104, - "width": 137, + "left": 168, + "top": 608, + "width": 273, "height": 25, "stereotypeLabel": { - "$ref": "AAAAAAF2KRmqRyei5Xg=" + "$ref": "AAAAAAF2KTkvVilazcI=" }, "nameLabel": { - "$ref": "AAAAAAF2KRmqRyejQbY=" + "$ref": "AAAAAAF2KTkvVilbS7A=" }, "namespaceLabel": { - "$ref": "AAAAAAF2KRmqRyekqBY=" + "$ref": "AAAAAAF2KTkvVilczYQ=" }, "propertyLabel": { - "$ref": "AAAAAAF2KRmqRyeli78=" + "$ref": "AAAAAAF2KTkvVildT5U=" } }, { "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAF2KRmqRyemRDs=", + "_id": "AAAAAAF2KTkvVileQhE=", "_parent": { - "$ref": "AAAAAAF2KRmqRyegw78=" + "$ref": "AAAAAAF2KTkvVilYQxA=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "font": "Arial;13;0", - "left": 392, - "top": 129, - "width": 137, + "left": 168, + "top": 633, + "width": 273, "height": 10 }, { "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAF2KRmqRyenog8=", + "_id": "AAAAAAF2KTkvVilfVa8=", "_parent": { - "$ref": "AAAAAAF2KRmqRyegw78=" + "$ref": "AAAAAAF2KTkvVilYQxA=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "font": "Arial;13;0", - "left": 392, - "top": 139, - "width": 137, + "left": 168, + "top": 643, + "width": 273, "height": 10 }, { "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAF2KRmqRyeoOO0=", + "_id": "AAAAAAF2KTkvVilg/zw=", "_parent": { - "$ref": "AAAAAAF2KRmqRyegw78=" + "$ref": "AAAAAAF2KTkvVilYQxA=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "visible": false, "font": "Arial;13;0", - "left": 8, + "left": -16, + "top": 8, "width": 10, "height": 10 }, { "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAF2KRmqRyepUws=", + "_id": "AAAAAAF2KTkvVilhHmg=", "_parent": { - "$ref": "AAAAAAF2KRmqRyegw78=" + "$ref": "AAAAAAF2KTkvVilYQxA=" }, "model": { - "$ref": "AAAAAAF2KRmqRiee4ZY=" + "$ref": "AAAAAAF2KTkvVilWWw4=" }, "visible": false, "font": "Arial;13;0", - "left": 8, + "left": -16, + "top": 8, "width": 10, "height": 10 } ], "font": "Arial;13;0", "containerChangeable": true, - "left": 392, - "top": 104, - "width": 137, - "height": 209, + "left": 168, + "top": 608, + "width": 273, + "height": 201, "nameCompartment": { - "$ref": "AAAAAAF2KRmqRyeh5qI=" + "$ref": "AAAAAAF2KTkvVilZxzs=" }, "attributeCompartment": { - "$ref": "AAAAAAF2KRmqRyemRDs=" + "$ref": "AAAAAAF2KTkvVileQhE=" }, "operationCompartment": { - "$ref": "AAAAAAF2KRmqRyenog8=" + "$ref": "AAAAAAF2KTkvVilfVa8=" }, "receptionCompartment": { - "$ref": "AAAAAAF2KRmqRyeoOO0=" + "$ref": "AAAAAAF2KTkvVilg/zw=" }, "templateParameterCompartment": { - "$ref": "AAAAAAF2KRmqRyepUws=" + "$ref": "AAAAAAF2KTkvVilhHmg=" } }, { @@ -1259,8 +1990,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -32, - "top": -48, + "left": 472, + "top": 1512, "height": 13 }, { @@ -1270,8 +2001,8 @@ "$ref": "AAAAAAF2KRq44ygWSSI=" }, "font": "Arial;13;1", - "left": 661, - "top": 103, + "left": 829, + "top": 623, "width": 151, "height": 13, "text": "VueJoueur" @@ -1284,11 +2015,11 @@ }, "visible": false, "font": "Arial;13;0", - "left": -32, - "top": -48, + "left": 472, + "top": 1512, "width": 73.67724609375, "height": 13, - "text": "(from Model)" + "text": "(from vue)" }, { "_type": "LabelView", @@ -1298,15 +2029,15 @@ }, "visible": false, "font": "Arial;13;0", - "left": -32, - "top": -48, + "left": 472, + "top": 1512, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 656, - "top": 96, + "left": 824, + "top": 616, "width": 161, "height": 25, "stereotypeLabel": { @@ -1332,8 +2063,8 @@ "$ref": "AAAAAAF2KRq44ygTkOc=" }, "font": "Arial;13;0", - "left": 656, - "top": 121, + "left": 824, + "top": 641, "width": 161, "height": 10 }, @@ -1347,8 +2078,8 @@ "$ref": "AAAAAAF2KRq44ygTkOc=" }, "font": "Arial;13;0", - "left": 656, - "top": 131, + "left": 824, + "top": 651, "width": 161, "height": 10 }, @@ -1363,8 +2094,8 @@ }, "visible": false, "font": "Arial;13;0", - "left": -16, - "top": -24, + "left": 320, + "top": 1016, "width": 10, "height": 10 }, @@ -1379,16 +2110,19 @@ }, "visible": false, "font": "Arial;13;0", - "left": -16, - "top": -24, + "left": 320, + "top": 1016, "width": 10, "height": 10 } ], + "containerView": { + "$ref": "AAAAAAF2KRgHQybUFho=" + }, "font": "Arial;13;0", "containerChangeable": true, - "left": 656, - "top": 96, + "left": 824, + "top": 616, "width": 161, "height": 177, "nameCompartment": { @@ -1408,189 +2142,251 @@ } }, { - "_type": "UMLInterfaceView", - "_id": "AAAAAAF2KRtIKihFjTU=", + "_type": "UMLClassView", + "_id": "AAAAAAF2KUGhrin8k40=", "_parent": { "$ref": "AAAAAAFF+qBtyKM79qY=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, "subViews": [ { "_type": "UMLNameCompartmentView", - "_id": "AAAAAAF2KRtIKihGMxg=", + "_id": "AAAAAAF2KUGhrin92pk=", "_parent": { - "$ref": "AAAAAAF2KRtIKihFjTU=" + "$ref": "AAAAAAF2KUGhrin8k40=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, "subViews": [ { "_type": "LabelView", - "_id": "AAAAAAF2KRtIKihHGXc=", + "_id": "AAAAAAF2KUGhrin+EJk=", "_parent": { - "$ref": "AAAAAAF2KRtIKihGMxg=" + "$ref": "AAAAAAF2KUGhrin92pk=" }, "visible": false, "font": "Arial;13;0", - "left": 312, - "top": 984, - "width": 64.32080078125, - "height": 13, - "text": "«interface»" + "left": -48, + "top": -16, + "height": 13 }, { "_type": "LabelView", - "_id": "AAAAAAF2KRtIKihIX2w=", + "_id": "AAAAAAF2KUGhryn/j44=", "_parent": { - "$ref": "AAAAAAF2KRtIKihGMxg=" + "$ref": "AAAAAAF2KUGhrin92pk=" }, "font": "Arial;13;1", - "left": 293, - "top": 741, - "width": 214, + "left": 853, + "top": 103, + "width": 163.68701171875, "height": 13, - "text": "Actions" + "text": "Partie" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRtIKihJNiY=", + "_id": "AAAAAAF2KUGhryoAqb0=", "_parent": { - "$ref": "AAAAAAF2KRtIKihGMxg=" + "$ref": "AAAAAAF2KUGhrin92pk=" }, "visible": false, "font": "Arial;13;0", - "left": 312, - "top": 984, - "width": 94.62451171875, + "left": -48, + "top": -16, + "width": 73.67724609375, "height": 13, - "text": "(from Controller)" + "text": "(from Model)" }, { "_type": "LabelView", - "_id": "AAAAAAF2KRtIKihKkt4=", + "_id": "AAAAAAF2KUGhryoBKCg=", "_parent": { - "$ref": "AAAAAAF2KRtIKihGMxg=" + "$ref": "AAAAAAF2KUGhrin92pk=" }, "visible": false, "font": "Arial;13;0", - "left": 312, - "top": 984, + "left": -48, + "top": -16, "height": 13, "horizontalAlignment": 1 } ], "font": "Arial;13;0", - "left": 288, - "top": 734, - "width": 224, + "left": 848, + "top": 96, + "width": 173.68701171875, "height": 25, "stereotypeLabel": { - "$ref": "AAAAAAF2KRtIKihHGXc=" + "$ref": "AAAAAAF2KUGhrin+EJk=" }, "nameLabel": { - "$ref": "AAAAAAF2KRtIKihIX2w=" + "$ref": "AAAAAAF2KUGhryn/j44=" }, "namespaceLabel": { - "$ref": "AAAAAAF2KRtIKihJNiY=" + "$ref": "AAAAAAF2KUGhryoAqb0=" }, "propertyLabel": { - "$ref": "AAAAAAF2KRtIKihKkt4=" + "$ref": "AAAAAAF2KUGhryoBKCg=" } }, { "_type": "UMLAttributeCompartmentView", - "_id": "AAAAAAF2KRtIKihLSg4=", + "_id": "AAAAAAF2KUGhryoClug=", "_parent": { - "$ref": "AAAAAAF2KRtIKihFjTU=" + "$ref": "AAAAAAF2KUGhrin8k40=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, - "visible": false, + "subViews": [ + { + "_type": "UMLAttributeView", + "_id": "AAAAAAF2KUTniCqdg/0=", + "_parent": { + "$ref": "AAAAAAF2KUGhryoClug=" + }, + "model": { + "$ref": "AAAAAAF2KUTngCqadDo=" + }, + "font": "Arial;13;0", + "left": 853, + "top": 126, + "width": 163.68701171875, + "height": 13, + "text": "-listeJoueur: Joueur[]", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 208, - "top": 656, - "width": 10, - "height": 10 + "left": 848, + "top": 121, + "width": 173.68701171875, + "height": 23 }, { "_type": "UMLOperationCompartmentView", - "_id": "AAAAAAF2KRtIKihMoGg=", + "_id": "AAAAAAF2KUGhryoDrHE=", "_parent": { - "$ref": "AAAAAAF2KRtIKihFjTU=" + "$ref": "AAAAAAF2KUGhrin8k40=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, - "visible": false, + "subViews": [ + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUTGJiqW2XI=", + "_parent": { + "$ref": "AAAAAAF2KUGhryoDrHE=" + }, + "model": { + "$ref": "AAAAAAF2KUTGISqTgRY=" + }, + "font": "Arial;13;0", + "left": 853, + "top": 149, + "width": 163.68701171875, + "height": 13, + "text": "+Partie()", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUcNwyqssvs=", + "_parent": { + "$ref": "AAAAAAF2KUGhryoDrHE=" + }, + "model": { + "$ref": "AAAAAAF2KUcNviqp1WY=" + }, + "font": "Arial;13;0", + "left": 853, + "top": 164, + "width": 163.68701171875, + "height": 13, + "text": "+getJoueur(): Joueur", + "horizontalAlignment": 0 + }, + { + "_type": "UMLOperationView", + "_id": "AAAAAAF2KUc7zCq1MTA=", + "_parent": { + "$ref": "AAAAAAF2KUGhryoDrHE=" + }, + "model": { + "$ref": "AAAAAAF2KUc7xyqyxiI=" + }, + "font": "Arial;13;0", + "left": 853, + "top": 179, + "width": 163.68701171875, + "height": 13, + "text": "+getJoueurGagnat(): Joueur", + "horizontalAlignment": 0 + } + ], "font": "Arial;13;0", - "left": 208, - "top": 656, - "width": 10, - "height": 10 + "left": 848, + "top": 144, + "width": 173.68701171875, + "height": 53 }, { "_type": "UMLReceptionCompartmentView", - "_id": "AAAAAAF2KRtIKihNUVI=", + "_id": "AAAAAAF2KUGhryoEpbU=", "_parent": { - "$ref": "AAAAAAF2KRtIKihFjTU=" + "$ref": "AAAAAAF2KUGhrin8k40=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, "visible": false, "font": "Arial;13;0", - "left": 208, - "top": 656, + "left": -24, + "top": -8, "width": 10, "height": 10 }, { "_type": "UMLTemplateParameterCompartmentView", - "_id": "AAAAAAF2KRtIKihOlo0=", + "_id": "AAAAAAF2KUGhryoF1H4=", "_parent": { - "$ref": "AAAAAAF2KRtIKihFjTU=" + "$ref": "AAAAAAF2KUGhrin8k40=" }, "model": { - "$ref": "AAAAAAF2KRtIKShDmlg=" + "$ref": "AAAAAAF2KUGhrin65MA=" }, "visible": false, "font": "Arial;13;0", - "left": 208, - "top": 656, + "left": -24, + "top": -8, "width": 10, "height": 10 } ], - "containerView": { - "$ref": "AAAAAAF2KRgSmybuyUU=" - }, "font": "Arial;13;0", "containerChangeable": true, - "left": 288, - "top": 592, - "width": 224, - "height": 168, - "stereotypeDisplay": "icon", + "left": 848, + "top": 96, + "width": 173.68701171875, + "height": 305, "nameCompartment": { - "$ref": "AAAAAAF2KRtIKihGMxg=" + "$ref": "AAAAAAF2KUGhrin92pk=" }, - "suppressAttributes": true, - "suppressOperations": true, "attributeCompartment": { - "$ref": "AAAAAAF2KRtIKihLSg4=" + "$ref": "AAAAAAF2KUGhryoClug=" }, "operationCompartment": { - "$ref": "AAAAAAF2KRtIKihMoGg=" + "$ref": "AAAAAAF2KUGhryoDrHE=" }, "receptionCompartment": { - "$ref": "AAAAAAF2KRtIKihNUVI=" + "$ref": "AAAAAAF2KUGhryoEpbU=" }, "templateParameterCompartment": { - "$ref": "AAAAAAF2KRtIKihOlo0=" + "$ref": "AAAAAAF2KUGhryoF1H4=" } } ] @@ -1609,23 +2405,15 @@ "_parent": { "$ref": "AAAAAAF2KRdKCyaZvqg=" }, - "name": "Controller", + "name": "controller", "ownedElements": [ - { - "_type": "UMLClass", - "_id": "AAAAAAF2KRlHiidyrPI=", - "_parent": { - "$ref": "AAAAAAF2KRgSmybsTGk=" - }, - "name": "Joueur" - }, { "_type": "UMLInterface", "_id": "AAAAAAF2KRtIKShDmlg=", "_parent": { "$ref": "AAAAAAF2KRgSmybsTGk=" }, - "name": "Actions" + "name": "PuissanceController" } ] }, @@ -1635,7 +2423,17 @@ "_parent": { "$ref": "AAAAAAF2KRdKCyaZvqg=" }, - "name": "Vue" + "name": "vue", + "ownedElements": [ + { + "_type": "UMLClass", + "_id": "AAAAAAF2KRq44ygTkOc=", + "_parent": { + "$ref": "AAAAAAF2KRgHQybSPl0=" + }, + "name": "VueJoueur" + } + ] }, { "_type": "UMLPackage", @@ -1643,7 +2441,7 @@ "_parent": { "$ref": "AAAAAAF2KRdKCyaZvqg=" }, - "name": "Model", + "name": "model", "ownedElements": [ { "_type": "UMLClass", @@ -1694,6 +2492,267 @@ "visibility": "private", "type": "int" } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSLKVSiZHsk=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "Grille" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSP57Sig1DY=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "getLigne", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSZNhSjTnqg=", + "_parent": { + "$ref": "AAAAAAF2KSP57Sig1DY=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSRUAyinLQ4=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "getColonne", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSZlvyjWdrs=", + "_parent": { + "$ref": "AAAAAAF2KSRUAyinLQ4=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSSB/SiuOT8=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "setLigne", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSZ+CijZJZQ=", + "_parent": { + "$ref": "AAAAAAF2KSSB/SiuOT8=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSSRVii1Y4M=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "setColonne", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSadtCjlDIQ=", + "_parent": { + "$ref": "AAAAAAF2KSSRVii1Y4M=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSV4kSjLufM=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "estVide", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSaypyjopiM=", + "_parent": { + "$ref": "AAAAAAF2KSV4kSjLufM=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KSdDPSjqh3g=", + "_parent": { + "$ref": "AAAAAAF2KRjA1ScWNd8=" + }, + "name": "estPleine", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KSd4Fyjy7WY=", + "_parent": { + "$ref": "AAAAAAF2KSdDPSjqh3g=" + }, + "type": "int", + "direction": "return" + } + ] + } + ] + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF2KRlHiidyrPI=", + "_parent": { + "$ref": "AAAAAAF2KRfl/ya4LCo=" + }, + "name": "Joueur", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KUIlsiozZCo=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "nom", + "type": "String" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KUJZ3So6i8U=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "nbPions", + "type": "int" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KUKE0SpFzfA=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "couleurPion", + "type": "Color" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KUKdWSpMp9Y=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "score", + "type": "int" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KULTMCpblSU=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "Joueur" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUMT1ypiGL0=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "getCouleur", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KUNN8Sppaxo=", + "_parent": { + "$ref": "AAAAAAF2KUMT1ypiGL0=" + }, + "type": "Color", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUNOICprjgQ=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "setCouleur" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUO3WCpydZc=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "getNom", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KUP7TSp5b20=", + "_parent": { + "$ref": "AAAAAAF2KUO3WCpydZc=" + }, + "type": "String", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUP7eSp72pU=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "setNom" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KURC1CqDec4=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "getScore", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KURrAiqKGsQ=", + "_parent": { + "$ref": "AAAAAAF2KURC1CqDec4=" + }, + "type": "int", + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUR14CqMptQ=", + "_parent": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "name": "setScore" + } ] } ] @@ -1706,7 +2765,77 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "Case" + "name": "Case", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KSpO5yj1CME=", + "_parent": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + }, + "name": "posLigne", + "visibility": "private", + "type": "int" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KTEgMSj9GTU=", + "_parent": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + }, + "name": "couleur", + "visibility": "private", + "type": "Color" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KTOmWSkN3I0=", + "_parent": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + }, + "name": "posColonne", + "visibility": "private", + "type": "int" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KTRX4CkdjjM=", + "_parent": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + }, + "name": "Case" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KTUalikmmXw=", + "_parent": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + }, + "name": "Remplir", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KTVi3yku77k=", + "_parent": { + "$ref": "AAAAAAF2KTUalikmmXw=" + }, + "name": "posLigne", + "type": "" + }, + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KTVi3ykvhaA=", + "_parent": { + "$ref": "AAAAAAF2KTUalikmmXw=" + }, + "name": "posColonne", + "type": "" + } + ] + } + ] }, { "_type": "UMLClass", @@ -1714,7 +2843,82 @@ "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "Pion" + "name": "Pion", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KTLXhikFVYU=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "couleur", + "visibility": "private", + "type": "Color" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KTyXtymqxoI=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "Attribute1", + "type": "" + }, + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KT5yoinLNbk=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "enplacement", + "visibility": "private", + "type": { + "$ref": "AAAAAAF2KRjtNCdDrwk=" + } + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KTtvmymM/Ms=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "Pion" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KTzXXCmx5m8=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "getCouleur" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KTzygSm4OfA=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "setCouleur" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KT5A0CnEE/Q=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "getCase" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KT+HeinW4pc=", + "_parent": { + "$ref": "AAAAAAF2KRmqRiee4ZY=" + }, + "name": "Operation1" + } + ] }, { "_type": "UMLClass", @@ -1726,11 +2930,83 @@ }, { "_type": "UMLClass", - "_id": "AAAAAAF2KRq44ygTkOc=", + "_id": "AAAAAAF2KTkvVilWWw4=", + "_parent": { + "$ref": "AAAAAAFF+qBWK6M3Z8Y=" + }, + "name": "Puissance4Controller" + }, + { + "_type": "UMLClass", + "_id": "AAAAAAF2KUGhrin65MA=", "_parent": { "$ref": "AAAAAAFF+qBWK6M3Z8Y=" }, - "name": "VueJoueur" + "name": "Partie", + "attributes": [ + { + "_type": "UMLAttribute", + "_id": "AAAAAAF2KUTngCqadDo=", + "_parent": { + "$ref": "AAAAAAF2KUGhrin65MA=" + }, + "name": "listeJoueur", + "visibility": "private", + "type": "Joueur[]" + } + ], + "operations": [ + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUTGISqTgRY=", + "_parent": { + "$ref": "AAAAAAF2KUGhrin65MA=" + }, + "name": "Partie" + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUcNviqp1WY=", + "_parent": { + "$ref": "AAAAAAF2KUGhrin65MA=" + }, + "name": "getJoueur", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KUc7liqwlWs=", + "_parent": { + "$ref": "AAAAAAF2KUcNviqp1WY=" + }, + "type": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "direction": "return" + } + ] + }, + { + "_type": "UMLOperation", + "_id": "AAAAAAF2KUc7xyqyxiI=", + "_parent": { + "$ref": "AAAAAAF2KUGhrin65MA=" + }, + "name": "getJoueurGagnat", + "parameters": [ + { + "_type": "UMLParameter", + "_id": "AAAAAAF2KUfXnyq5vmQ=", + "_parent": { + "$ref": "AAAAAAF2KUc7xyqyxiI=" + }, + "type": { + "$ref": "AAAAAAF2KRlHiidyrPI=" + }, + "direction": "return" + } + ] + } + ] } ] } diff --git a/src/puissance4/Main.java b/src/puissance4/Main.java index 9a6f735..c7fcba2 100644 --- a/src/puissance4/Main.java +++ b/src/puissance4/Main.java @@ -1,5 +1,7 @@ package puissance4; +import java.awt.*; + public class Main { public static void main(String[] args) diff --git a/src/puissance4/model/Grille.java b/src/puissance4/model/Grille.java new file mode 100644 index 0000000..fbd3ddc --- /dev/null +++ b/src/puissance4/model/Grille.java @@ -0,0 +1,6 @@ +package puissance4.model; + +public class Grille +{ + +} -- GitLab