r166 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne config/panels document document/panel extraction lot molecule personne purification specimen station testBio - Cantharella-commits

28 Feb 2013

Author: echatellier
Date: 2013-02-28 10:48:44 +0100 (Thu, 28 Feb 2013)
New Revision: 166

Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/166

Log:
Use entity instead of model to instanciate pages

Modified:
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java
   trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java
===================================================================

--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -263,7 +263,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                campagneModel, currentPage);
+                campagneModel.getObject(), currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || campagneService.updateOrdeleteCampagneEnabled(campagneModel.getObject(), getSession()
                         .getUtilisateur()));

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -137,7 +137,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                campagneModel, currentPage);
+                campagneModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -25,7 +25,6 @@
 import nc.ird.cantharella.service.services.SearchService;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
 import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Button;
@@ -34,7 +33,6 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.apache.wicket.util.time.Duration;
 
 /**
  * Panel qui permet de reconstruire l'index lucene.

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -105,23 +105,21 @@
     /**
      * Constructeur (mode création)
      * @param callerPage Page appelante
-     * @param documentAttachableModel entity where document is attached to
+     * @param documentAttachable entity where document is attached to
      * @param multipleEntry Saisie multiple
      */
-    public ManageDocumentPage(CallerPage callerPage, IModel<? extends DocumentAttachable> documentAttachableModel,
-            boolean multipleEntry) {
-        this(null, documentAttachableModel, callerPage, multipleEntry);
+    public ManageDocumentPage(CallerPage callerPage, DocumentAttachable documentAttachable, boolean multipleEntry) {
+        this(null, documentAttachable, callerPage, multipleEntry);
     }
 
     /**
      * Constructeur (mode édition)
      * @param document document to edit
-     * @param documentAttachableModel document sur le
+     * @param documentAttachable document sur le
      * @param callerPage Page appelante
      */
-    public ManageDocumentPage(Document document, IModel<? extends DocumentAttachable> documentAttachableModel,
-            CallerPage callerPage) {
-        this(document, documentAttachableModel, callerPage, false);
+    public ManageDocumentPage(Document document, DocumentAttachable documentAttachable, CallerPage callerPage) {
+        this(document, documentAttachable, callerPage, false);
     }
 
     /**
@@ -130,11 +128,11 @@
      * correspondant. Si document est renseigné, on créée un nouveau document à
      * partir des informations qu'il contient.
      * @param document document
-     * @param documentAttachableModel entity where document is attached to
+     * @param documentAttachable entity where document is attached to
      * @param callerPage Page appelante
      * @param multipleEntry Saisie multiple
      */
-    private ManageDocumentPage(Document document, final IModel<? extends DocumentAttachable> documentAttachableModel,
+    private ManageDocumentPage(Document document, final DocumentAttachable documentAttachable,
             final CallerPage callerPage, boolean multipleEntry) {
         super(ManageDocumentPage.class);
         this.callerPage = callerPage;
@@ -255,7 +253,7 @@
             @Override
             public void onProcess() throws DataConstraintException {
                 Document document = documentModel.getObject();
-                documentAttachableModel.getObject().addDocument(document);
+                documentAttachable.addDocument(document);
             }
 
             @Override
@@ -303,7 +301,7 @@
         Button deleteButton = new SubmittableButton(ACTION_DELETE, new SubmittableButtonEvents() {
             @Override
             public void onProcess() throws DataConstraintException {
-                documentAttachableModel.getObject().removeDocument(documentModel.getObject());
+                documentAttachable.removeDocument(documentModel.getObject());
             }
 
             @Override

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -72,11 +72,11 @@
     /**
      * Constructeur
      * @param document document
-     * @param documentAttachableModel entity where document is attached to
+     * @param documentAttachable entity where document is attached to
      * @param callerPage caller page
      */
-    public ReadDocumentPage(final Document document,
-            final IModel<? extends DocumentAttachable> documentAttachableModel, final CallerPage callerPage) {
+    public ReadDocumentPage(final Document document, final DocumentAttachable documentAttachable,
+            final CallerPage callerPage) {
         super(ReadDocumentPage.class);
         this.callerPage = callerPage;
         final CallerPage currentPage = new CallerPage(this);
@@ -120,7 +120,7 @@
                 .getObject())) {
             @Override
             public void onClick() {
-                setResponsePage(new ManageDocumentPage(getModelObject(), documentAttachableModel, currentPage));
+                setResponsePage(new ManageDocumentPage(getModelObject(), documentAttachable, currentPage));
             }
         };
         formView.add(updateLink);
@@ -129,7 +129,7 @@
         deleteButton = new SubmittableButton(ACTION_DELETE, ManageLotPage.class, new SubmittableButtonEvents() {
             @Override
             public void onProcess() throws DataConstraintException {
-                documentAttachableModel.getObject().removeDocument(documentModel.getObject());
+                documentAttachable.removeDocument(documentModel.getObject());
             }
 
             @Override

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -62,11 +62,10 @@
     /**
      * Constructeur.
      * @param id ID
-     * @param documentAttachableModel entity where documents are attached to
+     * @param documentAttachable entity where documents are attached to
      * @param currentPage currentPage
      */
-    public ManageListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel,
-            final CallerPage currentPage) {
+    public ManageListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) {
         super(id);
         // edit mode enabled by default
         this.updateOrDeleteEnabled = true;
@@ -78,8 +77,7 @@
         documentsTable.setOutputMarkupId(true);
         formView.add(documentsTable);
 
-        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachableModel,
-                "documents");
+        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents");
 
         // Contenu tableaux provenance
         ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List",
@@ -96,7 +94,7 @@
                     @Override
                     public void onClick() {
                         ReadDocumentPage readDocumentPage = new ReadDocumentPage(documentModel.getObject(),
-                                documentAttachableModel, currentPage);
+                                documentAttachable, currentPage);
                         readDocumentPage.setUpdateOrDeleteEnabled(updateOrDeleteEnabled);
                         setResponsePage(readDocumentPage);
                     }
@@ -114,7 +112,7 @@
                     @Override
                     protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
                         Document document = documentModel.getObject();
-                        documentAttachableModel.getObject().removeDocument(document);
+                        documentAttachable.removeDocument(document);
 
                         if (target != null) {
                             target.add(documentsTable);
@@ -128,13 +126,13 @@
         newDocumentLink = new AjaxSubmitLink("NewDocument") {
             @Override
             protected void onSubmit(AjaxRequestTarget request, Form<?> form) {
-                setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel, false));
+                setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false));
             }
 
             // si erreur, le formulaire est également enregistré puis la redirection effectuée
             @Override
             protected void onError(AjaxRequestTarget target, Form<?> form) {
-                setResponsePage(new ManageDocumentPage(currentPage, documentAttachableModel, false));
+                setResponsePage(new ManageDocumentPage(currentPage, documentAttachable, false));
             }
         };
         documentsTable.add(newDocumentLink);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -49,19 +49,17 @@
     /**
      * Constructeur
      * @param id ID
-     * @param documentAttachableModel document attachable
+     * @param documentAttachable document attachable
      * @param currentPage current page
      */
-    public ReadListDocumentsPanel(String id, final IModel<? extends DocumentAttachable> documentAttachableModel,
-            final CallerPage currentPage) {
+    public ReadListDocumentsPanel(String id, final DocumentAttachable documentAttachable, final CallerPage currentPage) {
         super(id);
 
         final MarkupContainer documentsTable = new WebMarkupContainer("ListDocumentsPage.AttachedDocuments.Table");
         documentsTable.setOutputMarkupId(true);
         add(documentsTable);
 
-        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachableModel,
-                "documents");
+        final IModel<List<Document>> documentModel = new PropertyModel<List<Document>>(documentAttachable, "documents");
 
         // Contenu tableaux provenance
         ListView<Document> documentsListView = new ListView<Document>("ListDocumentsPage.AttachedDocuments.List",
@@ -77,8 +75,7 @@
                 Link<Document> documentLink = new Link<Document>("Document.titre.List") {
                     @Override
                     public void onClick() {
-                        setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachableModel,
-                                currentPage));
+                        setResponsePage(new ReadDocumentPage(documentModel.getObject(), documentAttachable, currentPage));
                     }
                 };
                 documentLink.add(new Label("Document.titre.Label.List", new PropertyModel<Document>(documentModel,

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -274,7 +274,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                extractionModel, currentPage);
+                extractionModel.getObject(), currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the extraction

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -187,7 +187,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                extractionModel, currentPage);
+                extractionModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -294,7 +294,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                lotModel, currentPage);
+                lotModel.getObject(), currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || lotService.updateOrdeleteLotEnabled(lotModel.getObject(), getSession().getUtilisateur()));
         formView.add(manageListDocumentsPanel);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -141,8 +141,8 @@
         });
 
         // add list document panel
