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

r429 - trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer
by echatellier＠users.nuiton.org 09 Aug '12

09 Aug '12

Author: echatellier Date: 2012-08-09 10:34:07 +0200 (Thu, 09 Aug 2012) New Revision: 429 Url: http://nuiton.org/repositories/revision/nuiton-matrix/429 Log: fixes : #2243 Add option to initialize selected values in dimension and default displayed graph 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/MatrixViewerPanel.java Modified: trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java =================================================================== --- trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2012-08-07 14:24:28 UTC (rev 428) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixDimensionPanel.java 2012-08-09 08:34:07 UTC (rev 429) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -34,8 +34,10 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.Enumeration; import java.util.List; +import javax.swing.AbstractButton; import javax.swing.ButtonGroup; import javax.swing.ButtonModel; import javax.swing.DefaultListModel; @@ -46,6 +48,7 @@ import javax.swing.JToggleButton; import javax.swing.JToggleButton.ToggleButtonModel; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.math.matrix.MatrixND; @@ -78,7 +81,7 @@ setLayout(new GridLayout(0, 1)); subPanelList = new ArrayList<MatrixDimensionPanel.SubDimensionPanel>(); matrixDimentionActions = new ArrayList<MatrixDimensionAction>(); - + // default sum all action matrixDimentionActions.add(new SumAllAction()); } @@ -209,9 +212,20 @@ } // semantic list + //MatrixDimensionFilter filter = matrixDimensionFilters.get(index); semList = new JList(); - SemanticListModel semModel = new SemanticListModel(semantic); + List<?> dimSemantic = semantic; + /*if (filter != null) { + dimSemantic = filter.filterSemantic(dimSemantic); + }*/ + SemanticListModel semModel = new SemanticListModel(dimSemantic); semList.setModel(semModel); + /*if (filter != null) { + ListCellRenderer renderer = filter.getListCellRenderer(); + if (renderer != null) { + semList.setCellRenderer(renderer); + } + }*/ add(new JScrollPane(semList), new GridBagConstraints(0, 1, 1 + nbActionAdded, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.BOTH, new Insets(0, 0, 5, 0), 0, 0)); } @@ -372,4 +386,43 @@ return result; } + + /** + * Autoselect some dimensions values and some dimensions + * action. And perform rendering. + * + * @param dimSelectedValues selected values in each dimensions + * @param selectedActions selected actions in each dimensions + */ + public void initRenderering(List[] dimSelectedValues, + int[] selectedActions) { + + // values selection + for (int dimIndex = 0; dimIndex < dimSelectedValues.length; dimIndex++) { + List selectedValues = dimSelectedValues[dimIndex]; + if (selectedValues != null) { + SubDimensionPanel panel = subPanelList.get(dimIndex); + panel.semList.clearSelection(); + for (Object value : selectedValues) { + int index = panel.semantic.indexOf(value); + panel.semList.addSelectionInterval(index, index); + } + } + } + + // action selection + for (int dimIndex = 0; dimIndex < selectedActions.length; dimIndex++) { + int actionIndices = selectedActions[dimIndex]; + SubDimensionPanel panel = subPanelList.get(dimIndex); + int buttonIndex = 0; + Enumeration<AbstractButton> buttons = panel.buttonGroup.getElements(); + while (buttons.hasMoreElements()) { + AbstractButton button = buttons.nextElement(); + if (actionIndices == buttonIndex) { + button.setSelected(true); + } + buttonIndex++; + } + } + } } 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 2012-08-07 14:24:28 UTC (rev 428) +++ trunk/nuiton-matrix-gui/src/main/java/org/nuiton/math/matrix/viewer/MatrixViewerPanel.java 2012-08-09 08:34:07 UTC (rev 429) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -300,27 +300,29 @@ String actionCommand = e.getActionCommand(); if ("render".equals(actionCommand)) { - // get matrix to display filtered - MatrixND matrix = dimensionPanel.getModifiedMatrix(matrixFilters); + performRendering(); + } else { + // clic on render button + updateSelectedRenderingComponent(); + } + } - // matrice superieur a 2 dimensions non geree!! - if (matrix.getDimCount() > 2) { - JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), - _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + protected void performRendering() { + // get matrix to display filtered + MatrixND matrix = dimensionPanel.getModifiedMatrix(matrixFilters); + + // matrice superieur a 2 dimensions non geree!! + if (matrix.getDimCount() > 2) { + JOptionPane.showMessageDialog(this, _("nuitonmatrix.viewer.matrix.more.2d"), + _("nuitonmatrix.error"), JOptionPane.ERROR_MESSAGE); + } else { + // get all display component for each renderer + componentForRenderers.clear(); + for (MatrixRenderer matrixRenderer : matrixRenderers.keySet()) { + Component component = matrixRenderer.getComponent(matrix); + componentForRenderers.put(matrixRenderer, component); } - else { - // get all display component for each renderer - componentForRenderers.clear(); - for (MatrixRenderer matrixRenderer : matrixRenderers.keySet()) { - Component component = matrixRenderer.getComponent(matrix); - componentForRenderers.put(matrixRenderer, component); - } - - updateSelectedRenderingComponent(); - } - } - else { - // clic on render button + updateSelectedRenderingComponent(); } } @@ -475,8 +477,7 @@ renderingComponentContainer.add(component, BorderLayout.CENTER); } } - } - else { + } else { // if enables default rendering if (matrixRenderers.get(matrixRenderer)) { Component component = matrixRenderer.getComponent(null); @@ -489,4 +490,20 @@ renderingComponentContainer.validate(); renderingComponentContainer.repaint(); } + + /** + * Init renderering by autoselecting some dimensions values and some dimensions + * action. And perform rendering. + * + * @param dimSelectedValues selected values in each dimensions + * @param selectedActions selected action in each dimensions + * @throws IllegalArgumentException if matrix has not been set + */ + public void initRenderering(List[] dimSelectedValues, int[] selectedActions) { + if (this.matrix == null) { + throw new IllegalArgumentException("Must set matrix first"); + } + dimensionPanel.initRenderering(dimSelectedValues, selectedActions); + iconPanel.performRendering(); + } }

