Author: echatellier Date: 2013-02-14 17:39:05 +0100 (Thu, 14 Feb 2013) New Revision: 109 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/109 Log: Update to wicket 6.5 Added: trunk/cantharella.utils/src/license/ trunk/cantharella.utils/src/license/THIRD-PARTY.properties Modified: trunk/cantharella.data/src/license/THIRD-PARTY.properties trunk/cantharella.service/src/license/THIRD-PARTY.properties trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CantharellaConfig.java trunk/cantharella.web/src/license/THIRD-PARTY.properties trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 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/columns/TaxonomyPropertyColumn.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/extraction/ListExtractionsPage.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/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/purification/ListPurificationsPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.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/station/ListStationsPage.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/utils/behaviors/MoleculeEditorBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/AjaxButtonPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.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/columns/MapValuePropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/SimpleSortableListDataProvider.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java trunk/pom.xml Modified: trunk/cantharella.data/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.data/src/license/THIRD-PARTY.properties 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.data/src/license/THIRD-PARTY.properties 2013-02-14 16:39:05 UTC (rev 109) @@ -9,6 +9,7 @@ # - Eclipse Public License - v 1.0 # - GNU Lesser General Public License, version 2.1 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License @@ -22,5 +23,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jan 18 10:34:09 CET 2013 +#Thu Feb 14 17:34:33 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/cantharella.service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.service/src/license/THIRD-PARTY.properties 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.service/src/license/THIRD-PARTY.properties 2013-02-14 16:39:05 UTC (rev 109) @@ -11,6 +11,7 @@ # - GNU Lesser General Public License, version 2.1 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License @@ -24,5 +25,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jan 18 10:45:39 CET 2013 +#Thu Feb 14 17:34:54 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java 2013-02-14 16:39:05 UTC (rev 109) @@ -1,5 +1,28 @@ package nc.ird.cantharella.service.model; +/* + * #%L + * Cantharella :: Service + * $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 java.io.Serializable; import nc.ird.cantharella.data.model.Extrait; import nc.ird.cantharella.data.model.Fraction; Added: trunk/cantharella.utils/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.utils/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/cantharella.utils/src/license/THIRD-PARTY.properties 2013-02-14 16:39:05 UTC (rev 109) @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Thu Feb 14 17:34:15 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 Modified: trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CantharellaConfig.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CantharellaConfig.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.utils/src/main/java/nc/ird/module/utils/CantharellaConfig.java 2013-02-14 16:39:05 UTC (rev 109) @@ -1,5 +1,28 @@ package nc.ird.module.utils; +/* + * #%L + * Cantharella :: Utils + * $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 java.util.Properties; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; Modified: trunk/cantharella.web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/cantharella.web/src/license/THIRD-PARTY.properties 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/license/THIRD-PARTY.properties 2013-02-14 16:39:05 UTC (rev 109) @@ -7,11 +7,11 @@ # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 -# - Copyright (c) 2000-2011 INRIA, France Telecom # - Eclipse Public License - v 1.0 # - GNU Lesser General Public License, version 2.1 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - License Agreement for Java(TM) Servlet API Specification Interface Classes @@ -25,7 +25,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jan 18 11:06:20 CET 2013 -asm--asm--3.1=Copyright (c) 2000-2011 INRIA, France Telecom +#Thu Feb 14 17:35:11 CET 2013 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2013-02-14 16:39:05 UTC (rev 109) @@ -80,13 +80,13 @@ import org.apache.wicket.Session; import org.apache.wicket.authentication.IAuthenticationStrategy; import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy; +import org.apache.wicket.core.request.mapper.MountedMapper; +import org.apache.wicket.core.request.mapper.PackageMapper; import org.apache.wicket.injection.Injector; import org.apache.wicket.javascript.DefaultJavaScriptCompressor; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; -import org.apache.wicket.request.mapper.MountedMapper; -import org.apache.wicket.request.mapper.PackageMapper; import org.apache.wicket.request.mapper.mount.MountMapper; import org.apache.wicket.resource.NoOpTextCompressor; import org.apache.wicket.resource.loader.IStringResourceLoader; 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/TemplatePage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -46,14 +46,14 @@ import nc.ird.module.utils.AssertTools; import nc.ird.module.utils.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.IAjaxIndicatorAware; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.IHeaderContributor; -import org.apache.wicket.markup.html.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; @@ -65,7 +65,10 @@ import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; +import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.util.value.ValueMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Template page @@ -137,11 +140,11 @@ /** {@inheritDoc} */ public void renderHead(IHeaderResponse response) { // dynamic declaration of the menu Css due to the internationalization - response.renderCSSReference(getString("TemplatePage.Css.Menu")); + response.render(CssHeaderItem.forUrl(getString("TemplatePage.Css.Menu"))); // scroll up to the anchor if any feedback message if (!getSession().getFeedbackMessages().isEmpty()) { - response.renderOnLoadJavaScript("location.hash='header'"); + response.render(OnDomReadyHeaderItem.forScript("location.hash='header'")); // LOG.debug("session FeedbackMessages is not empty"); // for (FeedbackMessage msg : getSession().getFeedbackMessages()) { // LOG.debug(msg.getLevelAsString() + " : " + msg.getMessage() + ", from : " + msg.getReporter()); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/LinkProduitPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -39,8 +39,9 @@ * fraction). T MUST HAVE a property named "produit" which give a Produit. * @author Adrien Cheype * @param <T> Row type + * @param <S> the type of the sort property */ -public abstract class LinkProduitPropertyColumn<T> extends LinkPropertyColumn<T> { +public abstract class LinkProduitPropertyColumn<T, S> extends LinkPropertyColumn<T, S> { /** page used to get messages */ private final TemplatePage page; @@ -52,7 +53,7 @@ * @param propertyExpression propertyExpression * @param page page used to get messages */ - public LinkProduitPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public LinkProduitPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, TemplatePage page) { super(displayModel, sortProperty, propertyExpression); this.page = page; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -39,7 +39,7 @@ * @author Adrien Cheype * @param <T> Type of the row model */ -public class TaxonomyPropertyColumn<T> extends PropertyColumn<T> implements ExportableColumn<T> { +public class TaxonomyPropertyColumn<T, S> extends PropertyColumn<T, S> implements ExportableColumn<T, S> { /** * Constructor @@ -47,7 +47,7 @@ * @param sortProperty Sort property * @param propertyExpression Property expression */ - public TaxonomyPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression) { + public TaxonomyPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression) { super(displayModel, sortProperty, propertyExpression); } 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -92,16 +92,16 @@ LoadableDetachableSortableListDataProvider<Campagne> campagnesDataProvider = new LoadableDetachableSortableListDataProvider<Campagne>( campagnes, getSession().getLocale()); - List<IColumn<Campagne>> columns = new ArrayList<IColumn<Campagne>>(); + List<IColumn<Campagne, String>> columns = new ArrayList<IColumn<Campagne, String>>(); - columns.add(new LinkableImagePropertyColumn<Campagne>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/read.png", getString("Read"), getString("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>(new Model<String>(getString("Campagne.nom")), "nom", "nom", + columns.add(new LinkPropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.nom")), "nom", "nom", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Campagne>> item, String componentId, IModel<Campagne> model) { @@ -109,16 +109,16 @@ } }); - columns.add(new ShortDatePropertyColumn<Campagne>(new Model<String>(getString("Campagne.dateDeb")), "dateDeb", + columns.add(new ShortDatePropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.dateDeb")), "dateDeb", "dateDeb", getLocale())); - columns.add(new ShortDatePropertyColumn<Campagne>(new Model<String>(getString("Campagne.dateFin")), "dateFin", + columns.add(new ShortDatePropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.dateFin")), "dateFin", "dateFin", getLocale())); - columns.add(new MapValuePropertyColumn<Campagne, String>(new Model<String>(getString("Campagne.codePays")), + columns.add(new MapValuePropertyColumn<Campagne, String, String>(new Model<String>(getString("Campagne.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new LinkableImagePropertyColumn<Campagne>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Campagne, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -137,7 +137,7 @@ } }); - final DataTable<Campagne> campagnesDataTable = new AjaxFallbackDefaultDataTable<Campagne>( + final DataTable<Campagne, String> campagnesDataTable = new AjaxFallbackDefaultDataTable<Campagne, String>( "ListCampagnesPage.Campagnes", columns, campagnesDataProvider, WebContext.ROWS_PER_PAGE); campagnesRefresh.add(campagnesDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ListExtractionsPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -104,16 +104,16 @@ LoadableDetachableSortableListDataProvider<Extraction> extractionsDataProvider = new LoadableDetachableSortableListDataProvider<Extraction>( extractions, getSession().getLocale()); - List<IColumn<Extraction>> columns = new ArrayList<IColumn<Extraction>>(); + List<IColumn<Extraction, String>> columns = new ArrayList<IColumn<Extraction, String>>(); - columns.add(new LinkableImagePropertyColumn<Extraction>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Extraction, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { setResponsePage(new ReadExtractionPage(model.getObject().getIdExtraction(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Extraction.lot")), "lot", "lot", + columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.lot")), "lot", "lot", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -121,7 +121,7 @@ } }); - columns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Extraction.ref")), "ref", "ref", + columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -129,16 +129,16 @@ } }); - columns.add(new ShortDatePropertyColumn<Extraction>(new Model<String>(getString("Extraction.date")), "date", + columns.add(new ShortDatePropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.date")), "date", "date", getLocale())); - columns.add(new PropertyColumn<Extraction>(new Model<String>(getString("Extraction.methode2")), "methode", + columns.add(new PropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.methode2")), "methode", "methode")); - columns.add(new DecimalPropertyColumn<Extraction>(new Model<String>(getString("Extraction.masseDepart2")), + columns.add(new DecimalPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.masseDepart2")), "masseDepart", "masseDepart", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Campagne")), "lot.campagne", + columns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Campagne")), "lot.campagne", "lot.campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -147,7 +147,7 @@ } }); - columns.add(new AbstractColumn<Extraction>(new Model<String>(getString("Extraction.extraits"))) { + columns.add(new AbstractColumn<Extraction, String>(new Model<String>(getString("Extraction.extraits"))) { @Override public void populateItem(Item<ICellPopulator<Extraction>> cellItem, String componentId, IModel<Extraction> rowModel) { @@ -186,7 +186,7 @@ }); - columns.add(new LinkableImagePropertyColumn<Extraction>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Extraction, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -205,7 +205,7 @@ } }); - final DataTable<Extraction> extractionsDataTable = new AjaxFallbackDefaultDataTable<Extraction>( + final DataTable<Extraction, String> extractionsDataTable = new AjaxFallbackDefaultDataTable<Extraction, String>( "ListExtractionsPage.Extractions", columns, extractionsDataProvider, WebContext.ROWS_PER_PAGE); extractionsRefresh.add(extractionsDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ListLotsPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -96,16 +96,16 @@ LoadableDetachableSortableListDataProvider<Lot> lotsDataProvider = new LoadableDetachableSortableListDataProvider<Lot>( lots, getSession().getLocale()); - List<IColumn<Lot>> columns = new ArrayList<IColumn<Lot>>(); + List<IColumn<Lot, String>> columns = new ArrayList<IColumn<Lot, String>>(); - columns.add(new LinkableImagePropertyColumn<Lot>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Lot, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { setResponsePage(new ReadLotPage(model.getObject().getIdLot(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.ref")), "ref", "ref", + columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -113,10 +113,10 @@ } }); - columns.add(new PropertyColumn<Lot>(new Model<String>(getString("Lot.dateRecolte2")), "dateRecolte", + columns.add(new PropertyColumn<Lot, String>(new Model<String>(getString("Lot.dateRecolte2")), "dateRecolte", "dateRecolte")); - columns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.station")), "station", "station", + columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.station")), "station", "station", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -124,7 +124,7 @@ } }); - columns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.specimenRef2")), "specimenRef", + columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.specimenRef2")), "specimenRef", "specimenRef", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -132,30 +132,30 @@ } }); - columns.add(new EnumPropertyColumn<Lot>(new Model<String>(getString("Specimen.typeOrganisme")), + columns.add(new EnumPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.typeOrganisme")), "specimenRef.typeOrganisme", "specimenRef.typeOrganisme", ListLotsPage.this)); - columns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.embranchement")), + columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.embranchement")), "specimenRef.embranchement", "specimenRef.embranchement")); - columns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.famille")), + columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.famille")), "specimenRef.famille", "specimenRef.famille")); - columns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.genre")), + columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.genre")), "specimenRef.genre", "specimenRef.genre")); - columns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.espece")), + columns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.espece")), "specimenRef.espece", "specimenRef.espece")); - columns.add(new PropertyColumn<Lot>(new Model<String>(getString("Lot.partie")), "partie", "partie")); + columns.add(new PropertyColumn<Lot, String>(new Model<String>(getString("Lot.partie")), "partie", "partie")); - columns.add(new DecimalPropertyColumn<Lot>(new Model<String>(getString("Lot.masseFraiche2")), "masseFraiche", + columns.add(new DecimalPropertyColumn<Lot, String>(new Model<String>(getString("Lot.masseFraiche2")), "masseFraiche", "masseFraiche", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new DecimalPropertyColumn<Lot>(new Model<String>(getString("Lot.masseSeche2")), "masseSeche", + columns.add(new DecimalPropertyColumn<Lot, String>(new Model<String>(getString("Lot.masseSeche2")), "masseSeche", "masseSeche", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.campagne")), "campagne", "campagne", + columns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.campagne")), "campagne", "campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -163,10 +163,10 @@ } }); - columns.add(new MapValuePropertyColumn<Lot, String>(new Model<String>(getString("Campagne.codePays")), + columns.add(new MapValuePropertyColumn<Lot, String, String>(new Model<String>(getString("Campagne.codePays")), "campagne.codePays", "campagne.codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new LinkableImagePropertyColumn<Lot>("images/edit.png", getString("Update"), getString("Update")) { + columns.add(new LinkableImagePropertyColumn<Lot, String>("images/edit.png", getString("Update"), getString("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) { @@ -184,7 +184,7 @@ } }); - final DataTable<Lot> lotsDataTable = new AjaxFallbackDefaultDataTable<Lot>("ListLotsPage.Lots", columns, + final DataTable<Lot, String> lotsDataTable = new AjaxFallbackDefaultDataTable<Lot, String>("ListLotsPage.Lots", columns, lotsDataProvider, WebContext.ROWS_PER_PAGE); lotsRefresh.add(lotsDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ListMoleculesPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -97,7 +97,7 @@ Utilisateur utilisateur = getSession().getUtilisateur(); final List<MoleculeProvenanceBean> moleculeProvenances = moleculeService.listMoleculeProvenances(utilisateur); - DataTable<MoleculeProvenanceBean> moleculesDataTable = initMoleculesListTable(this, + DataTable<MoleculeProvenanceBean, String> moleculesDataTable = initMoleculesListTable(this, "ListMoleculesPage.Molecules", currentPage, moleculeProvenances); moleculesRefresh.add(moleculesDataTable); } @@ -113,7 +113,7 @@ * @param moleculeProvenances molecules provenance list * @return data table component */ - public static DataTable<MoleculeProvenanceBean> initMoleculesListTable(final TemplatePage templatePage, + public static DataTable<MoleculeProvenanceBean, String> initMoleculesListTable(final TemplatePage templatePage, final String componentId, final CallerPage callerPage, List<MoleculeProvenanceBean> moleculeProvenances) { @@ -121,9 +121,9 @@ new SimpleSortableListDataProvider<MoleculeProvenanceBean>( moleculeProvenances, templatePage.getSession().getLocale()); - List<IColumn<MoleculeProvenanceBean>> columns = new ArrayList<IColumn<MoleculeProvenanceBean>>(); + List<IColumn<MoleculeProvenanceBean, String>> columns = new ArrayList<IColumn<MoleculeProvenanceBean, String>>(); - columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean>( + columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>( "images/read.png", templatePage.getString("Read"), templatePage.getString("Read")) { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { @@ -131,7 +131,7 @@ } }); - columns.add(new LinkPropertyColumn<MoleculeProvenanceBean>( + columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.idMolecule")), "idMolecule", "idMolecule") { @Override @@ -140,7 +140,7 @@ } }); - columns.add(new AbstractColumn<MoleculeProvenanceBean>( + columns.add(new AbstractColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.formuleDevMol"))) { public void populateItem(Item<ICellPopulator<MoleculeProvenanceBean>> cellItem, String componentId, IModel<MoleculeProvenanceBean> rowModel) { cellItem.add(new Label(componentId, "-") @@ -148,23 +148,23 @@ } }); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.nomCommun")), "molecule.nomCommun", "molecule.nomCommun")); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.familleChimique")), "molecule.familleChimique", "molecule.familleChimique")); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.formuleBrute")), "molecule.formuleBrute", "molecule.formuleBrute")); - columns.add(new DecimalPropertyColumn<MoleculeProvenanceBean>( + columns.add(new DecimalPropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.masseMolaire")), "molecule.masseMolaire", "molecule.masseMolaire", DecimalDisplFormat.SMALL, templatePage.getLocale())); - columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean>( + columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>( "images/attachment.png", templatePage.getString("Read"), templatePage.getString("Read")) { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, String componentId, IModel<MoleculeProvenanceBean> model) { @@ -177,23 +177,23 @@ } }); - columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean>( + columns.add(new BooleanPropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.nouvMolecul")), "molecule.nouvMolecul", "molecule.nouvMolecul", templatePage)); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.provenance.embranchement")), "lot.specimenRef.embranchement", "lot.specimenRef.embranchement")); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + 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>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.provenance.espece")), "lot.specimenRef.espece", "lot.specimenRef.espece")); - columns.add(new LinkPropertyColumn<MoleculeProvenanceBean>( + columns.add(new LinkPropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.provenance.lot.ref")), "lot.ref", "lot.ref") { @Override @@ -207,11 +207,11 @@ } }); - columns.add(new PropertyColumn<MoleculeProvenanceBean>( + columns.add(new PropertyColumn<MoleculeProvenanceBean, String>( new Model<String>(templatePage.getString("Molecule.provenance.programme")), "lot.campagne.programme", "lot.campagne.programme")); - columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean>( + columns.add(new LinkableImagePropertyColumn<MoleculeProvenanceBean, String>( "images/edit.png", templatePage.getString("Update"), templatePage.getString("Update")) { @Override public void onClick(Item<ICellPopulator<MoleculeProvenanceBean>> item, @@ -221,8 +221,8 @@ } }); - final DataTable<MoleculeProvenanceBean> moleculesDataTable = - new AjaxFallbackDefaultDataTable<MoleculeProvenanceBean>( + final DataTable<MoleculeProvenanceBean, String> moleculesDataTable = + new AjaxFallbackDefaultDataTable<MoleculeProvenanceBean, String>( componentId, columns, moleculesDataProvider, WebContext.ROWS_PER_PAGE); return moleculesDataTable; } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -614,9 +614,9 @@ SimpleSortableListDataProvider<Document> attachedDocumentsDataProvider = new SimpleSortableListDataProvider<Document>(documents, getSession().getLocale()); - List<IColumn<Document>> columns = new ArrayList<IColumn<Document>>(); + List<IColumn<Document, String>> columns = new ArrayList<IColumn<Document, String>>(); - columns.add(new LinkPropertyColumn<Document>( + columns.add(new LinkPropertyColumn<Document, String>( new Model<String>(getString("Document.titre")), "titre", "titre") { @Override public void onClick(Item<ICellPopulator<Document>> item, String componentId, IModel<Document> model) { @@ -624,13 +624,13 @@ } }); - columns.add(new PropertyColumn<Document>( + columns.add(new PropertyColumn<Document, String>( new Model<String>(getString("Document.typeDocument")), "typeDocument.nom", "typeDocument.nom")); - columns.add(new PropertyColumn<Document>( + columns.add(new PropertyColumn<Document, String>( new Model<String>(getString("Document.createur")), "createur", "createur")); - columns.add(new LinkableImagePropertyColumn<Document>(new Model<String>(getString("Document.link")), + columns.add(new LinkableImagePropertyColumn<Document, String>(new Model<String>(getString("Document.link")), "images/download.png", getString("Document.link"), getString("Document.link")) { @Override public void onClick(Item<ICellPopulator<Document>> item, String componentId, IModel<Document> model) { @@ -650,10 +650,10 @@ } }); - final DataTable<Document> attachedDocumentTable = new AjaxFallbackDefaultDataTable<Document>("ListDocumentsPage.AttachedDocuments", columns, + final DataTable<Document, String> attachedDocumentTable = new AjaxFallbackDefaultDataTable<Document, String>("ListDocumentsPage.AttachedDocuments", columns, attachedDocumentsDataProvider, WebContext.ROWS_PER_PAGE); - columns.add(new AjaxButtonPropertyColumn<Document>(new Model<String>(getString("Actions")), + columns.add(new AjaxButtonPropertyColumn<Document, String>(new Model<String>(getString("Actions")), new Model<String>(getString("Delete")), formView) { @Override public void onSubmit(AjaxRequestTarget target, Form<?> form, IModel<Document> model) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -307,9 +307,9 @@ new SimpleSortableListDataProvider<Document>( documents, getSession().getLocale()); - List<IColumn<Document>> columns = new ArrayList<IColumn<Document>>(); + List<IColumn<Document, String>> columns = new ArrayList<IColumn<Document, String>>(); - columns.add(new LinkPropertyColumn<Document>( + columns.add(new LinkPropertyColumn<Document, String>( new Model<String>(getString("Document.titre")), "titre", "titre") { @Override public void onClick(Item<ICellPopulator<Document>> item, String componentId, IModel<Document> model) { @@ -317,13 +317,13 @@ } }); - columns.add(new PropertyColumn<Document>( + columns.add(new PropertyColumn<Document, String>( new Model<String>(getString("Document.typeDocument")), "typeDocument.nom", "typeDocument.nom")); - columns.add(new PropertyColumn<Document>( + columns.add(new PropertyColumn<Document, String>( new Model<String>(getString("Document.createur")), "createur", "createur")); - columns.add(new LinkableImagePropertyColumn<Document>(new Model<String>(getString("Document.link")), + columns.add(new LinkableImagePropertyColumn<Document, String>(new Model<String>(getString("Document.link")), "images/download.png", getString("Document.link"), getString("Document.link")) { @Override public void onClick(Item<ICellPopulator<Document>> item, String componentId, IModel<Document> model) { @@ -343,7 +343,7 @@ } }); - final DataTable<Document> attachedDocumentTable = new AjaxFallbackDefaultDataTable<Document>("ListDocumentsPage.AttachedDocuments", columns, + final DataTable<Document, String> attachedDocumentTable = new AjaxFallbackDefaultDataTable<Document, String>("ListDocumentsPage.AttachedDocuments", columns, attachedDocumentsDataProvider, WebContext.ROWS_PER_PAGE); add(attachedDocumentTable); } 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/personne/ListPersonnesPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -103,9 +103,9 @@ final LoadableDetachableSortableListDataProvider<Personne> personnesDataProvider = new LoadableDetachableSortableListDataProvider<Personne>( personnes, getSession().getLocale()); - List<IColumn<Personne>> columns = new ArrayList<IColumn<Personne>>(); + List<IColumn<Personne, String>> columns = new ArrayList<IColumn<Personne, String>>(); - columns.add(new LinkableImagePropertyColumn<Personne>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Personne, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> model) { if (model.getObject() instanceof Utilisateur) { @@ -117,11 +117,11 @@ } }); - columns.add(new PropertyColumn<Personne>(new Model<String>(getString("Personne.nom")), "nom", "nom")); + columns.add(new PropertyColumn<Personne, String>(new Model<String>(getString("Personne.nom")), "nom", "nom")); - columns.add(new PropertyColumn<Personne>(new Model<String>(getString("Personne.prenom")), "prenom", "prenom")); + columns.add(new PropertyColumn<Personne, String>(new Model<String>(getString("Personne.prenom")), "prenom", "prenom")); - columns.add(new LinkPropertyColumn<Personne>(new Model<String>(getString("Personne.courriel")), "courriel", + columns.add(new LinkPropertyColumn<Personne, String>(new Model<String>(getString("Personne.courriel")), "courriel", "courriel", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> rowModel) { @@ -134,7 +134,7 @@ } }); - columns.add(new AbstractColumn<Personne>(new Model<String>(getString("Utilisateur.typeDroit"))) { + columns.add(new AbstractColumn<Personne, String>(new Model<String>(getString("Utilisateur.typeDroit"))) { @Override public void populateItem(Item<ICellPopulator<Personne>> item, String componentId, IModel<Personne> rowModel) { String typeDroit; @@ -149,7 +149,7 @@ } }); - columns.add(new LinkableImagePropertyColumn<Personne>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Personne, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @@ -178,7 +178,7 @@ } }); - final DataTable<Personne> personnesDataTable = new AjaxFallbackDefaultDataTable<Personne>( + final DataTable<Personne, String> personnesDataTable = new AjaxFallbackDefaultDataTable<Personne, String>( "ListPersonnesPage.Personnes", columns, personnesDataProvider, WebContext.ROWS_PER_PAGE); personnesRefresh.add(personnesDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/purification/ListPurificationsPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -96,9 +96,9 @@ LoadableDetachableSortableListDataProvider<Purification> purificationsDataProvider = new LoadableDetachableSortableListDataProvider<Purification>( purifications, getSession().getLocale()); - List<IColumn<Purification>> columns = new ArrayList<IColumn<Purification>>(); + List<IColumn<Purification, String>> columns = new ArrayList<IColumn<Purification, String>>(); - columns.add(new LinkableImagePropertyColumn<Purification>("images/read.png", getString("Read"), + columns.add(new LinkableImagePropertyColumn<Purification, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -106,7 +106,7 @@ } }); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Extraction.lot")), "lotSource", + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Extraction.lot")), "lotSource", "lotSource", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -114,7 +114,7 @@ } }); - columns.add(new LinkProduitPropertyColumn<Purification>( + columns.add(new LinkProduitPropertyColumn<Purification, String>( new Model<String>(getString("ResultatTestBio.produit")), "produit", "produit", (TemplatePage) getPage()) { @Override public void onClickIfExtrait(Extrait extrait) { @@ -127,7 +127,7 @@ } }); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Purification.ref")), "ref", + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Purification.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -135,13 +135,13 @@ } }); - columns.add(new ShortDatePropertyColumn<Purification>(new Model<String>(getString("Purification.date")), + columns.add(new ShortDatePropertyColumn<Purification, String>(new Model<String>(getString("Purification.date")), "date", "date", getLocale())); - columns.add(new PropertyColumn<Purification>(new Model<String>(getString("Purification.methode2")), "methode", + columns.add(new PropertyColumn<Purification, String>(new Model<String>(getString("Purification.methode2")), "methode", "methode")); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Campagne")), + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Campagne")), "lotSource.campagne", "lotSource.campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -150,7 +150,7 @@ } }); - columns.add(new LinkableImagePropertyColumn<Purification>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Purification, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -171,7 +171,7 @@ } }); - final DataTable<Purification> purificationsDataTable = new AjaxFallbackDefaultDataTable<Purification>( + final DataTable<Purification, String> purificationsDataTable = new AjaxFallbackDefaultDataTable<Purification, String>( "ListPurificationsPage.Purifications", columns, purificationsDataProvider, WebContext.ROWS_PER_PAGE); purificationsRefresh.add(purificationsDataTable); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -147,7 +147,7 @@ List<MoleculeProvenanceBean> moleculeProvenances = moleculeService.listMoleculeProvenances(molecules, utilisateur); // call static methods in ListXXXPage - DataTable<MoleculeProvenanceBean> moleculesDataTable = ListMoleculesPage.initMoleculesListTable(this, + DataTable<MoleculeProvenanceBean, String> moleculesDataTable = ListMoleculesPage.initMoleculesListTable(this, "SearchPage.Molecules.Results", currentPage, moleculeProvenances); add(moleculesDataTable); add(new CsvExportLink("SearchPage.Molecules.ExportCSV", moleculesDataTable, "molecules.csv")); @@ -171,16 +171,16 @@ protected void addSpecimensTable(final CallerPage currentPage, SearchResult searchResult) { // search result : specimens List<Specimen> specimens = searchResult.getSpecimens(); - List<IColumn<Specimen>> specimensColumns = new ArrayList<IColumn<Specimen>>(); + List<IColumn<Specimen, String>> specimensColumns = new ArrayList<IColumn<Specimen, String>>(); - specimensColumns.add(new LinkableImagePropertyColumn<Specimen>("images/read.png", getString("Read"), getString("Read")) { + specimensColumns.add(new LinkableImagePropertyColumn<Specimen, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { setResponsePage(new ReadSpecimenPage(model.getObject().getIdSpecimen(), currentPage)); } }); - specimensColumns.add(new LinkPropertyColumn<Specimen>(new Model<String>(getString("Specimen.ref")), "ref", "ref", + specimensColumns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { @@ -188,22 +188,22 @@ } }); - specimensColumns.add(new EnumPropertyColumn<Specimen>(new Model<String>(getString("Specimen.typeOrganisme")), + specimensColumns.add(new EnumPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.typeOrganisme")), "typeOrganisme", "typeOrganisme", SearchPage.this)); - specimensColumns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.embranchement")), + specimensColumns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.embranchement")), "embranchement", "embranchement")); - specimensColumns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.famille")), "famille", + specimensColumns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.famille")), "famille", "famille")); - specimensColumns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.genre")), "genre", + specimensColumns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.genre")), "genre", "genre")); - specimensColumns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.espece")), "espece", + specimensColumns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.espece")), "espece", "espece")); - specimensColumns.add(new LinkPropertyColumn<Specimen>(new Model<String>(getString("Specimen.station2")), "station", + specimensColumns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.station2")), "station", "station", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { @@ -212,7 +212,7 @@ }); LoadableDetachableSortableListDataProvider<Specimen> specimensDataProvider = new LoadableDetachableSortableListDataProvider<Specimen>( specimens, getSession().getLocale()); - final DataTable<Specimen> specimensDataTable = new DefaultDataTable<Specimen>(getResource() + ".Specimens.Results", + final DataTable<Specimen, String> specimensDataTable = new DefaultDataTable<Specimen, String>(getResource() + ".Specimens.Results", specimensColumns, specimensDataProvider, Integer.MAX_VALUE); add(specimensDataTable); add(new CsvExportLink("SearchPage.Specimens.ExportCSV", specimensDataTable, "specimens.csv")); @@ -227,16 +227,16 @@ protected void addLotsTable(final CallerPage currentPage, SearchResult searchResult) { // search result : lots List<Lot> lots = searchResult.getLots(); - List<IColumn<Lot>> lotsColumns = new ArrayList<IColumn<Lot>>(); + List<IColumn<Lot, String>> lotsColumns = new ArrayList<IColumn<Lot, String>>(); - lotsColumns.add(new LinkableImagePropertyColumn<Lot>("images/read.png", getString("Read"), getString("Read")) { + lotsColumns.add(new LinkableImagePropertyColumn<Lot, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { setResponsePage(new ReadLotPage(model.getObject().getIdLot(), currentPage)); } }); - lotsColumns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.ref")), "ref", "ref", + lotsColumns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -244,10 +244,10 @@ } }); - lotsColumns.add(new ExportablePropertyColumn<Lot>(new Model<String>(getString("Lot.dateRecolte2")), "dateRecolte", + lotsColumns.add(new ExportablePropertyColumn<Lot, String>(new Model<String>(getString("Lot.dateRecolte2")), "dateRecolte", "dateRecolte")); - lotsColumns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.station")), "station", "station", + lotsColumns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.station")), "station", "station", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -255,7 +255,7 @@ } }); - lotsColumns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.specimenRef2")), "specimenRef", + lotsColumns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.specimenRef2")), "specimenRef", "specimenRef", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -263,30 +263,30 @@ } }); - lotsColumns.add(new EnumPropertyColumn<Lot>(new Model<String>(getString("Specimen.typeOrganisme")), + lotsColumns.add(new EnumPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.typeOrganisme")), "specimenRef.typeOrganisme", "specimenRef.typeOrganisme", SearchPage.this)); - lotsColumns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.embranchement")), + lotsColumns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.embranchement")), "specimenRef.embranchement", "specimenRef.embranchement")); - lotsColumns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.famille")), + lotsColumns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.famille")), "specimenRef.famille", "specimenRef.famille")); - lotsColumns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.genre")), + lotsColumns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.genre")), "specimenRef.genre", "specimenRef.genre")); - lotsColumns.add(new TaxonomyPropertyColumn<Lot>(new Model<String>(getString("Specimen.espece")), + lotsColumns.add(new TaxonomyPropertyColumn<Lot, String>(new Model<String>(getString("Specimen.espece")), "specimenRef.espece", "specimenRef.espece")); - lotsColumns.add(new ExportablePropertyColumn<Lot>(new Model<String>(getString("Lot.partie")), "partie", "partie")); + lotsColumns.add(new ExportablePropertyColumn<Lot, String>(new Model<String>(getString("Lot.partie")), "partie", "partie")); - lotsColumns.add(new DecimalPropertyColumn<Lot>(new Model<String>(getString("Lot.masseFraiche2")), "masseFraiche", + lotsColumns.add(new DecimalPropertyColumn<Lot, String>(new Model<String>(getString("Lot.masseFraiche2")), "masseFraiche", "masseFraiche", DecimalDisplFormat.SMALL, getLocale())); - lotsColumns.add(new DecimalPropertyColumn<Lot>(new Model<String>(getString("Lot.masseSeche2")), "masseSeche", + lotsColumns.add(new DecimalPropertyColumn<Lot, String>(new Model<String>(getString("Lot.masseSeche2")), "masseSeche", "masseSeche", DecimalDisplFormat.SMALL, getLocale())); - lotsColumns.add(new LinkPropertyColumn<Lot>(new Model<String>(getString("Lot.campagne")), "campagne", "campagne", + lotsColumns.add(new LinkPropertyColumn<Lot, String>(new Model<String>(getString("Lot.campagne")), "campagne", "campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Lot>> item, String componentId, IModel<Lot> model) { @@ -294,12 +294,12 @@ } }); - lotsColumns.add(new MapValuePropertyColumn<Lot, String>(new Model<String>(getString("Campagne.codePays")), + lotsColumns.add(new MapValuePropertyColumn<Lot, String, String>(new Model<String>(getString("Campagne.codePays")), "campagne.codePays", "campagne.codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); LoadableDetachableSortableListDataProvider<Lot> lotsDataProvider = new LoadableDetachableSortableListDataProvider<Lot>( lots, getSession().getLocale()); - final DataTable<Lot> lotsDataTable = new DefaultDataTable<Lot>(getResource() + ".Lots.Results", lotsColumns, + final DataTable<Lot, String> lotsDataTable = new DefaultDataTable<Lot, String>(getResource() + ".Lots.Results", lotsColumns, lotsDataProvider, Integer.MAX_VALUE); add(lotsDataTable); add(new CsvExportLink("SearchPage.Lots.ExportCSV", lotsDataTable, "lots.csv")); @@ -315,16 +315,16 @@ // search result : extractions List<Extraction> extractions = searchResult.getExtractions(); - List<IColumn<Extraction>> extractionsColumns = new ArrayList<IColumn<Extraction>>(); + List<IColumn<Extraction, String>> extractionsColumns = new ArrayList<IColumn<Extraction, String>>(); - extractionsColumns.add(new LinkableImagePropertyColumn<Extraction>("images/read.png", getString("Read"), getString("Read")) { + extractionsColumns.add(new LinkableImagePropertyColumn<Extraction, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { setResponsePage(new ReadExtractionPage(model.getObject().getIdExtraction(), currentPage)); } }); - extractionsColumns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Extraction.lot")), "lot", "lot", + extractionsColumns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.lot")), "lot", "lot", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -332,7 +332,7 @@ } }); - extractionsColumns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Extraction.ref")), "ref", "ref", + extractionsColumns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -340,16 +340,16 @@ } }); - extractionsColumns.add(new ShortDatePropertyColumn<Extraction>(new Model<String>(getString("Extraction.date")), "date", + extractionsColumns.add(new ShortDatePropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.date")), "date", "date", getLocale())); - extractionsColumns.add(new ExportablePropertyColumn<Extraction>(new Model<String>(getString("Extraction.methode2")), "methode", + extractionsColumns.add(new ExportablePropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.methode2")), "methode", "methode")); - extractionsColumns.add(new DecimalPropertyColumn<Extraction>(new Model<String>(getString("Extraction.masseDepart2")), + extractionsColumns.add(new DecimalPropertyColumn<Extraction, String>(new Model<String>(getString("Extraction.masseDepart2")), "masseDepart", "masseDepart", DecimalDisplFormat.SMALL, getLocale())); - extractionsColumns.add(new LinkPropertyColumn<Extraction>(new Model<String>(getString("Campagne")), "lot.campagne", + extractionsColumns.add(new LinkPropertyColumn<Extraction, String>(new Model<String>(getString("Campagne")), "lot.campagne", "lot.campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Extraction>> item, String componentId, IModel<Extraction> model) { @@ -358,7 +358,7 @@ } }); - extractionsColumns.add(new AbstractColumn<Extraction>(new Model<String>(getString("Extraction.extraits"))) { + extractionsColumns.add(new AbstractColumn<Extraction, String>(new Model<String>(getString("Extraction.extraits"))) { @Override public void populateItem(Item<ICellPopulator<Extraction>> cellItem, String componentId, IModel<Extraction> rowModel) { @@ -399,7 +399,7 @@ LoadableDetachableSortableListDataProvider<Extraction> extractionsDataProvider = new LoadableDetachableSortableListDataProvider<Extraction>( extractions, getSession().getLocale()); - final DataTable<Extraction> extractionsDataTable = new DefaultDataTable<Extraction>( + final DataTable<Extraction, String> extractionsDataTable = new DefaultDataTable<Extraction, String>( getResource() + ".Extractions.Results", extractionsColumns, extractionsDataProvider, Integer.MAX_VALUE); add(extractionsDataTable); add(new CsvExportLink("SearchPage.Extractions.ExportCSV", extractionsDataTable, "extractions.csv")); @@ -416,9 +416,9 @@ LoadableDetachableSortableListDataProvider<Purification> purificationsDataProvider = new LoadableDetachableSortableListDataProvider<Purification>( purifications, getSession().getLocale()); - List<IColumn<Purification>> columns = new ArrayList<IColumn<Purification>>(); + List<IColumn<Purification, String>> columns = new ArrayList<IColumn<Purification, String>>(); - columns.add(new LinkableImagePropertyColumn<Purification>("images/read.png", getString("Read"), + columns.add(new LinkableImagePropertyColumn<Purification, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -426,7 +426,7 @@ } }); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Extraction.lot")), "lotSource", + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Extraction.lot")), "lotSource", "lotSource", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -434,7 +434,7 @@ } }); - columns.add(new LinkProduitPropertyColumn<Purification>( + columns.add(new LinkProduitPropertyColumn<Purification, String>( new Model<String>(getString("ResultatTestBio.produit")), "produit", "produit", (TemplatePage) getPage()) { @Override public void onClickIfExtrait(Extrait extrait) { @@ -447,7 +447,7 @@ } }); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Purification.ref")), "ref", + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Purification.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -455,13 +455,13 @@ } }); - columns.add(new ShortDatePropertyColumn<Purification>(new Model<String>(getString("Purification.date")), + columns.add(new ShortDatePropertyColumn<Purification, String>(new Model<String>(getString("Purification.date")), "date", "date", getLocale())); - columns.add(new ExportablePropertyColumn<Purification>(new Model<String>(getString("Purification.methode2")), "methode", + columns.add(new ExportablePropertyColumn<Purification, String>(new Model<String>(getString("Purification.methode2")), "methode", "methode")); - columns.add(new LinkPropertyColumn<Purification>(new Model<String>(getString("Campagne")), + columns.add(new LinkPropertyColumn<Purification, String>(new Model<String>(getString("Campagne")), "lotSource.campagne", "lotSource.campagne", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Purification>> item, String componentId, IModel<Purification> model) { @@ -470,7 +470,7 @@ } }); - final DataTable<Purification> purificationsDataTable = new DefaultDataTable<Purification>( + final DataTable<Purification, String> purificationsDataTable = new DefaultDataTable<Purification, String>( getResource() + ".Purifications.Results", columns, purificationsDataProvider, Integer.MAX_VALUE); add(purificationsDataTable); add(new CsvExportLink("SearchPage.Purifications.ExportCSV", purificationsDataTable, "purifications.csv")); @@ -487,9 +487,9 @@ LoadableDetachableSortableListDataProvider<ResultatTestBio> resTestBiosDataProvider = new LoadableDetachableSortableListDataProvider<ResultatTestBio>( resultatTestBios, getSession().getLocale()); - List<IColumn<ResultatTestBio>> columns = new ArrayList<IColumn<ResultatTestBio>>(); + List<IColumn<ResultatTestBio, String>> columns = new ArrayList<IColumn<ResultatTestBio, String>>(); - columns.add(new LinkableImagePropertyColumn<ResultatTestBio>("images/read.png", getString("Read"), + columns.add(new LinkableImagePropertyColumn<ResultatTestBio, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, @@ -498,17 +498,17 @@ } }); - columns.add(new ExportableTextFilteredPropertyColumn<ResultatTestBio, String>(new Model<String>( + columns.add(new ExportableTextFilteredPropertyColumn<ResultatTestBio, String, String>(new Model<String>( getString("MethodeTestBio.cible2")), "testBio.methode.cible", "testBio.methode.cible")); - columns.add(new DecimalPropertyColumn<ResultatTestBio>(new Model<String>( + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>( getString("ResultatTestBio.concMasse2")), "concMasse", "concMasse", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new EnumPropertyColumn<ResultatTestBio>(new Model<String>(getString("TestBio.uniteConcMasse2")), + columns.add(new EnumPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("TestBio.uniteConcMasse2")), "uniteConcMasse", "uniteConcMasse", (TemplatePage) getPage())); - columns.add(new LinkProduitPropertyColumn<ResultatTestBio>(new Model<String>( + columns.add(new LinkProduitPropertyColumn<ResultatTestBio, String>(new Model<String>( getString("ResultatTestBio.produit")), "produit", "produit", (TemplatePage) getPage()) { @Override public void onClickIfExtrait(Extrait extrait) { @@ -521,35 +521,35 @@ } }); - columns.add(new DecimalPropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.valeur")), + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.valeur")), "valeur", "valeur", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new ExportablePropertyColumn<ResultatTestBio>(new Model<String>(getString("MethodeTestBio.uniteResultat2")), + columns.add(new ExportablePropertyColumn<ResultatTestBio, String>(new Model<String>(getString("MethodeTestBio.uniteResultat2")), "testBio.methode.uniteResultat", "testBio.methode.uniteResultat")); - columns.add(new ExportablePropertyColumn<ResultatTestBio>(new Model<String>(getString("Extrait.typeExtrait2")), + columns.add(new ExportablePropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Extrait.typeExtrait2")), "typeExtraitSource", "typeExtraitSource")); - columns.add(new BooleanPropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.actif")), + columns.add(new BooleanPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.actif")), "actif", "actif", (TemplatePage) getPage())); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.famille")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.famille")), "lotSource.specimenRef.famille", "lotSource.specimenRef.famille")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.genre")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.genre")), "lotSource.specimenRef.genre", "lotSource.specimenRef.genre")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.espece")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.espece")), "lotSource.specimenRef.espece", "lotSource.specimenRef.espece")); - columns.add(new MapValuePropertyColumn<ResultatTestBio, String>(new Model<String>( + columns.add(new MapValuePropertyColumn<ResultatTestBio, String, String>(new Model<String>( getString("Campagne.codePays")), "lotSource.campagne.codePays", "lotSource.campagne.codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new ExportablePropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.repere")), + columns.add(new ExportablePropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.repere")), "repere", "repere")); - columns.add(new LinkPropertyColumn<ResultatTestBio>(new Model<String>(getString("TestBio.ref")), "testBio.ref", + columns.add(new LinkPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("TestBio.ref")), "testBio.ref", "testBio.ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, @@ -558,7 +558,7 @@ } }); - final DataTable<ResultatTestBio> resTestBiosDataTable = new DefaultDataTable<ResultatTestBio>( + final DataTable<ResultatTestBio, String> resTestBiosDataTable = new DefaultDataTable<ResultatTestBio, String>( getResource() + ".ResultatTestBios.Results", columns, resTestBiosDataProvider, Integer.MAX_VALUE); add(resTestBiosDataTable); @@ -580,16 +580,16 @@ LoadableDetachableSortableListDataProvider<Station> stationsDataProvider = new LoadableDetachableSortableListDataProvider<Station>( stations, getSession().getLocale()); - List<IColumn<Station>> columns = new ArrayList<IColumn<Station>>(); + List<IColumn<Station, String>> columns = new ArrayList<IColumn<Station, String>>(); - columns.add(new LinkableImagePropertyColumn<Station>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Station, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { setResponsePage(new ReadStationPage(model.getObject().getIdStation(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Station>(new Model<String>(getString("Station.nom")), "nom", "nom", + columns.add(new LinkPropertyColumn<Station, String>(new Model<String>(getString("Station.nom")), "nom", "nom", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { @@ -597,20 +597,20 @@ } }); - columns.add(new MapValuePropertyColumn<Station, String>(new Model<String>(getString("Station.codePays")), + columns.add(new MapValuePropertyColumn<Station, String, String>(new Model<String>(getString("Station.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new ExportablePropertyColumn<Station>(new Model<String>(getString("Station.localite")), "localite", + columns.add(new ExportablePropertyColumn<Station, String>(new Model<String>(getString("Station.localite")), "localite", "localite")); - columns.add(new ExportablePropertyColumn<Station>(new Model<String>(getString("Station.latitude")), "latitude", + columns.add(new ExportablePropertyColumn<Station, String>(new Model<String>(getString("Station.latitude")), "latitude", "latitude")); - columns.add(new ExportablePropertyColumn<Station>(new Model<String>(getString("Station.longitude")), "longitude", + columns.add(new ExportablePropertyColumn<Station, String>(new Model<String>(getString("Station.longitude")), "longitude", "longitude")); - final DataTable<Station> stationsDataTable = new AjaxFallbackDefaultDataTable<Station>( + final DataTable<Station, String> stationsDataTable = new AjaxFallbackDefaultDataTable<Station, String>( getResource() + ".Stations.Results", columns, stationsDataProvider, WebContext.ROWS_PER_PAGE); add(stationsDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -91,16 +91,16 @@ LoadableDetachableSortableListDataProvider<Specimen> specimensDataProvider = new LoadableDetachableSortableListDataProvider<Specimen>( specimens, getSession().getLocale()); - List<IColumn<Specimen>> columns = new ArrayList<IColumn<Specimen>>(); + List<IColumn<Specimen, String>> columns = new ArrayList<IColumn<Specimen, String>>(); - columns.add(new LinkableImagePropertyColumn<Specimen>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Specimen, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { setResponsePage(new ReadSpecimenPage(model.getObject().getIdSpecimen(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Specimen>(new Model<String>(getString("Specimen.ref")), "ref", "ref", + columns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.ref")), "ref", "ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { @@ -108,22 +108,22 @@ } }); - columns.add(new EnumPropertyColumn<Specimen>(new Model<String>(getString("Specimen.typeOrganisme")), + columns.add(new EnumPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.typeOrganisme")), "typeOrganisme", "typeOrganisme", ListSpecimensPage.this)); - columns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.embranchement")), + columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.embranchement")), "embranchement", "embranchement")); - columns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.famille")), "famille", + columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.famille")), "famille", "famille")); - columns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.genre")), "genre", + columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.genre")), "genre", "genre")); - columns.add(new TaxonomyPropertyColumn<Specimen>(new Model<String>(getString("Specimen.espece")), "espece", + columns.add(new TaxonomyPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.espece")), "espece", "espece")); - columns.add(new LinkPropertyColumn<Specimen>(new Model<String>(getString("Specimen.station2")), "station", + columns.add(new LinkPropertyColumn<Specimen, String>(new Model<String>(getString("Specimen.station2")), "station", "station", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Specimen>> item, String componentId, IModel<Specimen> model) { @@ -131,7 +131,7 @@ } }); - columns.add(new LinkableImagePropertyColumn<Specimen>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Specimen, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -154,7 +154,7 @@ } }); - final DataTable<Specimen> specimensDataTable = new AjaxFallbackDefaultDataTable<Specimen>( + final DataTable<Specimen, String> specimensDataTable = new AjaxFallbackDefaultDataTable<Specimen, String>( "ListSpecimensPage.Specimens", columns, specimensDataProvider, WebContext.ROWS_PER_PAGE); specimensRefresh.add(specimensDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/station/ListStationsPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -91,16 +91,16 @@ LoadableDetachableSortableListDataProvider<Station> stationsDataProvider = new LoadableDetachableSortableListDataProvider<Station>( stations, getSession().getLocale()); - List<IColumn<Station>> columns = new ArrayList<IColumn<Station>>(); + List<IColumn<Station, String>> columns = new ArrayList<IColumn<Station, String>>(); - columns.add(new LinkableImagePropertyColumn<Station>("images/read.png", getString("Read"), getString("Read")) { + columns.add(new LinkableImagePropertyColumn<Station, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { setResponsePage(new ReadStationPage(model.getObject().getIdStation(), currentPage)); } }); - columns.add(new LinkPropertyColumn<Station>(new Model<String>(getString("Station.nom")), "nom", "nom", + columns.add(new LinkPropertyColumn<Station, String>(new Model<String>(getString("Station.nom")), "nom", "nom", getString("Read")) { @Override public void onClick(Item<ICellPopulator<Station>> item, String componentId, IModel<Station> model) { @@ -108,19 +108,19 @@ } }); - columns.add(new MapValuePropertyColumn<Station, String>(new Model<String>(getString("Station.codePays")), + columns.add(new MapValuePropertyColumn<Station, String, String>(new Model<String>(getString("Station.codePays")), "codePays", "codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new PropertyColumn<Station>(new Model<String>(getString("Station.localite")), "localite", + columns.add(new PropertyColumn<Station, String>(new Model<String>(getString("Station.localite")), "localite", "localite")); - columns.add(new PropertyColumn<Station>(new Model<String>(getString("Station.latitude")), "latitude", + columns.add(new PropertyColumn<Station, String>(new Model<String>(getString("Station.latitude")), "latitude", "latitude")); - columns.add(new PropertyColumn<Station>(new Model<String>(getString("Station.longitude")), "longitude", + columns.add(new PropertyColumn<Station, String>(new Model<String>(getString("Station.longitude")), "longitude", "longitude")); - columns.add(new LinkableImagePropertyColumn<Station>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<Station, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -143,7 +143,7 @@ } }); - final DataTable<Station> stationsDataTable = new AjaxFallbackDefaultDataTable<Station>( + final DataTable<Station, String> stationsDataTable = new AjaxFallbackDefaultDataTable<Station, String>( "ListStationsPage.Stations", columns, stationsDataProvider, WebContext.ROWS_PER_PAGE); stationsRefresh.add(stationsDataTable); 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/testBio/ListTestsBioPage.java 2013-02-14 16:39:05 UTC (rev 109) @@ -100,9 +100,9 @@ LoadableDetachableSortableListDataProvider<ResultatTestBio> resTestBiosDataProvider = new LoadableDetachableSortableListDataProvider<ResultatTestBio>( resTestsBios, getSession().getLocale()); - List<IColumn<ResultatTestBio>> columns = new ArrayList<IColumn<ResultatTestBio>>(); + List<IColumn<ResultatTestBio, String>> columns = new ArrayList<IColumn<ResultatTestBio, String>>(); - columns.add(new LinkableImagePropertyColumn<ResultatTestBio>("images/read.png", getString("Read"), + columns.add(new LinkableImagePropertyColumn<ResultatTestBio, String>("images/read.png", getString("Read"), getString("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, @@ -111,17 +111,17 @@ } }); - columns.add(new TextFilteredPropertyColumn<ResultatTestBio, String>(new Model<String>( + columns.add(new TextFilteredPropertyColumn<ResultatTestBio, String, String>(new Model<String>( getString("MethodeTestBio.cible2")), "testBio.methode.cible", "testBio.methode.cible")); - columns.add(new DecimalPropertyColumn<ResultatTestBio>(new Model<String>( + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>( getString("ResultatTestBio.concMasse2")), "concMasse", "concMasse", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new EnumPropertyColumn<ResultatTestBio>(new Model<String>(getString("TestBio.uniteConcMasse2")), + columns.add(new EnumPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("TestBio.uniteConcMasse2")), "uniteConcMasse", "uniteConcMasse", (TemplatePage) getPage())); - columns.add(new LinkProduitPropertyColumn<ResultatTestBio>(new Model<String>( + columns.add(new LinkProduitPropertyColumn<ResultatTestBio, String>(new Model<String>( getString("ResultatTestBio.produit")), "produit", "produit", (TemplatePage) getPage()) { @Override public void onClickIfExtrait(Extrait extrait) { @@ -134,35 +134,35 @@ } }); - columns.add(new DecimalPropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.valeur")), + columns.add(new DecimalPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.valeur")), "valeur", "valeur", DecimalDisplFormat.SMALL, getLocale())); - columns.add(new PropertyColumn<ResultatTestBio>(new Model<String>(getString("MethodeTestBio.uniteResultat2")), + columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(getString("MethodeTestBio.uniteResultat2")), "testBio.methode.uniteResultat", "testBio.methode.uniteResultat")); - columns.add(new PropertyColumn<ResultatTestBio>(new Model<String>(getString("Extrait.typeExtrait2")), + columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Extrait.typeExtrait2")), "typeExtraitSource", "typeExtraitSource")); - columns.add(new BooleanPropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.actif")), + columns.add(new BooleanPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.actif")), "actif", "actif", (TemplatePage) getPage())); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.famille")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.famille")), "lotSource.specimenRef.famille", "lotSource.specimenRef.famille")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.genre")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.genre")), "lotSource.specimenRef.genre", "lotSource.specimenRef.genre")); - columns.add(new TaxonomyPropertyColumn<ResultatTestBio>(new Model<String>(getString("Specimen.espece")), + columns.add(new TaxonomyPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("Specimen.espece")), "lotSource.specimenRef.espece", "lotSource.specimenRef.espece")); - columns.add(new MapValuePropertyColumn<ResultatTestBio, String>(new Model<String>( + columns.add(new MapValuePropertyColumn<ResultatTestBio, String, String>(new Model<String>( getString("Campagne.codePays")), "lotSource.campagne.codePays", "lotSource.campagne.codePays", WebContext.COUNTRIES.get(getSession().getLocale()))); - columns.add(new PropertyColumn<ResultatTestBio>(new Model<String>(getString("ResultatTestBio.repere")), + columns.add(new PropertyColumn<ResultatTestBio, String>(new Model<String>(getString("ResultatTestBio.repere")), "repere", "repere")); - columns.add(new LinkPropertyColumn<ResultatTestBio>(new Model<String>(getString("TestBio.ref")), "testBio.ref", + columns.add(new LinkPropertyColumn<ResultatTestBio, String>(new Model<String>(getString("TestBio.ref")), "testBio.ref", "testBio.ref", getString("Read")) { @Override public void onClick(Item<ICellPopulator<ResultatTestBio>> item, String componentId, @@ -171,7 +171,7 @@ } }); - columns.add(new LinkableImagePropertyColumn<ResultatTestBio>("images/edit.png", getString("Update"), + columns.add(new LinkableImagePropertyColumn<ResultatTestBio, String>("images/edit.png", getString("Update"), getString("Update")) { // pas de lien d'édition si l'utilisateur n'a pas les droits @Override @@ -193,7 +193,7 @@ } }); - final DataTable<ResultatTestBio> resTestBiosDataTable = new AjaxFallbackDefaultDataTable<ResultatTestBio>( + final DataTable<ResultatTestBio, String> resTestBiosDataTable = new AjaxFallbackDefaultDataTable<ResultatTestBio, String>( "ListTestsBioPage.ResultatsTestsBio", columns, resTestBiosDataProvider, WebContext.ROWS_PER_PAGE); // DRAFT FOR FILTER TABLE Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeEditorBehavior.java 2013-02-14 16:39:05 UTC (rev 109) @@ -22,12 +22,18 @@ */ package nc.ird.cantharella.web.utils.behaviors; +import nc.ird.cantharella.web.pages.HomePage; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; -import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.core.util.string.JavaScriptUtils; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.model.IModel; import org.apache.wicket.request.Response; -import org.apache.wicket.util.string.JavaScriptUtils; +import org.apache.wicket.request.resource.CssResourceReference; +import org.apache.wicket.request.resource.JavaScriptResourceReference; /** * Permet d'ajouter la formule dans un attribut formula. L'attribut est ensuite @@ -61,14 +67,14 @@ /** {@inheritDoc} */ @Override public void renderHead(Component component, IHeaderResponse response) { - response.renderCSSReference("ChemDoodleWeb/css/ChemDoodleWeb.css"); - response.renderCSSReference("ChemDoodleWeb/css/jquery-ui-1.9.2.custom.css"); - response.renderJavaScriptReference("js/jquery-1.9.1.min.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/ChemDoodleWeb-libs.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/ChemDoodleWeb.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/jquery-ui-1.9.2.custom.min.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/ChemDoodleWeb-sketcher.js"); - response.renderJavaScriptReference("js/moleditor.js"); + response.render(CssHeaderItem.forUrl("ChemDoodleWeb/css/ChemDoodleWeb.css")); + response.render(CssHeaderItem.forUrl("ChemDoodleWeb/css/jquery-ui-1.9.2.custom.css")); + response.render(JavaScriptHeaderItem.forUrl("js/jquery-1.9.1.min.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/ChemDoodleWeb-libs.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/ChemDoodleWeb.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/jquery-ui-1.9.2.custom.min.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/ChemDoodleWeb-sketcher.js")); + response.render(JavaScriptHeaderItem.forUrl("js/moleditor.js")); } /** {@inheritDoc} */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/behaviors/MoleculeViewBehavior.java 2013-02-14 16:39:05 UTC (rev 109) @@ -22,12 +22,18 @@ */ package nc.ird.cantharella.web.utils.behaviors; +import nc.ird.cantharella.web.pages.HomePage; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; -import org.apache.wicket.markup.html.IHeaderResponse; +import org.apache.wicket.core.util.string.JavaScriptUtils; +import org.apache.wicket.markup.head.CssHeaderItem; +import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.model.IModel; import org.apache.wicket.request.Response; -import org.apache.wicket.util.string.JavaScriptUtils; +import org.apache.wicket.request.resource.CssResourceReference; +import org.apache.wicket.request.resource.JavaScriptResourceReference; /** * Permet d'ajouter la formule dans un attribut formula. L'attribut est ensuite @@ -80,11 +86,11 @@ /** {@inheritDoc} */ @Override public void renderHead(Component component, IHeaderResponse response) { - response.renderCSSReference("ChemDoodleWeb/css/ChemDoodleWeb.css"); - response.renderJavaScriptReference("js/jquery-1.9.1.min.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/ChemDoodleWeb-libs.js"); - response.renderJavaScriptReference("ChemDoodleWeb/js/ChemDoodleWeb.js"); - response.renderJavaScriptReference("js/molviewer.js"); + response.render(CssHeaderItem.forUrl("ChemDoodleWeb/css/ChemDoodleWeb.css")); + response.render(JavaScriptHeaderItem.forUrl("js/jquery-1.9.1.min.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/ChemDoodleWeb-libs.js")); + response.render(JavaScriptHeaderItem.forUrl("ChemDoodleWeb/js/ChemDoodleWeb.js")); + response.render(JavaScriptHeaderItem.forUrl("js/molviewer.js")); } /** {@inheritDoc} */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/AjaxButtonPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/AjaxButtonPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/AjaxButtonPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -36,8 +36,9 @@ * Column embeded in a datatable which represent an linkable image * @author Adrien Cheype * @param <T> Generic type + * @param <S> the type of the sort property */ -abstract public class AjaxButtonPropertyColumn<T> extends AbstractColumn<T> { +abstract public class AjaxButtonPropertyColumn<T, S> extends AbstractColumn<T, S> { /** Title displayed for the button */ private Model<String> buttonLabel; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/BooleanPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -36,8 +36,9 @@ * PropertyColumn which display booleans * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property */ -public class BooleanPropertyColumn<T> extends AbstractColumn<T> implements ExportableColumn<T> { +public class BooleanPropertyColumn<T, S> extends AbstractColumn<T, S> implements ExportableColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -52,7 +53,7 @@ * @param propertyExpression Wicket property expression * @param page Page used to get True, False message */ - public BooleanPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public BooleanPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, TemplatePage page) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/DecimalPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -38,8 +38,9 @@ * PropertyColumn which display numbers with decimal format * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property */ -public class DecimalPropertyColumn<T> extends AbstractColumn<T> implements ExportableColumn<T> { +public class DecimalPropertyColumn<T, S> extends AbstractColumn<T, S> implements ExportableColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -58,7 +59,7 @@ * @param format format to display * @param locale Locale used to format decimal */ - public DecimalPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public DecimalPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, DecimalDisplFormat format, Locale locale) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/EnumPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -36,8 +36,9 @@ * PropertyColumns which display corresponding messages for enum values * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property */ -public class EnumPropertyColumn<T> extends AbstractColumn<T> implements ExportableColumn<T> { +public class EnumPropertyColumn<T, S> extends AbstractColumn<T, S> implements ExportableColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -52,7 +53,7 @@ * @param propertyExpression Wicket property expression * @param page Page used to get enum messages */ - public EnumPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public EnumPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, TemplatePage page) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -30,8 +30,9 @@ * @author echatellier * * @param <T> + * @param <S> the type of the sort property */ -public interface ExportableColumn<T> extends IColumn<T> { +public interface ExportableColumn<T, S> extends IColumn<T, S> { /** Export column name. */ String getHeaderName(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportablePropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -32,9 +32,10 @@ * @author echatellier * * @param <T> + * @param <S> the type of the sort property */ -public class ExportablePropertyColumn<T> extends PropertyColumn<T> implements - ExportableColumn<T> { +public class ExportablePropertyColumn<T, S> extends PropertyColumn<T, S> implements + ExportableColumn<T, S> { /** * Constructor. @@ -43,7 +44,7 @@ * @param sortProperty wicket sort property * @param propertyExpression wicket sort expression */ - public ExportablePropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression) { + public ExportablePropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression) { super(displayModel, sortProperty, propertyExpression); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ExportableTextFilteredPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -33,8 +33,9 @@ * * @param <T> * @param <F> + * @param <S> the type of the sort property */ -public class ExportableTextFilteredPropertyColumn<T, F> extends TextFilteredPropertyColumn<T, F> implements ExportableColumn<T> { +public class ExportableTextFilteredPropertyColumn<T, F, S> extends TextFilteredPropertyColumn<T, F, S> implements ExportableColumn<T, S> { /** * Constructor. @@ -44,7 +45,7 @@ * @param propertyExpression wicket sort expression */ public ExportableTextFilteredPropertyColumn(IModel<String> displayModel, - String sortProperty, String propertyExpression) { + S sortProperty, String propertyExpression) { super(displayModel, sortProperty, propertyExpression); } 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -38,8 +38,9 @@ * Column embeded in a datatable which represent a link code from * https://cwiki.apache.org/WICKET/adding-links-in-a-defaultdatatable.html * @param <T> Generic type + * @param <S> the type of the sort property */ -abstract public class LinkPropertyColumn<T> extends PropertyColumn<T> implements ExportableColumn<T>{ +abstract public class LinkPropertyColumn<T, S> extends PropertyColumn<T, S> implements ExportableColumn<T, S>{ /** Popup settings */ private PopupSettings popupSettings; @@ -57,7 +58,7 @@ * @param propertyExpression Property expression * @param popupSettings Popup setting */ - public LinkPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, PopupSettings popupSettings) { this(displayModel, sortProperty, propertyExpression); this.popupSettings = popupSettings; @@ -70,7 +71,7 @@ * @param propertyExpression Property expression * @param linkTitle Title displayed for the link */ - public LinkPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, String linkTitle) { this(displayModel, sortProperty, propertyExpression); this.linkTitle = linkTitle; @@ -84,7 +85,7 @@ * @param linkTitle Title displayed for the link * @param popupSettings Popup setting */ - public LinkPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, String linkTitle, PopupSettings popupSettings) { this(displayModel, sortProperty, propertyExpression); this.linkTitle = linkTitle; @@ -107,7 +108,7 @@ * @param sortProperty Sort property * @param propertyExpression Property expression */ - public LinkPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression) { + public LinkPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression) { super(displayModel, sortProperty, propertyExpression); } 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/LinkableImagePropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -36,8 +36,9 @@ * Column embeded in a datatable which represent an linkable image * @author Adrien Cheype * @param <T> Generic type + * @param <S> the type of the sort property */ -abstract public class LinkableImagePropertyColumn<T> extends AbstractColumn<T> { +abstract public class LinkableImagePropertyColumn<T, S> extends AbstractColumn<T, S> { /** Relative url for the image */ private String imageSrc; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/MapValuePropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -37,9 +37,10 @@ * PropertyColumn which display string resulting values of applying model value on a map. * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property * @param <U> Type of the map key. The map is thus parametred by <U, String> */ -public class MapValuePropertyColumn<T, U> extends AbstractColumn<T> implements ExportableColumn<T> { +public class MapValuePropertyColumn<T, S, U> extends AbstractColumn<T, S> implements ExportableColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -54,7 +55,7 @@ * @param propertyExpression Wicket property expression * @param map Applying map */ - public MapValuePropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public MapValuePropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, Map<U, String> map) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/PercentPropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -36,8 +36,9 @@ * PropertyColumns which display numbers with percent format * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property */ -public class PercentPropertyColumn<T> extends AbstractColumn<T> { +public class PercentPropertyColumn<T, S> extends AbstractColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -52,7 +53,7 @@ * @param propertyExpression Wicket property expression * @param locale Locale used to format decimal */ - public PercentPropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public PercentPropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, Locale locale) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/ShortDatePropertyColumn.java 2013-02-14 16:39:05 UTC (rev 109) @@ -37,8 +37,9 @@ * PropertyColumns which display dates with a short format * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> the type of the sort property */ -public class ShortDatePropertyColumn<T> extends AbstractColumn<T> implements ExportableColumn<T> { +public class ShortDatePropertyColumn<T, S> extends AbstractColumn<T, S> implements ExportableColumn<T, S> { /** wicket property expression */ private final String propertyExpression; @@ -53,7 +54,7 @@ * @param propertyExpression Wicket property expression * @param locale Locale used to format decimal */ - public ShortDatePropertyColumn(IModel<String> displayModel, String sortProperty, String propertyExpression, + public ShortDatePropertyColumn(IModel<String> displayModel, S sortProperty, String propertyExpression, Locale locale) { super(displayModel, sortProperty); this.propertyExpression = propertyExpression; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/links/CsvExportLink.java 2013-02-14 16:39:05 UTC (rev 109) @@ -45,13 +45,13 @@ * @author Eric Chatellier * @param <T> datatable type */ -public class CsvExportLink<T> extends Link<Void> { +public class CsvExportLink<T, S> extends Link<Void> { /** For serializable methods */ private static final long serialVersionUID = 20130204L; /** Data table containing data to export. */ - private final DataTable<T> table; + private final DataTable<T, S> table; /** Download filename. */ private final String filename; @@ -63,7 +63,7 @@ * @param table data table * @param filename csv filename */ - public CsvExportLink(String id, DataTable<T> table, String filename) { + public CsvExportLink(String id, DataTable<T, S> table, String filename) { super(id); this.table = table; this.filename = filename; @@ -94,10 +94,10 @@ } else { writer = new CsvWriter(out, ','); } - List<ExportableColumn<T>> exportable = getExportableColumns(); + List<ExportableColumn<T, S>> exportable = getExportableColumns(); // write header - for (ExportableColumn<T> column : exportable) { + for (ExportableColumn<T, S> column : exportable) { writer.write(column.getHeaderName()); } writer.endLine(); @@ -105,7 +105,7 @@ Iterator<? extends T> it = table.getDataProvider().iterator(0, table.getDataProvider().size()); while (it.hasNext()) { T object = it.next(); - for (ExportableColumn<T> col : exportable) { + for (ExportableColumn<T, S> col : exportable) { col.exportCsv(object, writer); } writer.endLine(); @@ -119,11 +119,11 @@ * @return exportable column list */ @SuppressWarnings("unchecked") - private List<ExportableColumn<T>> getExportableColumns() { - List<ExportableColumn<T>> exportable = new ArrayList<ExportableColumn<T>>(table.getColumns().size()); - for (IColumn<?> column : table.getColumns()) { - if (column instanceof ExportableColumn<?>) { - exportable.add((ExportableColumn<T>) column); + private List<ExportableColumn<T, S>> getExportableColumns() { + List<ExportableColumn<T, S>> exportable = new ArrayList<ExportableColumn<T, S>>(table.getColumns().size()); + for (IColumn<?, ?> column : table.getColumns()) { + if (column instanceof ExportableColumn<?, ?>) { + exportable.add((ExportableColumn<T, S>) column); } } return exportable; Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-02-14 16:39:05 UTC (rev 109) @@ -48,9 +48,10 @@ * avec "implements IFilterStateLocator<FilterMapHomeMade>" * @author Mickael Tricot * @author Adrien Cheype - * @param <M> Model object type + * @param <T> Model object type + * @param <S> the type of the sort property */ -public final class LoadableDetachableSortableListDataProvider<M extends AbstractModel> extends SortableDataProvider<M> { +public final class LoadableDetachableSortableListDataProvider<M extends AbstractModel> extends SortableDataProvider<M, String> { /** Logger */ private static final Logger LOG = LoggerFactory.getLogger(LoadableDetachableSortableListDataProvider.class); @@ -86,7 +87,7 @@ /** {@inheritDoc} */ @Override - public Iterator<? extends M> iterator(int first, int count) { + public Iterator<? extends M> iterator(long first, long count) { if (getSort() != null && !StringUtils.isEmpty(getSort().getProperty())) { Collections.sort(list, new Comparator<M>() { @@ -121,7 +122,7 @@ }); } - return list.subList(first, Math.min(first + count, size())).iterator(); + return list.subList((int)first, (int)Math.min(first + count, size())).iterator(); } /** {@inheritDoc} */ @@ -133,7 +134,7 @@ /** {@inheritDoc} */ @Override - public int size() { + public long size() { return list.size(); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/SimpleSortableListDataProvider.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/SimpleSortableListDataProvider.java 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/SimpleSortableListDataProvider.java 2013-02-14 16:39:05 UTC (rev 109) @@ -50,7 +50,7 @@ * @author Adrien Cheype * @param <M> Model object type */ -public class SimpleSortableListDataProvider<M> extends SortableDataProvider<M> { +public class SimpleSortableListDataProvider<M> extends SortableDataProvider<M, String> { private static final long serialVersionUID = 1L; @@ -87,7 +87,7 @@ /** {@inheritDoc} */ @Override - public Iterator<M> iterator(int first, int count) { + public Iterator<M> iterator(long first, long count) { if (getSort() != null && !StringUtils.isEmpty(getSort().getProperty())) { Collections.sort(list, new Comparator<M>() { @@ -122,7 +122,7 @@ }); } - return list.subList(first, Math.min(first + count, size())).iterator(); + return list.subList((int)first, (int)Math.min(first + count, size())).iterator(); } /** {@inheritDoc} */ @@ -140,7 +140,7 @@ /** {@inheritDoc} */ @Override - public int size() { + public long size() { return list.size(); } 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-02-14 15:39:46 UTC (rev 108) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-02-14 16:39:05 UTC (rev 109) @@ -105,8 +105,6 @@ return false; } - /** {@inheritDoc} */ - @Override public boolean authenticate(String username, String password) { boolean authenticate = personneService.authenticateUtilisateur(username, password); LOG.debug(String.valueOf(authenticate)); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-02-14 15:39:46 UTC (rev 108) +++ trunk/pom.xml 2013-02-14 16:39:05 UTC (rev 109) @@ -130,7 +130,7 @@ <version.servlet-api>2.5</version.servlet-api> - <version.wicket>1.5.9</version.wicket> + <version.wicket>6.5.0</version.wicket> <!-- FIXME echatellier Probleme de parallelisation des tests unitaire, cause org.hibernate.HibernateException: Don't change the reference to a collection