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 4e6cbb13a89323822a0e31ddcdb6330a46210f83 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 15:47:30 2015 +0100 fixes #6555: [CONFIG] Erreur au chargement de l'ordre des catégorisations dans la config --- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../data/SampleCategoryModelConverter.java | 8 ++++--- .../entities/data/SampleCategoryModelEntry.java | 3 +-- .../entities/data/SampleCategoryModels.java | 28 ++++++++++++++++++++++ .../category/EditSampleCategoryModelUIHandler.java | 21 +++------------- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 6 files changed, 39 insertions(+), 25 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 1b7fd48..2649825 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"), - "V_HV,1428,V/HV|Class_Tri,198,Class Tri|Sexe,196,Sexe|Maturite,174,Maturite|Age,1430,Age", + "1428,V/HV,V_HV|198,Class Tri,Class_Tri|196,Sexe,Sexe|174,Maturite,Maturite|1430,Age,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 276d970..bef09fb 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 @@ -64,10 +64,12 @@ public class SampleCategoryModelConverter implements NuitonConverter { for (String entryStr : entryStrs) { String[] entryParts = entryStr.split("\\s*\\,\\s*"); SampleCategoryModelEntry entry = new SampleCategoryModelEntry(); - entry.setCode(entryParts[0]); - entry.setCategoryId(Integer.valueOf(entryParts[1])); + entry.setCategoryId(Integer.valueOf(entryParts[0])); + entry.setLabel(entryParts[1]); if (entryParts.length > 2) { - entry.setLabel(entryParts[2]); + entry.setCode(entryParts[2]); + } else { + entry.setCode(SampleCategoryModels.getCode(entryParts[1])); } entry.setOrder(entries.size()); entries.add(entry); 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 6dd198b..e89c435 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 @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; import com.google.common.primitives.Ints; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; -import org.apache.commons.lang3.StringUtils; import java.io.Serializable; @@ -106,6 +105,6 @@ public class SampleCategoryModelEntry implements Comparable<SampleCategoryModelE @Override public String toString() { - return code + "," + categoryId + "," + (StringUtils.isBlank(label) ? "" : label); + return categoryId + "," + label + "," + code; } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModels.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModels.java new file mode 100644 index 0000000..f8c932a --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModels.java @@ -0,0 +1,28 @@ +package fr.ifremer.tutti.persistence.entities.data; + +import org.apache.commons.lang3.StringUtils; + +/** + * Created on 1/28/15. + * + * @author Tony Chemit - chemit@codelutin.com + * @since XXX + */ +public class SampleCategoryModels { + + public static String getCode(String label) { + String canonicalLabel = ""; + + if (StringUtils.isNotEmpty(label)) { + for (int i = 0; i < label.length(); i++) { + char a = label.charAt(i); + if (!Character.isLetterOrDigit(a)) { + a = '_'; + } + canonicalLabel += a; + } + } + + return canonicalLabel; + } +} diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java index 503a623..25cd449 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUIHandler.java @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; +import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModels; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -163,14 +164,13 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle @Override protected boolean isRowValid(EditSampleCategoryModelRowModel row) { boolean result = StringUtils.isNotBlank(row.getLabel()) && - StringUtils.isNotBlank(row.getCode()) && - getCode(row.getCode()).equals(row.getCode()); + StringUtils.isNotBlank(row.getCode()); if (result) { // check code is alphanumerique String code = row.getCode(); - result = code.equals(getCode(code)); + result = code.equals(SampleCategoryModels.getCode(code)); } if (result) { @@ -403,19 +403,4 @@ public class EditSampleCategoryModelUIHandler extends AbstractTuttiTableUIHandle model.setMoveDownEntryEnabled(enableMoveDownEntry); } - public static String getCode(String label) { - String canonicalLabel = ""; - - if (StringUtils.isNotEmpty(label)) { - for (int i = 0; i < label.length(); i++) { - char a = label.charAt(i); - if (!Character.isLetterOrDigit(a)) { - a = '_'; - } - canonicalLabel += a; - } - } - - return canonicalLabel; - } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 3cad4bd..6d2082e 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1036,7 +1036,7 @@ tutti.editSampleCategoryModel.passwordDialog.error.message=Le mot de passe que v tutti.editSampleCategoryModel.passwordDialog.error.title=Mot de passe incorrect tutti.editSampleCategoryModel.passwordDialog.message=Vous souhaitez entrer dans une partie sensible de l'application tutti.editSampleCategoryModel.passwordDialog.title=Zone sensible -tutti.editSampleCategoryModel.saved=Les catégorisations ont été enregistrées +tutti.editSampleCategoryModel.saved=Les catégorisations ont été enregistrées. tutti.editSampleCategoryModel.table.header.caracteristic=Caractéristique tutti.editSampleCategoryModel.table.header.caracteristic.tip=Caractéristique de la catégorie tutti.editSampleCategoryModel.table.header.code=Code -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.