This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-matrix. See http://git.nuiton.org/nuiton-matrix.git commit 3c6d01e55dd65910ae54388563b089a1e5245f9d Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Dec 9 11:50:38 2014 +0100 fixes #3596: Copy semantics coordinates --- nuiton-matrix-gui/pom.xml | 2 +- .../java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java | 8 +++----- nuiton-matrix/pom.xml | 2 +- .../src/main/java/org/nuiton/math/matrix/MatrixIterator.java | 6 +++++- pom.xml | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/nuiton-matrix-gui/pom.xml b/nuiton-matrix-gui/pom.xml index 5a33ff4..fd7dc47 100644 --- a/nuiton-matrix-gui/pom.xml +++ b/nuiton-matrix-gui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> diff --git a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java index 38678c0..4e8471e 100644 --- a/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java +++ b/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java @@ -28,6 +28,7 @@ import java.awt.Color; import java.awt.Component; import java.awt.Font; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import javax.swing.JTable; @@ -43,8 +44,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixIterator; import org.nuiton.math.matrix.MatrixND; -import cern.colt.Arrays; - /** * MatrixTableModelLinear. * @@ -98,9 +97,8 @@ public class MatrixTableModelLinear extends AbstractTableModel implements double value = i.getValue(); if (showDefault || value != defaultValue) { // make copy since change in getSemanticsCoordinates() - Object[] sems2 = new Object[sems.length]; - System.arraycopy(sems, 0, sems2, 0, sems.length); - mappingRowSems.add(sems2); + Object[] semsCopy = Arrays.copyOf(sems, sems.length); + mappingRowSems.add(semsCopy); } } } diff --git a/nuiton-matrix/pom.xml b/nuiton-matrix/pom.xml index d239acb..c22f1ee 100644 --- a/nuiton-matrix/pom.xml +++ b/nuiton-matrix/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> diff --git a/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java b/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java index f0fe546..5e6a697 100644 --- a/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java +++ b/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java @@ -2,7 +2,7 @@ * #%L * Nuiton Matrix :: API * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2014 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -39,6 +39,10 @@ public interface MatrixIterator extends BasicMatrixIterator { // MatrixIterator * Retourne les coordonnés de l'élément, en sémantique. Si la matrice n'a * pas de sémantique alors retourne null. * + * ATTENTION: Pour des raisons de performance, plusieurs appels successifs à cette méthode + * retourne la même instance de tableau avec de nouvelle coordonnées. Pour sauvegarder ces + * coordonnées, il faudra copier le tableau retourné. + * * @return current element semantics */ Object[] getSemanticsCoordinates(); diff --git a/pom.xml b/pom.xml index 058018c..eb235aa 100644 --- a/pom.xml +++ b/pom.xml @@ -6,11 +6,11 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.6</version> + <version>1.7</version> </parent> <artifactId>matrix</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Matrix</name> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.