1 0

r428 - in trunk: . nuiton-matrix nuiton-matrix/src/test/java/org/nuiton/math/matrix nuiton-matrix-gui
by echatellier＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: echatellier Date: 2012-08-07 16:24:28 +0200 (Tue, 07 Aug 2012) New Revision: 428 Url: http://nuiton.org/repositories/revision/nuiton-matrix/428 Log: refs #2004, #2235: Update libs Modified: trunk/nuiton-matrix-gui/pom.xml trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java trunk/pom.xml Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> @@ -53,6 +53,12 @@ <groupId>commons-primitives</groupId> <artifactId>commons-primitives</artifactId> </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <scope>test</scope> + </dependency> </dependencies> Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-08-07 14:24:28 UTC (rev 428) @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; @@ -317,7 +318,7 @@ "1;1;1;42.0"; File file = File.createTempFile("import-reader", ".txt"); file.deleteOnExit(); - FileUtil.writeString(file, matrix3D); + FileUtils.writeStringToFile(file, matrix3D, "utf-8"); MatrixND m = MatrixFactory.getInstance().create(new int[]{2, 2, 2}); m.importCSV(new FileReader(file), null); } Modified: trunk/nuiton-matrix-gui/pom.xml =================================================================== --- trunk/nuiton-matrix-gui/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/nuiton-matrix-gui/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.matrix</groupId> @@ -75,7 +75,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-07 07:51:18 UTC (rev 427) +++ trunk/pom.xml 2012-08-07 14:24:28 UTC (rev 428) @@ -14,7 +14,7 @@ </parent> <artifactId>matrix</artifactId> - <version>2.2.4-SNAPSHOT</version> + <version>2.3-SNAPSHOT</version> <modules> <module>nuiton-matrix</module> @@ -50,7 +50,7 @@ <artifactId>javahelp</artifactId> </exclusion> <exclusion> - <groupId>org.swinglabs</groupId> + <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-core</artifactId> </exclusion> <exclusion> @@ -98,8 +98,8 @@ <projectId>nuiton-matrix</projectId> - <jaxxVersion>2.4.2</jaxxVersion> - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <jaxxVersion>2.5.3</jaxxVersion> + <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> </properties> @@ -109,7 +109,7 @@ <plugins> <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin> <plugin>

