Author: echatellier Date: 2011-10-27 17:15:16 +0200 (Thu, 27 Oct 2011) New Revision: 885 Url: http://forge.codelutin.com/repositories/revision/coser/885 Log: #381 : Update nuiton-matrix to 2.2 Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/pom.xml Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-10-27 14:48:22 UTC (rev 884) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/DataHandler.java 2011-10-27 15:15:16 UTC (rev 885) @@ -35,7 +35,7 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.viewer.MatrixViewerPanel; import org.nuiton.math.matrix.viewer.renderer.MatrixChartRenderer; -import org.nuiton.math.matrix.viewer.renderer.MatrixInfoTableRenderer; +import org.nuiton.math.matrix.viewer.renderer.MatrixPanelRenderer; import org.nuiton.widget.SwingSession; import fr.ifremer.coser.bean.AbstractDataContainer; @@ -83,9 +83,9 @@ matrixViewerFrame.setName("lengthstructureframe"); MatrixViewerPanel panel = new MatrixViewerPanel(); panel.addMatrixRenderer(new MatrixChartRenderer()); - panel.addMatrixRenderer(new MatrixInfoTableRenderer()); + panel.addMatrixRenderer(new MatrixPanelRenderer()); panel.addMatrixFilter(new LengthStructureMatrixFilter(project, container)); - panel.addMatrix(matrix); + panel.setMatrix(matrix); matrixViewerFrame.add(panel); matrixViewerFrame.pack(); matrixViewerFrame.setLocationRelativeTo(parent); Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-10-27 14:48:22 UTC (rev 884) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/common/LengthStructureMatrixFilter.java 2011-10-27 15:15:16 UTC (rev 885) @@ -3,7 +3,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -57,6 +57,9 @@ this.container = container; } + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filter(org.nuiton.math.matrix.MatrixND) + */ @Override public MatrixND filter(MatrixND matrix) { @@ -133,4 +136,12 @@ return filteredMatrix; } + + /* + * @see org.nuiton.math.matrix.viewer.MatrixFilter#filterDimension(org.nuiton.math.matrix.MatrixND, int, int) + */ + @Override + public MatrixND filterDimension(MatrixND matrix, int dim, int sumStep) { + return matrix; + } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-10-27 14:48:22 UTC (rev 884) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2011-10-27 15:15:16 UTC (rev 885) @@ -1035,8 +1035,11 @@ ProjectService projectService = view.getContextValue(ProjectService.class); MatrixND samplingEffort = projectService.getSamplingEffort(project, selection); view.getMatrixPanelEditor().setMatrix(samplingEffort); + + // replace default renderer with a renderer that display + // null values in red background view.getMatrixPanelEditor().getTable().setDefaultRenderer(String.class, - new SamplingEffortRenderer((MatrixTableModelND)view.getMatrixPanelEditor().getTableModel())); + new SamplingEffortRenderer((MatrixTableModelND)view.getMatrixPanelEditor().getTable().getModel())); } /** Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-27 14:48:22 UTC (rev 884) +++ trunk/pom.xml 2011-10-27 15:15:16 UTC (rev 885) @@ -131,14 +131,14 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.1</version> + <version>2.2</version> <scope>compile</scope> </dependency>