-        ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel,
-                currentPage);
+        ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel
+                .getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -227,13 +227,14 @@
         // predéclaration des champs activé par la chec
         formView.add(new SimpleTooltipPanel("Molecule.nouvMolecul.info", new Model<String>(
                 getString("Molecule.nouvMolecul.info"))));
-        formView.add(new AjaxCheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) {
-            @Override
-            protected void onUpdate(AjaxRequestTarget target) {
-                nouvMoleculRefresh.setVisible(moleculeModel.getObject().isNouvMolecul());
-                target.add(nouvMoleculRefresh);
-            }
-        }.setEnabled(updateOrDeleteEnabled));
+        formView
+                .add(new AjaxCheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) {
+                    @Override
+                    protected void onUpdate(AjaxRequestTarget target) {
+                        nouvMoleculRefresh.setVisible(moleculeModel.getObject().isNouvMolecul());
+                        target.add(nouvMoleculRefresh);
+                    }
+                }.setEnabled(updateOrDeleteEnabled));
 
         AutoCompleteTextFieldString identifieeParInput = new AutoCompleteTextFieldString("Molecule.identifieePar",
                 new PropertyModel<String>(moleculeModel, "identifieePar"), organismes, ComparisonMode.CONTAINS);
@@ -273,7 +274,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                moleculeModel, currentPage);
+                moleculeModel.getObject(), currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(updateOrDeleteEnabled);
         formView.add(manageListDocumentsPanel);
 

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -152,7 +152,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                moleculeModel, currentPage);
+                moleculeModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -144,7 +144,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                personneModel, currentPage);
+                personneModel.getObject(), currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || getSession().getUtilisateur().getTypeDroit() == TypeDroit.ADMINISTRATEUR);
         formView.add(manageListDocumentsPanel);

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -87,7 +87,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                personneModel, currentPage);
+                personneModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Action : mise à jour (redirection vers le formulaire)

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -248,7 +248,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                purificationModel, currentPage);
+                purificationModel.getObject(), currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the purification

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -236,7 +236,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                purificationModel, currentPage);
+                purificationModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Formulaire des actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -282,7 +282,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                specimenModel, currentPage);
+                specimenModel.getObject(), currentPage);
         manageListDocumentsPanel.setUpdateOrDeleteEnabled(createMode
                 || specimenService.updateOrdeleteSpecimenEnabled(specimenModel.getObject(), getSession()
                         .getUtilisateur()));

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -146,7 +146,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                specimenModel, currentPage);
+                specimenModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         final Form<Void> formView = new Form<Void>("Form");

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -228,7 +228,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                stationModel, currentPage);
+                stationModel.getObject(), currentPage);
         manageListDocumentsPanel
                 .setUpdateOrDeleteEnabled(createMode
                         || stationService.updateOrdeleteStationEnabled(stationModel.getObject(), getSession()

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -111,7 +111,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                stationModel, currentPage);
+                stationModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -279,7 +279,7 @@
 
         // add list document panel
         ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel",
-                testBioModel, currentPage);
+                testBioModel.getObject(), currentPage);
         formView.add(manageListDocumentsPanel);
 
         // Action : create the testBio

Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java
===================================================================
--- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java	2013-02-28 09:27:15 UTC (rev 165)
+++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java	2013-02-28 09:48:44 UTC (rev 166)
@@ -120,7 +120,7 @@
 
         // add list document panel
         ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel",
-                testBioModel, currentPage);
+                testBioModel.getObject(), currentPage);
         add(readListDocumentsPanel);
 
         // Ajout du formulaire pour les actions

    

r166 - in trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain: campagne config/panels document document/panel extraction lot molecule personne purification specimen station testBio

echatellier＠users.forge.codelutin.com

tags

participants (1)