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 = ""; }