Author: echatellier Date: 2014-05-06 17:45:40 +0200 (Tue, 06 May 2014) New Revision: 268 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/268 Log: Format code Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.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/model/Document.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/DocumentContent.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.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/config/panels/ListErreurTestBioPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.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/ManageDocumentPage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/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/utils/models/LoadableDetachableSortableListDataProvider.java trunk/src/code-formatter-conf/code-format.xml Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/config/DataContext.java 2014-05-06 15:45:40 UTC (rev 268) @@ -71,7 +71,7 @@ * <p> * DB_* properties can be placed in the properties file, if they vary depending on the environment. * </p> - * + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -135,7 +135,7 @@ /** * Scale is the number of digits to the right of the decimal point in a number. For example, the number 123.45 has a * precision of 5 and a scale of 2 - * + * */ public static final int DECIMAL_SCALE = 4; @@ -286,8 +286,8 @@ hibernateProperties.setProperty("hibernate.format_sql", String.valueOf(false)); hibernateProperties.setProperty("hibernate.use_sql_comments", String.valueOf(dbDebugProperty)); // Hibernate: cache - hibernateProperties.setProperty("hibernate.cache.region.factory_class", SingletonEhCacheRegionFactory.class - .getName()); + hibernateProperties.setProperty("hibernate.cache.region.factory_class", + SingletonEhCacheRegionFactory.class.getName()); hibernateProperties.setProperty("hibernate.cache.use_query_cache", String.valueOf(true)); hibernateProperties.setProperty("hibernate.cache.use_second_level_cache", String.valueOf(true)); hibernateProperties.setProperty("hibernate.cache.use_structured_entries", String.valueOf(dbDebugProperty)); @@ -308,8 +308,8 @@ // Hibernate search hibernateProperties.setProperty("hibernate.search.default.directory_provider", "filesystem"); hibernateProperties.setProperty("hibernate.search.default.indexBase", hibernateSearchIndexBase); - hibernateProperties.setProperty(org.hibernate.search.Environment.ANALYZER_CLASS, CantharellaAnalyzer.class - .getName()); + hibernateProperties.setProperty(org.hibernate.search.Environment.ANALYZER_CLASS, + CantharellaAnalyzer.class.getName()); hibernateProperties.setProperty(org.hibernate.search.Environment.ENABLE_DIRTY_CHECK, "false"); hibernateProperties.setProperty(org.hibernate.search.Environment.LUCENE_MATCH_VERSION, "LUCENE_36"); // Hibernate: Session @@ -362,6 +362,7 @@ /** * Set the data layer properties for the cantharella configuration + * * @return The placeholder configurer which get the data layer properties */ @Bean Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/GenericDao.java 2014-05-06 15:45:40 UTC (rev 268) @@ -34,6 +34,7 @@ /** * Generic DAO (works for all models) + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -41,6 +42,7 @@ /** * Count the number of rows + * * @param <M> Model type * @param modelClass Model class (not null) * @return Number of rows @@ -50,6 +52,7 @@ /** * Count the number of result given by the search criteria. The criteria must contain the count projection. + * * @param criteria The criteria * @return The number */ @@ -58,6 +61,7 @@ /** * Count the number of result given by the hql search. The hql query must contain the count operator. + * * @param hqlQuery The HQL query string * @param parameters Parameters (in replacement of ?) * @return The number @@ -67,6 +71,7 @@ /** * Create a model + * * @param <M> Model type * @param model Model (not null) * @throws DataConstraintException When there is a problem of data integrity @@ -76,6 +81,7 @@ /** * Create or update a model + * * @param <M> Model type * @param model Model (not null) * @throws DataConstraintException When there is a problem of data integrity @@ -86,6 +92,7 @@ /** * Merge a model. Usefull when several detached objects are loaded (createOrUpdate throws NonUniqueObjectException * in this case). + * * @param <M> Model type * @param model Model (not null) * @throws DataConstraintException When there is a problem of data integrity @@ -94,6 +101,7 @@ // public <M extends AbstractModel> void merge(M model) throws DataConstraintException; /** * Delete a model + * * @param <M> model type * @param modelClass Model class (not null) * @param id Model ID (not null) @@ -106,6 +114,7 @@ /** * Delete a model + * * @param <M> Model type * @param model Model (not null) * @throws DataNotFoundException Model not found @@ -116,6 +125,7 @@ /** * List entities given by the search criteria + * * @param criteria The criteria * @return List of results */ @@ -124,6 +134,7 @@ /** * List entities given by the hql query + * * @param hqlQuery The HQL query string * @param parameters Parameters (in replacement of ?) * @return List of results @@ -134,6 +145,7 @@ /** * Execute SQL query. This method is not recommanded because it shortcuts the Hibernate process. Do not use it if it * is not really necessary. + * * @param sqlQuery SQL query * @param parameters Parameters (in replacement of ?) * @return Number of rows affected @@ -144,6 +156,7 @@ /** * Test model existence + * * @param <M> Model type * @param modelClass Model class (not null) * @param id ID (not null) @@ -154,6 +167,7 @@ /** * Test model existence + * * @param <M> Model type * @param modelClass Model class * @param property Property name @@ -165,6 +179,7 @@ /** * Test existence of a criteria + * * @param criteria The criteria * @return True if exists, otherwise false */ @@ -173,6 +188,7 @@ /** * Read models + * * @param <M> Model type * @param modelClass Model class (not null) * @return Models @@ -182,6 +198,7 @@ /** * Read models + * * @param <M> Model type * @param sortColumn column name for the models sort * @param modelClass Model class (not null) @@ -191,6 +208,7 @@ // <M extends AbstractModel> List<M> readList(Class<M> modelClass, String sortColumn); /** * Read models + * * @param <M> Model type * @param sortColumns column names for the models sort (with the order) * @param modelClass Model class (not null) @@ -201,6 +219,7 @@ /** * Read models according to the order of @Id or @EmbeddedId column + * * @param <M> Model type * @param modelClass Model class (not null) * @param firstResult First result (not negative) @@ -214,6 +233,7 @@ /** * Read models according to the order of @Id or @EmbeddedId column + * * @param <M> Model type * @param modelClass Model class (not null) * @param firstResult First result (not negative) @@ -225,6 +245,7 @@ /** * Read a model + * * @param <M> Model type * @param modelClass Model class (not null) * @param id Model ID (not null) @@ -237,6 +258,7 @@ /** * Read and fetch a model + * * @param <M> Model class * @param modelClass Model class * @param uniqueProperty Unique property name @@ -250,6 +272,7 @@ /** * Refresh a model object + * * @param <M> Model type * @param model Model object */ @@ -258,6 +281,7 @@ /** * Update a model + * * @param <M> Model type * @param model Model (not null) * @throws DataNotFoundException Model not found @@ -268,6 +292,7 @@ /** * Evict a model. Remove from the hibernate session. + * * @param <M> Model type * @param model Model (not null) */ @@ -276,6 +301,7 @@ /** * Check if the given model is in the hibernate session. + * * @param <M> Model type * @param model Model (not null) * @return If the given model is in the hibernate session @@ -285,6 +311,7 @@ /** * Merge a model from the hibernate session. + * * @param <M> Model type * @param model Model (not null) * @return merged object 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/dao/impl/HibernateTemplateDao.java 2014-05-06 15:45:40 UTC (rev 268) @@ -44,6 +44,7 @@ /** * Generic DAO implementation for Hibernate + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -62,6 +63,7 @@ /** * Criteria : model from a property value + * * @param modelClass Model class * @param propertyName Property name * @param value Value 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java 2014-05-06 15:45:40 UTC (rev 268) @@ -113,12 +113,12 @@ /** File data. */ @NotNull @OneToOne(orphanRemoval = true, optional = false, fetch = FetchType.LAZY) - @Cascade( { CascadeType.SAVE_UPDATE }) + @Cascade({ CascadeType.SAVE_UPDATE }) private DocumentContent fileContent; /** File data thumbnail. */ @OneToOne(orphanRemoval = true, optional = true, fetch = FetchType.LAZY) - @Cascade( { CascadeType.SAVE_UPDATE }) + @Cascade({ CascadeType.SAVE_UPDATE }) private DocumentContent fileContentThumb; /** File mime type. */ Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/DocumentContent.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/DocumentContent.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/DocumentContent.java 2014-05-06 15:45:40 UTC (rev 268) @@ -34,8 +34,8 @@ /** * Document entity content. * - * This entity extract bytea (byte[]) content from document entity for lazy - * loading to not load on file content from database. + * This entity extract bytea (byte[]) content from document entity for lazy loading to not load on file content from + * database. * * @author Eric Chatellier */ Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/config/ServiceContext.java 2014-05-06 15:45:40 UTC (rev 268) @@ -50,6 +50,7 @@ /** * Spring context for the service layer + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -99,6 +100,7 @@ /** * mailActivated getter + * * @return mailActivated */ public static boolean isMailActivated() { @@ -107,6 +109,7 @@ /** * mailActivated setter + * * @param mailActivated mailActivated */ public static void setMailActivated(boolean mailActivated) { @@ -176,6 +179,7 @@ /** * Set the service layer properties for the cantharella configuration + * * @return The placeholder configurer which get the service layer properties */ @Bean Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/DocumentService.java 2014-05-06 15:45:40 UTC (rev 268) @@ -39,12 +39,14 @@ /** * Services for documents + * * @author Adrien Cheype */ public interface DocumentService { /** * List the document types available + * * @return The list of document types */ @Transactional(readOnly = true) @@ -52,6 +54,7 @@ /** * Create a document type + * * @param typeDocument The document type to create * @throws DataConstraintException If the document type already exists (unique constraints) */ @@ -60,6 +63,7 @@ /** * Load a document type + * * @param idTypeDocument ID * @return The corresponding document type * @throws DataNotFoundException If not found @@ -68,6 +72,7 @@ /** * Charger a document type + * * @param nom The document type name * @return The corresponding document type * @throws DataNotFoundException If not found @@ -76,6 +81,7 @@ /** * Modify a document type + * * @param typeDocument The document type to modify * @throws DataConstraintException If an unique constraint is broken with another document type */ @@ -84,6 +90,7 @@ /** * Delete a document type + * * @param typeDocument The document type to delete * @throws DataConstraintException If the document type has linked data */ @@ -99,6 +106,7 @@ /** * Liste les programmes des organismes déjà saisis + * * @return Organisme des molécules */ @Transactional(readOnly = true) @@ -106,6 +114,7 @@ /** * Modify a document attachable + * * @param documentAttachable The document attachable to modify * @throws DataConstraintException If an unique constraint is broken with another document */ Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/CampagneServiceImpl.java 2014-05-06 15:45:40 UTC (rev 268) @@ -46,6 +46,7 @@ /** * Implémentation du service campagne + * * @author Mickael Tricot * @author Adrien Cheype */ Modified: trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java =================================================================== --- trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.service/src/main/java/nc/ird/cantharella/service/services/impl/DocumentServiceImpl.java 2014-05-06 15:45:40 UTC (rev 268) @@ -58,6 +58,7 @@ /** * Document service implementation + * * @author Adrien Cheype */ @Service @@ -75,6 +76,7 @@ /** * Configuration allowed extension list setter. + * * @param documentExtensionAllowed configuration value */ @Value("${document.extension.allowed}") Modified: trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java =================================================================== --- trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.utils/src/main/java/nc/ird/cantharella/utils/CantharellaConfig.java 2014-05-06 15:45:40 UTC (rev 268) @@ -29,19 +29,19 @@ import org.nuiton.config.ArgumentsParserException; /** - * Used as factory in spring configuration to get configuration file as properties - * this class use internaly {@link ApplicationConfig}. - * + * Used as factory in spring configuration to get configuration file as properties this class use internaly + * {@link ApplicationConfig}. + * * @author poussin * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ + * + * Last update: $Date$ by : $Author$ */ public class CantharellaConfig { /** * force filename to cantharella.config + * * @return cantharella configuration as properties * @throws ArgumentsParserException */ @@ -50,9 +50,8 @@ } /** - * This method take file name in argument, this permit to force filename for - * example for unit tests - * + * This method take file name in argument, this permit to force filename for example for unit tests + * * @param filename filename to use * @return cantharella configuration as properties * @throws ArgumentsParserException 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebApplicationImpl.java 2014-05-06 15:45:40 UTC (rev 268) @@ -114,11 +114,9 @@ private static final Logger LOG = LoggerFactory.getLogger(WebApplicationImpl.class); /** - * SpringBeans injector (some objects such as Pages are automatically - * injected, by not all of them) + * SpringBeans injector (some objects such as Pages are automatically injected, by not all of them) * - * @param object - * Object to be injected + * @param object Object to be injected */ public static void injectSpringBeans(Object object) { Injector.get().inject(object); @@ -151,14 +149,10 @@ /** * Constructor * - * @param debug - * Debug mode - * @param optimize - * Optimize mode - * @param wicketConfiguration - * Wicket configuration (DEVELOPMENT or DEPLOYMENT) - * @param messages - * Internationalization messages + * @param debug Debug mode + * @param optimize Optimize mode + * @param wicketConfiguration Wicket configuration (DEVELOPMENT or DEPLOYMENT) + * @param messages Internationalization messages */ public WebApplicationImpl(boolean debug, boolean optimize, RuntimeConfigurationType wicketConfiguration, IStringResourceLoader... messages) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/config/WebContext.java 2014-05-06 15:45:40 UTC (rev 268) @@ -64,7 +64,7 @@ /** * Spring context for the web layer - * + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -191,10 +191,10 @@ protected String log4jConfig; static { - Map<Locale, Map<String, String>> countries = new HashMap<Locale, Map<String, String>>(DataContext.LOCALES - .size()); - Map<Locale, Map<String, String>> languages = new HashMap<Locale, Map<String, String>>(DataContext.LOCALES - .size()); + Map<Locale, Map<String, String>> countries = new HashMap<Locale, Map<String, String>>( + DataContext.LOCALES.size()); + Map<Locale, Map<String, String>> languages = new HashMap<Locale, Map<String, String>>( + DataContext.LOCALES.size()); Map<Locale, List<String>> countryCodes = new HashMap<Locale, List<String>>(DataContext.LOCALES.size()); Map<Locale, List<String>> languageCodes = new HashMap<Locale, List<String>>(DataContext.LOCALES.size()); for (Locale locale : DataContext.LOCALES) { @@ -289,6 +289,7 @@ /** * Set the web layer properties for the cantharella configuration + * * @return The placeholder configurer which get the web layer properties */ @Bean @@ -306,7 +307,7 @@ /** * Init the log4j configuration filepath - * + * * @throws FileNotFoundException If the config file is not found */ @PostConstruct Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/HomePage.java 2014-05-06 15:45:40 UTC (rev 268) @@ -77,6 +77,7 @@ /** * Home page + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -171,8 +172,8 @@ successCurrentPage(ManageUtilisateurPage.class, "Update"); // Mise à jour de la liste - CollectionTools.setter(utilisateursInvalid, personneService - .listUtilisateursInvalid()); + CollectionTools.setter(utilisateursInvalid, + personneService.listUtilisateursInvalid()); invalidUtilisateursView.setVisibilityAllowed(!utilisateursInvalid.isEmpty()); if (target != null) { target.add(invalidUtilisateursView); @@ -309,9 +310,8 @@ // Champs du formulaire formView.add(new TextField<String>("Personne.courriel", new PropertyModel<String>(utilisateurModel, "courriel"))); - formView - .add(new PasswordTextField("LoginModel.password", new PropertyModel<String>(loginModel, "password")) - .setRequired(false)); + formView.add(new PasswordTextField("LoginModel.password", new PropertyModel<String>(loginModel, "password")) + .setRequired(false)); formView.add(new CheckBox("LoginModel.rememberMe", new PropertyModel<Boolean>(loginModel, "rememberMe"))); // Action : connexion 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ListCampagnesPage.java 2014-05-06 15:45:40 UTC (rev 268) @@ -54,10 +54,11 @@ /** * Page de consultation des campagnes + * * @author Mickael Tricot * @author Adrien Cheype */ -@AuthRoles( { AuthRole.ADMIN, AuthRole.USER }) +@AuthRoles({ AuthRole.ADMIN, AuthRole.USER }) public final class ListCampagnesPage extends TemplatePage { /** Service : campagne */ Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListErreurTestBioPanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -44,6 +44,7 @@ /** * Panel qui liste les erreurs de tests biologiques + * * @author Adrien Cheype */ public class ListErreurTestBioPanel extends Panel { @@ -54,6 +55,7 @@ /** * Constructor + * * @param id The panel ID */ public ListErreurTestBioPanel(String id) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeExtractionPanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -46,6 +46,7 @@ /** * Panel qui liste les méthodes d'extraction + * * @author Adrien Cheype */ public class ListMethodeExtractionPanel extends Panel { @@ -56,6 +57,7 @@ /** * Constructor + * * @param id The panel ID */ public ListMethodeExtractionPanel(String id) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodePurificationPanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -45,6 +45,7 @@ /** * Panel qui liste les méthodes de purification + * * @author Adrien Cheype */ public class ListMethodePurificationPanel extends Panel { @@ -55,6 +56,7 @@ /** * Constructor + * * @param id The panel ID */ public ListMethodePurificationPanel(String id) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListMethodeTestBioPanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -45,6 +45,7 @@ /** * Panel qui liste les méthodes de tests biologiques + * * @author Adrien Cheype */ public class ListMethodeTestBioPanel extends Panel { @@ -55,6 +56,7 @@ /** * Constructor + * * @param id The panel ID */ public ListMethodeTestBioPanel(String id) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/config/panels/ListPartiePanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -44,6 +44,7 @@ /** * Partie part of the SI configuration + * * @author Mickael Tricot * @author Adrien Cheype */ @@ -55,6 +56,7 @@ /** * Constructor + * * @param id The panel ID */ public ListPartiePanel(String id) { 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2014-05-06 15:45:40 UTC (rev 268) @@ -44,18 +44,15 @@ * Column displaying an image and model as tooltip. * * @author Eric Chatellier - * @param <T> - * Generic type - * @param <S> - * the type of the sort property + * @param <T> Generic type + * @param <S> the type of the sort property */ public abstract class DocumentTooltipColumn<T extends DocumentAttachable, S> extends AbstractColumn<T, S> { /** * Constructor. * - * @param displayModel - * header display model + * @param displayModel header display model */ public DocumentTooltipColumn(IModel<String> displayModel) { super(displayModel); @@ -94,26 +91,21 @@ /** * Called when link is clicked. * - * @param model - * current model + * @param model current model */ public abstract void onClick(IModel<T> model); /** - * Panel which include a linkable image. Used with the - * LinkableImagePropertyColumn$LinkablePanel.html file + * Panel which include a linkable image. Used with the LinkableImagePropertyColumn$LinkablePanel.html file */ public class DocumentTooltipPanel extends Panel { /** * Constructor * - * @param id - * Component id - * @param model - * model - * @param messageModel - * Message Model displayed over the image + * @param id Component id + * @param model model + * @param messageModel Message Model displayed over the image */ public DocumentTooltipPanel(String id, final IModel<T> model, IModel<?> messageModel) { super(id); @@ -134,18 +126,15 @@ } /** - * Use panel to be able to add an image into wicket <span wicket:id="label"> - * datatable column header. + * Use panel to be able to add an image into wicket <span wicket:id="label"> datatable column header. */ public class ImagePanel extends Panel { /** * Constructor * - * @param componentId - * component id - * @param imageSrc - * image src + * @param componentId component id + * @param imageSrc image src */ public ImagePanel(String componentId, final Model<String> imageSrc) { super(componentId); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/ManageDocumentPage.java 2014-05-06 15:45:40 UTC (rev 268) @@ -116,6 +116,7 @@ /** * Constructeur (mode création) + * * @param callerPage Page appelante * @param documentAttachable entity where document is attached to * @param multipleEntry Saisie multiple @@ -126,6 +127,7 @@ /** * Constructeur (mode édition) + * * @param document document to edit * @param documentAttachable document sur le * @param callerPage Page appelante @@ -137,10 +139,10 @@ } /** - * Constructeur. Si idDocument et document sont null, on créée un nouveau Document. - * Si idDocument est renseigné, on édite le document - * correspondant. Si document est renseigné, on créée un nouveau document à - * partir des informations qu'il contient. + * Constructeur. Si idDocument et document sont null, on créée un nouveau Document. Si idDocument est renseigné, on + * édite le document correspondant. Si document est renseigné, on créée un nouveau document à partir des + * informations qu'il contient. + * * @param document document * @param documentAttachable entity where document is attached to * @param callerPage Page appelante Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2014-05-06 15:45:40 UTC (rev 268) @@ -61,6 +61,7 @@ /** * Constructeur. + * * @param id ID * @param documentAttachableModel entity model where documents are attached to * @param currentPage currentPage 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/search/SearchPage.java 2014-05-06 15:45:40 UTC (rev 268) @@ -120,8 +120,7 @@ /** * Constructor. * - * @param queryBean - * form query bean + * @param queryBean form query bean */ public SearchPage(SearchBean queryBean) { super(SearchPage.class); 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/specimen/ListSpecimensPage.java 2014-05-06 15:45:40 UTC (rev 268) @@ -56,10 +56,11 @@ /** * Page de consultation des spécimens + * * @author Mickael Tricot * @author Adrien Cheype */ -@AuthRoles( { AuthRole.ADMIN, AuthRole.USER }) +@AuthRoles({ AuthRole.ADMIN, AuthRole.USER }) public final class ListSpecimensPage extends TemplatePage { /** Service : specimen */ 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 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/models/LoadableDetachableSortableListDataProvider.java 2014-05-06 15:45:40 UTC (rev 268) @@ -46,6 +46,7 @@ /** * Generic loadable/detachable/sortable data provider. Warning: do not use it in forms. TODO ajouter gestion des filtres * avec "implements IFilterStateLocator<FilterMapHomeMade>" + * * @author Mickael Tricot * @author Adrien Cheype * @param <M> Model object type @@ -73,6 +74,7 @@ // private FilterMapHomeMade filter; /** * Constructor + * * @param list List * @param locale Locale */ @@ -140,6 +142,7 @@ /** * list getter + * * @return list */ public List<M> getList() { @@ -148,6 +151,7 @@ /** * list setter + * * @param list list */ public void setList(List<M> list) { Modified: trunk/src/code-formatter-conf/code-format.xml =================================================================== --- trunk/src/code-formatter-conf/code-format.xml 2014-05-06 15:39:05 UTC (rev 267) +++ trunk/src/code-formatter-conf/code-format.xml 2014-05-06 15:45:40 UTC (rev 268) @@ -80,7 +80,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/> @@ -236,7 +236,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/> +<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/> <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/> @@ -253,7 +253,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/> +<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/> @@ -275,7 +275,7 @@ <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/> -<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/> +<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/> <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/> <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>