February 2016 - Tutti-commits - mailman.cloud.codelutin.com

branch feature/6592-2 created (now 09eafe8)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/6592-2 in repository tutti. See http://git.codelutin.com/tutti.git at 09eafe8 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) This branch includes the following new commits: new 09eafe8 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 09eafe8fc2e3454f2f40485932def0693085b69f Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 12:21:26 2016 +0100 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7929_editeur_de_zone updated (32a93e0 -> a96d18f)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git discards 32a93e0 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) discards 2beea6e activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) discards 3be1d33 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) discards 6ca90c6 utilisation de fromEntity et toEntity au lieu de fromBean et toBean discards b99cb29 tri des noeuds + i18n (refs #7929) discards 38b5700 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) discards 0f29ae8 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) discards 08c08a6 sauvegarde du protocol (refs #7929) discards ede2fb2 ajout des icones + tri des noeuds dans les arbres (refs #7929) discards 00cd88d suprpession des sous strates d'une zone (refs #7929) discards c009f80 ajout des listeners sur les strates et sous strates (refs #7929) discards 8f112f8 création des modeles de strates et sous strates (refs #7929) discards f259b29 creation de zones + déplacement des noeuds (refs #7929) discards 48ded36 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) discards fc7dabe mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) discards 9ae2970 ajout des strates et sous strates au modèle (refs #7929) discards 267fd13 ajout de l'onglet d'édition des zone (refs #7929) discards dedff13 ajout des zones au protocole (refs #7929) discards 595843d use java 1.8 adds 320a3a0 Trim update url, because of haw theroy... (See #7946) adds 3a73396 Merge branch 'feature/7946' into 'develop' new be26619 use java 1.8 new cb089af ajout des zones au protocole (refs #7929) new c175e1d ajout de l'onglet d'édition des zone (refs #7929) new 553538e ajout des strates et sous strates au modèle (refs #7929) new 7a82e95 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) new ee33a64 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) new 0ff5002 creation de zones + déplacement des noeuds (refs #7929) new ea86043 création des modeles de strates et sous strates (refs #7929) new 3cbf075 ajout des listeners sur les strates et sous strates (refs #7929) new 2f86084 suprpession des sous strates d'une zone (refs #7929) new c1770b6 ajout des icones + tri des noeuds dans les arbres (refs #7929) new 64396f9 sauvegarde du protocol (refs #7929) new 48ee1cf on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) new b5d8711 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) new a437aed tri des noeuds + i18n (refs #7929) new 098b663 utilisation de fromEntity et toEntity au lieu de fromBean et toBean new e7fd65a - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) new 119818a activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) new a96d18f desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (32a93e0) \ N -- N -- N refs/heads/feature/7929_editeur_de_zone (a96d18f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a96d18ff71d6f71f8c3d23dabc8e929a619b4358 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 11:05:50 2016 +0100 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) commit 119818a13e446de273c79eed7116ab0410a910d5 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 10:46:33 2016 +0100 activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) commit e7fd65aa77e3448775ccc6348b28452bdd0241cc Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 19:10:52 2016 +0100 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) commit 098b663940cb314765a5be5a4469be2b2fa909cc Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 15:54:09 2016 +0100 utilisation de fromEntity et toEntity au lieu de fromBean et toBean commit a437aed7070ad5b8370872afe22554cdee8d0e14 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 14:36:07 2016 +0100 tri des noeuds + i18n (refs #7929) commit b5d8711c0fb79b98858ff7436b8ea0eea552d245 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 1 19:09:05 2016 +0100 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) commit 48ee1cfebc5f8314475040567a55afe268f51928 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:35:38 2016 +0100 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) commit 64396f97ee982f248d402a765c74ca1440b30d26 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 17:12:06 2016 +0100 sauvegarde du protocol (refs #7929) commit c1770b68bdadd49ee0c46a779aab22fd2d081d7b Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 14:49:39 2016 +0100 ajout des icones + tri des noeuds dans les arbres (refs #7929) commit 2f86084d3917f753b6f2f3453228af6b1a88318d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Jan 29 11:34:43 2016 +0100 suprpession des sous strates d'une zone (refs #7929) commit 3cbf075d1be41de84bd93df0f1031b40de2ec92a Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:22:03 2016 +0100 ajout des listeners sur les strates et sous strates (refs #7929) commit ea86043f569ce4557f2cfff793e4e9ac1cb0230e Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Jan 28 19:21:56 2016 +0100 création des modeles de strates et sous strates (refs #7929) commit 0ff5002e3a03ae359d36f5bd04981d817e5c1990 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:39:17 2016 +0100 creation de zones + déplacement des noeuds (refs #7929) commit ee33a6433136cb43cb42f46093c8d941cfd452a7 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:38:05 2016 +0100 noeuds + renderer + modeles d'arbre + modele de zone (refs #7929) commit 7a82e9504cde295068df51bf9a1f4e81140fa957 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:37:01 2016 +0100 mise a jour suite aux modifs du modele + appel des oncloseui des sous-ui (refs #7929) commit 553538eacb36c4da27722fc604c34b2c46a3a386 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Jan 27 18:35:31 2016 +0100 ajout des strates et sous strates au modèle (refs #7929) commit c175e1d3a00958464221bc56bea4fafb9db07348 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:23:25 2016 +0100 ajout de l'onglet d'édition des zone (refs #7929) commit cb089af19dca490f53adc3d5d4790145df880e13 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:53 2016 +0100 ajout des zones au protocole (refs #7929) commit be26619afdfe3a0a3baaac8ad850cbb257c30ae0 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Jan 25 11:22:00 2016 +0100 use java 1.8 Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 11

