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

r332 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org Jan. 27, 2011

Jan. 27, 2011

Author: tchemit Date: 2011-01-27 09:53:52 +0100 (Thu, 27 Jan 2011) New Revision: 332 Url: http://nuiton.org/repositories/revision/nuiton-matrix/332 Log: Update mavenpom4redmineAndCentral to 2.4.3. Modified: branches/nuiton-matrix-2.1.x/pom.xml Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2011-01-27 08:53:49 UTC (rev 331) +++ branches/nuiton-matrix-2.1.x/pom.xml 2011-01-27 08:53:52 UTC (rev 332) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.3</version> </parent> <artifactId>nuiton-matrix</artifactId>

1 0

r331 - trunk
by tchemit＠users.nuiton.org Jan. 27, 2011

Jan. 27, 2011

Author: tchemit Date: 2011-01-27 09:53:49 +0100 (Thu, 27 Jan 2011) New Revision: 331 Url: http://nuiton.org/repositories/revision/nuiton-matrix/331 Log: Update mavenpom4redmineAndCentral to 2.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:40:30 UTC (rev 330) +++ trunk/pom.xml 2011-01-27 08:53:49 UTC (rev 331) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2</version> + <version>2.4.3</version> </parent> <artifactId>matrix</artifactId>

1 0

r330 - in trunk: . nuiton-matrix nuiton-matrix-gui
by echatellier＠users.nuiton.org Jan. 26, 2011

Jan. 26, 2011

Author: echatellier Date: 2011-01-26 17:40:30 +0100 (Wed, 26 Jan 2011) New Revision: 330 Url: http://nuiton.org/repositories/revision/nuiton-matrix/330 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-01-26 16:40:29 UTC (rev 329) +++ trunk/nuiton-matrix/pom.xml 2011-01-26 16:40:30 UTC (rev 330) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2011-01-26 16:40:29 UTC (rev 329) +++ trunk/nuiton-matrix-gui/pom.xml 2011-01-26 16:40:30 UTC (rev 330) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 16:40:29 UTC (rev 329) +++ trunk/pom.xml 2011-01-26 16:40:30 UTC (rev 330) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.1</version> + <version>2.2-SNAPSHOT</version> <modules> <module>nuiton-matrix</module> @@ -144,11 +144,11 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.1 + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/tags/matrix-2.1</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> </scm> </project>

1 0

r329 - in tags: . matrix-2.1
by echatellier＠users.nuiton.org Jan. 26, 2011

Jan. 26, 2011

Author: echatellier Date: 2011-01-26 17:40:29 +0100 (Wed, 26 Jan 2011) New Revision: 329 Url: http://nuiton.org/repositories/revision/nuiton-matrix/329 Log: [maven-release-plugin] copy for tag matrix-2.1 Added: tags/matrix-2.1/ Property changes on: tags/matrix-2.1 ___________________________________________________________________ Added: svn:ignore + target .settings .classpath .project *.ipr *.iml bin Added: svn:mergeinfo +

1 0

r328 - in trunk: . nuiton-matrix nuiton-matrix-gui
by echatellier＠users.nuiton.org Jan. 26, 2011

Jan. 26, 2011

Author: echatellier Date: 2011-01-26 17:40:26 +0100 (Wed, 26 Jan 2011) New Revision: 328 Url: http://nuiton.org/repositories/revision/nuiton-matrix/328 Log: [maven-release-plugin] prepare release matrix-2.1 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-01-26 14:04:04 UTC (rev 327) +++ trunk/nuiton-matrix/pom.xml 2011-01-26 16:40:26 UTC (rev 328) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2011-01-26 14:04:04 UTC (rev 327) +++ trunk/nuiton-matrix-gui/pom.xml 2011-01-26 16:40:26 UTC (rev 328) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> </parent> <groupId>org.nuiton.matrix</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 14:04:04 UTC (rev 327) +++ trunk/pom.xml 2011-01-26 16:40:26 UTC (rev 328) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -16,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> + <version>2.1</version> <modules> <module>nuiton-matrix</module> @@ -146,11 +144,11 @@  <scm> <connection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.1 </connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/tags/matrix-2.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/tags/matrix-2.1</url> </scm> </project>

