Author: tchemit Date: 2013-04-21 16:40:42 +0200 (Sun, 21 Apr 2013) New Revision: 842 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/842 Log: fixes #2342: D?\195?\169coration de l'ordre des cat?\195?\169gories ko dans la configuration Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.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-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-04-21 14:40:42 UTC (rev 842) @@ -32,6 +32,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -98,7 +99,7 @@ registerTuttiDecorator(Gear.class, "${label}$s#${name}$s", SEPARATOR, " - "); registerTuttiDecorator(Person.class, "${firstName}$s#${lastName}$s#${department}$s", SEPARATOR, " "); registerTuttiDecorator(Caracteristic.class, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s", SEPARATOR, " - "); - registerTuttiDecorator(Caracteristic.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); + registerTuttiDecorator(CaracteristicBean.class, CARACTERISTIC_PARAMETER_ONLY, "${parameterName}$s", SEPARATOR, " - "); // registerMultiJXPathDecorator(Caracteristic.class, CARACTERISTIC_WITH_UNIT, "${parameterName}$s#${matrixName}$s#${fractionName}$s#${methodName}$s (${unit}$s)", SEPARATOR, " - "); registerTuttiDecorator(CaracteristicQualitativeValue.class, "${name}$s", SEPARATOR, " - "); registerTuttiDecorator(SpeciesProtocol.class, "${speciesReferenceTaxonId}", SEPARATOR, " - "); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2013-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/DecoratorServiceTest.java 2013-04-21 14:40:42 UTC (rev 842) @@ -34,6 +34,7 @@ import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -80,7 +81,7 @@ assertDecoratorByTypeFound(Gear.class); assertDecoratorByTypeFound(Person.class); assertDecoratorByTypeFound(Caracteristic.class); - assertDecoratorByTypeFound(DecoratorService.CARACTERISTIC_PARAMETER_ONLY, Caracteristic.class); + assertDecoratorByTypeFound(DecoratorService.CARACTERISTIC_PARAMETER_ONLY, CaracteristicBean.class); assertDecoratorByTypeFound(SpeciesProtocol.class); assertDecoratorByTypeFound(CaracteristicQualitativeValue.class); assertDecoratorByTypeFound(Attachment.class); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-04-21 14:27:12 UTC (rev 841) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUIHandler.java 2013-04-21 14:40:42 UTC (rev 842) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; +import fr.ifremer.tutti.persistence.entities.referential.CaracteristicBean; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import jaxx.runtime.SwingUtil; @@ -142,9 +143,9 @@ jToolBar.setFloatable(false); ui.getSampleOrderEditorTopPanel().setRightDecoration(jToolBar); - JXPathDecorator<Caracteristic> decorator = - (JXPathDecorator<Caracteristic>) context.getDecoratorService().getDecoratorByType( - Caracteristic.class, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); + JXPathDecorator<CaracteristicBean> decorator = + (JXPathDecorator<CaracteristicBean>) context.getDecoratorService().getDecoratorByType( + CaracteristicBean.class, DecoratorService.CARACTERISTIC_PARAMETER_ONLY); ui.getList().setCellRenderer(new MultiDecoratorListCellRenderer(decorator)); ui.getList().addKeyListener(new KeyAdapter() {