1 0

r427 - trunk
by tchemit＠users.nuiton.org 07 Aug '12

07 Aug '12

Author: tchemit Date: 2012-08-07 09:51:18 +0200 (Tue, 07 Aug 2012) New Revision: 427 Url: http://nuiton.org/repositories/revision/nuiton-matrix/427 Log: Update mavenpom4redmine to 3.3.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-06 12:56:06 UTC (rev 426) +++ trunk/pom.xml 2012-08-07 07:51:18 UTC (rev 427) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.4</version> + <version>3.3.5</version> </parent> <artifactId>matrix</artifactId>

1 0

r426 - in trunk/src/site: . rst
by echatellier＠users.nuiton.org 06 Aug '12

06 Aug '12

Author: echatellier Date: 2012-08-06 14:56:06 +0200 (Mon, 06 Aug 2012) New Revision: 426 Url: http://nuiton.org/repositories/revision/nuiton-matrix/426 Log: Fix site g?\195?\169n?\195?\169ration Modified: trunk/src/site/rst/Serializable.rst trunk/src/site/rst/gui-matrixpanelviewer.rst trunk/src/site/rst/importexport.rst trunk/src/site/rst/index.rst trunk/src/site/site_fr.xml Modified: trunk/src/site/rst/Serializable.rst =================================================================== --- trunk/src/site/rst/Serializable.rst 2012-08-06 12:47:29 UTC (rev 425) +++ trunk/src/site/rst/Serializable.rst 2012-08-06 12:56:06 UTC (rev 426) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + ============================= La serialization des matrices ============================= Modified: trunk/src/site/rst/gui-matrixpanelviewer.rst =================================================================== --- trunk/src/site/rst/gui-matrixpanelviewer.rst 2012-08-06 12:47:29 UTC (rev 425) +++ trunk/src/site/rst/gui-matrixpanelviewer.rst 2012-08-06 12:56:06 UTC (rev 426) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + MatrixPanelViewer component =========================== Modified: trunk/src/site/rst/importexport.rst =================================================================== --- trunk/src/site/rst/importexport.rst 2012-08-06 12:47:29 UTC (rev 425) +++ trunk/src/site/rst/importexport.rst 2012-08-06 12:56:06 UTC (rev 426) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Matrix CSV Import/Export ======================== @@ -75,7 +76,7 @@ - dimensions semantics - value for each dimension -For example, importing a 2*2*2 matrix: +For example, importing a 2*2*2 matrix:: [2, 2, 2] java.lang.String:2009,2010 @@ -95,7 +96,8 @@ Previous example was using only "String" to lookup for semantics. You can use an additional SemanticMapper to use custom object. -For example: +For example:: + [2, 2, 2] Year:2009,2010 City:Nantes,Lille Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-08-06 12:47:29 UTC (rev 425) +++ trunk/src/site/rst/index.rst 2012-08-06 12:56:06 UTC (rev 426) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + NuitonMatrix ============ Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-06 12:47:29 UTC (rev 425) +++ trunk/src/site/site_fr.xml 2012-08-06 12:56:06 UTC (rev 426) @@ -29,19 +29,9 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>1.2.2</version> </skin> - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <googleSearch/> - <sideBarEnabled>false</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> - <bannerLeft> <name>${project.name}</name> <href>index.html</href>

1 0

r425 - trunk/src/site/rst
by echatellier＠users.nuiton.org 06 Aug '12

06 Aug '12

