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

r199 - trunk/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: echatellier Date: 2009-11-04 15:22:06 +0100 (Wed, 04 Nov 2009) New Revision: 199 Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java Log: Move equals debug to trace (very, very, very verbose) Modified: trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2009-11-04 10:10:26 UTC (rev 198) +++ trunk/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2009-11-04 14:22:06 UTC (rev 199) @@ -482,10 +482,9 @@ double v1 = i.getValue(); double v2 = getValue(i.getCoordinates()); result = v1 == v2; - if (log.isDebugEnabled()) { - log.debug("v1(" + v1 + ")==v2(" + v2 + ")=" + result); + if (log.isTraceEnabled()) { + log.trace("v1(" + v1 + ")==v2(" + v2 + ")=" + result); } - // System.out.println("v1("+v1+")==v2("+v2+ ")="+result); } return result;

1 0

r198 - trunk/src/main/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 04 Nov '09

04 Nov '09

Author: echatellier Date: 2009-11-04 11:10:26 +0100 (Wed, 04 Nov 2009) New Revision: 198 Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java Log: Remove old lutinxml comments Modified: trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2009-11-02 11:11:40 UTC (rev 197) +++ trunk/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2009-11-04 10:10:26 UTC (rev 198) @@ -35,65 +35,6 @@ */ public class MatrixFactory { // MatrixFactory - /* following code in only an exception generator since - * lutinxml in not used anymore :) - static { - - // on essai d'enregistrer le converter XML - try { - // Il faut le faire par pur introspection sinon l'exception - // NoClassDefFoundError est levé avant d'entrer dans le constructeur - // static :( - Class converterClass = Class - .forName("org.codelutin.math.matrix.MatrixNDXMLConverter"); - Object converter = converterClass.newInstance(); - - Class converterFactoryClass = Class - .forName("org.codelutin.xml.XMLConverterFactory"); - Method m = converterFactoryClass.getMethod("addConverter", - Class.class, Class - .forName("org.codelutin.xml.XMLConverter")); - m.invoke(null, MatrixND.class, converter); - - // org.codelutin.xml.XMLConverterFactory.addConverter(MatrixND.class, - // new MatrixNDXMLConverter()); - log.info("Converter XML pour MatrixND ajoute"); - - // on essai d'enregistrer le converter JDBC - // le JDBC depend du XML - try { - converterClass = Class - .forName("org.codelutin.math.matrix.MatrixNDJDBCConverter"); - converter = converterClass.newInstance(); - - converterFactoryClass = Class - .forName("org.codelutin.topia.persistence.jdbctransformer.JDBCTransformerFactory"); - m = converterFactoryClass - .getMethod( - "addConverter", - Class.class, - Class.forName("org.codelutin.topia.persistence.jdbctransformer.JDBCTransformer")); - m.invoke(null, MatrixND.class, converter); - - // Class converterClass = - // org.codelutin.math.matrix.MatrixNDJDBCConverter(); - // JDBCTransformerFactory - // .addConverter(MatrixND.class, new MatrixNDJDBCConverter()); - log.info("Converter JDBC pour MatrixND ajoute"); - } catch (Throwable eee) { - log - .info("librairie topia non presente. Import/Export JDBC impossible"); - log.debug("L'exception etait", eee); - } - - } catch (Throwable eee) { - log - .info("librairie lutinxml non presente. Import/Export XML impossible"); - log.debug("L'exception etait", eee); - } - - }*/ - /** Valeur par defaut si aucun type de Vector n'est donné */ protected static Class<?> defaultVectorClass = DoubleBigVector.class; @@ -138,10 +79,8 @@ /** * Convert a double array into matrix. * - * @param values - * The values to fill the matrix - * @param dim - * An array representing the dimensions of the matrix + * @param values The values to fill the matrix + * @param dim An array representing the dimensions of the matrix * @return a 2D matrix filled with the values, null if the dimension is more * than 2 */ @@ -198,8 +137,7 @@ * Crée une nouvelle matrice identité. Une matrice identité est une matrice * à 2 dimensions dont tous les éléments de la diagonal vaut 1 * - * @param size - * la taille de la matrice + * @param size la taille de la matrice * @return une nouvelle matrice identité */ public MatrixND matrixId(int size) { @@ -221,4 +159,3 @@ } } // MatrixFactory -

1 0

r197 - in trunk: . src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 12:11:40 +0100 (Mon, 02 Nov 2009) New Revision: 197 Modified: trunk/changelog.txt trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Log: Affiche la traduction des dimensions. Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/changelog.txt 2009-11-02 11:11:40 UTC (rev 197) @@ -1,3 +1,6 @@ +ver-2.0.1 chatellier + * Display translated column names (i18n) + ver-2.0 chatellier * rename some methods (make originals deprecated) * add generics Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2009-11-02 11:11:40 UTC (rev 197) @@ -17,6 +17,8 @@ package org.nuiton.math.matrix.gui; +import static org.nuiton.i18n.I18n._; + import java.awt.Color; import java.awt.Component; import java.awt.Font; @@ -188,14 +190,18 @@ } - /* - * @see javax.swing.table.AbstractTableModel#getColumnName(int) + /** + * {@inheritDoc} + * + * Return column names. + * Try to return i18n column names if possible. */ @Override public String getColumnName(int column) { String result = null; if (column < m.getDimCount()) { - result = m.getDimensionName(column); + String columnName = m.getDimensionName(column); + result = _(columnName); } else { result = ""; } Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 10:32:05 UTC (rev 196) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 11:11:40 UTC (rev 197) @@ -17,6 +17,8 @@ package org.nuiton.math.matrix.gui; +import static org.nuiton.i18n.I18n._; + import java.awt.Color; import java.awt.Component; import java.awt.Font; @@ -145,16 +147,25 @@ return result; } + /** + * Get value. + * + * Return column name (i18n if possible) for bounded values. + * + * @param row row + * @param col column + * @return value + */ protected Object getValue(int row, int col) { Object result = null; if (row < addRow && col < addCol) { if (row == addRow - 1 && col == addCol - 1) { - result = m.getDimensionName(col * 2) + "\\" - + m.getDimensionName(row * 2 + 1); + result = _(m.getDimensionName(col * 2)) + "\\" + + _(m.getDimensionName(row * 2 + 1)); } else if (row == addRow - 1) { - result = m.getDimensionName(col * 2); + result = _(m.getDimensionName(col * 2)); } else if (col == addCol - 1) { - result = m.getDimensionName(row * 2 + 1); + result = _(m.getDimensionName(row * 2 + 1)); } else { result = ""; }

1 0

r196 - trunk
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 11:32:05 +0100 (Mon, 02 Nov 2009) New Revision: 196 Modified: trunk/pom.xml Log: i18n was not parsing jaxx generated files Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 09:57:44 UTC (rev 195) +++ trunk/pom.xml 2009-11-02 10:32:05 UTC (rev 196) @@ -153,6 +153,13 @@ <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>

1 0

r195 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 10:57:44 +0100 (Mon, 02 Nov 2009) New Revision: 195 Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java Log: Not valid todo Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 09:54:02 UTC (rev 194) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2009-11-02 09:57:44 UTC (rev 195) @@ -38,9 +38,6 @@ * Extension de AbstractTableModel pour definir un TableModel avec une * MatrixND comme support d'information. * - * TODO changer les 'matrice' en 'matrix', s'il y a des methodes public - * avec les nom 'matice' les laisser mais les mettres depreciées - * * Created: 21 mars 2006 19:01:27 * * @author poussin

1 0

r194 - trunk/src/main/java/org/nuiton/math/matrix/gui
by echatellier＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 10:54:02 +0100 (Mon, 02 Nov 2009) New Revision: 194 Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx Log: Untranslated strings ? Modified: trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx =================================================================== --- trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-02 08:11:04 UTC (rev 193) +++ trunk/src/main/java/org/nuiton/math/matrix/gui/JAXXMatrixEditor.jaxx 2009-11-02 09:54:02 UTC (rev 194) @@ -149,7 +149,7 @@ protected void btnAction(){ String dim; - dim = JOptionPane.showInputDialog(null, I18n._("lutinmatrix.create.matrix.message"), I18n._("lutinmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); + dim = JOptionPane.showInputDialog(null, I18n._("nuitonmatrix.create.matrix.message"), I18n._("nuitonmatrix.create.matrix.title"), JOptionPane.DEFAULT_OPTION); if (dim != null) { String[] sdim = dim.split(";"); @@ -173,6 +173,6 @@ <JScrollPane id='editArea' constraints='BorderLayout.CENTER'> <JTable id='table' autoResizeMode='{JTable.AUTO_RESIZE_OFF}' cellSelectionEnabled='{true}' selectionMode='{ListSelectionModel.SINGLE_INTERVAL_SELECTION}'/> </JScrollPane> - <JButton id='buttonEdit' text='lutinmatrix.create.matrix.button' visible='{isDimensionEdit()}' + <JButton id='buttonEdit' text='nuitonmatrix.create.matrix.button' visible='{isDimensionEdit()}' onActionPerformed='btnAction()' constraints='BorderLayout.SOUTH'/> </MatrixEditor>

1 0

r193 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 09:11:04 +0100 (Mon, 02 Nov 2009) New Revision: 193 Modified: branches/nuiton-matrix-2.1.x/pom.xml Log: svn ignore idea files Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 08:08:55 UTC (rev 192) +++ branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 08:11:04 UTC (rev 193) @@ -119,7 +119,6 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -154,7 +153,6 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> <executions> <execution> <goals> @@ -171,6 +169,18 @@ <plugins> <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + </plugin> + + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency>

1 0

r192 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 09:08:55 +0100 (Mon, 02 Nov 2009) New Revision: 192 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .settings .classpath .project lutinmatrix.ipr lutinmatrix.iml bin + target .settings .classpath .project *.ipr *.iml bin

1 0

r191 - trunk
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 09:07:34 +0100 (Mon, 02 Nov 2009) New Revision: 191 Modified: trunk/pom.xml Log: use mavenpom 1.1.0, improve pom Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:48:20 UTC (rev 190) +++ trunk/pom.xml 2009-11-02 08:07:34 UTC (rev 191) @@ -1,5 +1,6 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-matrix</artifactId> @@ -31,7 +32,7 @@ <version>2.4</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -118,7 +119,6 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> <executions> <execution> <goals> @@ -126,7 +126,8 @@ </goals> <id>generate-ui</id> <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue + </extraImportList> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration> @@ -152,7 +153,6 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> <executions> <execution> <goals> @@ -169,6 +169,18 @@ <plugins> <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + </plugin> + + <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> @@ -205,7 +217,7 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> </scm> - + <profiles> <profile> <id>release-profile</id> @@ -217,7 +229,7 @@ </activation> <build> <plugins> - +  <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -238,7 +250,7 @@ </descriptorRefs> </configuration> </plugin> - + </plugins> </build>

1 0

r190 - branches/nuiton-matrix-2.1.x
by tchemit＠users.nuiton.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 04:48:20 +0100 (Mon, 02 Nov 2009) New Revision: 190 Modified: branches/nuiton-matrix-2.1.x/pom.xml Log: use mavenpom 1.1.0 Modified: branches/nuiton-matrix-2.1.x/pom.xml =================================================================== --- branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 03:38:59 UTC (rev 189) +++ branches/nuiton-matrix-2.1.x/pom.xml 2009-11-02 03:48:20 UTC (rev 190) @@ -1,5 +1,6 @@ <?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/maven-v4_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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -10,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-matrix</artifactId> @@ -31,7 +32,7 @@ <version>2.4</version> <scope>compile</scope> </dependency> - + <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> @@ -126,7 +127,8 @@ </goals> <id>generate-ui</id> <configuration> - <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue</extraImportList> + <extraImportList>jaxx.runtime.SwingUtil,static jaxx.runtime.Util.getStringValue + </extraImportList> <addSourcesToClassPath>true</addSourcesToClassPath> <addProjectClassPath>true</addProjectClassPath> </configuration> @@ -205,7 +207,7 @@ <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-matrix/trunk</developerConnection> <url>http://www.nuiton.org/repositories/browse/nuiton-matrix/trunk</url> </scm> - + <profiles> <profile> <id>release-profile</id> @@ -217,7 +219,7 @@ </activation> <build> <plugins> - +  <plugin> <artifactId>maven-assembly-plugin</artifactId> @@ -238,7 +240,7 @@ </descriptorRefs> </configuration> </plugin> - + </plugins> </build>

1 0