1 0

r327 - trunk
by echatellier＠users.nuiton.org Jan. 26, 2011

Jan. 26, 2011

Author: echatellier Date: 2011-01-26 15:04:04 +0100 (Wed, 26 Jan 2011) New Revision: 327 Url: http://nuiton.org/repositories/revision/nuiton-matrix/327 Log: Update nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-26 09:02:53 UTC (rev 326) +++ trunk/pom.xml 2011-01-26 14:04:04 UTC (rev 327) @@ -99,7 +99,7 @@ <projectId>nuiton-matrix</projectId> <jaxxVersion>2.2.5</jaxxVersion> - <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.0</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> </properties>

1 0

r326 - trunk
by echatellier＠users.nuiton.org Jan. 26, 2011

Jan. 26, 2011

Author: echatellier Date: 2011-01-26 10:02:53 +0100 (Wed, 26 Jan 2011) New Revision: 326 Url: http://nuiton.org/repositories/revision/nuiton-matrix/326 Log: Update libs Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-23 17:30:51 UTC (rev 325) +++ trunk/pom.xml 2011-01-26 09:02:53 UTC (rev 326) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.2-SNAPSHOT</version> + <version>2.4.2</version> </parent> <artifactId>matrix</artifactId> @@ -98,9 +98,9 @@ <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.2.3</jaxxVersion> - <nuitonUtilsVersion>1.5</nuitonUtilsVersion> - <nuitonI18nVersion>2.0.1</nuitonI18nVersion> + <jaxxVersion>2.2.5</jaxxVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> + <nuitonI18nVersion>2.2</nuitonI18nVersion> </properties>

1 0

r325 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org Jan. 23, 2011

Jan. 23, 2011

Author: tchemit Date: 2011-01-23 18:30:51 +0100 (Sun, 23 Jan 2011) New Revision: 325 Url: http://nuiton.org/repositories/revision/nuiton-matrix/325 Log: Updates to mavenpom 2.4.2 Modified: branches/nuiton-matrix-2.1.x/pom.xml Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2011-01-23 17:30:42 UTC (rev 324) +++ branches/nuiton-matrix-2.1.x/pom.xml 2011-01-23 17:30:51 UTC (rev 325) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <artifactId>nuiton-matrix</artifactId>

1 0

r324 - trunk
by tchemit＠users.nuiton.org Jan. 23, 2011

Jan. 23, 2011

Author: tchemit Date: 2011-01-23 18:30:42 +0100 (Sun, 23 Jan 2011) New Revision: 324 Url: http://nuiton.org/repositories/revision/nuiton-matrix/324 Log: Updates to mavenpom 2.4.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-22 09:32:20 UTC (rev 323) +++ trunk/pom.xml 2011-01-23 17:30:42 UTC (rev 324) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1</version> + <version>2.4.2-SNAPSHOT</version> </parent> <artifactId>matrix</artifactId>

1 0

r323 - in trunk: . nuiton-matrix nuiton-matrix/src/license nuiton-matrix/src/main/java/org/nuiton/math/matrix nuiton-matrix/src/main/resources/i18n nuiton-matrix/src/test/java/org/nuiton/math/matrix nuiton-matrix/src/test/resources nuiton-matrix-gui nuiton-matrix-gui/src/license nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui nuiton-matrix-gui/src/main/resources/i18n nuiton-matrix-gui/src/main/resources/icons nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui src/s
by tchemit＠users.nuiton.org Jan. 22, 2011

Jan. 22, 2011

