Author: chatellier Date: 2010-11-09 15:01:20 +0000 (Tue, 09 Nov 2010) New Revision: 195 Log: Fix NPE and display sampling effort matrix Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-09 14:45:50 UTC (rev 194) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-09 15:01:20 UTC (rev 195) @@ -116,7 +116,7 @@ </cell> <cell anchor="east"> <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDesisionPanelLayout().show(getDetailDesisionPanel(), "SPECIESDATA");' /> + onActionPerformed='getDetailDesisionPanelLayout().show(getDetailDesisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> </cell> </row> <row> @@ -167,8 +167,7 @@ <JXImageView id="zonesMap" /> </JScrollPane> <JScrollPane constraints='"SPECIESDATA"'> - <JTable> - </JTable> + <org.nuiton.math.matrix.gui.MatrixPanelEditor id="matrixPanelEditor" /> </JScrollPane> </JPanel> </cell> 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 2010-11-09 14:45:50 UTC (rev 194) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-09 15:01:20 UTC (rev 195) @@ -39,6 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; import fr.ifremer.coser.CoserBusinessException; import fr.ifremer.coser.CoserException; @@ -167,7 +168,7 @@ Integer endYear = (Integer)view.getSelectionDetailsEndYearField().getSelectedItem(); // il est possible que l'evenement fasse suite a une seule des selections - if (beginYear != null && endYear != null) { + if (beginYear != null && endYear != null && zones != null) { List<String> species = projectService.getProjectSpecies(project, selection, zones, beginYear, endYear, specyTypes); view.getSpecyListModel().setSpecy(species); } @@ -315,4 +316,17 @@ view.dispose(); } } + + /** + * + */ + public void showSamplingEffort(SelectionDetailsView view) { + Project project = view.getContextValue(Project.class); + Selection selection = view.getContextValue(Selection.class); + ProjectService projectService = view.getContextValue(ProjectService.class); + MatrixND samplingEffort = projectService.getSamplingEffort(project, selection); + view.getMatrixPanelEditor().setMatrix(samplingEffort); + + //projectService.getOccurence(project, selection); + } }