Author: echatellier Date: 2014-04-15 16:20:44 +0200 (Tue, 15 Apr 2014) New Revision: 3956 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3956 Log: Fix export table model Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-15 14:20:04 UTC (rev 3955) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java 2014-04-15 14:20:44 UTC (rev 3956) @@ -323,7 +323,7 @@ public void addExports(OptimizationUI view) { // get elements SimulationParameter param = getSimulationParameter(view); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); // add all selected exports List<String> selectedExports = view.getFieldExportList().getSelectedValuesList(); @@ -353,7 +353,7 @@ // get element SimulationParameter param = getSimulationParameter(view); Map<Export, Observation> optimizationExports = param.getOptimizationExportsObservations(); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); JTable table = view.getExportObservationTable(); int[] rows = table.getSelectedRows(); @@ -377,7 +377,7 @@ // get elements SimulationParameter param = getSimulationParameter(view); Map<Export, Observation> optimizationExports = param.getOptimizationExportsObservations(); - ExportObservationTableModel tableModel = view.getExportObservationTableModel(); + ExportObservationTableModel tableModel = (ExportObservationTableModel)view.getExportObservationTable().getModel(); // clear optimizationExports.clear(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:20:04 UTC (rev 3955) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx 2014-04-15 14:20:44 UTC (rev 3956) @@ -123,8 +123,7 @@ </cell> <cell fill="both" weightx="1.0" weighty="1.0"> <JScrollPane> - <ExportObservationTableModel id="exportObservationTableModel" javaBean="handler.getExportObservationTableModel(this)" /> - <JTable id="exportObservationTable" model="{getExportObservationTableModel()}" rowHeight='24' /> + <JTable id="exportObservationTable" model="{handler.getExportObservationTableModel(this)}" rowHeight='24' /> <ListSelectionModel id="exportObservationSelectionModel" initializer="exportObservationTable.getSelectionModel()" onValueChanged='removeExportsButton.setEnabled(!exportObservationSelectionModel.isSelectionEmpty());clearExportsButton.setEnabled(exportObservationTableModel.getRowCount() > 0);' /> </JScrollPane>