r148 - in trunk: cantharella.data/src/main/java/nc/ird/cantharella/data/config cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl cantharella.data/src/main/java/nc/ird/cantharella/data/model cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators cantharella.data/src/main/java/nc/ird/cantharella/data/model/search cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils cantharella.data/src/test/java/nc/ird/cantharella/data cantharella.service/src
Author: echatellier Date: 2013-02-21 15:47:28 +0100 (Thu, 21 Feb 2013) New Revision: 148 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/148 Log: Fix all project javadoc and some warnings Removed: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanLookupTest.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchResult.java trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanToolsTest.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/config/panels/RebuildLuceneIndexPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentPageHelper.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ExtraitsColumn.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/data/TableExportToolbar.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/security/AuthSession.java Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/ValidationIntegrator.java 2013-02-21 14:47:28 UTC (rev 148) @@ -48,6 +48,7 @@ /** Logger */ private static final Logger LOG = LoggerFactory.getLogger(ValidationIntegrator.class); + /** {@inheritDoc} */ @Override public void integrate(Configuration configuration, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) { @@ -65,12 +66,14 @@ eventRegistry.prependListeners(EventType.PRE_UPDATE, validationListener); } + /** {@inheritDoc} */ @Override public void integrate(MetadataImplementor metadata, SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) { integrate((Configuration) null, sessionFactory, serviceRegistry); } + /** {@inheritDoc} */ @Override public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java 2013-02-21 14:47:28 UTC (rev 148) @@ -53,6 +53,9 @@ @Resource private SessionFactory sessionFactory; + /** + * Empty constructor. + */ public HibernateTemplateDao() { } Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/ProduitDao.java 2013-02-21 14:47:28 UTC (rev 148) @@ -62,8 +62,9 @@ } /** - * Rend le criteria qui rend le nombre de molécule qui référencent un produit - * @param produit Le produit + * Rend le criteria qui rend le nombre de molécule qui référencent un produit. + * + * @param refProduit product reference * @return Le criteria **/ public static DetachedCriteria getCriteriaCountMoleculeFromProduit(String refProduit) { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java 2013-02-21 14:47:28 UTC (rev 148) @@ -112,106 +112,236 @@ @Length(max = LENGTH_MEDIUM_TEXT) private String fileMimetype; + /** + * Document id getter. + * + * @return document id + */ public Integer getIdDocument() { return idDocument; } + /** + * Document id setter. + * + * @param idDocument document id + */ public void setIdDocument(Integer idDocument) { this.idDocument = idDocument; } + /** + * Titre getter. + * + * @return titre + */ public String getTitre() { return titre; } + /** + * Titre setter. + * + * @param titre titre + */ public void setTitre(String titre) { this.titre = titre; } + /** + * Createur getter. + * + * @return createur + */ public Personne getCreateur() { return createur; } + /** + * Createur setter. + * + * @param createur createur + */ public void setCreateur(Personne createur) { this.createur = createur; } + /** + * Date creation getter. + * + * @return date creation + */ public Date getDateCreation() { return dateCreation; } + /** + * Date creation setter. + * + * @param dateCreation date creation + */ public void setDateCreation(Date dateCreation) { this.dateCreation = dateCreation; } + /** + * Editeur getter. + * + * @return editeur + */ public String getEditeur() { return editeur; } + /** + * Editeur setter. + * + * @param editeur editeur + */ public void setEditeur(String editeur) { this.editeur = editeur; } + /** + * Description getter. + * + * @return description + */ public String getDescription() { return description; } + /** + * Description setter. + * + * @param description description + */ public void setDescription(String description) { this.description = description; } + /** + * Langue getter. + * + * @return langue + */ public String getLangue() { return langue; } + /** + * Langue setter. + * + * @param langue langue + */ public void setLangue(String langue) { this.langue = langue; } + /** + * Contrainte legale getter. + * + * @return contrainte legale + */ public String getContrainteLegale() { return contrainteLegale; } + /** + * Contrainte legale setter. + * + * @param contrainteLegale containte legale + */ public void setContrainteLegale(String contrainteLegale) { this.contrainteLegale = contrainteLegale; } + /** + * Ajoute par setter. + * + * @return ajoute apr + */ public Personne getAjoutePar() { return ajoutePar; } + /** + * Ajoute par setter. + * + * @param ajoutePar + */ public void setAjoutePar(Personne ajoutePar) { this.ajoutePar = ajoutePar; } + /** + * Type document getter. + * + * @return type document + */ public TypeDocument getTypeDocument() { return typeDocument; } + /** + * Type document setter. + * + * @param typeDocument type document + */ public void setTypeDocument(TypeDocument typeDocument) { this.typeDocument = typeDocument; } + /** + * File name getter. + * + * @return file name + */ public String getFileName() { return fileName; } + /** + * File name setter. + * + * @param fileName file name + */ public void setFileName(String fileName) { this.fileName = fileName; } + /** + * File content getter. + * + * @return file content + */ public byte[] getFileContent() { return fileContent; } + /** + * File content setter. + * + * @param fileContent file content + */ public void setFileContent(byte[] fileContent) { this.fileContent = fileContent; } + /** + * File mime type getter. + * + * @return file mime type + */ public String getFileMimetype() { return fileMimetype; } + /** + * File mime type setter. + * + * @param fileMimetype file mime type + */ public void setFileMimetype(String fileMimetype) { this.fileMimetype = fileMimetype; } Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/FractionsOfPurificationComp.java 2013-02-21 14:47:28 UTC (rev 148) @@ -31,7 +31,6 @@ /** * Fractions comparator. Compare on indice with intuitive sort. - * @see nc.ird.module.utils.IntuitiveStringComparator * @author Adrien Cheype */ public class FractionsOfPurificationComp implements Comparator<Fraction> { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/comparators/ResultatsOfTestBioComp.java 2013-02-21 14:47:28 UTC (rev 148) @@ -31,7 +31,6 @@ /** * ResultatTestBio comparator. Compare on repere with intuitive sort. - * @see nc.ird.module.utils.IntuitiveStringComparator * @author Adrien Cheype */ public class ResultatsOfTestBioComp implements Comparator<ResultatTestBio> { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/ProduitBridge.java 2013-02-21 14:47:28 UTC (rev 148) @@ -47,6 +47,7 @@ /** Logger */ private static final Logger LOG = LoggerFactory.getLogger(ProduitBridge.class); + /** {@inheritDoc} */ @Override public void set(String name, Object value, Document document, LuceneOptions luceneOptions) { Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/search/UtilisateurSearchFilter.java 2013-02-21 14:47:28 UTC (rev 148) @@ -56,14 +56,29 @@ /** Utilisateur performing the query. */ protected Utilisateur utilisateur; + /** + * Utilisateur getter. + * + * @return utilisateur + */ public Utilisateur getUtilisateur() { return utilisateur; } + /** + * Utilisateur setter. + * + * @param utilisateur utilisateur + */ public void setUtilisateur(Utilisateur utilisateur) { this.utilisateur = utilisateur; } + /** + * Return filter parameters key. + * + * @return filter parameters + */ @Key public FilterKey getKey() { StandardFilterKey key = new StandardFilterKey(); @@ -71,6 +86,7 @@ return key; } + /** {@inheritDoc} */ @Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException { OpenBitSet bitSet = new OpenBitSet(reader.maxDoc()); Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/utils/AbstractModel.java 2013-02-21 14:47:28 UTC (rev 148) @@ -82,7 +82,6 @@ * @return @Id or @EmbeddedId field * @throws UnexpectedException If it does not exist */ - @SuppressWarnings("unchecked") public final static Field getIdField(final Class<? extends AbstractModel> clazz) { AssertTools.assertNotNull(clazz); Field field = null; Modified: trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java =================================================================== --- trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.data/src/test/java/nc/ird/cantharella/data/SchemaExporter.java 2013-02-21 14:47:28 UTC (rev 148) @@ -33,8 +33,18 @@ import org.junit.Test; import org.springframework.orm.hibernate4.LocalSessionFactoryBean; +/** + * Schema export test. + * + * @author Eric Chatellier + */ public class SchemaExporter { + /** + * Export schema creation script. + * + * @throws IOException + */ @Test public void exportSchema() throws IOException { LocalSessionFactoryBean sessionFactoryBean = new LocalSessionFactoryBean(); 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-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/MoleculeProvenanceBean.java 2013-02-21 14:47:28 UTC (rev 148) @@ -23,7 +23,6 @@ * #L% */ -import java.io.Serializable; import java.util.List; import nc.ird.cantharella.data.model.Document; @@ -45,40 +44,65 @@ * Last update: $Date$ * by : $Author$ */ -public class MoleculeProvenanceBean implements DocumentAttachable, Serializable { - private static final long serialVersionUID = 1L; +public class MoleculeProvenanceBean implements DocumentAttachable { - /** - * Molecule - */ + /** Molecule. */ protected Molecule molecule; + /** Provenance, this field can be null if provenance is not readable by user. */ + protected MoleculeProvenance provenance; + /** - * Provenance, this field can be null if provenance is not readable by user + * Constructor with molecule and null provenance. + * + * @param molecule molecule */ - protected MoleculeProvenance provenance; - public MoleculeProvenanceBean(Molecule molecule) { this.molecule = molecule; } + /** + * Constructor with provenance. + * + * @param provenance + */ public MoleculeProvenanceBean(MoleculeProvenance provenance) { this(provenance.getMolecule()); this.provenance = provenance; } + /** + * Molecule id getter. + * + * @return molecule id + */ public Integer getIdMolecule() { return molecule.getIdMolecule(); } + /** + * Molecule getter. + * + * @return molecule + */ public Molecule getMolecule() { return molecule; } + /** + * Molecule provenance getter. + * + * @return molecule provenance (can be null) + */ public MoleculeProvenance getMoleculeProvenance() { return provenance; } + /** + * Lot getter. + * + * @return lot (can be null if provenance is null) + */ public Lot getLot() { Lot result = null; if (provenance != null) { Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchResult.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchResult.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/model/SearchResult.java 2013-02-21 14:47:28 UTC (rev 148) @@ -40,75 +40,149 @@ */ public class SearchResult implements Serializable { - /** serialVersionUID. */ - private static final long serialVersionUID = -283841649665446890L; - + /** Search result specimens. */ protected List<Specimen> specimens; + /** Search result lots. */ protected List<Lot> lots; + /** Search result extractions. */ protected List<Extraction> extractions; + /** Search result purification. */ protected List<Purification> purifications; + /** Search result resultatTestBios. */ protected List<ResultatTestBio> resultatTestBios; + /** Search result stations. */ protected List<Station> stations; + /** Search result molecules. */ protected List<Molecule> molecules; + /** + * Specimens getter. + * + * @return specimes + */ public List<Specimen> getSpecimens() { return specimens; } + /** + * Specimens setter. + * + * @param specimens specimens + */ public void setSpecimens(List<Specimen> specimens) { this.specimens = specimens; } + /** + * Lots getter. + * + * @return lots + */ public List<Lot> getLots() { return lots; } + /** + * Lots setter. + * + * @param lots lots + */ public void setLots(List<Lot> lots) { this.lots = lots; } + /** + * Extraction getter. + * + * @return extractions + */ public List<Extraction> getExtractions() { return extractions; } + /** + * Extraction setter. + * + * @param extractions extraction + */ public void setExtractions(List<Extraction> extractions) { this.extractions = extractions; } + /** + * Purifcations getter. + * + * @return purification + */ public List<Purification> getPurifications() { return purifications; } + /** + * Purification setter. + * + * @param purifications purification + */ public void setPurifications(List<Purification> purifications) { this.purifications = purifications; } + /** + * ResultatTestBios getter. + * + * @return resultattestbios + */ public List<ResultatTestBio> getResultatTestBios() { return resultatTestBios; } + /** + * ResultatTestBios setter. + * + * @param resultatTestBios resultatTestBios + */ public void setResultatTestBios(List<ResultatTestBio> resultatTestBios) { this.resultatTestBios = resultatTestBios; } + /** + * Stations getter. + * + * @return stations + */ public List<Station> getStations() { return stations; } + /** + * Stations setter. + * + * @param stations stations + */ public void setStations(List<Station> stations) { this.stations = stations; } + /** + * Molecule getter. + * + * @return molecule + */ public List<Molecule> getMolecules() { return molecules; } + /** + * Molecule setter. + * + * @param molecules molecules + */ public void setMolecules(List<Molecule> molecules) { this.molecules = molecules; } Deleted: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/BeanLookup.java 2013-02-21 14:47:28 UTC (rev 148) @@ -1,68 +0,0 @@ -/* - * #%L - * Cantharella :: Utils - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 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% - */ -package nc.ird.cantharella.utils; - -import nc.ird.cantharella.utils.BeanTools.AccessType; - -/** - * Retrieve a bean field value from the bean field name - * - * @author Mickael Tricot - * @author Adrien Cheype - */ -public final class BeanLookup { - - /** Access type */ - private final AccessType accessType; - - /** Bean */ - private final Object bean; - - /** - * Constructor - * - * @param bean - * Bean - * @param accessType - * Access type - */ - public BeanLookup(Object bean, AccessType accessType) { - super(); - AssertTools.assertNotNull(bean); - AssertTools.assertNotNull(accessType); - this.bean = bean; - this.accessType = accessType; - } - - /** {@inheritDoc} */ - public String lookup(String key) { - AssertTools.assertNotNull(key); - Object value; - try { - value = BeanTools.getValue(bean, accessType, key); - } catch (IllegalArgumentException e) { - value = null; - } - return value != null ? value.toString() : null; - } -} \ No newline at end of file Deleted: trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanLookupTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanLookupTest.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanLookupTest.java 2013-02-21 14:47:28 UTC (rev 148) @@ -1,131 +0,0 @@ -/* - * #%L - * Cantharella :: Utils - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 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% - */ -package nc.ird.cantharella.utils; - -import nc.ird.cantharella.utils.BeanLookup; -import nc.ird.cantharella.utils.BeanTools.AccessType; - -import org.junit.Assert; -import org.junit.Test; - -/** - * BeanLookup test - * @author Mickael Tricot - */ -public final class BeanLookupTest { - - /** - * Bean for the test - * @author acheype - */ - public final class Bean { - - /** boolean */ - public boolean bool; - - /** integer */ - public Integer integer; - - /** string */ - public String string; - - /** - * integer getter - * @return integer - */ - public Integer getInteger() { - return integer; - } - - /** - * string getter - * @return string - */ - public String getString() { - return string; - } - - /** - * bool getter - * @return bool - */ - public boolean isBool() { - return bool; - } - - /** - * bool setter - * @param bool bool - */ - public void setBool(boolean bool) { - this.bool = bool; - } - - /** - * integer setter - * @param integer integer - */ - public void setInteger(Integer integer) { - this.integer = integer; - } - - /** - * string setter - * @param string string - */ - public void setString(String string) { - this.string = string; - } - - } - - /** - * lookup test - */ - @Test - public void lookup() { - Bean bean = new Bean(); - BeanLookup lookupGetter = new BeanLookup(bean, AccessType.GETTER); - BeanLookup lookupField = new BeanLookup(bean, AccessType.FIELD); - Assert.assertNull(lookupGetter.lookup("Toto")); - Assert.assertNull(lookupField.lookup("Toto")); - Assert.assertNull(lookupGetter.lookup("integer")); - Assert.assertNull(lookupField.lookup("integer")); - Assert.assertNull(lookupGetter.lookup("string")); - Assert.assertNull(lookupField.lookup("string")); - bean.setInteger(0); - bean.setString(""); - bean.setBool(true); - Assert.assertNull(lookupGetter.lookup("Toto")); - Assert.assertNull(lookupField.lookup("Toto")); - Assert.assertEquals(bean.getInteger().toString(), lookupGetter.lookup("integer")); - Assert.assertEquals(bean.integer.toString(), lookupField.lookup("integer")); - Assert.assertEquals(bean.getString(), lookupGetter.lookup("string")); - Assert.assertEquals(bean.string, lookupField.lookup("string")); - Assert.assertEquals(String.valueOf(bean.isBool()), lookupGetter.lookup("bool")); - Assert.assertEquals(String.valueOf(bean.bool), lookupField.lookup("bool")); - bean.setBool(false); - Assert.assertEquals(String.valueOf(bean.isBool()), lookupGetter.lookup("bool")); - Assert.assertEquals(String.valueOf(bean.bool), lookupField.lookup("bool")); - } -} Modified: trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanToolsTest.java =================================================================== --- trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanToolsTest.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.utils/src/test/java/nc/ird/cantharella/utils/BeanToolsTest.java 2013-02-21 14:47:28 UTC (rev 148) @@ -421,7 +421,6 @@ * @throws NullPointerException - * @throws NoSuchFieldException - */ - @SuppressWarnings("unchecked") @Test(expected = NoSuchFieldException.class) public void getAnnotatedPublicFieldKO() throws SecurityException, NullPointerException, NoSuchFieldException { BeanTools.getAnnotatedPublicField(new Bean(), Deprecated.class); @@ -433,7 +432,6 @@ * @throws NullPointerException - * @throws NoSuchFieldException - */ - @SuppressWarnings("unchecked") @Test public void getAnnotatedPublicFieldOK() throws SecurityException, NullPointerException, NoSuchFieldException { Field f = Bean.class.getField("integer"); 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-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/columns/TaxonomyPropertyColumn.java 2013-02-21 14:47:28 UTC (rev 148) @@ -34,6 +34,7 @@ * Column which display taxonomy names. Put "taxonomy" at attribute class of the html column. * @author Adrien Cheype * @param <T> Type of the row model + * @param <S> Type of sort property */ public class TaxonomyPropertyColumn<T, S> extends PropertyColumn<T, S> { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/RebuildLuceneIndexPanel.java 2013-02-21 14:47:28 UTC (rev 148) @@ -44,8 +44,6 @@ @SpringBean private SearchService searchService; - protected Label rebuildResultLabel; - /** * Constructor * @param id The panel ID @@ -55,6 +53,8 @@ final Form<Void> formView = new Form<Void>("Form"); + final Label rebuildResultLabel = new Label("rebuildResult", new Model<String>("")); + Button addButton = new AjaxFallbackButton("Rebuild", formView) { @Override protected void onSubmit(AjaxRequestTarget target, Form<?> form) { @@ -69,7 +69,6 @@ } }; formView.add(addButton); - rebuildResultLabel = new Label("rebuildResult", new Model<String>("")); formView.add(rebuildResultLabel); add(formView); } Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentPageHelper.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentPageHelper.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentPageHelper.java 2013-02-21 14:47:28 UTC (rev 148) @@ -155,7 +155,6 @@ * Init attached document table for current entity. * * @param templatePage parent page - * @param formView form to add table to * @param documentAttachable entity to get documents * @param currentPage current page */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-02-21 14:47:28 UTC (rev 148) @@ -49,9 +49,8 @@ public abstract class DocumentTooltipColumn<T extends DocumentAttachable, S> extends AbstractColumn<T, S> { /** - * Constructor + * Constructor. * @param displayModel header display model - * @param documentAttachableModel document attachable model */ public DocumentTooltipColumn(IModel<String> displayModel) { super(displayModel); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ReadDocumentPage.java 2013-02-21 14:47:28 UTC (rev 148) @@ -59,8 +59,9 @@ /** * Constructeur - * @param idDocument ID document - * @param callerPage Page appelante + * @param document document + * @param documentAttachable entity where document is attached to + * @param callerPage caller page */ public ReadDocumentPage(final Document document, final DocumentAttachable documentAttachable, final CallerPage callerPage) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ExtraitsColumn.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ExtraitsColumn.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/extraction/ExtraitsColumn.java 2013-02-21 14:47:28 UTC (rev 148) @@ -84,6 +84,10 @@ /** * Improve data model to support optionnal html formatting. + * + * @param rowModel current row to format + * @param html enable html formatting (must be false for csv) + * @return data model */ protected IModel<Serializable> getDataModel(IModel<Extraction> rowModel, final boolean html) { return new Model<Serializable>(rowModel) { 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-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/columns/AjaxButtonPropertyColumn.java 2013-02-21 14:47:28 UTC (rev 148) @@ -48,9 +48,8 @@ /** * Constructor - * @param imageSrc Relative url for the image - * @param linkTitle Title displayed for the link - * @param altMessage Alternative message displayed when image can't be rendered + * @param buttonLabel Title displayed for the button + * @param form form */ public AjaxButtonPropertyColumn(Model<String> buttonLabel, Form<?> form) { this(new Model<String>(), buttonLabel, form); @@ -59,9 +58,8 @@ /** * Constructor * @param displayModel header display model - * @param imageSrc Relative url for the image - * @param linkTitle Title displayed for the link - * @param altMessage Alternative message displayed when image can't be rendered + * @param buttonLabel Title displayed for the button + * @param form form */ public AjaxButtonPropertyColumn(IModel<String> displayModel, Model<String> buttonLabel, Form<?> form) { super(displayModel); @@ -78,8 +76,8 @@ /** * Override this method to react to link clicks. Your own/internal row id will most likely be inside the model. - * @param item Item - * @param componentId Component id + * @param target target + * @param form form * @param model Model */ public abstract void onSubmit(AjaxRequestTarget target, Form<?> form, IModel<T> model); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-02-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/TableExportToolbar.java 2013-02-21 14:47:28 UTC (rev 148) @@ -39,6 +39,13 @@ */ public class TableExportToolbar extends ExportToolbar { + /** + * Constructor adding csv export configuration. + * + * @param table table to add export to + * @param fileName export filename + * @param locale locale + */ public TableExportToolbar(DataTable<?, ?> table, String fileName, Locale locale) { super(table); 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-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2013-02-21 14:47:28 UTC (rev 148) @@ -48,8 +48,7 @@ * avec "implements IFilterStateLocator<FilterMapHomeMade>" * @author Mickael Tricot * @author Adrien Cheype - * @param <T> Model object type - * @param <S> the type of the sort property + * @param <M> Model object type */ public final class LoadableDetachableSortableListDataProvider<M extends AbstractModel> extends SortableDataProvider<M, String> { 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-21 14:02:23 UTC (rev 147) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/security/AuthSession.java 2013-02-21 14:47:28 UTC (rev 148) @@ -105,6 +105,13 @@ return false; } + /** + * Check user authenticate. + * + * @param username username + * @param password password + * @return {@code true} if username and password match + */ public boolean authenticate(String username, String password) { boolean authenticate = personneService.authenticateUtilisateur(username, password); LOG.debug(String.valueOf(authenticate));
participants (1)
-
echatellier＠users.forge.codelutin.com