- Cantharella-commits - mailman.cloud.codelutin.com

r203 - in trunk/cantharella.web: . src/main/java/nc/ird/cantharella/web/pages/domain/document/panel src/main/webapp/js src/site/rst
by echatellier＠users.forge.codelutin.com April 19, 2013

April 19, 2013

Author: echatellier Date: 2013-04-19 10:52:14 +0200 (Fri, 19 Apr 2013) New Revision: 203 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/203 Log: Fix release Modified: trunk/cantharella.web/pom.xml trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/DocumentLinkPanel.java trunk/cantharella.web/src/main/webapp/js/imagebox.js trunk/cantharella.web/src/site/rst/index.rst Modified: trunk/cantharella.web/pom.xml =================================================================== --- trunk/cantharella.web/pom.xml 2013-04-19 08:39:32 UTC (rev 202) +++ trunk/cantharella.web/pom.xml 2013-04-19 08:52:14 UTC (rev 203) @@ -82,10 +82,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/DocumentLinkPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/DocumentLinkPanel.java 2013-04-19 08:39:32 UTC (rev 202) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/DocumentLinkPanel.java 2013-04-19 08:52:14 UTC (rev 203) @@ -1,5 +1,28 @@ package nc.ird.cantharella.web.pages.domain.document.panel; +/* + * #%L + * Cantharella :: Web + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import nc.ird.cantharella.data.model.Document; import org.apache.commons.lang3.ArrayUtils; Modified: trunk/cantharella.web/src/main/webapp/js/imagebox.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/imagebox.js 2013-04-19 08:39:32 UTC (rev 202) +++ trunk/cantharella.web/src/main/webapp/js/imagebox.js 2013-04-19 08:52:14 UTC (rev 203) @@ -1,3 +1,25 @@ +/* + * #%L + * Cantharella :: Web + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ $(document).ready(function() { $('.colorbox').colorbox({ photo:true, Modified: trunk/cantharella.web/src/site/rst/index.rst =================================================================== --- trunk/cantharella.web/src/site/rst/index.rst 2013-04-19 08:39:32 UTC (rev 202) +++ trunk/cantharella.web/src/site/rst/index.rst 2013-04-19 08:52:14 UTC (rev 203) @@ -1,3 +1,25 @@ +.. - +.. * #%L +.. * Cantharella :: Web +.. * $Id:$ +.. * $HeadURL:$ +.. * %% +.. * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Cantharella web module ======================

1 0

r202 - trunk
by echatellier＠users.forge.codelutin.com April 19, 2013

April 19, 2013

Author: echatellier Date: 2013-04-19 10:39:32 +0200 (Fri, 19 Apr 2013) New Revision: 202 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/202 Log: Update wicket and some plugins Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-19 08:39:09 UTC (rev 201) +++ trunk/pom.xml 2013-04-19 08:39:32 UTC (rev 202) @@ -105,9 +105,9 @@ <license.licenseName>agpl_v3</license.licenseName>  - <version.maven-compiler-plugin>3.0</version.maven-compiler-plugin> + <version.maven-compiler-plugin>3.1</version.maven-compiler-plugin> <version.hibernate3-maven-plugin>3.0</version.hibernate3-maven-plugin> - <version.maven-surefire-plugin>2.14</version.maven-surefire-plugin> + <version.maven-surefire-plugin>2.14.1</version.maven-surefire-plugin> <version.animal-sniffer-maven-plugin>1.10</version.animal-sniffer-maven-plugin> <version.maven-dependency-plugin>2.7</version.maven-dependency-plugin> <version.maven-java-formatter-plugin>0.3.1</version.maven-java-formatter-plugin> @@ -139,7 +139,7 @@ <version.poi>3.9</version.poi> <version.nuiton-utils>2.6.12</version.nuiton-utils> <version.servlet-api>2.5</version.servlet-api> - <version.wicket>6.6.0</version.wicket> + <version.wicket>6.7.0</version.wicket> <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, cause org.hibernate.HibernateException: Don't change the reference to a collection

1 0

April 19, 2013

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

1 0

Build failed in Jenkins: cantharella #143
by admin+hudson＠codelutin.com April 17, 2013

April 17, 2013

See <http://ci.nuiton.org/jenkins/job/cantharella/143/changes> Changes: [Éric Chatellier] Update to bean validator 1.1 ------------------------------------------ [...truncated 4 lines...] U pom.xml At revision 200 Parsing POMs Modules changed, recalculating dependency graph [trunk] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-agent-1.2.jar:/opt/maven3/boot/plexus-classworlds-2.4.jar org.jvnet.hudson.maven3.agent.Maven3Main /opt/maven3 /opt/repo/apache-tomcat-7.0.34/webapps/jenkins/WEB-INF/lib/remoting-2.22.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-1.2.jar 54579 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml> -U -e clean install [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Cantharella [INFO] Cantharella :: Utils [INFO] Cantharella :: Data [INFO] Cantharella :: Service [INFO] Cantharella :: Web Projects to build: [MavenProject: nc.ird:cantharella:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml,> MavenProject: nc.ird:cantharella.utils:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…,> MavenProject: nc.ird:cantharella.data:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…,> MavenProject: nc.ird:cantharella.service:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…,> MavenProject: nc.ird:cantharella.web:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/pom.x…]> projectStarted nc.ird:cantharella:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target> mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ cantharella --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ cantharella --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/surefire-workd…> [INFO] Executed tasks mojoSucceeded org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ cantharella --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-assembly-plugin:2.4(make-assembly) [INFO] [INFO] --- maven-assembly-plugin:2.4:single (make-assembly) @ cantharella --- [INFO] Reading assembly descriptor: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/assembly/code-formatt…> [INFO] Building zip: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> mojoSucceeded org.apache.maven.plugins:maven-assembly-plugin:2.4(make-assembly) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ cantharella --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml> to /var/local/maven/data/repository/nc/ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT.pom [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/maven/data/repository/nc/ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-site.xml [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/maven/data/repository/nc/ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-code-formatter-conf.zip mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded nc.ird:cantharella:1.1-SNAPSHOT projectStarted nc.ird:cantharella.utils:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Utils 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean)[INFO] Deleting <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cantharella.utils --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ cantharella.utils --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ cantharella.utils --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 0 resource mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) [INFO] [INFO] --- maven-dependency-plugin:2.7:unpack (unpack-code-formatter-conf) @ cantharella.utils --- [INFO] Configured Artifact: nc.ird:cantharella:code-formatter-conf:1.1-SNAPSHOT:zip [INFO] Unpacking <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> with includes "**/*.xml" and excludes "" mojoSucceeded org.apache.maven.plugins:maven-dependency-plugin:2.7(unpack-code-formatter-conf) mojoStarted com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default) [INFO] [INFO] --- maven-java-formatter-plugin:0.3.1:format (default) @ cantharella.utils --- [INFO] Using 'UTF-8' encoding to format source files. [INFO] Number of files to be formatted: 25 mojoSucceeded com.googlecode.maven-java-formatter-plugin:maven-java-formatter-plugin:0.3.1(default)[INFO] Successfully formatted: 0 file(s) [INFO] Fail to format : 0 file(s) [INFO] Skipped : 25 file(s) [INFO] Approximate time taken: 2s mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) [INFO] [INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ cantharella.utils --- [INFO] Changes detected - recompiling the module! [INFO] Compiling 14 source files to <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> mojoSucceeded org.apache.maven.plugins:maven-compiler-plugin:3.0(default-compile) mojoStarted org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ cantharella.utils --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> [INFO] Executed tasks mojoSucceeded org.apache.maven.plugins:maven-antrun-plugin:1.7(generate-surefire-workdir) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ cantharella.utils --- [INFO] Not copying test resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-testResources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) [INFO] [INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ cantharella.utils --- [INFO] Not compiling test sources mojoSucceeded org.apache.maven.plugins:maven-compiler-plugin:3.0(default-testCompile) mojoStarted org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) [INFO] [INFO] --- maven-surefire-plugin:2.14:test (default-test) @ cantharella.utils --- [INFO] Tests are skipped. mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) mojoStarted org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cantharella.utils --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> mojoSucceeded org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ cantharella.utils --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ cantharella.utils --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> to /var/local/maven/data/repository/nc/ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…> to /var/local/maven/data/repository/nc/ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded nc.ird:cantharella.utils:1.1-SNAPSHOT projectStarted nc.ird:cantharella.data:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Data 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/javax/validation/valida… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/hibernate/hibernate… projectFailed nc.ird:cantharella.data:1.1-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Cantharella ....................................... SUCCESS [9.441s] [INFO] Cantharella :: Utils .............................. SUCCESS [13.178s] [INFO] Cantharella :: Data ............................... FAILURE [3.685s] [INFO] Cantharella :: Service ............................ SKIPPED [INFO] Cantharella :: Web ................................ SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 28.346s [INFO] Finished at: Mon Apr 15 13:05:10 CEST 2013 [INFO] Final Memory: 28M/127M [INFO] ------------------------------------------------------------------------ Projects to build: [MavenProject: nc.ird:cantharella:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml,> MavenProject: nc.ird:cantharella.utils:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…,> MavenProject: nc.ird:cantharella.data:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…,> MavenProject: nc.ird:cantharella.service:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…,> MavenProject: nc.ird:cantharella.web:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/pom.x…]> [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/pom…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.utils/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.utils/tar…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.utils/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella.utils/1.1-SNAPSHOT/cantharella.utils-1.1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.service/p…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.service/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella.service/1.1-SNAPSHOT/cantharella.service-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.data/pom.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.data/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella.data/1.1-SNAPSHOT/cantharella.data-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/cantharella.web/pom.x…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella.web/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella.web/1.1-SNAPSHOT/cantharella.web-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-site.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/cantharella/ws/trunk/target/cantharella-1.…> to /var/local/jenkins/data/jobs/cantharella/modules/nc.ird$cantharella/builds/2013-04-15_13-04-37/archive/nc.ird/cantharella/1.1-SNAPSHOT/cantharella-1.1-SNAPSHOT-code-formatter-conf.zip Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal on project cantharella.data: Could not resolve dependencies for project nc.ird:cantharella.data:jar:1.1-SNAPSHOT: Failed to collect dependencies for [nc.ird:cantharella.utils:jar:1.1-SNAPSHOT (compile), org.slf4j:slf4j-log4j12:jar:1.7.5 (test), log4j:log4j:jar:1.2.17 (test), org.apache.commons:commons-lang3:jar:3.1 (compile), commons-beanutils:commons-beanutils:jar:1.8.3 (compile), commons-collections:commons-collections:jar:3.2.1 (compile), org.nuiton:nuiton-config:jar:2.6.12 (compile), postgresql:postgresql:jar:9.1-901-1.jdbc4 (compile), com.h2database:h2:jar:1.3.171 (test), javax.validation:validation-api:jar:1.1.0.Final (compile), org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final (compile), org.hibernate:hibernate-core:jar:4.2.0.Final (compile), org.hibernate:hibernate-ehcache:jar:4.2.0.Final (compile), org.hibernate:hibernate-validator:jar:5.0.0.Final (compile), org.hibernate:hibernate-search-engine:jar:4.2.0.Final (compile), org.hibernate:hibernate-search-orm:jar:4.2.0.Final (compile), org.apache.lucene:lucene-core:jar:3.6.2 (compile), c3p0:c3p0:jar:0.9.1 (compile), org.aspectj:aspectjrt:jar:1.7.2 (compile), org.aspectj:aspectjweaver:jar:1.7.2 (test), org.springframework:spring-core:jar:3.2.2.RELEASE (compile), org.springframework:spring-context:jar:3.2.2.RELEASE (compile), org.springframework:spring-beans:jar:3.2.2.RELEASE (compile), org.springframework:spring-tx:jar:3.2.2.RELEASE (compile), org.springframework:spring-orm:jar:3.2.2.RELEASE (compile), org.springframework:spring-test:jar:3.2.2.RELEASE (test), cglib:cglib-nodep:jar:2.2.2 (test), junit:junit:jar:4.11 (test), org.slf4j:slf4j-api:jar:1.7.5 (compile), org.slf4j:jcl-over-slf4j:jar:1.7.5 (runtime)] cause : Could not resolve dependencies for project nc.ird:cantharella.data:jar:1.1-SNAPSHOT: Failed to collect dependencies for [nc.ird:cantharella.utils:jar:1.1-SNAPSHOT (compile), org.slf4j:slf4j-log4j12:jar:1.7.5 (test), log4j:log4j:jar:1.2.17 (test), org.apache.commons:commons-lang3:jar:3.1 (compile), commons-beanutils:commons-beanutils:jar:1.8.3 (compile), commons-collections:commons-collections:jar:3.2.1 (compile), org.nuiton:nuiton-config:jar:2.6.12 (compile), postgresql:postgresql:jar:9.1-901-1.jdbc4 (compile), com.h2database:h2:jar:1.3.171 (test), javax.validation:validation-api:jar:1.1.0.Final (compile), org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final (compile), org.hibernate:hibernate-core:jar:4.2.0.Final (compile), org.hibernate:hibernate-ehcache:jar:4.2.0.Final (compile), org.hibernate:hibernate-validator:jar:5.0.0.Final (compile), org.hibernate:hibernate-search-engine:jar:4.2.0.Final (compile), org.hibernate:hibernate-search-orm:jar:4.2.0.Final (compile), org.apache.lucene:lucene-core:jar:3.6.2 (compile), c3p0:c3p0:jar:0.9.1 (compile), org.aspectj:aspectjrt:jar:1.7.2 (compile), org.aspectj:aspectjweaver:jar:1.7.2 (test), org.springframework:spring-core:jar:3.2.2.RELEASE (compile), org.springframework:spring-context:jar:3.2.2.RELEASE (compile), org.springframework:spring-beans:jar:3.2.2.RELEASE (compile), org.springframework:spring-tx:jar:3.2.2.RELEASE (compile), org.springframework:spring-orm:jar:3.2.2.RELEASE (compile), org.springframework:spring-test:jar:3.2.2.RELEASE (test), cglib:cglib-nodep:jar:2.2.2 (test), junit:junit:jar:4.11 (test), org.slf4j:slf4j-api:jar:1.7.5 (compile), org.slf4j:jcl-over-slf4j:jar:1.7.5 (runtime)] Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal on project cantharella.data: Could not resolve dependencies for project nc.ird:cantharella.data:jar:1.1-SNAPSHOT: Failed to collect dependencies for [nc.ird:cantharella.utils:jar:1.1-SNAPSHOT (compile), org.slf4j:slf4j-log4j12:jar:1.7.5 (test), log4j:log4j:jar:1.2.17 (test), org.apache.commons:commons-lang3:jar:3.1 (compile), commons-beanutils:commons-beanutils:jar:1.8.3 (compile), commons-collections:commons-collections:jar:3.2.1 (compile), org.nuiton:nuiton-config:jar:2.6.12 (compile), postgresql:postgresql:jar:9.1-901-1.jdbc4 (compile), com.h2database:h2:jar:1.3.171 (test), javax.validation:validation-api:jar:1.1.0.Final (compile), org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final (compile), org.hibernate:hibernate-core:jar:4.2.0.Final (compile), org.hibernate:hibernate-ehcache:jar:4.2.0.Final (compile), org.hibernate:hibernate-validator:jar:5.0.0.Final (compile), org.hibernate:hibernate-search-engine:jar:4.2.0.Final (compile), org.hibernate:hibernate-search-orm:jar:4.2.0.Final (compile), org.apache.lucene:lucene-core:jar:3.6.2 (compile), c3p0:c3p0:jar:0.9.1 (compile), org.aspectj:aspectjrt:jar:1.7.2 (compile), org.aspectj:aspectjweaver:jar:1.7.2 (test), org.springframework:spring-core:jar:3.2.2.RELEASE (compile), org.springframework:spring-context:jar:3.2.2.RELEASE (compile), org.springframework:spring-beans:jar:3.2.2.RELEASE (compile), org.springframework:spring-tx:jar:3.2.2.RELEASE (compile), org.springframework:spring-orm:jar:3.2.2.RELEASE (compile), org.springframework:spring-test:jar:3.2.2.RELEASE (test), cglib:cglib-nodep:jar:2.2.2 (test), junit:junit:jar:4.11 (test), org.slf4j:slf4j-api:jar:1.7.5 (compile), org.slf4j:jcl-over-slf4j:jar:1.7.5 (runtime)] at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:210) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.resolveProjectDependencies(LifecycleDependencyResolver.java:117) at org.apache.maven.lifecycle.internal.MojoExecutor.ensureDependenciesAreResolved(MojoExecutor.java:258) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:201) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.project.DependencyResolutionException: Could not resolve dependencies for project nc.ird:cantharella.data:jar:1.1-SNAPSHOT: Failed to collect dependencies for [nc.ird:cantharella.utils:jar:1.1-SNAPSHOT (compile), org.slf4j:slf4j-log4j12:jar:1.7.5 (test), log4j:log4j:jar:1.2.17 (test), org.apache.commons:commons-lang3:jar:3.1 (compile), commons-beanutils:commons-beanutils:jar:1.8.3 (compile), commons-collections:commons-collections:jar:3.2.1 (compile), org.nuiton:nuiton-config:jar:2.6.12 (compile), postgresql:postgresql:jar:9.1-901-1.jdbc4 (compile), com.h2database:h2:jar:1.3.171 (test), javax.validation:validation-api:jar:1.1.0.Final (compile), org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final (compile), org.hibernate:hibernate-core:jar:4.2.0.Final (compile), org.hibernate:hibernate-ehcache:jar:4.2.0.Final (compile), org.hibernate:hibernate-validator:jar:5.0.0.Final (compile), org.hibernate:hibernate-search-engine:jar:4.2.0.Final (compile), org.hibernate:hibernate-search-orm:jar:4.2.0.Final (compile), org.apache.lucene:lucene-core:jar:3.6.2 (compile), c3p0:c3p0:jar:0.9.1 (compile), org.aspectj:aspectjrt:jar:1.7.2 (compile), org.aspectj:aspectjweaver:jar:1.7.2 (test), org.springframework:spring-core:jar:3.2.2.RELEASE (compile), org.springframework:spring-context:jar:3.2.2.RELEASE (compile), org.springframework:spring-beans:jar:3.2.2.RELEASE (compile), org.springframework:spring-tx:jar:3.2.2.RELEASE (compile), org.springframework:spring-orm:jar:3.2.2.RELEASE (compile), org.springframework:spring-test:jar:3.2.2.RELEASE (test), cglib:cglib-nodep:jar:2.2.2 (test), junit:junit:jar:4.11 (test), org.slf4j:slf4j-api:jar:1.7.5 (compile), org.slf4j:jcl-over-slf4j:jar:1.7.5 (runtime)] at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:158) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:185) ... 30 more Caused by: org.sonatype.aether.collection.DependencyCollectionException: Failed to collect dependencies for [nc.ird:cantharella.utils:jar:1.1-SNAPSHOT (compile), org.slf4j:slf4j-log4j12:jar:1.7.5 (test), log4j:log4j:jar:1.2.17 (test), org.apache.commons:commons-lang3:jar:3.1 (compile), commons-beanutils:commons-beanutils:jar:1.8.3 (compile), commons-collections:commons-collections:jar:3.2.1 (compile), org.nuiton:nuiton-config:jar:2.6.12 (compile), postgresql:postgresql:jar:9.1-901-1.jdbc4 (compile), com.h2database:h2:jar:1.3.171 (test), javax.validation:validation-api:jar:1.1.0.Final (compile), org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar:1.0.1.Final (compile), org.hibernate:hibernate-core:jar:4.2.0.Final (compile), org.hibernate:hibernate-ehcache:jar:4.2.0.Final (compile), org.hibernate:hibernate-validator:jar:5.0.0.Final (compile), org.hibernate:hibernate-search-engine:jar:4.2.0.Final (compile), org.hibernate:hibernate-search-orm:jar:4.2.0.Final (compile), org.apache.lucene:lucene-core:jar:3.6.2 (compile), c3p0:c3p0:jar:0.9.1 (compile), org.aspectj:aspectjrt:jar:1.7.2 (compile), org.aspectj:aspectjweaver:jar:1.7.2 (test), org.springframework:spring-core:jar:3.2.2.RELEASE (compile), org.springframework:spring-context:jar:3.2.2.RELEASE (compile), org.springframework:spring-beans:jar:3.2.2.RELEASE (compile), org.springframework:spring-tx:jar:3.2.2.RELEASE (compile), org.springframework:spring-orm:jar:3.2.2.RELEASE (compile), org.springframework:spring-test:jar:3.2.2.RELEASE (test), cglib:cglib-nodep:jar:2.2.2 (test), junit:junit:jar:4.11 (test), org.slf4j:slf4j-api:jar:1.7.5 (compile), org.slf4j:jcl-over-slf4j:jar:1.7.5 (runtime)] at org.sonatype.aether.impl.internal.DefaultDependencyCollector.collectDependencies(DefaultDependencyCollector.java:258) at org.sonatype.aether.impl.internal.DefaultRepositorySystem.collectDependencies(DefaultRepositorySystem.java:308) at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:150) ... 31 more Caused by: org.sonatype.aether.resolution.ArtifactDescriptorException: Failed to read artifact descriptor for javax.validation:validation-api:jar:1.1.0.Final at org.apache.maven.repository.internal.DefaultArtifactDescriptorReader.loadPom(DefaultArtifactDescriptorReader.java:296) at org.apache.maven.repository.internal.DefaultArtifactDescriptorReader.readArtifactDescriptor(DefaultArtifactDescriptorReader.java:186) at org.sonatype.aether.impl.internal.DefaultDependencyCollector.process(DefaultDependencyCollector.java:412) at org.sonatype.aether.impl.internal.DefaultDependencyCollector.collectDependencies(DefaultDependencyCollector.java:240) ... 33 more Caused by: org.sonatype.aether.resolution.ArtifactResolutionException: Could not transfer artifact javax.validation:validation-api:pom:1.1.0.Final from/to central (http://nexus.nuiton.org/nexus/content/groups/public) Failed to transfer file: http://nexus.nuiton.org/nexus/content/groups/public/javax/validation/valida…. Return code is: 503 , ReasonPhrase:Service Temporarily Unavailable. at org.sonatype.aether.impl.internal.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:538) at org.sonatype.aether.impl.internal.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:216) at org.sonatype.aether.impl.internal.DefaultArtifactResolver.resolveArtifact(DefaultArtifactResolver.java:193) at org.apache.maven.repository.internal.DefaultArtifactDescriptorReader.loadPom(DefaultArtifactDescriptorReader.java:281) ... 36 more Caused by: org.sonatype.aether.transfer.ArtifactTransferException: Could not transfer artifact javax.validation:validation-api:pom:1.1.0.Final from/to central (http://nexus.nuiton.org/nexus/content/groups/public) Failed to transfer file: http://nexus.nuiton.org/nexus/content/groups/public/javax/validation/valida…. Return code is: 503 , ReasonPhrase:Service Temporarily Unavailable. at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$4.wrap(WagonRepositoryConnector.java:951) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$4.wrap(WagonRepositoryConnector.java:941) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$GetTask.run(WagonRepositoryConnector.java:669) at org.sonatype.aether.util.concurrency.RunnableErrorForwarder$1.run(RunnableErrorForwarder.java:60) ... 3 more Caused by: org.apache.maven.wagon.TransferFailedException: Failed to transfer file: http://nexus.nuiton.org/nexus/content/groups/public/javax/validation/valida…. Return code is: 503 , ReasonPhrase:Service Temporarily Unavailable. at org.apache.maven.wagon.shared.http4.AbstractHttpClientWagon.fillInputData(AbstractHttpClientWagon.java:945) at org.apache.maven.wagon.StreamWagon.getInputStream(StreamWagon.java:116) at org.apache.maven.wagon.StreamWagon.getIfNewer(StreamWagon.java:88) at org.apache.maven.wagon.StreamWagon.get(StreamWagon.java:61) at org.sonatype.aether.connector.wagon.WagonRepositoryConnector$GetTask.run(WagonRepositoryConnector.java:601) ... 4 more Sending e-mails to: cantharella-commits(a)list.forge.codelutin.com echatellier(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: cantharella » Cantharella :: Data #143
by admin+hudson＠codelutin.com April 17, 2013

