Author: tchemit Date: 2013-02-04 02:35:24 +0100 (Mon, 04 Feb 2013) New Revision: 323 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/323 Log: utilisation du cruiseCode (reste ?\195?\160 bien l'utiliser dans les combos) Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-04 01:30:03 UTC (rev 322) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-02-04 01:35:24 UTC (rev 323) @@ -39,11 +39,14 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; +import org.apache.commons.jxpath.JXPathContext; import org.nuiton.util.decorator.Decorator; import org.nuiton.util.decorator.DecoratorProvider; +import org.nuiton.util.decorator.MultiJXPathDecorator; import java.io.Serializable; +import static org.nuiton.i18n.I18n._; import static org.nuiton.i18n.I18n.n_; /** @@ -64,7 +67,7 @@ String getLabel(); } - public static final String SPECIES_BY_CRUISE_CODE= "byCruiseCode"; + public static final String SPECIES_BY_CRUISE_CODE = "byCruiseCode"; public static final String SPECIES_BY_REF_TAX_CODE = "byRefTaxCode"; @@ -95,6 +98,10 @@ return decoratorProvider.getDecoratorByType(type, name); } + public static String getSpeciesContext(boolean protocolFilled) { + return protocolFilled ? SPECIES_BY_CRUISE_CODE : null; + } + @Override public void setServiceContext(TuttiServiceContext context) { super.setServiceContext(context); @@ -108,7 +115,7 @@ registerMultiJXPathDecorator(TuttiProtocol.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(FishingOperation.class, "${stationNumber}$s#${fishingOperationNumber}$s#${multirigAggregation}$s#${gearShootingStartDate}$td/%4$tm/%4$tY", SEPARATOR, " - "); registerMultiJXPathDecorator(Zone.class, "${label}$s#${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); +// registerMultiJXPathDecorator(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Country.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); @@ -117,7 +124,7 @@ registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerMultiJXPathDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, "${refTaxCode}$s#${name}$s", SEPARATOR, " - "); - registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - "); +// registerMultiJXPathDecorator(Species.class, SPECIES_BY_CRUISE_CODE, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, SPECIES_BY_REF_TAX_CODE, "${refTaxCode}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(Species.class, SPECIES_BY_GENUS, "${name}$s", SEPARATOR, " - "); registerMultiJXPathDecorator(SpeciesProtocol.class, "${speciesId}", SEPARATOR, " - "); @@ -131,6 +138,41 @@ return bean == null ? "" : String.valueOf(bean); } }); + registerDecorator(new MultiJXPathDecorator<Vessel>(Vessel.class, "${name}$s#${internalRegistrationCode}$s", SEPARATOR, " - ") { + + private static final long serialVersionUID = 1L; + + @Override + protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { + Comparable result = super.getTokenValue(jxcontext, token); + if ("internalRegistrationCode".equals(token)) { + if (result == null || "null".equals(result)) { + result = _("tutti.propety.no.vessel.internalRegistrationCode"); + } + } else if ("name".equals(token)) { + if (result == null || "null".equals(result)) { + result = _("tutti.propety.no.vessel.name"); + } + } + return result; + } + }); + + registerDecorator(SPECIES_BY_CRUISE_CODE, new MultiJXPathDecorator<Species>(Species.class, "${cruiseCode}$s#${refTaxCode}$s#${name}$s", SEPARATOR, " - ") { + + private static final long serialVersionUID = 1L; + + @Override + protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { + Comparable result = super.getTokenValue(jxcontext, token); + if ("cruiseCode".equals(token)) { + if (result == null || "null".equals(result)) { + result = _("tutti.propety.no.species.cruiseCode"); + } + } + return result; + } + }); } }; } Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-04 01:30:03 UTC (rev 322) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-02-04 01:35:24 UTC (rev 323) @@ -38,4 +38,7 @@ tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone +tutti.propety.no.species.cruiseCode=\# +tutti.propety.no.vessel.internalRegistrationCode=Immatriculation inconnu +tutti.propety.no.vessel.name=Nom inconnu tutti.service.config=Configuration des services de Tutti Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-04 01:30:03 UTC (rev 322) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-02-04 01:35:24 UTC (rev 323) @@ -40,6 +40,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; @@ -455,7 +456,8 @@ HashMultimap.create(); - if (context.isProtocolFilled()) { + boolean protocolFilled = context.isProtocolFilled(); + if (protocolFilled) { // get loaded protocol @@ -537,7 +539,7 @@ addColumnToModel(columnModel, null, - newTableCellRender(Species.class), + newTableCellRender(Species.class, DecoratorService.getSpeciesContext(protocolFilled)), SpeciesBatchTableModel.SPECIES); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-04 01:30:03 UTC (rev 322) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUIHandler.java 2013-02-04 01:35:24 UTC (rev 323) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; @@ -106,9 +107,12 @@ initUI(ui); + boolean protocolFilled = context.isProtocolFilled(); + initBeanComboBox(ui.getSpeciesComboBox(), Lists.<Species>newArrayList(), - null); + null, + DecoratorService.getSpeciesContext(protocolFilled)); Caracteristic caracteristic = persistenceService.getSortedUnsortedCaracteristic();