branch feature/7929_editeur_de_zone updated (3be1d33 -> 32a93e0)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from 3be1d33 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) new 2beea6e activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) new 32a93e0 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32a93e00588df1c459a0fbd82814edceccafcd39 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 11:05:50 2016 +0100 desactivation des boutons d'ajout et de suppression des strates à l'ouverture de l'écran (refs #7929) commit 2beea6ed016caa96d94ef027f6b44d5f6f1b926e Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Feb 3 10:46:33 2016 +0100 activation ou non des boutons d'ajout et de suppresion des strates (refs #7929) Summary of changes: .../swing/content/protocol/zones/ZoneEditorUI.jcss | 3 -- .../protocol/zones/ZoneEditorUIHandler.java | 58 ++++++++++++++++------ .../protocol/zones/actions/AddStratasAction.java | 5 ++ .../zones/actions/RemoveStratasAction.java | 1 + 4 files changed, 50 insertions(+), 17 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (6c0822a -> 3a73396)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 320a3a0 Trim update url, because of haw theroy... (See #7946) adds 3a73396 Merge branch 'feature/7946' into 'develop' No new revisions were added by this update. Summary of changes: .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7946 created (now 320a3a0)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7946 in repository tutti. See http://git.codelutin.com/tutti.git at 320a3a0 Trim update url, because of haw theroy... (See #7946) This branch includes the following new commits: new 320a3a0 Trim update url, because of haw theroy... (See #7946) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 320a3a0edbdaa9e8e878bfe23e08675a5a921bbb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 10:38:03 2016 +0100 Trim update url, because of haw theroy... (See #7946) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7656 updated (7857694 -> a206acf)
by codelutin.com scm Feb. 3, 2016

Feb. 3, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git from 7857694 Quelques modifications et mises à jour sur les spécifications (See #7656) new a206acf Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a206acf33296c778f87dcada2719c184b1d4b82b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 3 09:58:57 2016 +0100 Ajout de toutes les requêtes manquantes dans les spécifications et nommage de le fichier de requêtes de l'application (See #7656) Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 996724 -> 1017160 bytes .../src/main/resources/queries-failsafe.hbm.xml | 82 +++++++++++++++------ 2 files changed, 61 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/7656 updated (6c0822a -> 7857694)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git from 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 7857694 Quelques modifications et mises à jour sur les spécifications (See #7656) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 78576942712625319d8bde89ac1f65d39e25d107 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 2 20:51:54 2016 +0100 Quelques modifications et mises à jour sur les spécifications (See #7656) Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 982028 -> 996724 bytes 1 file changed, 0 insertions(+), 0 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7929_editeur_de_zone updated (38b5700 -> 3be1d33)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from 38b5700 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) new b99cb29 tri des noeuds + i18n (refs #7929) new 6ca90c6 utilisation de fromEntity et toEntity au lieu de fromBean et toBean new 3be1d33 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3be1d33a764b90698038151856df99fe3ec8f50f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 19:10:52 2016 +0100 - utilisation directement du modele du protocol - ajout d'une popup de menu pour surrpimer et renommer les zones (refs #7929) commit 6ca90c62a9ded86114ddad35c64fe7f696146291 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 15:54:09 2016 +0100 utilisation de fromEntity et toEntity au lieu de fromBean et toBean commit b99cb2954d19ab03401aaff1bbab0ea0a75091c1 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 2 14:36:07 2016 +0100 tri des noeuds + i18n (refs #7929) Summary of changes: .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../accidental/AccidentalBatchUIHandler.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 4 +- .../IndividualObservationBatchUIHandler.java | 2 +- .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 4 +- .../actions/EditFishingOperationAction.java | 4 +- .../actions/SaveFishingOperationAction.java | 2 +- .../content/program/EditProgramUIHandler.java | 2 +- .../content/program/actions/SaveProgramAction.java | 2 +- .../content/protocol/EditProtocolUIHandler.java | 26 +-- .../content/protocol/EditProtocolUIModel.java | 179 +++++++++++++++++- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolCaracteristicAction.java | 4 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../protocol/actions/SaveProtocolAction.java | 17 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 18 +- .../swing/content/protocol/zones/ZoneEditorUI.jcss | 16 +- .../protocol/zones/ZoneEditorUIHandler.java | 207 +++++++++++---------- .../content/protocol/zones/ZoneEditorUIModel.java | 175 ----------------- .../protocol/zones/actions/AddStratasAction.java | 55 +++--- .../CollapseAvailableStratasTreeAction.java | 3 +- .../zones/actions/CollapseZonesTreeAction.java | 3 +- .../protocol/zones/actions/CreateZoneAction.java | 8 +- .../protocol/zones/actions/DeleteZoneAction.java | 26 ++- .../protocol/zones/actions/RenameZoneAction.java | 54 ++++++ .../protocol/zones/models/SubStrataUIModel.java | 6 +- .../zones/tree/AbstractZoneEditorTreeModel.java | 25 +++ .../protocol/zones/tree/StratasTreeModel.java | 30 +-- .../protocol/zones/tree/ZoneEditorNode.java | 19 ++ .../protocol/zones/tree/ZonesTreeModel.java | 34 +--- .../report/actions/GenerateReportAction.java | 2 +- .../actions/EditCruiseInValidationUIAction.java | 2 +- .../EditFishingOperationInValidationUIAction.java | 4 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 15 ++ .../EditProtocolUIModel-error-validation.xml} | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 11 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 42 files changed, 563 insertions(+), 442 deletions(-) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/ZoneEditorUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/RenameZoneAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/tree/AbstractZoneEditorTreeModel.java copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{home/SelectCruiseUIModel-error-validation.xml => protocol/EditProtocolUIModel-error-validation.xml} (85%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/7656 created (now 6c0822a)
by codelutin.com scm Feb. 2, 2016

Feb. 2, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7656 in repository tutti. See http://git.codelutin.com/tutti.git at 6c0822a [jgitflow-maven-plugin]Updating develop poms back to pre merge state No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7929_editeur_de_zone updated (0f29ae8 -> 38b5700)
by codelutin.com scm Feb. 1, 2016

Feb. 1, 2016

This is an automated email from the git hooks/post-receive script. New change to branch feature/7929_editeur_de_zone in repository tutti. See http://git.codelutin.com/tutti.git from 0f29ae8 on pousse les zones dans le modele de protocole (peut etre faire l'inverse...) (refs #7929) new 38b5700 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 38b5700dd45a62f7f04d121064d8d3ea053f2751 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 1 19:09:05 2016 +0100 - ajout de la suppression de zone - probleme de rechargement de l'arbre quand on cache la racine - sélection de la zone créée (refs #7929) Summary of changes: .../content/protocol/EditProtocolUIHandler.java | 6 +++ .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 1 + .../swing/content/protocol/zones/ZoneEditorUI.jcss | 7 ++- .../protocol/zones/ZoneEditorUIHandler.java | 30 ++++++++---- .../protocol/zones/actions/CreateZoneAction.java | 15 ++++++ .../protocol/zones/actions/DeleteZoneAction.java | 54 ++++++++++++++++++++++ .../protocol/zones/tree/StratasTreeModel.java | 14 ++++-- .../protocol/zones/tree/ZonesTreeModel.java | 14 +++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 10 files changed, 120 insertions(+), 23 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/zones/actions/DeleteZoneAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1