Author: tchemit Date: 2011-01-22 10:32:20 +0100 (Sat, 22 Jan 2011) New Revision: 323 Url: http://nuiton.org/repositories/revision/nuiton-matrix/323 Log: reformat poms + improve them add svn-keywords Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/nuiton-matrix-gui/ trunk/nuiton-matrix-gui/LICENSE.txt trunk/nuiton-matrix-gui/README.txt trunk/nuiton-matrix-gui/changelog.txt trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix-gui/src/license/THIRD-PARTY.properties trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java trunk/nuiton-matrix-gui/src/main/resources/i18n/nuiton-matrix-gui_en_GB.properties trunk/nuiton-matrix-gui/src/main/resources/i18n/nuiton-matrix-gui_fr_FR.properties trunk/nuiton-matrix-gui/src/main/resources/icons/1rightarrow.png trunk/nuiton-matrix-gui/src/main/resources/icons/chart_curve.png trunk/nuiton-matrix-gui/src/main/resources/icons/sigma-barre.gif trunk/nuiton-matrix-gui/src/main/resources/icons/sigma.gif trunk/nuiton-matrix-gui/src/main/resources/icons/table.png trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java trunk/nuiton-matrix/ trunk/nuiton-matrix/LICENSE.txt trunk/nuiton-matrix/README.txt trunk/nuiton-matrix/changelog.txt trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/license/THIRD-PARTY.properties trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DimensionHelper.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixException.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticList.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java trunk/nuiton-matrix/src/main/resources/i18n/nuiton-matrix_en_GB.properties trunk/nuiton-matrix/src/main/resources/i18n/nuiton-matrix_fr_FR.properties trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java trunk/nuiton-matrix/src/test/resources/log4j.properties trunk/pom.xml trunk/src/site/rst/Serializable.rst trunk/src/site/rst/Todo.rst trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix ___________________________________________________________________ Modified: svn:ignore - .classpath .project .settings target + .classpath .project .settings target *.ipr *.iml *.iws Property changes on: trunk/nuiton-matrix/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2011-01-04 17:39:14 UTC (rev 322) +++ trunk/nuiton-matrix/pom.xml 2011-01-22 09:32:20 UTC (rev 323) @@ -1,83 +1,91 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>matrix</artifactId> + <version>2.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.matrix</groupId> - <artifactId>nuiton-matrix</artifactId> + <groupId>org.nuiton.matrix</groupId> + <artifactId>nuiton-matrix</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-primitives</groupId> - <artifactId>commons-primitives</artifactId> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> - <name>NuitonMatrix :: Nuiton-matrix</name> - <description>Matrix core module</description> - <packaging>jar</packaging> + </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> +  +  +  - </build> + <name>NuitonMatrix :: Nuiton-matrix</name> + <description>Matrix core module</description> + + <properties> + +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> </project> Property changes on: trunk/nuiton-matrix/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrixIterator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DimensionHelper.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleBigVector.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/DoubleVector.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatBigVector.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/FloatVector.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MapFunction.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixEncoder.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixException.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixHelper.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIterator.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixIteratorImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixND.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixNDImpl.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SemanticList.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/SubMatrix.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/Vector.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/resources/i18n/nuiton-matrix_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/main/resources/i18n/nuiton-matrix_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixBigTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/FloatVectorTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixHelperTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixStringEncoderTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/SubMatrixTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui ___________________________________________________________________ Modified: svn:ignore - .settings target .classpath .project + .settings target .classpath .project *.iml *.ipr *.iws Property changes on: trunk/nuiton-matrix-gui/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2011-01-04 17:39:14 UTC (rev 322) +++ trunk/nuiton-matrix-gui/pom.xml 2011-01-22 09:32:20 UTC (rev 323) @@ -1,173 +1,178 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>matrix</artifactId> + <version>2.1-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.matrix</groupId> - <artifactId>nuiton-matrix-gui</artifactId> + <groupId>org.nuiton.matrix</groupId> + <artifactId>nuiton-matrix-gui</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>org.nuiton.matrix</groupId> - <artifactId>nuiton-matrix</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-matrix</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>NuitonMatrix :: Nuiton-matrix-gui</name> - <description>Matrix gui module</description> - <packaging>jar</packaging> + <name>NuitonMatrix :: Nuiton-matrix-gui</name> + <description>Matrix gui module</description> - <properties> + <properties> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-ui</id> - <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.JAXXUtil.getStringValue</extraImportList> - <addSourcesToClassPath>true</addSourcesToClassPath> - <addProjectClassPath>true</addProjectClassPath> - </configuration> - </execution> - <execution> - <goals> - <goal>generate</goal> - </goals> - <id>generate-tests</id> - <phase>generate-test-sources</phase> - <configuration> - <testPhase>true</testPhase> - <src>src/test/java</src> - <outJava>target/generated-sources/test-java</outJava> - <addProjectClassPath>true</addProjectClassPath> - <addCompileClassPath>true</addCompileClassPath> - </configuration> - </execution> - </executions> - </plugin> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-ui</id> + <configuration> + <extraImportList> + jaxx.runtime.SwingUtil, + static jaxx.runtime.JAXXUtil.getStringValue + </extraImportList> + <addSourcesToClassPath>true</addSourcesToClassPath> + <addProjectClassPath>true</addProjectClassPath> + </configuration> + </execution> + <execution> + <goals> + <goal>generate</goal> + </goals> + <id>generate-tests</id> + <phase>generate-test-sources</phase> + <configuration> + <testPhase>true</testPhase> + <src>src/test/java</src> + <outJava>target/generated-sources/test-java</outJava> + <addProjectClassPath>true</addProjectClassPath> + <addCompileClassPath>true</addCompileClassPath> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <configuration> - <entries> - <entry> - <basedir>${project.build.directory}/generated-sources/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>${project.build.directory}/generated-sources/java/ + </basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> - </build> + </build> -  -  -  +  +  +  - <profiles> + <profiles> -  - <profile> - <id>assembly-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> -  - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> +  + <profile> + <id>assembly-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> +  + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> Property changes on: trunk/nuiton-matrix-gui/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixEditor.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditor.jaxx ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEvent.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelListener.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModel.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/i18n/nuiton-matrix-gui_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/i18n/nuiton-matrix-gui_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/icons/1rightarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/icons/chart_curve.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/icons/sigma-barre.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/icons/sigma.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/main/resources/icons/table.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixEditorsTests.jaxx ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixPanelListenerTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-matrix-gui/src/test/java/org/nuiton/math/matrix/gui/MatrixTableModelTest.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-04 17:39:14 UTC (rev 322) +++ trunk/pom.xml 2011-01-22 09:32:20 UTC (rev 323) @@ -1,153 +1,156 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmineAndCentral</artifactId> + <version>2.4.1</version> + </parent> - <artifactId>matrix</artifactId> - <version>2.1-SNAPSHOT</version> + <artifactId>matrix</artifactId> + <version>2.1-SNAPSHOT</version> - <modules> - <module>nuiton-matrix</module> - <module>nuiton-matrix-gui</module> - </modules> + <modules> + <module>nuiton-matrix</module> + <module>nuiton-matrix-gui</module> + </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${nuitonI18nVersion}</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + <scope>compile</scope> + </dependency> -  - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxxVersion}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.help</groupId> - <artifactId>javahelp</artifactId> - </exclusion> - <exclusion> - <groupId>com.opensymphony</groupId> - <artifactId>xwork</artifactId> - </exclusion> - <exclusion> - <groupId>opensymphony</groupId> - <artifactId>ognl</artifactId> - </exclusion> - <exclusion> - <groupId>commons-jxpath</groupId> - <artifactId>commons-jxpath</artifactId> - </exclusion> - <exclusion> - <groupId>org.swinglabs</groupId> - <artifactId>jxlayer</artifactId> - </exclusion> - </exclusions> - </dependency> +  + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxxVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </exclusion> + <exclusion> + <groupId>com.opensymphony</groupId> + <artifactId>xwork</artifactId> + </exclusion> + <exclusion> + <groupId>opensymphony</groupId> + <artifactId>ognl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-jxpath</groupId> + <artifactId>commons-jxpath</artifactId> + </exclusion> + <exclusion> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </exclusion> + </exclusions> + </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - <scope>compile</scope> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> + <scope>compile</scope> + </dependency> + </dependencies> + </dependencyManagement> -  -  -  +  +  +  - <name>NuitonMatrix</name> - <description>Multiple dimensions matrix library</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-matrix</url> + <name>NuitonMatrix</name> + <description>Multiple dimensions matrix library</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/nuiton-matrix</url> -  -  -  +  +  +  - <packaging>pom</packaging> + <packaging>pom</packaging> - <properties> + <properties> - <projectId>nuiton-matrix</projectId> + <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.2.3</jaxxVersion> - <nuitonUtilsVersion>1.5</nuitonUtilsVersion> - <nuitonI18nVersion>2.0</nuitonI18nVersion> + <jaxxVersion>2.2.3</jaxxVersion> + <nuitonUtilsVersion>1.5</nuitonUtilsVersion> + <nuitonI18nVersion>2.0.1</nuitonI18nVersion> -  - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </properties> + </properties> - <distributionManagement> - <site> - <id>${site.server}</id> - <url>${our.site.repository}/nuiton-matrix</url> - </site> - </distributionManagement> - - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxxVersion}</version> - </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${nuitonI18nVersion}</version> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> + <distributionManagement> + <site> + <id>${site.server}</id> + <url>${our.site.repository}/nuiton-matrix</url> + </site> + </distributionManagement> - </build> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxxVersion}</version> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> -  -  -  + </build> -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> - </scm> +  +  +  + +  + <scm> + <connection> + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + </connection> + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> + </scm> </project> Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/Serializable.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/Todo.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL

