Author: echatellier Date: 2013-02-20 15:57:34 +0100 (Wed, 20 Feb 2013) New Revision: 139 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/139 Log: Format code 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/ReadMoleculePage.java 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-20 14:49:43 UTC (rev 138) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ManageMoleculePage.java 2013-02-20 14:57:34 UTC (rev 139) @@ -220,10 +220,9 @@ "formuleDevMol")).add(new MoleculeEditorBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol")))); } else { - formView - .add(new HiddenField<String>("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, - "formuleDevMol")).setEnabled(false) // important otherwise, loose data - .add(new MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol"), true))); + formView.add(new HiddenField<String>("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, + "formuleDevMol")).setEnabled(false) // important otherwise, loose data + .add(new MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol"), true))); } formView.add(new TextField<String>("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")) 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-20 14:49:43 UTC (rev 138) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/pages/domain/molecule/ReadMoleculePage.java 2013-02-20 14:57:34 UTC (rev 139) @@ -137,8 +137,8 @@ add(new Label("Molecule.formuleDevMol", new PropertyModel<String>(moleculeModel, "formuleDevMol")).add( new ReplaceEmptyLabelBehavior()).add( new MoleculeViewBehavior(new PropertyModel<String>(moleculeModel, "formuleDevMol"), true))); - add(new ResourceLink<Molecule>("DownloadMolFile", new ByteArrayResource("chemical/x-mdl-molfile", - moleculeModel.getObject().getFormuleDevMol().getBytes(), "molecule.mol"))); + add(new ResourceLink<Molecule>("DownloadMolFile", new ByteArrayResource("chemical/x-mdl-molfile", moleculeModel + .getObject().getFormuleDevMol().getBytes(), "molecule.mol"))); add(new Label("Molecule.nomIupca", new PropertyModel<String>(moleculeModel, "nomIupca")) .add(new ReplaceEmptyLabelBehavior())); add(new Label("Molecule.formuleBrute", new PropertyModel<String>(moleculeModel, "formuleBrute")) @@ -281,7 +281,8 @@ } }); - item.add(new Label("Molecule.provenance.List.presence", new DisplayDecimalPropertyModel(provenanceModel, + item.add( + new Label("Molecule.provenance.List.presence", new DisplayDecimalPropertyModel(provenanceModel, "pourcentage", DecimalDisplFormat.SMALL, getLocale()))).add( new ReplaceEmptyLabelBehavior()); if (provenanceModel.getObject().getProduit() instanceof Fraction) {