Author: echatellier Date: 2012-08-06 14:47:29 +0200 (Mon, 06 Aug 2012) New Revision: 425 Url: http://nuiton.org/repositories/revision/nuiton-matrix/425 Log: Udpate documentation Modified: trunk/src/site/rst/importexport.rst Modified: trunk/src/site/rst/importexport.rst =================================================================== --- trunk/src/site/rst/importexport.rst 2012-07-09 10:21:26 UTC (rev 424) +++ trunk/src/site/rst/importexport.rst 2012-08-06 12:47:29 UTC (rev 425) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2011 CodeLutin, Chatellier Eric +.. * Copyright (C) 2011 - 2012 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 @@ -62,10 +62,85 @@ With semantics ~~~~~~~~~~~~~~ - Without semantics ~~~~~~~~~~~~~~~~~ n dimensional matrix -------------------- +With n dimension import, file format is a little bit more complicated. It's +must include: + +- matrix dimensions +- dimensions semantics +- value for each dimension + +For example, importing a 2*2*2 matrix: + + [2, 2, 2] + java.lang.String:2009,2010 + java.lang.String:Nantes,Lille + java.lang.String:Informatique,Administration + 0;0;0;0.0 + 0;0;1;1.0 + 0;1;1;4.0 + 1;0;0;-4.0E-7 + 1;0;1;2.0 + 1;1;0;4.0 + 1;1;1;42.0 + +Using semantics mapper +~~~~~~~~~~~~~~~~~~~~~~ + +Previous example was using only "String" to lookup for semantics. You can use +an additional SemanticMapper to use custom object. + +For example: + [2, 2, 2] + Year:2009,2010 + City:Nantes,Lille + Department:Informatique,Administration + 0;0;0;0.0 + 0;0;1;1.0 + 0;1;1;4.0 + 1;0;0;-4.0E-7 + 1;0;1;2.0 + 1;1;0;4.0 + 1;1;1;42.0 + +The SemanticMapper will be called to resolv object identified by ids such as '2009', +'2010'... + +Here is a SemanticMapper sample code:: + + public class IsisMatrixSemanticMapper extends SemanticMapper { + + public Class getType(String typeName) { + + // In simulation context : + Class clazz = null; + try { + clazz = Class.forName("org.exemple." + typeName); + } catch (Exception ex) { + clazz = String.class; + } + return clazz; + } + + public Object getValue(Class type, String valueId) { + + // In simulation context : + Object value = null; + try { + // lookup in database object identified by valueId + [...] + + } catch (Exception ex) { + log.warn("Can't get value for " + valueId, ex); + value = valueId; + } + return value; + + //return valueId; + } + } \ No newline at end of file

1 0

r424 - trunk
by tchemit＠users.nuiton.org 09 Jul '12

09 Jul '12

Author: tchemit Date: 2012-07-09 12:21:26 +0200 (Mon, 09 Jul 2012) New Revision: 424 Url: http://nuiton.org/repositories/revision/nuiton-matrix/424 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-30 16:16:32 UTC (rev 423) +++ trunk/pom.xml 2012-07-09 10:21:26 UTC (rev 424) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.3.2</version> + <version>3.3.4</version> </parent> <artifactId>matrix</artifactId>

1 0

r423 - trunk/src/site
by tchemit＠users.nuiton.org 30 May '12

30 May '12

Author: tchemit Date: 2012-05-30 18:16:32 +0200 (Wed, 30 May 2012) New Revision: 423 Url: http://nuiton.org/repositories/revision/nuiton-matrix/423 Log: add missing external links Modified: trunk/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-05-30 16:12:28 UTC (rev 422) +++ trunk/src/site/site_fr.xml 2012-05-30 16:16:32 UTC (rev 423) @@ -62,7 +62,13 @@ </poweredBy> <body> - + + <links> + <item name="Nuiton.org" href="http://nuiton.org"/> + <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Libre entreprise" href="http://www.libre-entreprise.org"/> + </links> + <breadcrumbs> <item name="${project.name}" href="index.html" /> </breadcrumbs>

1 0

r422 - in trunk: . src/site
by tchemit＠users.nuiton.org 30 May '12

30 May '12

