Author: echatellier Date: 2013-02-21 18:19:50 +0100 (Thu, 21 Feb 2013) New Revision: 150 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/150 Log: Format previous commit 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/Lot.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.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/document/panel/ReadListDocumentsPanel.java trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 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 17:16:19 UTC (rev 149) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Document.java 2013-02-21 17:19:50 UTC (rev 150) @@ -330,7 +330,7 @@ public void setFileContent(byte[] fileContent) { this.fileContent = fileContent; } - + /** * File content thumbnail getter. * Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/Lot.java 2013-02-21 17:19:50 UTC (rev 150) @@ -465,7 +465,7 @@ public void setExtractions(List<Extraction> extractions) { this.extractions = extractions; } - + /** {@inheritDoc} */ public List<Document> getDocuments() { return documents; Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/ResultatTestBio.java 2013-02-21 17:19:50 UTC (rev 150) @@ -66,7 +66,8 @@ @CollectionUniqueField(fieldName = "repere", pathToCollection = "testBio.resultats") @Indexed @FullTextFilterDefs( { @FullTextFilterDef(name = "utilisateur-ResultatTestBio", impl = UtilisateurSearchFilter.class) }) -public class ResultatTestBio extends AbstractModel implements Cloneable, Comparable<ResultatTestBio>, DocumentAttachable { +public class ResultatTestBio extends AbstractModel implements Cloneable, Comparable<ResultatTestBio>, + DocumentAttachable { /** * Type du résultat de test biologique Modified: trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java =================================================================== --- trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.data/src/main/java/nc/ird/cantharella/data/model/TestBio.java 2013-02-21 17:19:50 UTC (rev 150) @@ -71,7 +71,7 @@ */ @Entity @Embeddable -public class TestBio extends AbstractModel implements Comparable<TestBio>, DocumentAttachable { +public class TestBio extends AbstractModel implements Comparable<TestBio>, DocumentAttachable { /** Id du test bio */ @Id Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/campagne/ManageCampagnePage.java 2013-02-21 17:19:50 UTC (rev 150) @@ -260,7 +260,7 @@ initParticipantsFields(formView); initStationsFields(formView); - + // add list document panel ManageListDocumentsPanel manageListDocumentsPanel = new ManageListDocumentsPanel("ManageListDocumentsPanel", campagneModel.getObject(), currentPage); 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 17:16:19 UTC (rev 149) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/DocumentTooltipColumn.java 2013-02-21 17:19:50 UTC (rev 150) @@ -115,7 +115,7 @@ link.add(img); } } - + /** * Use panel to be able to add an image into wicket <span wicket:id="label"> * datatable column header. Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ManageListDocumentsPanel.java 2013-02-21 17:19:50 UTC (rev 150) @@ -85,8 +85,8 @@ List<IColumn<Document, String>> columns = new ArrayList<IColumn<Document, String>>(); - columns.add(new LinkPropertyColumn<Document, String>( - new Model<String>(getString("Document.titre")), "titre", "titre") { + 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) { setResponsePage(new ReadDocumentPage(model.getObject(), documentAttachable, currentPage)); @@ -96,12 +96,11 @@ columns.add(new PropertyColumn<Document, String>(new Model<String>(getString("Document.typeDocument")), "typeDocument.nom", "typeDocument.nom")); - columns.add(new PropertyColumn<Document, String>( - new Model<String>(getString("Document.createur")), "createur", "createur")); + columns.add(new PropertyColumn<Document, String>(new Model<String>(getString("Document.createur")), "createur", + "createur")); columns.add(new LinkableImagePropertyColumn<Document, String>(new Model<String>(getString("Document.link")), - "images/download.png", getString("Document.link"), - 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) { Document document = model.getObject(); @@ -115,8 +114,8 @@ final DataTable<Document, String> attachedDocumentTable = new AjaxFallbackDefaultDataTable<Document, String>( "ListDocumentsPage.AttachedDocuments", columns, attachedDocumentsDataProvider, WebContext.ROWS_PER_PAGE); - columns.add(new AjaxButtonPropertyColumn<Document, String>( - new Model<String>(getString("Actions")), new Model<String>(getString("Delete")), formView) { + 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) { Document document = model.getObject(); Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/document/panel/ReadListDocumentsPanel.java 2013-02-21 17:19:50 UTC (rev 150) @@ -66,8 +66,8 @@ List<IColumn<Document, String>> columns = new ArrayList<IColumn<Document, String>>(); - columns.add(new LinkPropertyColumn<Document, String>( - new Model<String>(getString("Document.titre")), "titre", "titre") { + 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) { setResponsePage(new ReadDocumentPage(model.getObject(), documentAttachable, currentPage)); @@ -77,12 +77,11 @@ columns.add(new PropertyColumn<Document, String>(new Model<String>(getString("Document.typeDocument")), "typeDocument.nom", "typeDocument.nom")); - columns.add(new PropertyColumn<Document, String>( - new Model<String>(getString("Document.createur")), "createur", "createur")); + columns.add(new PropertyColumn<Document, String>(new Model<String>(getString("Document.createur")), "createur", + "createur")); columns.add(new LinkableImagePropertyColumn<Document, String>(new Model<String>(getString("Document.link")), - "images/download.png", getString("Document.link"), - 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) { Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java =================================================================== --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-02-21 17:16:19 UTC (rev 149) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/lot/ReadLotPage.java 2013-02-21 17:19:50 UTC (rev 150) @@ -141,8 +141,8 @@ }); // add list document panel - ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", - lotModel.getObject(), currentPage); + ReadListDocumentsPanel readListDocumentsPanel = new ReadListDocumentsPanel("ReadListDocumentsPanel", lotModel + .getObject(), currentPage); add(readListDocumentsPanel); // Formulaire des actions