Author: tchemit Date: 2014-02-24 09:25:42 +0100 (Mon, 24 Feb 2014) New Revision: 465 Url: http://nuiton.org/projects/nuiton-matrix/repository/revisions/465 Log: fixes #3088: Updates to mavenpom 4.7 fixes #3089: Updates i18n to 3.0 fixes #3090: updates nuiton-utils to 3.0-rc-2 fixes #3091: Updates jaxx to 2.8.1 fixes #3092: Updates commons-lang3 to 3.2.1 Modified: trunk/LICENSE.txt trunk/nuiton-matrix-gui/LICENSE.txt trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditorHandler.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/MatrixTableModelLinear.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelOption.java 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/MatrixViewerPanel.java trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 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/jfreechart/GraphComboRenderer.java trunk/nuiton-matrix/LICENSE.txt trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/LICENSE.txt 2014-02-24 08:25:42 UTC (rev 465) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-matrix/LICENSE.txt =================================================================== --- trunk/nuiton-matrix/LICENSE.txt 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix/LICENSE.txt 2014-02-24 08:25:42 UTC (rev 465) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix/pom.xml 2014-02-24 08:25:42 UTC (rev 465) @@ -1,21 +1,26 @@ <?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"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> + <name>NuitonMatrix :: Nuiton-matrix</name> + <description>Matrix core module</description> + + <properties> + + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + <dependencies> <dependency> @@ -36,7 +41,6 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.1</version> </dependency> <dependency> @@ -62,25 +66,11 @@ </dependencies> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <name>NuitonMatrix :: Nuiton-matrix</name> - <description>Matrix core module</description> - - <properties> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> <plugins> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <goals> @@ -91,9 +81,8 @@ </executions> </plugin> </plugins> - </build> - + <profiles> <profile> <id>assembly-profile</id> Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/BasicMatrix.java 2014-02-24 08:25:42 UTC (rev 465) @@ -260,7 +260,7 @@ protected void checkDim(int[] dim) { for (int i = 0; i < dim.length; i++) { if (dim[i] <= 0) { - throw new IllegalArgumentException(I18n._( + throw new IllegalArgumentException(I18n.t( "nuitonmatrix.invalid.size", Integer.valueOf(i), Integer .valueOf(dim[i]))); } @@ -275,7 +275,7 @@ */ protected void checkDim(int dim) { if (dim < 0 || dim >= getNbDim()) { - throw new IndexOutOfBoundsException(I18n._( + throw new IndexOutOfBoundsException(I18n.t( "nuitonmatrix.invalid.size", dim, getNbDim())); } } @@ -294,7 +294,7 @@ result = (0 <= pos[i]) && (pos[i] < dim[i]); } if (!result) { - throw new NoSuchElementException(I18n._( + throw new NoSuchElementException(I18n.t( "nuitonmatrix.invalid.element", Arrays.toString(pos), Arrays .toString(dim))); } Modified: trunk/nuiton-matrix-gui/LICENSE.txt =================================================================== --- trunk/nuiton-matrix-gui/LICENSE.txt 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/LICENSE.txt 2014-02-24 08:25:42 UTC (rev 465) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 0. Additional Definitions. As used herein, "this License" refers to version 3 of the GNU Lesser General Public License, and the "GNU GPL" refers to version 3 of the GNU @@ -111,7 +111,7 @@ a copy of the Library already present on the user's computer system, and (b) will operate properly with a modified version of the Library that is interface-compatible with the Linked - Version. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/pom.xml 2014-02-24 08:25:42 UTC (rev 465) @@ -1,21 +1,29 @@ <?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"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> + <name>NuitonMatrix :: Nuiton-matrix-gui</name> + <description>Matrix gui module</description> + + <properties> + + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + <!-- Post Release configuration --> + <skipPostRelease>false</skipPostRelease> + + </properties> + <dependencies> <dependency> @@ -56,21 +64,6 @@ </dependency> </dependencies> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <name>NuitonMatrix :: Nuiton-matrix-gui</name> - <description>Matrix gui module</description> - - <properties> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - </properties> - <build> <plugins> <plugin> @@ -110,7 +103,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <configuration> <entries> <entry> @@ -129,13 +122,8 @@ </executions> </plugin> </plugins> - </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <profiles> <!-- create assemblies only at release time --> Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditorHandler.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditorHandler.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPanelEditorHandler.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.gui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Event; import java.awt.event.KeyEvent; @@ -140,8 +140,8 @@ */ public void modifyMatrixDimension(MatrixPanelEditor matrixPanelEditor) { String dim = JOptionPane.showInputDialog(matrixPanelEditor, - _("nuitonmatrix.create.matrix.message"), - _("nuitonmatrix.create.matrix.title")); + t("nuitonmatrix.create.matrix.message"), + t("nuitonmatrix.create.matrix.title")); if (dim != null && dim.indexOf(';') != -1) { String[] sdim = dim.split(";"); Modified: 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/MatrixPopupMenu.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixPopupMenu.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.gui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -128,7 +128,7 @@ sendToFile = getSendToFile(); withSemantics = new JCheckBoxMenuItem( - _("nuitonmatrix.menu.option.semantics"), false); + t("nuitonmatrix.menu.option.semantics"), false); JMenu applyDataAction = getApplyDataAction(); @@ -146,15 +146,15 @@ */ protected JMenu getSendToClipBoard() { if (sendToClipBoard == null) { - sendToClipBoard = new JMenu(_("nuitonmatrix.menu.action")); + sendToClipBoard = new JMenu(t("nuitonmatrix.menu.action")); JMenuItem sendToClipBoardAllCopy = new JMenuItem( - _("nuitonmatrix.menu.action.copy")); + t("nuitonmatrix.menu.action.copy")); JMenuItem sendToClipBoardAllPaste = new JMenuItem( - _("nuitonmatrix.menu.action.paste")); + t("nuitonmatrix.menu.action.paste")); JMenuItem sendToClipBoardSelectionCopy = new JMenuItem( - _("nuitonmatrix.menu.action.copy.selection")); + t("nuitonmatrix.menu.action.copy.selection")); JMenuItem sendToClipBoardCurrentPaste = new JMenuItem( - _("nuitonmatrix.menu.action.paste.position")); + t("nuitonmatrix.menu.action.paste.position")); sendToClipBoard.add(sendToClipBoardAllCopy); sendToClipBoard.add(sendToClipBoardAllPaste); @@ -182,15 +182,15 @@ */ protected JMenu getSendToFile() { if (sendToFile == null) { - sendToFile = new JMenu(_("nuitonmatrix.menu.csv")); + sendToFile = new JMenu(t("nuitonmatrix.menu.csv")); JMenuItem sendToFileAllCopy = new JMenuItem( - _("nuitonmatrix.menu.csv.export.file")); + t("nuitonmatrix.menu.csv.export.file")); JMenuItem sendToFileAllPaste = new JMenuItem( - _("nuitonmatrix.menu.csv.import.file")); + t("nuitonmatrix.menu.csv.import.file")); JMenuItem sendToFileSelectionCopy = new JMenuItem( - _("nuitonmatrix.menu.csv.export.selection")); + t("nuitonmatrix.menu.csv.export.selection")); JMenuItem sendToFileCurrentPaste = new JMenuItem( - _("nuitonmatrix.menu.csv.import.position")); + t("nuitonmatrix.menu.csv.import.position")); sendToFile.add(sendToFileAllCopy); sendToFile.add(sendToFileAllPaste); @@ -215,11 +215,11 @@ * @return retourne le menu d'action pour les fichiers CSV */ protected JMenu getApplyDataAction() { - JMenu getApplyDataAction = new JMenu(_("nuitonmatrix.menu.data")); + JMenu getApplyDataAction = new JMenu(t("nuitonmatrix.menu.data")); JMenuItem dataIdentityItem = new JMenuItem( - _("nuitonmatrix.menu.data.identity")); + t("nuitonmatrix.menu.data.identity")); JMenuItem dataFillValueItem = new JMenuItem( - _("nuitonmatrix.menu.data.fillvalue")); + t("nuitonmatrix.menu.data.fillvalue")); getApplyDataAction.add(dataIdentityItem); getApplyDataAction.add(dataFillValueItem); @@ -509,10 +509,10 @@ matrixEditor.repaint(); } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.clipboard.write"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + t("nuitonmatrix.error.clipboard.write"), + t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.clipboard.write"), ex); + log.error(t("nuitonmatrix.error.clipboard.write"), ex); } } } @@ -529,10 +529,10 @@ matrixEditor.repaint(); } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.clipboard.read"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + t("nuitonmatrix.error.clipboard.read"), + t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.clipboard.read"), ex); + log.error(t("nuitonmatrix.error.clipboard.read"), ex); } } } @@ -552,10 +552,10 @@ matrixEditor.repaint(); } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.clipboard.write"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + t("nuitonmatrix.error.clipboard.write"), + t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.clipboard.write"), ex); + log.error(t("nuitonmatrix.error.clipboard.write"), ex); } } } @@ -573,10 +573,10 @@ matrixEditor.repaint(); } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.clipboard.read"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + t("nuitonmatrix.error.clipboard.read"), + t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.clipboard.read"), ex); + log.error(t("nuitonmatrix.error.clipboard.read"), ex); } } } @@ -670,10 +670,10 @@ } } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.file.write"), _("nuitonmatrix.error"), + t("nuitonmatrix.error.file.write"), t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.file.write"), ex); + log.error(t("nuitonmatrix.error.file.write"), ex); } } } @@ -692,10 +692,10 @@ } } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.file.read"), _("nuitonmatrix.error"), + t("nuitonmatrix.error.file.read"), t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.file.read"), ex); + log.error(t("nuitonmatrix.error.file.read"), ex); } } } @@ -713,10 +713,10 @@ } } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.file.write"), _("nuitonmatrix.error"), + t("nuitonmatrix.error.file.write"), t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.file.write"), ex); + log.error(t("nuitonmatrix.error.file.write"), ex); } } } @@ -736,10 +736,10 @@ } } catch (Exception ex) { JOptionPane.showMessageDialog(matrixEditor, - _("nuitonmatrix.error.file.read"), _("nuitonmatrix.error"), + t("nuitonmatrix.error.file.read"), t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); if (log.isErrorEnabled()) { - log.error(_("nuitonmatrix.error.file.read"), ex); + log.error(t("nuitonmatrix.error.file.read"), ex); } } } @@ -757,7 +757,7 @@ * Ask user for new value to fill into matrix. */ protected void dataFillValuePerformed() { - String stringValue = JOptionPane.showInputDialog(matrixEditor, _("nuitonmatrix.menu.data.fillvalue.ask")); + String stringValue = JOptionPane.showInputDialog(matrixEditor, t("nuitonmatrix.menu.data.fillvalue.ask")); if (stringValue != null) { try { double value = Double.parseDouble(stringValue); Modified: 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/MatrixTableModelLinear.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelLinear.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.gui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -201,7 +201,7 @@ String result = null; if (column < m.getDimCount()) { String columnName = m.getDimensionName(column); - result = _(columnName); + result = t(columnName); } else { result = ""; } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelND.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.gui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Color; import java.awt.Component; @@ -175,12 +175,12 @@ 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 = t(m.getDimensionName(col * 2)) + "\\" + + t(m.getDimensionName(row * 2 + 1)); } else if (row == addRow - 1) { - result = _(m.getDimensionName(col * 2)); + result = t(m.getDimensionName(col * 2)); } else if (col == addCol - 1) { - result = _(m.getDimensionName(row * 2 + 1)); + result = t(m.getDimensionName(row * 2 + 1)); } else { result = ""; } Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelOption.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelOption.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/gui/MatrixTableModelOption.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.gui; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; @@ -139,10 +139,10 @@ public String getColumnName(int columnIndex) { String result = null; if (sumOption && columnIndex == delegate.getColumnCount() + 0) { - result = null; //_("nuitonmatrix.gui.model.sum"); + result = null; //t("nuitonmatrix.gui.model.sum"); } else if (meanOption && columnIndex == delegate.getColumnCount() + 1) { - result = null; //_("nuitonmatrix.gui.model.mean"); + result = null; //t("nuitonmatrix.gui.model.mean"); } else { result = delegate.getColumnName(columnIndex); @@ -205,14 +205,14 @@ // une seule operation if (columnIndex == 0) { if (rowIndex == rowCount + 1) { - result = _("nuitonmatrix.gui.model.mean"); + result = t("nuitonmatrix.gui.model.mean"); } else { if (sumOption) { - result = _("nuitonmatrix.gui.model.sum"); + result = t("nuitonmatrix.gui.model.sum"); } else { - result = _("nuitonmatrix.gui.model.mean"); + result = t("nuitonmatrix.gui.model.mean"); } } } @@ -254,14 +254,14 @@ // une seule operation if (rowIndex == 0) { if (columnIndex == columnCount + 1) { - result = _("nuitonmatrix.gui.model.mean"); + result = t("nuitonmatrix.gui.model.mean"); } else { if (sumOption) { - result = _("nuitonmatrix.gui.model.sum"); + result = t("nuitonmatrix.gui.model.sum"); } else { - result = _("nuitonmatrix.gui.model.mean"); + result = t("nuitonmatrix.gui.model.mean"); } } } 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 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.viewer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -264,9 +264,9 @@ for (List<?> semantic : matrix.getSemantics()) { // compute dimension name - String dimensionName = _(matrix.getDimensionName(index)); + String dimensionName = t(matrix.getDimensionName(index)); if (dimensionName == null || dimensionName.isEmpty()) { - dimensionName = _("nuitonmatrix.viewer.dimnameindex", index); + dimensionName = t("nuitonmatrix.viewer.dimnameindex", index); } SubDimensionPanel dimPanel = new SubDimensionPanel(index, dimensionName, semantic); @@ -349,10 +349,10 @@ matrix = matrix.sumOverDim(i, subDimPanel.getSumStep()); if (matrix.getDim(i) == 1) { // c une somme global sur tous les elements - matrix.setDimensionName(i, _("nuitonmatrix.viewer.sum")); + matrix.setDimensionName(i, t("nuitonmatrix.viewer.sum")); } else { // c une somme partielle - String name = matrix.getDimensionName(i) + " " + _("nuitonmatrix.viewer.sum"); + String name = matrix.getDimensionName(i) + " " + t("nuitonmatrix.viewer.sum"); matrix.setDimensionName(i, name); } 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 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.viewer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Component; @@ -200,7 +200,7 @@ String matrixName = null; if (value != null) { - matrixName = _((String)value); + matrixName = t((String)value); } return super.getListCellRendererComponent(list, matrixName, index, isSelected, cellHasFocus); } @@ -313,8 +313,8 @@ // matrice superieur a 2 dimensions non geree!! if (matrix.getDimCount() > 2) { - JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog(this, t("nuitonmatrix.viewer.matrix.more.2d"), + t("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); } else { // get all display component for each renderer componentForRenderers.clear(); Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixChartRenderer.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.viewer.renderer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Component; @@ -88,7 +88,7 @@ */ @Override public String getName() { - return _("nuitonmatrix.viewer.renderer.chart"); + return t("nuitonmatrix.viewer.renderer.chart"); } protected JPanel getJFreeChartPanel(MatrixND matrix) { @@ -146,7 +146,7 @@ protected CategoryAxis getCategoryAxis(MatrixND matrix) { CategoryAxis horizontalAxis = new CategoryAxis(); horizontalAxis.setCategoryLabelPositions(CategoryLabelPositions.UP_90); - horizontalAxis.setLabel(_(matrix.getDimensionName(0))); + horizontalAxis.setLabel(t(matrix.getDimensionName(0))); return horizontalAxis; } @@ -180,7 +180,7 @@ * @return chart */ protected JFreeChart getJFreeChart(MatrixND matrix) { - JFreeChart chart = new JFreeChart(_(matrix.getName()), JFreeChart.DEFAULT_TITLE_FONT, getCategoryPlot(matrix), true); + JFreeChart chart = new JFreeChart(t(matrix.getName()), JFreeChart.DEFAULT_TITLE_FONT, getCategoryPlot(matrix), true); return chart; } 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 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/MatrixPanelRenderer.java 2014-02-24 08:25:42 UTC (rev 465) @@ -25,7 +25,7 @@ package org.nuiton.math.matrix.viewer.renderer; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.BorderLayout; import java.awt.Component; @@ -82,7 +82,7 @@ panel.add(editor, BorderLayout.CENTER); // export button - exportButton = new JButton(_("nuitonmatrix.viewer.renderer.exportascsv")); + exportButton = new JButton(t("nuitonmatrix.viewer.renderer.exportascsv")); exportButton.addActionListener(this); exportButton.setActionCommand("exportascsv"); exportButton.setEnabled(false); @@ -123,7 +123,7 @@ */ @Override public String getName() { - return _("nuitonmatrix.viewer.renderer.panel"); + return t("nuitonmatrix.viewer.renderer.panel"); } /* Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/renderer/jfreechart/GraphComboRenderer.java 2014-02-24 08:25:42 UTC (rev 465) @@ -23,7 +23,7 @@ package org.nuiton.math.matrix.viewer.renderer.jfreechart; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.awt.Component; @@ -57,21 +57,21 @@ super.getListCellRendererComponent(liste, o, attributeIndex, isSelected, hasFocus); if (o instanceof StackedBarRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.bar.stacked")); + setText(t("nuitonmatrix.viewer.graphcomborender.bar.stacked")); } else if (o instanceof BarRenderer3D) { - setText(_("nuitonmatrix.viewer.graphcomborender.bar.3d")); + setText(t("nuitonmatrix.viewer.graphcomborender.bar.3d")); } else if (o instanceof BarRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.bar")); + setText(t("nuitonmatrix.viewer.graphcomborender.bar")); } else if (o instanceof StackedAreaRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.surface.stacked")); + setText(t("nuitonmatrix.viewer.graphcomborender.surface.stacked")); } else if (o instanceof AreaRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.surface")); + setText(t("nuitonmatrix.viewer.graphcomborender.surface")); } else if (o instanceof LineRenderer3D) { - setText(_("nuitonmatrix.viewer.graphcomborender.line.3d")); + setText(t("nuitonmatrix.viewer.graphcomborender.line.3d")); } else if (o instanceof LineAndShapeRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.line")); + setText(t("nuitonmatrix.viewer.graphcomborender.line")); } else if (o instanceof MinMaxCategoryRenderer) { - setText(_("nuitonmatrix.viewer.graphcomborender.min.max")); + setText(t("nuitonmatrix.viewer.graphcomborender.min.max")); } else { setText((o == null) ? "" : o.toString()); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/pom.xml 2014-02-24 08:25:42 UTC (rev 465) @@ -1,26 +1,53 @@ <?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"> - <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>4.7</version> </parent> <artifactId>matrix</artifactId> - <version>2.3.3-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Nuiton Matrix</name> + <description>Multiple dimensions matrix library</description> + <url>http://maven-site.nuiton.org/nuiton-matrix</url> + <inceptionYear>2004</inceptionYear> + <modules> <module>nuiton-matrix</module> <module>nuiton-matrix-gui</module> </modules> + <scm> + <connection> + scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk + </connection> + <developerConnection> + scm:svn:https://nuiton.org/svn/nuiton-matrix/trunk + </developerConnection> + <url>https://www.nuiton.org/projects/nuiton-matrix/repository/show/trunk</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + + <properties> + + <projectId>nuiton-matrix</projectId> + + <jaxxVersion>2.8.1</jaxxVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + + </properties> + <dependencyManagement> <dependencies> @@ -79,31 +106,6 @@ </dependencies> </dependencyManagement> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>Nuiton Matrix</name> - <description>Multiple dimensions matrix library</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-matrix</url> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>pom</packaging> - - <properties> - - <projectId>nuiton-matrix</projectId> - - <jaxxVersion>2.5.4</jaxxVersion> - <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> - <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - - </properties> - <build> <pluginManagement> <plugins> @@ -114,7 +116,7 @@ </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <artifactId>i18n-maven-plugin</artifactId> <version>${nuitonI18nVersion}</version> </plugin> <plugin> @@ -129,31 +131,8 @@ </plugin> </plugins> </pluginManagement> - </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!-- Source control management. --> - <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/projects/nuiton-matrix/repository/show/trunk</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/${projectId}</url> - </site> - </distributionManagement> - <profiles> <profile> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2013-12-06 11:42:20 UTC (rev 464) +++ trunk/src/site/site_fr.xml 2014-02-24 08:25:42 UTC (rev 465) @@ -29,7 +29,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.2</version> + <version>${fluidoSkinVersion}</version> </skin> <bannerLeft> @@ -47,12 +47,21 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> + <logo href="https:/maven-site.nution.org/jrst" name="JRst" img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> </poweredBy> <body> + <head> + <script type="text/javascript" + src="${mavenpomSiteCommonResourcesUrl}/js/mavenpom-site.js"> + </script> + + <link rel="stylesheet" type="text/css" + href="${mavenpomSiteCommonResourcesUrl}/css/mavenpom-site.css"/> + </head> + <links> <item name="Nuiton.org" href="http://nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -65,7 +74,7 @@ <menu name="Utilisateur"> <item href="index.html" name="Accueil"/> - <item href="usage.html" name="Usage" /> + <!--FIXME TC-2014-02-24 Does not exist. item href="usage.html" name="Usage" /--> <item href="importexport.html" name="Import/Export" /> <item href="gui-matrixpanelviewer.html" name="Matrix panel viewer"/> </menu> @@ -80,10 +89,6 @@ <footer> - <script type="text/javascript" - src="http://maven-site.nuiton.org/public/js/maven-site-nuiton.org.js"> - </script> - <div id='projectMetas' projectversion='${project.version}' platform='${project.platform}' @@ -93,7 +98,8 @@ scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}'> + piwikId='${project.piwikId}' + scmwebeditor_skipDefaultFiles='true'> </div> </footer> </body>