Author: tchemit Date: 2012-05-30 18:12:28 +0200 (Wed, 30 May 2012) New Revision: 422 Url: http://nuiton.org/repositories/revision/nuiton-matrix/422 Log: updates to mavenpom 3.3.2 Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-29 09:47:10 UTC (rev 421) +++ trunk/pom.xml 2012-05-30 16:12:28 UTC (rev 422) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.2</version> + <version>3.3.2</version> </parent> <artifactId>matrix</artifactId> @@ -99,7 +99,7 @@ <projectId>nuiton-matrix</projectId> <jaxxVersion>2.4.2</jaxxVersion> - <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> </properties> @@ -153,4 +153,48 @@ <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> + </plugin> + + </plugins> + </reporting> + + </profile> + + </profiles> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-03-29 09:47:10 UTC (rev 421) +++ trunk/src/site/site_fr.xml 2012-05-30 16:12:28 UTC (rev 422) @@ -26,11 +26,35 @@ <project name="${project.name}"> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + <bannerLeft> <name>${project.name}</name> <href>index.html</href> </bannerLeft> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <publishDate position="right" /> + <version position="right" /> + <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"/> @@ -58,5 +82,23 @@ <menu ref="reports"/> + <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}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> </body> </project>

1 0

r421 - trunk
by tchemit＠users.nuiton.org 29 Mar '12

29 Mar '12

Author: tchemit Date: 2012-03-29 11:47:10 +0200 (Thu, 29 Mar 2012) New Revision: 421 Url: http://nuiton.org/repositories/revision/nuiton-matrix/421 Log: updates to mavenpom 3.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-09 09:22:50 UTC (rev 420) +++ trunk/pom.xml 2012-03-29 09:47:10 UTC (rev 421) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.1.1</version> + <version>3.2</version> </parent> <artifactId>matrix</artifactId>

1 0

r420 - in trunk/nuiton-matrix: . src/main/java/org/nuiton/math/matrix src/test/java/org/nuiton/math/matrix
by echatellier＠users.nuiton.org 09 Mar '12

09 Mar '12

Author: echatellier Date: 2012-03-09 10:22:50 +0100 (Fri, 09 Mar 2012) New Revision: 420 Url: http://nuiton.org/repositories/revision/nuiton-matrix/420 Log: #2005 : Update to commons-lang 3.1 Modified: trunk/nuiton-matrix/pom.xml trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java Modified: trunk/nuiton-matrix/pom.xml =================================================================== --- trunk/nuiton-matrix/pom.xml 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/pom.xml 2012-03-09 09:22:50 UTC (rev 420) @@ -34,8 +34,9 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.1</version> </dependency> <dependency> Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/AbstractMatrixND.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2012 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 @@ -40,9 +40,9 @@ import org.apache.commons.collections.primitives.ArrayIntList; import org.apache.commons.collections.primitives.IntList; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ArrayUtil; Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixFactory.java 2012-03-09 09:22:50 UTC (rev 420) @@ -48,7 +48,7 @@ protected Class<?> vectorClass = null; - protected static SemanticMapper defaultSemanticMapper = new SemanticMapper();; + protected static SemanticMapper defaultSemanticMapper = new SemanticMapper(); protected MatrixFactory(Class<?> vectorClass) { this.vectorClass = vectorClass; Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixProxy.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 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 @@ -28,8 +28,8 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ObjectUtils; /** * Matrix proxy contains only dimension and semantics definition, but Modified: trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java =================================================================== --- trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/main/java/org/nuiton/math/matrix/MatrixStringEncoder.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 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 @@ -33,7 +33,7 @@ import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConvertUtilsBean; -import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/BasicMatrixTest.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 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 @@ -28,7 +28,7 @@ import java.util.Arrays; import java.util.NoSuchElementException; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.junit.Assert; import org.junit.Test; Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/ImportExportMatrixTest.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2004 - 2012 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 @@ -33,7 +33,7 @@ import java.util.Arrays; import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/MatrixNDTest.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 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 @@ -33,7 +33,7 @@ import java.util.List; import java.util.Stack; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.junit.Assert; import org.junit.Test; import org.nuiton.util.StringUtil; Modified: trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java =================================================================== --- trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java 2012-03-09 09:16:46 UTC (rev 419) +++ trunk/nuiton-matrix/src/test/java/org/nuiton/math/matrix/PerfTest.java 2012-03-09 09:22:50 UTC (rev 420) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2004 - 2010 CodeLutin + * Copyright (C) 2004 - 2012 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 @@ -28,7 +28,7 @@ import java.util.ArrayList; import java.util.List; -import org.apache.commons.lang.time.DurationFormatUtils; +import org.apache.commons.lang3.time.DurationFormatUtils; import org.junit.Test; /**

1 0