Author: echatellier Date: 2013-04-19 10:39:09 +0200 (Fri, 19 Apr 2013) New Revision: 201 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/201 Log: Fix translation to support locale change. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 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/ListConfigurationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageTypeDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 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/extraction/ListExtractionsPage.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/ListLotsPage.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/ListMoleculesPage.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/ListPersonnesPage.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/ListPurificationsPage.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/ListSpecimensPage.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/ListStationsPage.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/ListTestsBioPage.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 trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java trunk/cantharella.web/src/main/resources/cantharella.conf trunk/cantharella.web/src/main/resources/web_en.properties trunk/cantharella.web/src/main/resources/web_fr.properties Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -207,7 +207,7 @@ refreshFeedbackPage(target); } }; - deleteLink.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteLink.add(new JSConfirmationBehavior(getStringModel("Confirm"))); item.add(deleteLink); } }); @@ -261,7 +261,7 @@ userContent.add(detailsRight); if (getSession().getUtilisateur().getTypeDroit() == TypeDroit.ADMINISTRATEUR) { - userContent.add(new Label("HomePage.Rights.User1", getString("HomePage.Rights.Admin"))); + userContent.add(new Label("HomePage.Rights.User1", getStringModel("HomePage.Rights.Admin"))); // pas d'affichage du lien de détails detailsRight.setVisibilityAllowed(false); EmptyPanel rights2 = new EmptyPanel("HomePage.Rights.User2"); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.html 2013-04-19 08:39:09 UTC (rev 201) @@ -23,7 +23,7 @@ --> <html xmlns:wicket="http://wicket.apache.org" wicket:message="lang:TemplatePage.Lang"> <head> -<title>Cantharella <wicket:head> +<title>Cantharella - <wicket:head> <wicket:container wicket:id="PageTitleHead" /> </wicket:head></title> <meta name="description" wicket:message="content:TemplatePage.Subtitle" /> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -65,8 +65,10 @@ import org.apache.wicket.markup.html.link.BookmarkablePageLink; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.FeedbackPanel; +import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.value.ValueMap; import org.slf4j.Logger; @@ -100,9 +102,6 @@ /** Pattern error property: "property message" */ private static final String PATTERN_ERROR_MESSAGE_VALIDATOR = "%s - %s"; - /** Pattern: page title head (- resource) */ - private static final String PATTERN_PANEL_PAGE_TITLE_HEAD = " - %s"; - /** Pattern: message success (resource.action.OK) */ private static final String PATTERN_SUCCESS_ACTION_MESSAGE = "%s.%s.OK"; @@ -285,9 +284,9 @@ * Add page titles (in head and body) */ private void addPageTitles() { - String page = getString(getResource()); + IModel<String> page = getStringModel(getResource()); - add(new Label("PageTitleHead", String.format(PATTERN_PANEL_PAGE_TITLE_HEAD, page))); + add(new Label("PageTitleHead", page)); add(new Label("PageTitleBody", page)); } @@ -472,4 +471,16 @@ return getString(enumValueMessage); } -} \ No newline at end of file + /** + * Translation method, similar to {@link #getString(String)}, but return + * a model instead of a static String to fix page reload in case of + * locale change. + * + * @param key key to translate + * @param parameters translation parameter + * @return a model containing translation of {@code key} + */ + public IModel<String> getStringModel(String key, Object... parameters) { + return new StringResourceModel(key, this, null, parameters); + } +} Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java 2013-04-19 08:39:09 UTC (rev 201) @@ -83,9 +83,9 @@ // title différent suivant si le produit provient d'une extraction ou d'une purification Produit prod = (Produit) BeanTools.getValue(model.getObject(), AccessType.GETTER, "produit"); if (prod.isExtrait()) { - linkTitle = page.getString("ReadExtraction"); + linkTitle = page.getStringModel("ReadExtraction"); } else { - linkTitle = page.getString("ReadPurification"); + linkTitle = page.getStringModel("ReadPurification"); } } super.populateItem(item, componentId, model); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -50,7 +50,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; /** @@ -96,34 +95,32 @@ List<IColumn<Campagne, String>> columns = new ArrayList<IColumn<Campagne, String>>(); - columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/read.png", getString("Read"), - getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/read.png", getStringModel("Read"), + getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Campagne>> item, String componentId, IModel<Campagne> model) { setResponsePage(new ReadCampagnePage(model.getObject().getIdCampagne(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.nom")), "nom", - "nom", getString("Read")) { + columns.add(new LinkPropertyColumn<Campagne, String>(getStringModel("Campagne.nom"), "nom", "nom", + getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Campagne>> item, String componentId, IModel<Campagne> model) { setResponsePage(new ReadCampagnePage(model.getObject().getIdCampagne(), currentPage)); } }); - columns.add(new ShortDatePropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.dateDeb")), - "dateDeb", "dateDeb", getLocale())); + columns.add(new ShortDatePropertyColumn<Campagne, String>(getStringModel("Campagne.dateDeb"), "dateDeb", + "dateDeb", getLocale())); - columns.add(new ShortDatePropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.dateFin")), - "dateFin", "dateFin", getLocale())); + columns.add(new ShortDatePropertyColumn<Campagne, String>(getStringModel("Campagne.dateFin"), "dateFin", + "dateFin", getLocale())); - columns.add(new MapValuePropertyColumn<Campagne, String, String>(new Model<String>( - getString("Campagne.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(getSession() - .getLocale()))); + columns.add(new MapValuePropertyColumn<Campagne, String, String>(getStringModel("Campagne.codePays"), + "codePays", "codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new DocumentTooltipColumn<Campagne, String>(Model - .of(getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Campagne, String>(getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Campagne> model) { int idCampagne = model.getObject().getIdCampagne(); @@ -131,8 +128,8 @@ } }); - columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/edit.png", getString("Update"), - getString("Update")) { + columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/edit.png", getStringModel("Update"), + getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Campagne>> item, String componentId, IModel<Campagne> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -243,13 +243,12 @@ formView.add(new TextArea<String>("Campagne.mentionLegale", new PropertyModel<String>(campagneModel, "mentionLegale"))); - formView.add(new SimpleTooltipPanel("Campagne.mentionLegale.info", new Model<String>( - getString("Campagne.mentionLegale.info")))); + formView.add(new SimpleTooltipPanel("Campagne.mentionLegale.info", + getStringModel("Campagne.mentionLegale.info"))); formView .add(new TextArea<String>("Campagne.complement", new PropertyModel<String>(campagneModel, "complement"))); - formView.add(new SimpleTooltipPanel("Campagne.complement.info", new Model<String>( - getString("Campagne.complement.info")))); + formView.add(new SimpleTooltipPanel("Campagne.complement.info", getStringModel("Campagne.complement.info"))); formView.add(new TextField<String>("Campagne.createur", new PropertyModel<String>(campagneModel, "createur")) .setEnabled(false)); @@ -329,7 +328,7 @@ deleteButton.setVisibilityAllowed(!createMode && campagneService.updateOrdeleteCampagneEnabled(campagneModel.getObject(), getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); @@ -725,7 +724,7 @@ if (dateErrors.isEmpty() && (campagneModel.getObject().getDateDeb() == null || campagneModel.getObject().getDateFin() == null || !campagneModel .getObject().getDateDeb().before(campagneModel.getObject().getDateFin()))) { - getPage().error(getString("Campagne.dates.KO")); + getPage().error(getStringModel("Campagne.dates.KO")); } } } \ No newline at end of file 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ReadCampagnePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -119,13 +119,12 @@ .add(new ReplaceEmptyLabelBehavior())); add(new MultiLineLabel("Campagne.mentionLegale", new PropertyModel<String>(campagneModel, "mentionLegale")) .add(new ReplaceEmptyLabelBehavior())); - add(new SimpleTooltipPanel("Campagne.mentionLegale.info", new Model<String>( - getString("Campagne.mentionLegale.info2")))); + add(new SimpleTooltipPanel("Campagne.mentionLegale.info", getStringModel("Campagne.mentionLegale.info2"))); add(new MultiLineLabel("Campagne.complement", new PropertyModel<String>(campagneModel, "complement")) .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Campagne.createur", new PropertyModel<Personne>(campagneModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -179,7 +178,7 @@ }); deleteButton.setVisibilityAllowed(campagneService.updateOrdeleteCampagneEnabled(campagne, getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); add(formView); } @@ -201,7 +200,7 @@ CampagnePersonneParticipant participant = item.getModelObject(); // affichage + lien vers la fiche item.add(new PropertyLabelLinkPanel<Personne>("Campagne.participants.List.personne", - new Model<Personne>(participant.getId().getPk2()), getString("Read")) { + new Model<Personne>(participant.getId().getPk2()), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -285,7 +284,7 @@ IModel<Station> stationModel = item.getModel(); // affichage + lien vers la fiche item.add(new PropertyLabelLinkPanel<Station>("Campagne.stations.List.station", item.getModel(), - getString("Read")) { + getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadStationPage(getModelObject().getIdStation(), currentPage)); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ListConfigurationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -35,7 +35,6 @@ import nc.ird.cantharella.web.utils.security.AuthRoles; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; /** @@ -71,8 +70,8 @@ } else { // initialize the Partie panel - add(new CollapsiblePanel(getResource() + ".ListPartiePanel", new Model<String>( - getString("ListConfigurationPage.Parties")), partieOpened) { + add(new CollapsiblePanel(getResource() + ".ListPartiePanel", + getStringModel("ListConfigurationPage.Parties"), partieOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -82,8 +81,8 @@ } // initialize the MethodeExtraction panel - add(new CollapsiblePanel(getResource() + ".ListMethodeExtractionPanel", new Model<String>( - getString("ListConfigurationPage.MethodesExtraction")), methExtrOpened) { + add(new CollapsiblePanel(getResource() + ".ListMethodeExtractionPanel", + getStringModel("ListConfigurationPage.MethodesExtraction"), methExtrOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -92,8 +91,8 @@ }); // initialize the MethodePurification panel - add(new CollapsiblePanel(getResource() + ".ListMethodePurificationPanel", new Model<String>( - getString("ListConfigurationPage.MethodesPurification")), methPuriOpened) { + add(new CollapsiblePanel(getResource() + ".ListMethodePurificationPanel", + getStringModel("ListConfigurationPage.MethodesPurification"), methPuriOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -102,8 +101,8 @@ }); // initialize the MethodeTest panel - add(new CollapsiblePanel(getResource() + ".ListMethodeTestBioPanel", new Model<String>( - getString("ListConfigurationPage.MethodesTestBio")), methTestOpened) { + add(new CollapsiblePanel(getResource() + ".ListMethodeTestBioPanel", + getStringModel("ListConfigurationPage.MethodesTestBio"), methTestOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -112,8 +111,8 @@ }); // initialize the TestErreur panel - add(new CollapsiblePanel(getResource() + ".ListErreurTestBioPanel", new Model<String>( - getString("ListConfigurationPage.ErreursTestBio")), errTestOpened) { + add(new CollapsiblePanel(getResource() + ".ListErreurTestBioPanel", + getStringModel("ListConfigurationPage.ErreursTestBio"), errTestOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -122,8 +121,8 @@ }); // initialize the TypeDocument panel - add(new CollapsiblePanel(getResource() + ".ListTypeDocumentPanel", new Model<String>( - getString("ListConfigurationPage.TypesDocument")), typeDocOpened) { + add(new CollapsiblePanel(getResource() + ".ListTypeDocumentPanel", + getStringModel("ListConfigurationPage.TypesDocument"), typeDocOpened) { @Override protected Panel getInnerPanel(String markupId) { @@ -132,8 +131,8 @@ }); // initialize the RebuidLuceneIndex panel - add(new CollapsiblePanel(getResource() + ".RebuildLuceneIndexPanel", new Model<String>( - getString("ListConfigurationPage.RebuildLuceneIndex")), rebIndexOpened) { + add(new CollapsiblePanel(getResource() + ".RebuildLuceneIndexPanel", + getStringModel("ListConfigurationPage.RebuildLuceneIndex"), rebIndexOpened) { @Override protected Panel getInnerPanel(String markupId) { return new RebuildLuceneIndexPanel(markupId); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageErreurTestBioPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -183,7 +183,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeExtractionPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -321,7 +321,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodePurificationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -323,7 +323,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageMethodeTestBioPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -201,7 +201,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManagePartiePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -180,7 +180,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageTypeDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageTypeDocumentPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/ManageTypeDocumentPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -28,7 +28,6 @@ import nc.ird.cantharella.data.model.TypeDocument; import nc.ird.cantharella.data.validation.utils.ModelValidator; import nc.ird.cantharella.service.services.DocumentService; -import nc.ird.cantharella.service.services.TestBioService; import nc.ird.cantharella.web.pages.TemplatePage; import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; import nc.ird.cantharella.web.utils.forms.SubmittableButton; @@ -204,7 +203,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 2013-04-19 08:39:09 UTC (rev 201) @@ -25,6 +25,7 @@ <wicket:panel> <form wicket:id="Form"> + <p><wicket:message key="RebuildLuceneIndexPanel.rebuildInfo" /></p> <input type="submit" wicket:message="value:Rebuild" wicket:id="Rebuild" /> <span wicket:id="Status" /> </form> 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-04-19 08:39:09 UTC (rev 201) @@ -58,7 +58,6 @@ label.setOutputMarkupId(true); formView.add(label); - final AjaxFallbackButton addButton = new AjaxFallbackButton("Rebuild", formView) { @Override protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -42,7 +42,6 @@ import nc.ird.cantharella.web.pages.domain.personne.ManagePersonnePage; import nc.ird.cantharella.web.utils.CallerPage; import nc.ird.cantharella.web.utils.behaviors.JSConfirmationBehavior; -import nc.ird.cantharella.web.utils.behaviors.ReplaceEmptyLabelBehavior; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString; import nc.ird.cantharella.web.utils.forms.AutoCompleteTextFieldString.ComparisonMode; import nc.ird.cantharella.web.utils.forms.SubmittableButton; @@ -114,9 +113,6 @@ /** Caller page. */ private final CallerPage callerPage; - /** Update with service flag. */ - private boolean updateWithService; - /** * Constructeur (mode création) * @param callerPage Page appelante @@ -153,7 +149,6 @@ final CallerPage callerPage, boolean multipleEntry, final boolean updateWithService) { super(ManageDocumentPage.class); this.callerPage = callerPage; - this.updateWithService = updateWithService; final CallerPage currentPage = new CallerPage(this); @@ -283,10 +278,10 @@ // if no error validateModel(); } catch (InvalidFileExtensionException ex) { - error(getString("ManageDocumentPage.Error.notAllowedExtension")); + error(getStringModel("ManageDocumentPage.Error.notAllowedExtension")); } } else if (StringUtils.isEmpty(document.getFileName())) { - error(getString("ManageDocumentPage.Error.emptyFile")); + error(getStringModel("ManageDocumentPage.Error.emptyFile")); } else { validateModel(); } @@ -366,7 +361,7 @@ } }); deleteButton.setVisibilityAllowed(!createMode); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -156,7 +156,7 @@ redirect(); } }); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-04-19 08:39:09 UTC (rev 201) @@ -43,8 +43,8 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.StringResourceModel; /** * Display document list in manage mode. @@ -111,7 +111,7 @@ item.add(new Label("Document.createur.List", new PropertyModel<String>(documentModel, "createur"))); item.add(new DocumentLinkPanel("Document.link.List", documentModel)); - item.add(new AjaxButton("Document.Delete.List", Model.of(getString("Delete"))) { + item.add(new AjaxButton("Document.Delete.List", new StringResourceModel("Delete", this, null)) { @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { Document document = documentModel.getObject(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -120,41 +120,41 @@ List<IColumn<Extraction, String>> columns = new ArrayList<IColumn<Extraction, String>>(); columns.add(new LinkableImagePropertyColumn<Extraction, String>("images/read.png", templatePage - .getString("Read"), templatePage.getString("Read")) { + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { templatePage.setResponsePage(new ReadExtractionPage(model.getObject().getIdExtraction(), callerPage)); } }); - columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(templatePage - .getString("Extraction.lot")), "lot", "lot", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Extraction, String>(templatePage.getStringModel("Extraction.lot"), "lot", + "lot", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { templatePage.setResponsePage(new ReadLotPage(model.getObject().getLot().getIdLot(), callerPage)); } }); - columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(templatePage - .getString("Extraction.ref")), "ref", "ref", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Extraction, String>(templatePage.getStringModel("Extraction.ref"), "ref", + "ref", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { templatePage.setResponsePage(new ReadExtractionPage(model.getObject().getIdExtraction(), callerPage)); } }); - columns.add(new ShortDatePropertyColumn<Extraction, String>(new Model<String>(templatePage - .getString("Extraction.date")), "date", "date", templatePage.getLocale())); + columns.add(new ShortDatePropertyColumn<Extraction, String>(templatePage.getStringModel("Extraction.date"), + "date", "date", templatePage.getLocale())); - columns.add(new PropertyColumn<Extraction, String>(new Model<String>(templatePage - .getString("Extraction.methode2")), "methode", "methode")); + columns.add(new PropertyColumn<Extraction, String>(templatePage.getStringModel("Extraction.methode2"), + "methode", "methode")); - columns.add(new DecimalPropertyColumn<Extraction, String>(new Model<String>(templatePage - .getString("Extraction.masseDepart2")), "masseDepart", "masseDepart", DecimalDisplFormat.SMALL, + columns.add(new DecimalPropertyColumn<Extraction, String>(templatePage + .getStringModel("Extraction.masseDepart2"), "masseDepart", "masseDepart", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(templatePage.getString("Campagne")), - "lot.campagne", "lot.campagne", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Extraction, String>(templatePage.getStringModel("Campagne"), "lot.campagne", + "lot.campagne", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { templatePage.setResponsePage(new ReadCampagnePage(model.getObject().getLot().getCampagne() @@ -162,11 +162,10 @@ } }); - columns.add(new ExtraitsColumn(new Model<String>(templatePage.getString("Extraction.extraits")), templatePage - .getLocale())); + columns.add(new ExtraitsColumn(templatePage.getStringModel("Extraction.extraits"), templatePage.getLocale())); - columns.add(new DocumentTooltipColumn<Extraction, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Extraction, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Extraction> model) { int idExtraction = model.getObject().getIdExtraction(); @@ -175,7 +174,7 @@ }); columns.add(new LinkableImagePropertyColumn<Extraction, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ManageExtractionPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -336,7 +336,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ReadExtractionPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -104,7 +104,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Extraction.manipulateur", new PropertyModel<Personne>( - extractionModel, "manipulateur"), getString("Read")) { + extractionModel, "manipulateur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -115,7 +115,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Lot>("Extraction.lot", new PropertyModel<Lot>(extractionModel, "lot"), - getString("Read")) { + getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadLotPage(getModelObject().getIdLot(), currentPage)); @@ -127,7 +127,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Extraction.createur", new PropertyModel<Personne>(extractionModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -221,7 +221,7 @@ }); deleteButton.setVisibilityAllowed(extractionService.updateOrdeleteExtractionEnabled( extractionModel.getObject(), getSession().getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -118,27 +118,27 @@ List<IColumn<Lot, String>> columns = new ArrayList<IColumn<Lot, String>>(); - columns.add(new LinkableImagePropertyColumn<Lot, String>("images/read.png", templatePage.getString("Read"), - templatePage.getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Lot, String>("images/read.png", + templatePage.getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { templatePage.setResponsePage(new ReadLotPage(model.getObject().getIdLot(), callerPage)); } }); - columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.ref")), "ref", - "ref", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Lot, String>(templatePage.getStringModel("Lot.ref"), "ref", "ref", + templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { templatePage.setResponsePage(new ReadLotPage(model.getObject().getIdLot(), callerPage)); } }); - columns.add(new PropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.dateRecolte2")), - "dateRecolte", "dateRecolte")); + columns.add(new PropertyColumn<Lot, String>(templatePage.getStringModel("Lot.dateRecolte2"), "dateRecolte", + "dateRecolte")); - columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.station")), - "station", "station", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Lot, String>(templatePage.getStringModel("Lot.station"), "station", + "station", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { templatePage.setResponsePage(new ReadStationPage(model.getObject().getStation().getIdStation(), @@ -146,8 +146,8 @@ } }); - columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.specimenRef2")), - "specimenRef", "specimenRef", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Lot, String>(templatePage.getStringModel("Lot.specimenRef2"), "specimenRef", + "specimenRef", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { templatePage.setResponsePage(new ReadSpecimenPage(model.getObject().getSpecimenRef().getIdSpecimen(), @@ -155,36 +155,32 @@ } }); - columns.add(new EnumPropertyColumn<Lot, String>(new Model<String>(templatePage - .getString("Specimen.typeOrganisme")), "specimenRef.typeOrganisme", "specimenRef.typeOrganisme", - templatePage)); + columns.add(new EnumPropertyColumn<Lot, String>(templatePage.getStringModel("Specimen.typeOrganisme"), + "specimenRef.typeOrganisme", "specimenRef.typeOrganisme", templatePage)); - columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(templatePage - .getString("Specimen.embranchement")), "specimenRef.embranchement", "specimenRef.embranchement")); + columns.add(new TaxonomyPropertyColumn<Lot, String>(templatePage.getStringModel("Specimen.embranchement"), + "specimenRef.embranchement", "specimenRef.embranchement")); - columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(templatePage - .getString("Specimen.famille")), "specimenRef.famille", "specimenRef.famille")); + columns.add(new TaxonomyPropertyColumn<Lot, String>(templatePage.getStringModel("Specimen.famille"), + "specimenRef.famille", "specimenRef.famille")); - columns.add(new TaxonomyPropertyColumn<Lot, String>( - new Model<String>(templatePage.getString("Specimen.genre")), "specimenRef.genre", "specimenRef.genre")); + columns.add(new TaxonomyPropertyColumn<Lot, String>(templatePage.getStringModel("Specimen.genre"), + "specimenRef.genre", "specimenRef.genre")); - columns.add(new TaxonomyPropertyColumn<Lot, String>( - new Model<String>(templatePage.getString("Specimen.espece")), "specimenRef.espece", - "specimenRef.espece")); + columns.add(new TaxonomyPropertyColumn<Lot, String>(templatePage.getStringModel("Specimen.espece"), + "specimenRef.espece", "specimenRef.espece")); - columns.add(new PropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.partie")), "partie", - "partie")); + columns.add(new PropertyColumn<Lot, String>(templatePage.getStringModel("Lot.partie"), "partie", "partie")); - columns.add(new DecimalPropertyColumn<Lot, String>(new Model<String>(templatePage - .getString("Lot.masseFraiche2")), "masseFraiche", "masseFraiche", DecimalDisplFormat.SMALL, - templatePage.getLocale())); + columns.add(new DecimalPropertyColumn<Lot, String>(templatePage.getStringModel("Lot.masseFraiche2"), + "masseFraiche", "masseFraiche", DecimalDisplFormat.SMALL, templatePage.getLocale())); columns.add(new DecimalPropertyColumn<Lot, String>( new Model<String>(templatePage.getString("Lot.masseSeche2")), "masseSeche", "masseSeche", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(templatePage.getString("Lot.campagne")), - "campagne", "campagne", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Lot, String>(templatePage.getStringModel("Lot.campagne"), "campagne", + "campagne", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { templatePage.setResponsePage(new ReadCampagnePage(model.getObject().getCampagne().getIdCampagne(), @@ -192,12 +188,12 @@ } }); - columns.add(new MapValuePropertyColumn<Lot, String, String>(new Model<String>(templatePage - .getString("Campagne.codePays")), "campagne.codePays", "campagne.codePays", WebContext.COUNTRIES - .get(templatePage.getSession().getLocale()))); + columns.add(new MapValuePropertyColumn<Lot, String, String>(templatePage.getStringModel("Campagne.codePays"), + "campagne.codePays", "campagne.codePays", WebContext.COUNTRIES.get(templatePage.getSession() + .getLocale()))); - columns.add(new DocumentTooltipColumn<Lot, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Lot, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Lot> model) { int idLot = model.getObject().getIdLot(); @@ -205,8 +201,8 @@ } }); - columns.add(new LinkableImagePropertyColumn<Lot, String>("images/edit.png", templatePage.getString("Update"), - templatePage.getString("Update")) { + columns.add(new LinkableImagePropertyColumn<Lot, String>("images/edit.png", templatePage + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ManageLotPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -240,7 +240,7 @@ stationsInput.setNullValid(false); stationsInput.setEnabled(lotModel.getObject().getCampagne() != null); formView.add(stationsInput); - formView.add(new SimpleTooltipPanel("Lot.station.info", new Model<String>(getString("Lot.station.info")))); + formView.add(new SimpleTooltipPanel("Lot.station.info", getStringModel("Lot.station.info"))); campagnesInput.add(new AjaxFormComponentUpdatingBehavior("onchange") { protected void onUpdate(AjaxRequestTarget target) { @@ -357,7 +357,7 @@ }); deleteButton.setVisibilityAllowed(!createMode && lotService.updateOrdeleteLotEnabled(lotModel.getObject(), getSession().getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -91,7 +91,7 @@ lotModel = new GenericLoadableDetachableModel<Lot>(Lot.class, idLot); add(new PropertyLabelLinkPanel<Campagne>("Lot.campagne", new PropertyModel<Campagne>(lotModel, "campagne"), - getString("Read")) { + getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadCampagnePage(getModelObject().getIdCampagne(), currentPage)); @@ -99,7 +99,7 @@ }); add(new PropertyLabelLinkPanel<Station>("Lot.station", new PropertyModel<Station>(lotModel, "station"), - getString("Read")) { + getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadStationPage(getModelObject().getIdStation(), currentPage)); @@ -111,7 +111,7 @@ add(new Label("Lot.ref", new PropertyModel<String>(lotModel, "ref")).add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Specimen>("Lot.specimenRef", - new PropertyModel<Specimen>(lotModel, "specimenRef"), getString("Read")) { + new PropertyModel<Specimen>(lotModel, "specimenRef"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadSpecimenPage(getModelObject().getIdSpecimen(), currentPage)); @@ -133,7 +133,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Lot.createur", new PropertyModel<Personne>(lotModel, "createur"), - getString("Read")) { + getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -174,7 +174,7 @@ }); deleteButton.setVisibilityAllowed(lotService.updateOrdeleteLotEnabled(lotModel.getObject(), getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -57,7 +57,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.spring.injection.annot.SpringBean; @@ -123,7 +122,7 @@ List<IColumn<MoleculeProvenanceBean, String>> columns = new ArrayList<IColumn<MoleculeProvenanceBean, String>>(); columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>("images/read.png", templatePage - .getString("Read"), templatePage.getString("Read")) { + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { @@ -131,8 +130,8 @@ } }); - columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.idMolecule")), "idMolecule", "idMolecule") { + columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.idMolecule"), "idMolecule", "idMolecule") { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { @@ -140,8 +139,8 @@ } }); - columns.add(new AbstractColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.formuleDevMol"))) { + columns.add(new AbstractColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.formuleDevMol")) { public void populateItem(Item<ICellPopulator<MoleculeProvenanceBean>> cellItem, String componentId, IModel<MoleculeProvenanceBean> rowModel) { cellItem.add(new Label(componentId, "-").add(new MoleculeViewBehavior(new PropertyModel<String>( @@ -149,34 +148,34 @@ } }); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.nomCommun")), "molecule.nomCommun", "molecule.nomCommun")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.nomCommun"), "molecule.nomCommun", "molecule.nomCommun")); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.familleChimique")), "molecule.familleChimique", "molecule.familleChimique")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.familleChimique"), "molecule.familleChimique", "molecule.familleChimique")); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.formuleBrute")), "molecule.formuleBrute", "molecule.formuleBrute")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.formuleBrute"), "molecule.formuleBrute", "molecule.formuleBrute")); - columns.add(new DecimalPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.masseMolaire")), "molecule.masseMolaire", "molecule.masseMolaire", + columns.add(new DecimalPropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.masseMolaire"), "molecule.masseMolaire", "molecule.masseMolaire", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.nouvMolecul")), "molecule.nouvMolecul", "molecule.nouvMolecul", templatePage)); + columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.nouvMolecul"), "molecule.nouvMolecul", "molecule.nouvMolecul", templatePage)); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.provenance.embranchement")), "lot.specimenRef.embranchement", + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.provenance.embranchement"), "lot.specimenRef.embranchement", "lot.specimenRef.embranchement")); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.provenance.genre")), "lot.specimenRef.genre", "lot.specimenRef.genre")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.provenance.genre"), "lot.specimenRef.genre", "lot.specimenRef.genre")); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.provenance.espece")), "lot.specimenRef.espece", "lot.specimenRef.espece")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.provenance.espece"), "lot.specimenRef.espece", "lot.specimenRef.espece")); - columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.provenance.lot.ref")), "lot.ref", "lot.ref") { + columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.provenance.lot.ref"), "lot.ref", "lot.ref") { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { @@ -188,11 +187,11 @@ } }); - columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(new Model<String>(templatePage - .getString("Molecule.provenance.programme")), "lot.campagne.programme", "lot.campagne.programme")); + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("Molecule.provenance.programme"), "lot.campagne.programme", "lot.campagne.programme")); - columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<MoleculeProvenanceBean, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<MoleculeProvenanceBean> model) { int idMolecule = model.getObject().getIdMolecule(); @@ -201,7 +200,7 @@ }); columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -207,8 +207,8 @@ formView.add(new TextField<String>("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")) .setEnabled(updateOrDeleteEnabled)); - formView.add(new SimpleTooltipPanel("Molecule.formuleBrute.info", new Model<String>( - getString("Molecule.formuleBrute.info")))); + formView + .add(new SimpleTooltipPanel("Molecule.formuleBrute.info", getStringModel("Molecule.formuleBrute.info"))); formView.add(new TextField<String>("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute")).setEnabled(updateOrDeleteEnabled)); @@ -225,8 +225,7 @@ formView.add(nouvMoleculRefresh); // 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 SimpleTooltipPanel("Molecule.nouvMolecul.info", getStringModel("Molecule.nouvMolecul.info"))); formView .add(new AjaxCheckBox("Molecule.nouvMolecul", new PropertyModel<Boolean>(moleculeModel, "nouvMolecul")) { @Override @@ -334,7 +333,7 @@ } }); deleteButton.setVisibilityAllowed(!createMode && updateOrDeleteEnabled); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -143,7 +143,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Molecule.createur", new PropertyModel<Personne>(moleculeModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -182,7 +182,7 @@ }); deleteButton.setVisibilityAllowed(moleculeService.updateOrdeleteMoleculeEnabled(moleculeModel.getObject(), getSession().getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -54,7 +54,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; /** @@ -106,8 +105,8 @@ List<IColumn<Personne, String>> columns = new ArrayList<IColumn<Personne, String>>(); - columns.add(new LinkableImagePropertyColumn<Personne, String>("images/read.png", getString("Read"), - getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Personne, String>("images/read.png", getStringModel("Read"), + getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> model) { if (model.getObject() instanceof Utilisateur) { @@ -119,13 +118,12 @@ } }); - columns.add(new PropertyColumn<Personne, String>(new Model<String>(getString("Personne.nom")), "nom", "nom")); + columns.add(new PropertyColumn<Personne, String>(getStringModel("Personne.nom"), "nom", "nom")); - columns.add(new PropertyColumn<Personne, String>(new Model<String>(getString("Personne.prenom")), "prenom", - "prenom")); + columns.add(new PropertyColumn<Personne, String>(getStringModel("Personne.prenom"), "prenom", "prenom")); - columns.add(new LinkPropertyColumn<Personne, String>(new Model<String>(getString("Personne.courriel")), - "courriel", "courriel", getString("Read")) { + columns.add(new LinkPropertyColumn<Personne, String>(getStringModel("Personne.courriel"), "courriel", + "courriel", getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> rowModel) { if (rowModel.getObject() instanceof Utilisateur) { @@ -137,7 +135,7 @@ } }); - columns.add(new AbstractColumn<Personne, String>(new Model<String>(getString("Utilisateur.typeDroit"))) { + columns.add(new AbstractColumn<Personne, String>(getStringModel("Utilisateur.typeDroit")) { @Override public void populateItem(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> rowModel) { String typeDroit; @@ -152,8 +150,7 @@ } }); - columns.add(new DocumentTooltipColumn<Personne, String>(Model - .of(getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Personne, String>(getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Personne> model) { int idPersonne = model.getObject().getIdPersonne(); @@ -161,8 +158,8 @@ } }); - columns.add(new LinkableImagePropertyColumn<Personne, String>("images/edit.png", getString("Update"), - getString("Update")) { + columns.add(new LinkableImagePropertyColumn<Personne, String>("images/edit.png", getStringModel("Update"), + getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ManagePersonnePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -229,7 +229,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ReadPersonnePage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -126,7 +126,7 @@ }); deleteButton.setVisibilityAllowed(personneService.updateOrDeletePersonneEnabled(personne, getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); add(formView); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -56,7 +56,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; /** @@ -122,7 +121,7 @@ List<IColumn<Purification, String>> columns = new ArrayList<IColumn<Purification, String>>(); columns.add(new LinkableImagePropertyColumn<Purification, String>("images/read.png", templatePage - .getString("Read"), templatePage.getString("Read")) { + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { templatePage @@ -130,16 +129,16 @@ } }); - columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(templatePage - .getString("Extraction.lot")), "lotSource", "lotSource", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Purification, String>(templatePage.getStringModel("Extraction.lot"), + "lotSource", "lotSource", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { templatePage.setResponsePage(new ReadLotPage(model.getObject().getLotSource().getIdLot(), callerPage)); } }); - columns.add(new LinkProduitPropertyColumn<Purification, String>(new Model<String>(templatePage - .getString("ResultatTestBio.produit")), "produit", "produit", templatePage) { + columns.add(new LinkProduitPropertyColumn<Purification, String>(templatePage + .getStringModel("ResultatTestBio.produit"), "produit", "produit", templatePage) { @Override public void onClickIfExtrait(Extrait extrait) { templatePage.setResponsePage(new ReadExtractionPage(extrait.getExtraction().getIdExtraction(), @@ -153,8 +152,8 @@ } }); - columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(templatePage - .getString("Purification.ref")), "ref", "ref", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Purification, String>(templatePage.getStringModel("Purification.ref"), + "ref", "ref", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { templatePage @@ -162,14 +161,14 @@ } }); - columns.add(new ShortDatePropertyColumn<Purification, String>(new Model<String>(templatePage - .getString("Purification.date")), "date", "date", templatePage.getLocale())); + columns.add(new ShortDatePropertyColumn<Purification, String>(templatePage.getStringModel("Purification.date"), + "date", "date", templatePage.getLocale())); - columns.add(new PropertyColumn<Purification, String>(new Model<String>(templatePage - .getString("Purification.methode2")), "methode", "methode")); + columns.add(new PropertyColumn<Purification, String>(templatePage.getStringModel("Purification.methode2"), + "methode", "methode")); - columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(templatePage.getString("Campagne")), - "lotSource.campagne", "lotSource.campagne", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Purification, String>(templatePage.getStringModel("Campagne"), + "lotSource.campagne", "lotSource.campagne", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { templatePage.setResponsePage(new ReadCampagnePage(model.getObject().getLotSource().getCampagne() @@ -177,8 +176,8 @@ } }); - columns.add(new DocumentTooltipColumn<Purification, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Purification, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Purification> model) { int idPurification = model.getObject().getIdPurification(); @@ -187,7 +186,7 @@ }); columns.add(new LinkableImagePropertyColumn<Purification, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Purification>> item, String componentId, 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ManagePurificationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -309,7 +309,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ReadPurificationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -132,7 +132,7 @@ add(new MultiLineLabel("Purification.complement", new PropertyModel<String>(purificationModel, "complement")) .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Purification.createur", new PropertyModel<Personne>( - purificationModel, "createur"), getString("Read")) { + purificationModel, "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -270,7 +270,7 @@ }); deleteButton.setVisibilityAllowed(purificationService.updateOrdeletePurificationEnabled(purificationModel .getObject(), getSession().getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -52,7 +52,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; import org.apache.wicket.spring.injection.annot.SpringBean; /** @@ -116,39 +115,39 @@ List<IColumn<Specimen, String>> columns = new ArrayList<IColumn<Specimen, String>>(); - columns.add(new LinkableImagePropertyColumn<Specimen, String>("images/read.png", - templatePage.getString("Read"), templatePage.getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Specimen, String>("images/read.png", templatePage + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { templatePage.setResponsePage(new ReadSpecimenPage(model.getObject().getIdSpecimen(), callerPage)); } }); - columns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(templatePage.getString("Specimen.ref")), - "ref", "ref", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.ref"), "ref", "ref", + templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { templatePage.setResponsePage(new ReadSpecimenPage(model.getObject().getIdSpecimen(), callerPage)); } }); - columns.add(new EnumPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.typeOrganisme")), "typeOrganisme", "typeOrganisme", templatePage)); + columns.add(new EnumPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.typeOrganisme"), + "typeOrganisme", "typeOrganisme", templatePage)); - columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.embranchement")), "embranchement", "embranchement")); + columns.add(new TaxonomyPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.embranchement"), + "embranchement", "embranchement")); - columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.famille")), "famille", "famille")); + columns.add(new TaxonomyPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.famille"), + "famille", "famille")); - columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.genre")), "genre", "genre")); + columns.add(new TaxonomyPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.genre"), + "genre", "genre")); - columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.espece")), "espece", "espece")); + columns.add(new TaxonomyPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.espece"), + "espece", "espece")); - columns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(templatePage - .getString("Specimen.station2")), "station", "station", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Specimen, String>(templatePage.getStringModel("Specimen.station2"), + "station", "station", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { templatePage.setResponsePage(new ReadStationPage(model.getObject().getStation().getIdStation(), @@ -156,8 +155,8 @@ } }); - columns.add(new DocumentTooltipColumn<Specimen, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Specimen, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Specimen> model) { int idSpecimen = model.getObject().getIdSpecimen(); @@ -166,7 +165,7 @@ }); columns.add(new LinkableImagePropertyColumn<Specimen, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ManageSpecimenPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -348,7 +348,7 @@ deleteButton.setVisibilityAllowed(!createMode && specimenService.updateOrdeleteSpecimenEnabled(specimenModel.getObject(), getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ReadSpecimenPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -110,7 +110,7 @@ add(new Label("Specimen.typeOrganisme", new DisplayEnumPropertyModel(specimenModel, "typeOrganisme", this))); add(new PropertyLabelLinkPanel<Personne>("Specimen.identificateur", new PropertyModel<Personne>(specimenModel, - "identificateur"), getString("Read")) { + "identificateur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -118,7 +118,7 @@ }); add(new PropertyLabelLinkPanel<Station>("Specimen.station", - new PropertyModel<Station>(specimenModel, "station"), getString("Read")) { + new PropertyModel<Station>(specimenModel, "station"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadStationPage(getModelObject().getIdStation(), currentPage)); @@ -129,7 +129,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Specimen.createur", new PropertyModel<Personne>(specimenModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -180,7 +180,7 @@ deleteButton.setVisibilityAllowed(!createMode && specimenService.updateOrdeleteSpecimenEnabled(specimenModel.getObject(), getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -117,37 +117,37 @@ List<IColumn<Station, String>> columns = new ArrayList<IColumn<Station, String>>(); - columns.add(new LinkableImagePropertyColumn<Station, String>("images/read.png", templatePage.getString("Read"), - templatePage.getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Station, String>("images/read.png", templatePage + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { templatePage.setResponsePage(new ReadStationPage(model.getObject().getIdStation(), callerPage)); } }); - columns.add(new LinkPropertyColumn<Station, String>(new Model<String>(templatePage.getString("Station.nom")), - "nom", "nom", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<Station, String>(templatePage.getStringModel("Station.nom"), "nom", "nom", + templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { templatePage.setResponsePage(new ReadStationPage(model.getObject().getIdStation(), callerPage)); } }); - columns.add(new MapValuePropertyColumn<Station, String, String>(new Model<String>(templatePage - .getString("Station.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(templatePage - .getSession().getLocale()))); + columns.add(new MapValuePropertyColumn<Station, String, String>( + templatePage.getStringModel("Station.codePays"), "codePays", "codePays", WebContext.COUNTRIES + .get(templatePage.getSession().getLocale()))); - columns.add(new PropertyColumn<Station, String>(new Model<String>(templatePage.getString("Station.localite")), - "localite", "localite")); + columns.add(new PropertyColumn<Station, String>(templatePage.getStringModel("Station.localite"), "localite", + "localite")); - columns.add(new PropertyColumn<Station, String>(new Model<String>(templatePage.getString("Station.latitude")), - "latitude", "latitude")); + columns.add(new PropertyColumn<Station, String>(templatePage.getStringModel("Station.latitude"), "latitude", + "latitude")); - columns.add(new PropertyColumn<Station, String>(new Model<String>(templatePage.getString("Station.longitude")), - "longitude", "longitude")); + columns.add(new PropertyColumn<Station, String>(templatePage.getStringModel("Station.longitude"), "longitude", + "longitude")); - columns.add(new DocumentTooltipColumn<Station, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<Station, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<Station> model) { int idStation = model.getObject().getIdStation(); @@ -156,7 +156,7 @@ }); columns.add(new LinkableImagePropertyColumn<Station, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ManageStationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -300,7 +300,7 @@ .setVisibilityAllowed(!createMode && stationService.updateOrdeleteStationEnabled(stationModel.getObject(), getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); deleteButton.setDefaultFormProcessing(false); formView.add(deleteButton); 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ReadStationPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -94,7 +94,7 @@ add(new Label("Station.localite", new PropertyModel<String>(stationModel, "localite")) .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("Station.createur", new PropertyModel<Personne>(stationModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -153,7 +153,7 @@ }); deleteButton.setVisibilityAllowed(stationService.updateOrdeleteStationEnabled(station, getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); add(formView); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -125,7 +125,7 @@ List<IColumn<ResultatTestBio, String>> columns = new ArrayList<IColumn<ResultatTestBio, String>>(); columns.add(new LinkableImagePropertyColumn<ResultatTestBio, String>("images/read.png", templatePage - .getString("Read"), templatePage.getString("Read")) { + .getStringModel("Read"), templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, IModel<ResultatTestBio> model) { @@ -134,18 +134,18 @@ } }); - columns.add(new TextFilteredPropertyColumn<ResultatTestBio, String, String>(new Model<String>(templatePage - .getString("MethodeTestBio.cible2")), "testBio.methode.cible", "testBio.methode.cible")); + columns.add(new TextFilteredPropertyColumn<ResultatTestBio, String, String>(templatePage + .getStringModel("MethodeTestBio.cible2"), "testBio.methode.cible", "testBio.methode.cible")); - columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("ResultatTestBio.concMasse2")), "concMasse", "concMasse", DecimalDisplFormat.SMALL, + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("ResultatTestBio.concMasse2"), "concMasse", "concMasse", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new EnumPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("TestBio.uniteConcMasse2")), "uniteConcMasse", "uniteConcMasse", templatePage)); + columns.add(new EnumPropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("TestBio.uniteConcMasse2"), "uniteConcMasse", "uniteConcMasse", templatePage)); - columns.add(new LinkProduitPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("ResultatTestBio.produit")), "produit", "produit", templatePage) { + columns.add(new LinkProduitPropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("ResultatTestBio.produit"), "produit", "produit", templatePage) { @Override public void onClickIfExtrait(Extrait extrait) { templatePage.setResponsePage(new ReadExtractionPage(extrait.getExtraction().getIdExtraction(), @@ -159,38 +159,39 @@ } }); - columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("ResultatTestBio.valeur")), "valeur", "valeur", DecimalDisplFormat.SMALL, templatePage + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("ResultatTestBio.valeur"), "valeur", "valeur", DecimalDisplFormat.SMALL, templatePage .getLocale())); - columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("MethodeTestBio.uniteResultat2")), "testBio.methode.uniteResultat", + columns.add(new PropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("MethodeTestBio.uniteResultat2"), "testBio.methode.uniteResultat", "testBio.methode.uniteResultat")); - columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("Extrait.typeExtrait2")), "typeExtraitSource", "typeExtraitSource")); + columns.add(new PropertyColumn<ResultatTestBio, String>(templatePage.getStringModel("Extrait.typeExtrait2"), + "typeExtraitSource", "typeExtraitSource")); - columns.add(new BooleanPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("ResultatTestBio.actif")), "actif", "actif", templatePage)); + columns.add(new BooleanPropertyColumn<ResultatTestBio, String>(templatePage + .getStringModel("ResultatTestBio.actif"), "actif", "actif", templatePage)); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("Specimen.famille")), "lotSource.specimenRef.famille", "lotSource.specimenRef.famille")); + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>( + templatePage.getStringModel("Specimen.famille"), "lotSource.specimenRef.famille", + "lotSource.specimenRef.famille")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("Specimen.genre")), "lotSource.specimenRef.genre", "lotSource.specimenRef.genre")); + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(templatePage.getStringModel("Specimen.genre"), + "lotSource.specimenRef.genre", "lotSource.specimenRef.genre")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("Specimen.espece")), "lotSource.specimenRef.espece", "lotSource.specimenRef.espece")); + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(templatePage.getStringModel("Specimen.espece"), + "lotSource.specimenRef.espece", "lotSource.specimenRef.espece")); - columns.add(new MapValuePropertyColumn<ResultatTestBio, String, String>(new Model<String>(templatePage - .getString("Campagne.codePays")), "lotSource.campagne.codePays", "lotSource.campagne.codePays", + columns.add(new MapValuePropertyColumn<ResultatTestBio, String, String>(templatePage + .getStringModel("Campagne.codePays"), "lotSource.campagne.codePays", "lotSource.campagne.codePays", WebContext.COUNTRIES.get(templatePage.getSession().getLocale()))); - columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("ResultatTestBio.repere")), "repere", "repere")); + columns.add(new PropertyColumn<ResultatTestBio, String>(templatePage.getStringModel("ResultatTestBio.repere"), + "repere", "repere")); - columns.add(new LinkPropertyColumn<ResultatTestBio, String>(new Model<String>(templatePage - .getString("TestBio.ref")), "testBio.ref", "testBio.ref", templatePage.getString("Read")) { + columns.add(new LinkPropertyColumn<ResultatTestBio, String>(templatePage.getStringModel("TestBio.ref"), + "testBio.ref", "testBio.ref", templatePage.getStringModel("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, IModel<ResultatTestBio> model) { @@ -199,8 +200,8 @@ } }); - columns.add(new DocumentTooltipColumn<ResultatTestBio, String>(Model.of(templatePage - .getString("ListDocumentsPage.AttachedDocuments"))) { + columns.add(new DocumentTooltipColumn<ResultatTestBio, String>(templatePage + .getStringModel("ListDocumentsPage.AttachedDocuments")) { @Override public void onClick(IModel<ResultatTestBio> model) { int idTestBio = model.getObject().getTestBio().getIdTestBio(); @@ -209,7 +210,7 @@ }); columns.add(new LinkableImagePropertyColumn<ResultatTestBio, String>("images/edit.png", templatePage - .getString("Update"), templatePage.getString("Update")) { + .getStringModel("Update"), templatePage.getStringModel("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override public void populateItem(Item<ICellPopulator<ResultatTestBio>> item, String componentId, 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ManageTestBioPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -339,7 +339,7 @@ }); deleteButton.setVisibilityAllowed(!createMode); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); formView.add(new Link<Void>("Cancel") { 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-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ReadTestBioPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -162,7 +162,7 @@ }); deleteButton.setVisibilityAllowed(testBioService.updateOrdeleteTestBioEnabled(testBio, getSession() .getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); add(formView); } @@ -178,7 +178,7 @@ .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("TestBio.manipulateur", new PropertyModel<Personne>(testBioModel, - "manipulateur"), getString("Read")) { + "manipulateur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); @@ -217,7 +217,7 @@ add(new MultiLineLabel("TestBio.complement", new PropertyModel<String>(testBioModel, "complement")) .add(new ReplaceEmptyLabelBehavior())); add(new PropertyLabelLinkPanel<Personne>("TestBio.createur", new PropertyModel<Personne>(testBioModel, - "createur"), getString("Read")) { + "createur"), getStringModel("Read")) { @Override public void onClick() { setResponsePage(new ReadPersonnePage(getModelObject().getIdPersonne(), currentPage)); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ManageUtilisateurPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -413,7 +413,7 @@ deleteButton.setVisibilityAllowed(utilisateurEstValide() && getSession().getUtilisateur().getIdPersonne() != utilisateurModel.getObject().getIdPersonne()); deleteButton.setDefaultFormProcessing(false); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); // Action : rejet de l'utilisateur @@ -431,7 +431,7 @@ }); rejectButton.setVisibilityAllowed(!utilisateurEstValide()); rejectButton.setDefaultFormProcessing(false); - rejectButton.add(new JSConfirmationBehavior(getString("Confirm"))); + rejectButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(rejectButton); // Action : annulation Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/ReadUtilisateurPage.java 2013-04-19 08:39:09 UTC (rev 201) @@ -141,7 +141,7 @@ }); deleteButton.setVisibilityAllowed(personneService.updateOrDeletePersonneEnabled(utilisateurModel.getObject(), getSession().getUtilisateur())); - deleteButton.add(new JSConfirmationBehavior(getString("Confirm"))); + deleteButton.add(new JSConfirmationBehavior(getStringModel("Confirm"))); formView.add(deleteButton); add(formView); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/utilisateur/panels/ReadDroitsUtilisateurPanel.java 2013-04-19 08:39:09 UTC (rev 201) @@ -47,6 +47,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; +import org.apache.wicket.model.StringResourceModel; import edu.emory.mathcs.backport.java.util.Collections; @@ -96,7 +97,8 @@ } item.add(new PropertyLabelLinkPanel<Campagne>("Authorizations.Campagnes.Campagne.nom", - new PropertyModel<Campagne>(item.getModel(), "id.pk1"), getString("Read")) { + new PropertyModel<Campagne>(item.getModel(), "id.pk1"), new StringResourceModel("Read", + this, null)) { @Override public void onClick() { setResponsePage(new ReadCampagnePage(getModelObject().getIdCampagne(), new CallerPage( @@ -124,7 +126,8 @@ } item.add(new PropertyLabelLinkPanel<Campagne>("Authorizations.Lots.Campagne.nom", - new PropertyModel<Campagne>(item.getModel(), "id.pk1.campagne"), getString("Read")) { + new PropertyModel<Campagne>(item.getModel(), "id.pk1.campagne"), new StringResourceModel( + "Read", this, null)) { @Override public void onClick() { setResponsePage(new ReadCampagnePage(getModelObject().getIdCampagne(), new CallerPage( @@ -133,7 +136,7 @@ }); item.add(new PropertyLabelLinkPanel<Lot>("Authorizations.Lots.Lot.ref", new PropertyModel<Lot>(item - .getModel(), "id.pk1"), getString("Read")) { + .getModel(), "id.pk1"), new StringResourceModel("Read", this, null)) { @Override public void onClick() { setResponsePage(new ReadLotPage(getModelObject().getIdLot(), new CallerPage( Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/JSConfirmationBehavior.java 2013-04-19 08:39:09 UTC (rev 201) @@ -29,6 +29,7 @@ import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.model.IModel; /** * JavaScript confirmation behavior @@ -44,15 +45,15 @@ private static final String JS_SCRIPT_TEMPLATE = "return confirm(\"%s\");"; /** JS script */ - private final String jsScript; + private final IModel<String> message; /** * Constructor * @param message Confirmation message */ - public JSConfirmationBehavior(String message) { - AssertTools.assertNotEmpty(message); - jsScript = String.format(JS_SCRIPT_TEMPLATE, message); + public JSConfirmationBehavior(IModel<String> message) { + AssertTools.assertNotNull(message); + this.message = message; } /** {@inheritDoc} */ @@ -60,6 +61,7 @@ public void onComponentTag(Component component, ComponentTag tag) { if (component instanceof Button || component instanceof Link<?>) { tag.getAttributes().remove(JS_EVENT); + String jsScript = String.format(JS_SCRIPT_TEMPLATE, message.getObject()); tag.getAttributes().put(JS_EVENT, jsScript); } } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2013-04-19 08:39:09 UTC (rev 201) @@ -31,7 +31,6 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; /** * Column embeded in a datatable which represent a link code from @@ -48,7 +47,7 @@ private IModel<String> labelModel; /** Title displayed for the link */ - protected String linkTitle; + protected IModel<String> linkTitle; /** * Constructor @@ -70,7 +69,8 @@ * @param propertyExpression Property expression * @param linkTitle Title displayed for the link */ - public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, String linkTitle) { + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, + IModel<String> linkTitle) { this(displayModel, sortProperty, propertyExpression); this.linkTitle = linkTitle; } @@ -83,8 +83,8 @@ * @param linkTitle Title displayed for the link * @param popupSettings Popup setting */ - public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, String linkTitle, - PopupSettings popupSettings) { + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, + IModel<String> linkTitle, PopupSettings popupSettings) { this(displayModel, sortProperty, propertyExpression); this.linkTitle = linkTitle; this.popupSettings = popupSettings; @@ -156,7 +156,7 @@ }; link.setPopupSettings(popupSettings); if (linkTitle != null) { - link.add(new AttributeModifier("title", new Model<String>(linkTitle))); + link.add(new AttributeModifier("title", linkTitle)); } add(link); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java 2013-04-19 08:39:09 UTC (rev 201) @@ -44,10 +44,10 @@ private String imageSrc; /** Title displayed for the link */ - private String linkTitle; + private IModel<String> linkTitle; /** Alternative message displayed when image can't be rendered */ - private String altMessage; + private IModel<String> altMessage; /** * Constructor @@ -55,7 +55,7 @@ * @param linkTitle Title displayed for the link * @param altMessage Alternative message displayed when image can't be rendered */ - public LinkableImagePropertyColumn(String imageSrc, String linkTitle, String altMessage) { + public LinkableImagePropertyColumn(String imageSrc, IModel<String> linkTitle, IModel<String> altMessage) { this(new Model<String>(), imageSrc, linkTitle, altMessage); } @@ -66,7 +66,8 @@ * @param linkTitle Title displayed for the link * @param altMessage Alternative message displayed when image can't be rendered */ - public LinkableImagePropertyColumn(IModel<String> displayModel, String imageSrc, String linkTitle, String altMessage) { + public LinkableImagePropertyColumn(IModel<String> displayModel, String imageSrc, IModel<String> linkTitle, + IModel<String> altMessage) { super(displayModel); this.imageSrc = imageSrc; this.linkTitle = linkTitle; @@ -110,11 +111,11 @@ } }; if (linkTitle != null) { - link.add(new AttributeModifier("title", new Model<String>(linkTitle))); + link.add(new AttributeModifier("title", linkTitle)); } - ContextImage image = new ContextImage("image", new Model<String>(imageSrc)); + ContextImage image = new ContextImage("image", imageSrc); if (altMessage != null) { - image.add(new AttributeModifier("alt", new Model<String>(altMessage))); + image.add(new AttributeModifier("alt", altMessage)); } link.add(image); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-04-19 08:39:09 UTC (rev 201) @@ -27,22 +27,17 @@ import java.util.Date; import java.util.Locale; -import nc.ird.cantharella.web.pages.domain.document.DocumentTooltipColumn; - -import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.CSVDataExporter; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.ExportToolbar; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.IDataExporter; -import org.apache.wicket.extensions.markup.html.repeater.data.table.export.ExportToolbar.DataExportResourceStreamWriter; import org.apache.wicket.markup.html.WebComponent; import org.apache.wicket.markup.html.image.Image; -import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.link.ResourceLink; import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; +import org.apache.wicket.model.StringResourceModel; import org.apache.wicket.request.resource.ContextRelativeResource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceStreamResource; @@ -66,7 +61,7 @@ super(table); // set message model - setMessageModel(new Model<String>(getString("ExportTo"))); + setMessageModel(new StringResourceModel("ExportTo", this, null)); // file name model DateFormat dateFormat = new SimpleDateFormat("yyyy_MM_dd-HH_mm-"); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkPanel.java 2013-04-19 08:39:09 UTC (rev 201) @@ -27,7 +27,6 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; /** * Panel which display a link with inside the corresponding value of the model @@ -64,11 +63,11 @@ * @param linkModel model used to generate the link * @param linkTitle title displayed for the link */ - public PropertyLabelLinkPanel(String id, IModel<T> linkModel, String linkTitle) { + public PropertyLabelLinkPanel(String id, IModel<T> linkModel, IModel<String> linkTitle) { this(id, linkModel); if (linkTitle != null) { - link.add(new AttributeModifier("title", new Model<String>(linkTitle))); + link.add(new AttributeModifier("title", linkTitle)); } } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/panels/PropertyLabelLinkProduitPanel.java 2013-04-19 08:39:09 UTC (rev 201) @@ -80,14 +80,14 @@ public PropertyLabelLinkProduitPanel(String id, IModel<Produit> produitModel, TemplatePage page) { this(id, produitModel); if (produitModel.getObject() != null) { - String linkTitle; + IModel<String> linkTitle; // title différent suivant si le produit provient d'une extraction ou d'une purification if (produitModel.getObject().isExtrait()) { - linkTitle = page.getString("ReadExtraction"); + linkTitle = page.getStringModel("ReadExtraction"); } else { - linkTitle = page.getString("ReadPurification"); + linkTitle = page.getStringModel("ReadPurification"); } - link.add(new AttributeModifier("title", new Model<String>(linkTitle))); + link.add(new AttributeModifier("title", linkTitle)); } } Modified: trunk/cantharella.web/src/main/resources/cantharella.conf =================================================================== --- trunk/cantharella.web/src/main/resources/cantharella.conf 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/resources/cantharella.conf 2013-04-19 08:39:09 UTC (rev 201) @@ -23,17 +23,21 @@ # # WEB CONFIGURATION # -app.debug=true +#app.debug=true # value for production -#app.debug=false -app.optimize=false +app.debug=false + +#app.optimize=false # value for production -#app.optimize=true -wicket.configuration=development +app.optimize=true + +#wicket.configuration=development # value for production -#wicket.configuration=deployment +wicket.configuration=deployment + log4j.config=classpath:log4j.xml # value for production #log4j.config=/home/tomcat/.config/log4j_prod.xml + #document file max upload size (Mb) document.maxUploadSize=1 Modified: trunk/cantharella.web/src/main/resources/web_en.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_en.properties 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/resources/web_en.properties 2013-04-19 08:39:09 UTC (rev 201) @@ -245,6 +245,7 @@ ListConfigurationPage.TypesDocument=Document types list ListTypeDocumentPanel.NewTypeDocument=New document type ListConfigurationPage.RebuildLuceneIndex=Rebuild lucene index +RebuildLuceneIndexPanel.rebuildInfo=Push rebuild button only once and wait about 1 minute for end process message to display. ManagePartiePage=Managing a part ManagePartiePage.Create.OK=Part created Modified: trunk/cantharella.web/src/main/resources/web_fr.properties =================================================================== --- trunk/cantharella.web/src/main/resources/web_fr.properties 2013-04-15 10:55:44 UTC (rev 200) +++ trunk/cantharella.web/src/main/resources/web_fr.properties 2013-04-19 08:39:09 UTC (rev 201) @@ -244,6 +244,7 @@ ListConfigurationPage.TypesDocument=Liste des types de documents ListTypeDocumentPanel.NewTypeDocument=Nouveau type de document ListConfigurationPage.RebuildLuceneIndex=Reconstruire l'index lucene +RebuildLuceneIndexPanel.rebuildInfo=Appuyer une seule fois sur le bouton et attendre environ 1 minute l'affichage du message de fin d'indexation. ManagePartiePage=Gestion d'une partie ManagePartiePage.Create.OK=Partie créée