1 0

r322 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org Jan. 4, 2011

Jan. 4, 2011

Author: echatellier Date: 2011-01-04 18:39:14 +0100 (Tue, 04 Jan 2011) New Revision: 322 Url: http://nuiton.org/repositories/revision/nuiton-matrix/322 Log: Ajout de filtres pour transformer les matrices apres reduction et avant rendu Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixFilter.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java Added: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixFilter.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixFilter.java (rev 0) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixFilter.java 2011-01-04 17:39:14 UTC (rev 322) @@ -0,0 +1,48 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.math.matrix.viewer; + +import org.nuiton.math.matrix.MatrixND; + +/** + * Matrix filtering used by matrix panel viewer. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface MatrixFilter { + + /** + * Filter input matrix. + * + * @param matrix matrix to filter + * @return filtered matrix + */ + public MatrixND filter(MatrixND matrix); +} Property changes on: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2010-12-21 16:20:31 UTC (rev 321) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2011-01-04 17:39:14 UTC (rev 322) @@ -39,6 +39,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -90,6 +91,9 @@ /** Matrix renderer plugins. */ protected List<MatrixRenderer> matrixRenderers; + /** Matrix filters (used after matrix reduction). */ + protected List<MatrixFilter> matrixFilters; + /** Matrices to render (depend on {@link #matrixComboVisible} to {@code true}). */ protected List<MatrixND> matrices; @@ -112,6 +116,7 @@ public MatrixViewerPanel() { matrixRenderers = new ArrayList<MatrixRenderer>(); + matrixFilters = new ArrayList<MatrixFilter>(); matrices = new ArrayList<MatrixND>(); componentForRenderers = new HashMap<MatrixRenderer, Component>(); @@ -150,6 +155,23 @@ return result; } + /** + * Add new matrix filter. + * Used after matrix reduction and before matrix rendering. + * + * @param matrixFilter matrix filter + * @return {@code true} (as specified by {@link Collection#add(Object)} + */ + public boolean addMatrixFilter(MatrixFilter matrixFilter) { + boolean result = matrixFilters.add(matrixFilter); + return result; + } + + public boolean removeMatrixFilter(Object matrixFilter) { + boolean result = matrixFilters.remove(matrixFilter); + return result; + } + public void addMatrix(MatrixND... matrices) { for (MatrixND matrix : matrices) { this.matrices.add(matrix); @@ -342,7 +364,9 @@ if ("render".equals(actionCommand)) { // get matrix to display MatrixND matrix = dimensionPanel.getModifiedMatrix(); - + // filter matrix + matrix = getFilteredMatrix(matrix); + // matrice superieur a 2 dimensions non geree!! if (matrix.getDimCount() > 2) { JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), @@ -364,6 +388,21 @@ updateSelectedRenderingComponent(); } } + + /** + * Filter matrix if any filter is defined. + * (after reduction and before rendering) + * + * @param matrix matrix to filter + * @return filtered matrix + */ + protected MatrixND getFilteredMatrix(MatrixND matrix) { + MatrixND filteredMatrix = matrix; + for (MatrixFilter matrixFilter : matrixFilters) { + filteredMatrix = matrixFilter.filter(filteredMatrix); + } + return filteredMatrix; + } } /** Radio button rendering panel. */

1 0