April 17, 2013

See <http://ci.nuiton.org/jenkins/job/cantharella/nc.ird$cantharella.data/143/ch…> Changes: [Éric Chatellier] Update to bean validator 1.1 ------------------------------------------ projectStarted nc.ird:cantharella.data:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Cantharella :: Data 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/javax/validation/valida… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/hibernate/hibernate… projectFailed nc.ird:cantharella.data:1.1-SNAPSHOT

1 1

r200 - in trunk: . cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils
by echatellier＠users.forge.codelutin.com April 15, 2013

April 15, 2013

Author: echatellier Date: 2013-04-15 12:55:44 +0200 (Mon, 15 Apr 2013) New Revision: 200 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/200 Log: Update to bean validator 1.1 Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java trunk/pom.xml Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2013-04-15 10:46:01 UTC (rev 199) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/validation/utils/ModelValidatorImpl.java 2013-04-15 10:55:44 UTC (rev 200) @@ -145,6 +145,15 @@ public Object getValidatedValue() { return violation.getInvalidValue(); } + + @Override + public <T> T unwrap(Class<T> type) { + //allow unwrapping into public super types + if (type.isAssignableFrom(Context.class)) { + return type.cast(this); + } + throw new ClassCastException(); + } }, locale))); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-15 10:46:01 UTC (rev 199) +++ trunk/pom.xml 2013-04-15 10:55:44 UTC (rev 200) @@ -123,10 +123,10 @@ <version.commons-codec>1.7</version.commons-codec> <version.postgresql>9.1-901-1.jdbc4</version.postgresql> <version.h2>1.3.171</version.h2> - <version.validation-api>1.0.0.GA</version.validation-api> + <version.validation-api>1.1.0.Final</version.validation-api> <version.hibernate-jpa-2.0-api>1.0.1.Final</version.hibernate-jpa-2.0-api> <version.hibernate>4.2.0.Final</version.hibernate> - <version.hibernate-validator>4.3.1.Final</version.hibernate-validator> + <version.hibernate-validator>5.0.0.Final</version.hibernate-validator> <version.hibernate-search>4.2.0.Final</version.hibernate-search> <version.lucene>3.6.2</version.lucene> <version.c3p0>0.9.1</version.c3p0> @@ -581,5 +581,4 @@ <artifactId>jcl-over-slf4j</artifactId> </dependency> </dependencies> - </project>

1 0

r199 - trunk/cantharella.data/src/main/resources
by echatellier＠users.forge.codelutin.com April 15, 2013

April 15, 2013

Author: echatellier Date: 2013-04-15 12:46:01 +0200 (Mon, 15 Apr 2013) New Revision: 199 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/199 Log: Fix locale Modified: trunk/cantharella.data/src/main/resources/data_en.properties Modified: trunk/cantharella.data/src/main/resources/data_en.properties =================================================================== --- trunk/cantharella.data/src/main/resources/data_en.properties 2013-04-15 10:31:40 UTC (rev 198) +++ trunk/cantharella.data/src/main/resources/data_en.properties 2013-04-15 10:46:01 UTC (rev 199) @@ -187,7 +187,7 @@ Molecule.formuleDevMol=Developed formula Molecule.nomIupca=IUPAC name Molecule.formuleBrute=Formula -Molecule.masseMolaire=Molar mass (g/mol) +Molecule.masseMolaire=Molecular weight (g/mol) Molecule.nouvMolecul=New molecule ? Molecule.campagne=In the campaign Molecule.identifieePar=Identified by @@ -199,7 +199,7 @@ Molecule.provenance.presence=% Molecule.provenance.lot.ref=Lot ref. Molecule.provenance.embranchement=Phylum -Molecule.provenance.genre=Gender +Molecule.provenance.genre=Genus Molecule.provenance.espece=Species Molecule.provenance.campagne=Campaign Molecule.provenance.programme=Program

1 0

r198 - trunk/cantharella.web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com April 15, 2013

April 15, 2013

Author: echatellier Date: 2013-04-15 12:31:40 +0200 (Mon, 15 Apr 2013) New Revision: 198 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/198 Log: Fix molecule view with colorbox. Modified: trunk/cantharella.web/src/main/webapp/js/molviewer.js Modified: trunk/cantharella.web/src/main/webapp/js/molviewer.js =================================================================== --- trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-04-04 13:54:38 UTC (rev 197) +++ trunk/cantharella.web/src/main/webapp/js/molviewer.js 2013-04-15 10:31:40 UTC (rev 198) @@ -52,12 +52,13 @@ // forcer l'existance du tag' var formulaString = $(formulaTag).attr('formula').substring(1); var id = $(formulaTag).attr('id'); - $(formulaTag).replaceWith("<a download='molecule'><canvas id='"+id+"'/></a>"); + $(formulaTag).replaceWith("<a download='molecule'><canvas id='"+id+"'/></a><canvas id='"+id+"-big' style='display:none' />"); addChemCanvas(id, formulaString, 100, 100); + addChemCanvas(id + '-big', formulaString, 500, 300); // add download link - var dataUrl = document.getElementById(id).toDataURL("image/png"); + var dataUrl = document.getElementById(id + '-big').toDataURL("image/png"); $('#' + id).parent().attr('href', dataUrl); // link to colorbox

1 0

r197 - trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels
by echatellier＠users.forge.codelutin.com April 4, 2013

April 4, 2013

Author: echatellier Date: 2013-04-04 15:54:38 +0200 (Thu, 04 Apr 2013) New Revision: 197 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/197 Log: Fix rebuild panel message update 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.java 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-02 14:01:15 UTC (rev 196) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.html 2013-04-04 13:54:38 UTC (rev 197) @@ -26,7 +26,7 @@ <wicket:panel> <form wicket:id="Form"> <input type="submit" wicket:message="value:Rebuild" wicket:id="Rebuild" /> - <span wicket:id="rebuildResult" /> + <span wicket:id="Status" /> </form> </wicket:panel> </html> \ No newline at end of file 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-02 14:01:15 UTC (rev 196) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-04-04 13:54:38 UTC (rev 197) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + * Copyright (C) 2009 - 2013 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -27,7 +27,6 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxFallbackButton; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; @@ -37,7 +36,7 @@ /** * Panel qui permet de reconstruire l'index lucene. * - * @author Eric Chattellier + * @author Eric Chatellier */ public class RebuildLuceneIndexPanel extends Panel { @@ -54,29 +53,29 @@ final Form<Void> formView = new Form<Void>("Form"); - final IModel<String> messageModel = Model.of(""); - final Label rebuildResultLabel = new Label("rebuildResult", messageModel); - rebuildResultLabel.setOutputMarkupId(true); + final IModel<String> stringLabel = Model.of(""); + final Label label = new Label("Status", stringLabel); + label.setOutputMarkupId(true); + formView.add(label); - final Button addButton = new AjaxFallbackButton("Rebuild", formView) { + + final AjaxFallbackButton addButton = new AjaxFallbackButton("Rebuild", formView) { @Override - protected void onSubmit(AjaxRequestTarget target, Form<?> form) { - messageModel.setObject("Rebuilding..."); - setEnabled(false); + protected void onAfterSubmit(AjaxRequestTarget target, Form<?> form) { searchService.reIndex(); - messageModel.setObject("Done."); - setEnabled(true); - target.add(rebuildResultLabel); + stringLabel.setObject("Done"); + target.add(label); } @Override protected void onError(AjaxRequestTarget target, Form<?> form) { - messageModel.setObject("Error (see logs)."); - target.add(rebuildResultLabel); + stringLabel.setObject("Error"); + target.add(label); } }; + addButton.setOutputMarkupId(true); formView.add(addButton); - formView.add(rebuildResultLabel); + add(formView); } }

1 0

r196 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/config cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security
by echatellier＠users.forge.codelutin.com April 2, 2013

April 2, 2013

Author: echatellier Date: 2013-04-02 16:01:15 +0200 (Tue, 02 Apr 2013) New Revision: 196 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/196 Log: Fix usage of set default locale to entiere JVM Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-04-02 13:18:05 UTC (rev 195) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2013-04-02 14:01:15 UTC (rev 196) @@ -198,7 +198,6 @@ locales.add(Locale.ENGLISH); LOCALES = Collections.unmodifiableList(locales); - Locale.setDefault(LOCALES.get(0)); Map<Integer, String> referentiels = new HashMap<Integer, String>(); referentiels.put(4326, "WGS84"); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-04-02 13:18:05 UTC (rev 195) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-04-02 14:01:15 UTC (rev 196) @@ -71,9 +71,7 @@ public AuthSession(Request request) { super(request); WebApplicationImpl.injectSpringBeans(this); - if (!DataContext.LOCALES.contains(getLocale())) { - setLocale(Locale.getDefault()); - } + checkLocale(); setAttribute(ATTRIBUTE_ROLE, new HashSet<TypeDroit>()); setUtilisateur(null); @@ -84,6 +82,22 @@ } /** + * Check that current locale is a locale managed by cantharella. + */ + protected void checkLocale() { + Locale locale = super.getLocale(); + if (!DataContext.LOCALES.contains(locale)) { + // try to get new locale with current locale language + locale = new Locale(locale.getLanguage()); + if (!DataContext.LOCALES.contains(getLocale())) { + // default to "en" locale + locale = DataContext.LOCALES.get(0); + } + setLocale(locale); + } + } + + /** * Autologin * @return Success */

1 0