October 2011 - Nuiton-matrix-commits - mailman.cloud.codelutin.com

r392 - trunk
by maven-release＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:25:35 +0200 (Fri, 28 Oct 2011) New Revision: 392 Url: http://nuiton.org/repositories/revision/nuiton-matrix/392 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 14:35:52 UTC (rev 391) +++ trunk/pom.xml 2011-10-28 21:25:35 UTC (rev 392) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <artifactId>matrix</artifactId>

1 0

r391 - in trunk: . nuiton-matrix nuiton-matrix-gui
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 16:35:52 +0200 (Thu, 27 Oct 2011) New Revision: 391 Url: http://nuiton.org/repositories/revision/nuiton-matrix/391 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2011-10-27 14:35:51 UTC (rev 390) +++ trunk/nuiton-matrix/pom.xml 2011-10-27 14:35:52 UTC (rev 391) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2011-10-27 14:35:51 UTC (rev 390) +++ trunk/nuiton-matrix-gui/pom.xml 2011-10-27 14:35:52 UTC (rev 391) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 14:35:51 UTC (rev 390) +++ trunk/pom.xml 2011-10-27 14:35:52 UTC (rev 391) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.2</version> + <version>2.2.1-SNAPSHOT</version> <modules> <module>nuiton-matrix</module> @@ -133,12 +133,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.2 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.2 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/matrix-2.2</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r390 - in tags: . matrix-2.2
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 16:35:51 +0200 (Thu, 27 Oct 2011) New Revision: 390 Url: http://nuiton.org/repositories/revision/nuiton-matrix/390 Log: [maven-release-plugin] copy for tag matrix-2.2 Added: tags/matrix-2.2/ Property changes on: tags/matrix-2.2 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.ipr *.iml bin Added: svn:mergeinfo +

1 0

r389 - in trunk: . nuiton-matrix nuiton-matrix-gui
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 16:35:48 +0200 (Thu, 27 Oct 2011) New Revision: 389 Url: http://nuiton.org/repositories/revision/nuiton-matrix/389 Log: [maven-release-plugin] prepare release matrix-2.2 Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2011-10-27 14:17:50 UTC (rev 388) +++ trunk/nuiton-matrix/pom.xml 2011-10-27 14:35:48 UTC (rev 389) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2011-10-27 14:17:50 UTC (rev 388) +++ trunk/nuiton-matrix-gui/pom.xml 2011-10-27 14:35:48 UTC (rev 389) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 14:17:50 UTC (rev 388) +++ trunk/pom.xml 2011-10-27 14:35:48 UTC (rev 389) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.2</version> <modules> <module>nuiton-matrix</module> @@ -133,12 +133,12 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.2 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.2 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-matrix/repository/show/tags/matrix-2.2</url> </scm> <distributionManagement>

1 0

r388 - trunk
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 16:17:50 +0200 (Thu, 27 Oct 2011) New Revision: 388 Url: http://nuiton.org/repositories/revision/nuiton-matrix/388 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 14:13:39 UTC (rev 387) +++ trunk/pom.xml 2011-10-27 14:17:50 UTC (rev 388) @@ -92,9 +92,9 @@ <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.4</jaxxVersion> - <nuitonUtilsVersion>2.2</nuitonUtilsVersion> - <nuitonI18nVersion>2.4</nuitonI18nVersion> + <jaxxVersion>2.4.2</jaxxVersion> + <nuitonUtilsVersion>2.3</nuitonUtilsVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> </properties>

1 0

r387 - in trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer: . renderer
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 16:13:39 +0200 (Thu, 27 Oct 2011) New Revision: 387 Url: http://nuiton.org/repositories/revision/nuiton-matrix/387 Log: Remove use of commons io and commons lang Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2011-10-27 13:52:22 UTC (rev 386) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2011-10-27 14:13:39 UTC (rev 387) @@ -27,8 +27,6 @@ import static org.nuiton.i18n.I18n._; -import org.apache.commons.lang.StringUtils; - import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; @@ -253,7 +251,7 @@ // compute dimension name String dimensionName = _(matrix.getDimensionName(index)); - if (StringUtils.isBlank(dimensionName)) { + if (dimensionName == null || dimensionName.isEmpty()) { dimensionName = _("nuitonmatrix.viewer.dimnameindex", index); } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2011-10-27 13:52:22 UTC (rev 386) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2011-10-27 14:13:39 UTC (rev 387) @@ -39,7 +39,6 @@ import javax.swing.JButton; import javax.swing.JPanel; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -153,7 +152,15 @@ } } finally { - IOUtils.closeQuietly(writer); + if (writer != null) { + try { + writer.close(); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close writer", ex); + } + } + } } } }

1 0

r386 - trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 27 Oct '11

27 Oct '11

Author: echatellier Date: 2011-10-27 15:52:22 +0200 (Thu, 27 Oct 2011) New Revision: 386 Url: http://nuiton.org/repositories/revision/nuiton-matrix/386 Log: Remove IOUtils use Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2011-09-22 17:27:06 UTC (rev 385) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2011-10-27 13:52:22 UTC (rev 386) @@ -40,14 +40,12 @@ import org.apache.commons.collections.primitives.ArrayIntList; import org.apache.commons.collections.primitives.IntList; -import org.apache.commons.io.IOUtils; import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ArrayUtil; -import org.nuiton.util.FileUtil; /** * Abstract matrix class with all dimension and semantics support (but @@ -1222,7 +1220,15 @@ } importCSV(reader, origin, matrixName); } finally { - IOUtils.closeQuietly(reader); + if (reader != null) { + try { + reader.close(); + } catch (IOException ex) { + if (log.isErrorEnabled()) { + log.error("Can't close reader", ex); + } + } + } } }

1 0