This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4aa9c547864cbee28526dfc186e7a55c62e9f9ea Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 11:18:30 2015 +0100 ajout de la propriete code sur une categorie --- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../entities/data/SampleCategoryModelConverter.java | 13 +++++++------ .../entities/data/SampleCategoryModelEntry.java | 20 ++++++++++++++------ .../config/TuttiPersistenceConfigTest.java | 8 ++++++++ 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 1535075..8404849 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -248,7 +248,7 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { SAMPLE_CATEGORY_MODEL( "tutti.persistence.SampleCategoryModel", n("tutti.config.option.persistence.SampleCategoryModel.description"), - "1428,V/HV|198,Class Tri|196,Sexe|174,Maturite|1430,Age", + "V_HV,1428,V/HV|Class_Tri,198,Class Tri|Sexe,196,Sexe|Maturite,174,Maturite|Age,1430,Age", SampleCategoryModel.class, false ), diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java index 3215d14..276d970 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java @@ -43,14 +43,14 @@ import static org.nuiton.i18n.I18n.t; public class SampleCategoryModelConverter implements NuitonConverter { @Override - public Object convert(Class aClass, Object value) { + public <T> T convert(Class<T> aClass, Object value) { Preconditions.checkNotNull( value, "Can not convert a null SampleCategoryModel"); if (isEnabled(aClass)) { Object result; if (isEnabled(value.getClass())) { result = value; - return result; + return (T) result; } if (value instanceof String) { @@ -64,16 +64,17 @@ public class SampleCategoryModelConverter implements NuitonConverter { for (String entryStr : entryStrs) { String[] entryParts = entryStr.split("\\s*\\,\\s*"); SampleCategoryModelEntry entry = new SampleCategoryModelEntry(); - entry.setCategoryId(Integer.valueOf(entryParts[0])); - if (entryParts.length > 1) { - entry.setLabel(entryParts[1]); + entry.setCode(entryParts[0]); + entry.setCategoryId(Integer.valueOf(entryParts[1])); + if (entryParts.length > 2) { + entry.setLabel(entryParts[2]); } entry.setOrder(entries.size()); entries.add(entry); } } result = new SampleCategoryModel(entries); - return result; + return (T) result; } } throw new ConversionException( diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java index 9389ea7..946a08f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelEntry.java @@ -42,9 +42,9 @@ public class SampleCategoryModelEntry implements Comparable<SampleCategoryModelE private static final long serialVersionUID = 1L; - protected String label; + protected String code; - protected String canonicalLabel; + protected String label; protected Integer categoryId; @@ -53,21 +53,29 @@ public class SampleCategoryModelEntry implements Comparable<SampleCategoryModelE protected transient Caracteristic caracteristic; public void load(TuttiPersistence service) { + Preconditions.checkNotNull(code, "Can't have a null code"); Preconditions.checkNotNull(categoryId, "Can't have a null category id"); caracteristic = service.getCaracteristic(categoryId); Preconditions.checkNotNull(caracteristic, "Could not find category if id: " + categoryId); } + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + public String getLabel() { return label; } public void setLabel(String label) { this.label = label; - this.canonicalLabel = null; } - public String getCanonicalLabel() { + /*public String getCanonicalLabel() { if (canonicalLabel == null) { canonicalLabel = ""; @@ -83,7 +91,7 @@ public class SampleCategoryModelEntry implements Comparable<SampleCategoryModelE } } return canonicalLabel; - } + }*/ public Caracteristic getCaracteristic() { return caracteristic; @@ -116,6 +124,6 @@ public class SampleCategoryModelEntry implements Comparable<SampleCategoryModelE @Override public String toString() { - return categoryId + "," + (StringUtils.isBlank(label) ? "" : label); + return code + "," + categoryId + "," + (StringUtils.isBlank(label) ? "" : label); } } diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java index 6ded88f..fdcdc5e 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigTest.java @@ -75,26 +75,31 @@ public class TuttiPersistenceConfigTest { SampleCategoryModelEntry vracHVrac = new SampleCategoryModelEntry(); vracHVrac.setCategoryId(1428); + vracHVrac.setCode("V_HV"); vracHVrac.setLabel("V/HV"); vracHVrac.setOrder(0); SampleCategoryModelEntry classDeTri = new SampleCategoryModelEntry(); classDeTri.setCategoryId(198); + classDeTri.setCode("Class_Tri"); classDeTri.setLabel("Class Tri"); classDeTri.setOrder(1); SampleCategoryModelEntry sex = new SampleCategoryModelEntry(); sex.setCategoryId(196); + sex.setCode("Sexe"); sex.setLabel("Sexe"); sex.setOrder(2); SampleCategoryModelEntry maturity = new SampleCategoryModelEntry(); maturity.setCategoryId(174); + maturity.setCode("Maturite"); maturity.setLabel("Maturite"); maturity.setOrder(3); SampleCategoryModelEntry age = new SampleCategoryModelEntry(); age.setCategoryId(1430); + age.setCode("Age"); age.setLabel("Age"); age.setOrder(4); @@ -123,11 +128,13 @@ public class TuttiPersistenceConfigTest { SampleCategoryModelEntry e = new SampleCategoryModelEntry(); e.setCategoryId(1); + e.setCode("Label1"); e.setLabel("Label1"); e.setOrder(0); SampleCategoryModelEntry e2 = new SampleCategoryModelEntry(); e2.setCategoryId(2); + e2.setCode("Label2"); e2.setLabel("Label2"); e2.setOrder(1); @@ -169,6 +176,7 @@ public class TuttiPersistenceConfigTest { protected void assertModelEntry(SampleCategoryModelEntry expected, SampleCategoryModelEntry actual) { Assert.assertEquals(expected.getCategoryId(), actual.getCategoryId()); + Assert.assertEquals(expected.getCode(), actual.getCode()); Assert.assertEquals(expected.getLabel(), actual.getLabel()); Assert.assertEquals(expected.getOrder(), actual.getOrder()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.