This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit fd97a405ef5483e7f6e051dac3302ab892a8ca77 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 19:20:03 2016 +0100 [LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri (Fixes #7892) --- .../swing/ui/content/impl/longline/BasketsTableModel.java | 9 ++++++++- .../swing/ui/content/impl/longline/BranchlinesTableModel.java | 7 +++++++ .../swing/ui/content/impl/longline/SectionsTableModel.java | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java index 79351a0..0fdfeeb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BasketsTableModel.java @@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; * #L% */ -import fr.ird.observe.services.dto.longline.SectionTemplate; import fr.ird.observe.services.dto.longline.BasketDto; +import fr.ird.observe.services.dto.longline.SectionTemplate; /** * Created on 12/11/14. @@ -89,6 +89,13 @@ public class BasketsTableModel extends LonglineCompositionTableModelSupport<Bask } + public static final Class<?>[] CLASSES = {Integer.class, Integer.class, Float.class, Float.class}; + + @Override + public Class<?> getColumnClass(int columnIndex) { + return CLASSES[columnIndex]; + } + @Override public Object getValueAt(int rowIndex, int columnIndex) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java index cb9e53f..f6df049 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlinesTableModel.java @@ -101,6 +101,13 @@ public class BranchlinesTableModel extends LonglineCompositionTableModelSupport< } + public static final Class<?>[] CLASSES = {Integer.class, Integer.class, Float.class, Float.class}; + + @Override + public Class<?> getColumnClass(int columnIndex) { + return CLASSES[columnIndex]; + } + @Override public Object getValueAt(int rowIndex, int columnIndex) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java index c2801d6..a3225ad 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SectionsTableModel.java @@ -90,6 +90,14 @@ public class SectionsTableModel extends LonglineCompositionTableModelSupport<Sec } + + public static final Class<?>[] CLASSES = {Integer.class, Integer.class, SectionWithTemplate.class}; + + @Override + public Class<?> getColumnClass(int columnIndex) { + return CLASSES[columnIndex]; + } + @Override public Object getValueAt(int rowIndex, int columnIndex) { SectionWithTemplate row = data.get(rowIndex); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.