Author: chatellier Date: 2009-09-04 14:59:18 +0000 (Fri, 04 Sep 2009) New Revision: 2583 Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Fix sensitivity export in UI. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2009-09-04 13:17:18 UTC (rev 2582) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -38,7 +38,7 @@ /** serialVersionUID. */ private static final long serialVersionUID = -4070846632975105788L; - protected List<? extends Export> exports; + protected List<Export> exports; /** * Empty constructor. @@ -52,7 +52,7 @@ * * @param exports exports */ - public ExportListModel(List<? extends Export> exports) { + public ExportListModel(List<Export> exports) { super(); setExport(exports); } @@ -62,7 +62,7 @@ * * @return the exports */ - public List<? extends Export> getExports() { + public List<Export> getExports() { return exports; } @@ -71,7 +71,7 @@ * * @param exports the exports to set */ - public void setExport(List<? extends Export> exports) { + public void setExport(List<Export> exports) { this.exports = exports; } Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,98 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import java.util.List; + +import javax.swing.AbstractListModel; + +import fr.ifremer.isisfish.export.SensitivityExport; + +/** + * Model pour la liste des instances d'exports. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportListModel extends AbstractListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + protected List<SensitivityExport> exports; + + /** + * Empty constructor. + */ + public SensitivityExportListModel() { + this(null); + } + + /** + * Constructor with plan list. + * + * @param exports exports + */ + public SensitivityExportListModel(List<SensitivityExport> exports) { + super(); + setSensitivityExports(exports); + } + + /** + * Get exports list. + * + * @return the exports + */ + public List<SensitivityExport> getSensitivityExports() { + return exports; + } + + /** + * Set exports list. + * + * @param exports the exports to set + */ + public void setSensitivityExports(List<SensitivityExport> exports) { + this.exports = exports; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return exports.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (exports != null) { + size = exports.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,69 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import java.awt.Component; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.export.SensitivityExport; + +/** + * Renderer pour la liste des plans d'analyse. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportListRenderer extends DefaultListCellRenderer implements + ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /* + * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) + */ + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + // this must be used to have alterned highlight rows and default + // selection color + JLabel c = (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + SensitivityExport export = (SensitivityExport) value; + c.setText(SensitivityExportStorage.getName(export)); + + try { + c.setToolTipText(export.getDescription()); + } catch (Exception e) { + // can't get exception + } + + return this; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,97 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import java.util.List; + +import javax.swing.DefaultListModel; + +/** + * Model pour la liste des noms d'exports. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportNameListModel extends DefaultListModel { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** Analyze plan names. */ + protected List<String> sensitivityExportNames; + + /** + * Empty constructor. + */ + public SensitivityExportNameListModel() { + this(null); + } + + /** + * Constructor with export list. + * + * @param exportNames exports Names + */ + public SensitivityExportNameListModel(List<String> exportNames) { + super(); + setSensitivityExportNames(exportNames); + } + + /** + * Get exports names. + * + * @return the analyze plan names + */ + public List<String> getSensitivityExportNames() { + return sensitivityExportNames; + } + + /** + * Set export names. + * + * @param sensitivityExportNames the exports names to set + */ + public void setSensitivityExportNames(List<String> sensitivityExportNames) { + this.sensitivityExportNames = sensitivityExportNames; + } + + /* + * @see javax.swing.ListModel#getElementAt(int) + */ + @Override + public Object getElementAt(int index) { + return sensitivityExportNames.get(index); + } + + /* + * @see javax.swing.ListModel#getSize() + */ + @Override + public int getSize() { + int size = 0; + + if (sensitivityExportNames != null) { + size = sensitivityExportNames.size(); + } + return size; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,94 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import static org.codelutin.i18n.I18n._; + +import java.awt.Component; +import java.util.HashMap; +import java.util.Map; + +import javax.swing.DefaultListCellRenderer; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.ui.util.TooltipHelper; + +/** + * Renderer pour la combo des noms d'export. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportNameListRenderer extends DefaultListCellRenderer implements + ListCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -4070846632975105788L; + + /** Export cache. */ + protected Map<String, SensitivityExport> sensitivityExportCache; + + /** + * Empty constructor. + */ + public SensitivityExportNameListRenderer() { + sensitivityExportCache = new HashMap<String, SensitivityExport>(); + } + + /* + * @see javax.swing.ListCellRenderer#getListCellRendererComponent(javax.swing.JList, java.lang.Object, int, boolean, boolean) + */ + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + + // this must be used to have alterned highlight rows and default + // selection color + JLabel c = (JLabel) super.getListCellRendererComponent(list, value, + index, isSelected, cellHasFocus); + + String exportName = (String) value; + c.setText(exportName); + + // c'est tres couteux d'avoir une instance + // on les met en cache + try { + SensitivityExport export = sensitivityExportCache.get(exportName); + if (export == null) { + SensitivityExportStorage storage = SensitivityExportStorage.getSensitivityExport(exportName); + export = storage.getNewSensitivityExportInstance(); + sensitivityExportCache.put(exportName, export); + } + + c.setToolTipText(export.getDescription()); + } catch (Exception e) { + String errorTooltip = TooltipHelper.getErrorTooltip(_("isisfish.error.compile.fileerror", exportName)); + c.setToolTipText(errorTooltip); + } + + return c; + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,72 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.ui.widget.editor.ParameterTableCellEditor; + +/** + * Specific editor for export parameters. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportParametersTableCellEditor extends ParameterTableCellEditor { + + /** serialVersionUID. */ + private static final long serialVersionUID = 8211639776194497615L; + + protected SensitivityExport export; + + protected List<Class<?>> exportParametersTypes; + + /** + * Constructor with export parameter. + * + * @param export export + */ + public SensitivityExportParametersTableCellEditor(SensitivityExport export) { + super(); + + this.export = export; + exportParametersTypes = new ArrayList<Class<?>>(); + //TODO map may be sorted + Map<String, Class<?>> planParametersNamesAndTypes = SensitivityExportStorage + .getParameterNames(export); + for (Class<?> type : planParametersNamesAndTypes.values()) { + exportParametersTypes.add(type); + } + } + + /* + * @see fr.ifremer.isisfish.ui.widget.editor.ParameterTableCellEditor#getType(java.lang.Object, int, int) + */ + @Override + protected Class<?> getType(Object value, int row, int column) { + return exportParametersTypes.get(row); + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellEditor.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,76 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableCellRenderer; + +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.ui.util.TooltipHelper; +import fr.ifremer.isisfish.util.Doc; + +/** + * Specific renderer for export parameters. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportParametersTableCellRenderer extends DefaultTableCellRenderer + implements TableCellRenderer { + + /** serialVersionUID. */ + private static final long serialVersionUID = -1655744662816030649L; + + protected SensitivityExport export; + + public SensitivityExportParametersTableCellRenderer(SensitivityExport export) { + this.export = export; + } + + /* + * @see javax.swing.table.TableCellRenderer#getTableCellRendererComponent(javax.swing.JTable, java.lang.Object, boolean, boolean, int, int) + */ + @Override + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) { + + // this must be used to have alterned highlight rows and default + // selection color + JLabel c = (JLabel) super.getTableCellRendererComponent(table, value, + isSelected, hasFocus, row, column); + + String parameterName = (String) value; + c.setText(parameterName); + + Doc doc = SensitivityExportStorage.getParameterDoc(export, parameterName); + String documentation = TooltipHelper.docToString(doc); + c.setToolTipText(documentation); + + return c; + } + +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableCellRenderer.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java (rev 0) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -0,0 +1,194 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package fr.ifremer.isisfish.ui.models.sensitivityexport; + +import static org.codelutin.i18n.I18n._; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.swing.table.AbstractTableModel; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.datastore.SensitivityExportStorage; +import fr.ifremer.isisfish.export.SensitivityExport; + +/** + * Model de la table de definition de parametre d'un export. + * + * Columns : + * <li>Parameter name</li> + * <li>Parameter value</li> + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author: chatellier $ + */ +public class SensitivityExportParametersTableModel extends AbstractTableModel { + + /** Log. */ + private static Log log = LogFactory + .getLog(SensitivityExportParametersTableModel.class); + + /** serialVersionUID. */ + private static final long serialVersionUID = 3169786638868209920L; + + /** Columns names. */ + public final static String[] COLUMN_NAMES = { _("isisfish.common.name"), + _("isisfish.common.value") }; + + protected SensitivityExport export; + + protected List<String> exportParametersNames; + + /** + * Constructor with data. + * + * @param export export to edit parameters + */ + public SensitivityExportParametersTableModel(SensitivityExport export) { + super(); + this.export = export; + + //TODO map may be sorted + exportParametersNames = new ArrayList<String>(); + Map<String, Class<?>> planParametersNamesAndTypes = SensitivityExportStorage + .getParameterNames(export); + for (String names : planParametersNamesAndTypes.keySet()) { + exportParametersNames.add(names); + } + } + + /* + * @see javax.swing.table.TableModel#getColumnCount() + */ + @Override + public int getColumnCount() { + return COLUMN_NAMES.length; + } + + /* + * @see javax.swing.table.TableModel#getRowCount() + */ + @Override + public int getRowCount() { + return exportParametersNames.size(); + } + + /* + * @see javax.swing.table.TableModel#getValueAt(int, int) + */ + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + + Object result = null; + + String name = exportParametersNames.get(rowIndex); + switch (columnIndex) { + case 0: + result = name; + break; + case 1: + try { + result = SensitivityExportStorage.getParameterValue(export, name); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.debug("Can't get parameters value", e); + } + } + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnClass(int) + */ + @Override + public Class<?> getColumnClass(int columnIndex) { + + Class<?> result = null; + + switch (columnIndex) { + case 0: + result = String.class; + break; + case 1: + result = Object.class; + break; + default: + throw new IndexOutOfBoundsException("No such column " + columnIndex); + } + + return result; + } + + /* + * @see javax.swing.table.TableModel#getColumnName(int) + */ + @Override + public String getColumnName(int columnIndex) { + return COLUMN_NAMES[columnIndex]; + } + + /* + * @see javax.swing.table.TableModel#isCellEditable(int, int) + */ + @Override + public boolean isCellEditable(int rowIndex, int columnIndex) { + return columnIndex > 0; + } + + /* + * @see javax.swing.table.TableModel#setValueAt(java.lang.Object, int, int) + */ + @Override + public void setValueAt(Object value, int rowIndex, int columnIndex) { + + if (log.isDebugEnabled()) { + log.debug("Cell edition (column " + columnIndex + ") = " + value); + } + + String name = exportParametersNames.get(rowIndex); + switch (columnIndex) { + case 1: + try { + SensitivityExportStorage.setParameterValue(export, name, value); + } catch (IsisFishException e) { + if (log.isErrorEnabled()) { + log.error("Can't set parameter value", e); + } + } + break; + default: + throw new IndexOutOfBoundsException("Can't edit column " + + columnIndex); + } + + } +} Property changes on: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportParametersTableModel.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-09-04 13:17:18 UTC (rev 2582) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-09-04 14:59:18 UTC (rev 2583) @@ -34,13 +34,13 @@ import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.IsisFishException; - import fr.ifremer.isisfish.ui.models.export.ExportListModel; - import fr.ifremer.isisfish.ui.models.export.ExportListRenderer; - import fr.ifremer.isisfish.ui.models.export.ExportNameListModel; - import fr.ifremer.isisfish.ui.models.export.ExportNameListRenderer; - import fr.ifremer.isisfish.ui.models.export.ExportParametersTableCellEditor; - import fr.ifremer.isisfish.ui.models.export.ExportParametersTableCellRenderer; - import fr.ifremer.isisfish.ui.models.export.ExportParametersTableModel; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListModel; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer; + import fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel; import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel; import fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer; @@ -142,9 +142,9 @@ }); } - protected ExportNameListModel getAvailableExportListModel() { + protected SensitivityExportNameListModel getAvailableExportListModel() { java.util.List<String> exportNames = getSimulAction().getSensitivityExportNames(); - ExportNameListModel model = new ExportNameListModel(exportNames); + SensitivityExportNameListModel model = new SensitivityExportNameListModel(exportNames); return model; } @@ -158,7 +158,7 @@ for (Object exportName : exportNames) { getSimulAction().addSensitivityExport((String)exportName); } - setExportListModel(); + setSensitivityExportListModel(); } /** @@ -169,7 +169,7 @@ for (Object export : exports) { getSimulAction().removeSensitivityExport((SensitivityExport)export); } - setExportListModel(); + setSensitivityExportListModel(); } /** @@ -177,17 +177,17 @@ */ protected void clearExports() { getSimulAction().clearSensitivityExport(); - setExportListModel(); + setSensitivityExportListModel(); } /** * Set model (refresh export JList). */ - public void setExportListModel() { + public void setSensitivityExportListModel() { java.util.List<SensitivityExport> exports = getSimulAction().getSensitivityExports(); - ExportListModel model = new ExportListModel(exports); + SensitivityExportListModel model = new SensitivityExportListModel(exports); selectedSensitivityExports.setModel(model); - selectedSensitivityExports.setCellRenderer(new ExportListRenderer()); + selectedSensitivityExports.setCellRenderer(new SensitivityExportListRenderer()); clearExportsButton.setEnabled(!exports.isEmpty()); } @@ -218,10 +218,10 @@ if (selectedSensitivityExports.getSelectedIndices().length == 1) { SensitivityExport export = (SensitivityExport)selectedSensitivityExports.getSelectedValue(); - ExportParametersTableModel model = new ExportParametersTableModel(export); + SensitivityExportParametersTableModel model = new SensitivityExportParametersTableModel(export); exportParamsTable.setModel(model); - exportParamsTable.getColumnModel().getColumn(0).setCellRenderer(new ExportParametersTableCellRenderer(export)); - ExportParametersTableCellEditor cellEditor = new ExportParametersTableCellEditor(export); + exportParamsTable.getColumnModel().getColumn(0).setCellRenderer(new SensitivityExportParametersTableCellRenderer(export)); + SensitivityExportParametersTableCellEditor cellEditor = new SensitivityExportParametersTableCellEditor(export); cellEditor.setRegion(simulAction.getRegionStorage()); exportParamsTable.getColumnModel().getColumn(1).setCellEditor(cellEditor); } @@ -325,7 +325,7 @@ <cell fill="both" weightx="0.5" weighty="1.0"> <JScrollPane> <JList id="availableSensitivityExports" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - model='{getAvailableExportListModel()}' cellRenderer='{new ExportNameListRenderer()}' + model='{getAvailableExportListModel()}' cellRenderer='{new SensitivityExportNameListRenderer()}' onValueChanged='availableSensitivityExportSelection()' /> </JScrollPane> </cell> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-09-04 13:17:18 UTC (rev 2582) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-09-04 14:59:18 UTC (rev 2583) @@ -157,7 +157,7 @@ } protected void setExportSens() { if (isSensitivity()) { - getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setExportListModel(); + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setSensitivityExportListModel(); } } protected void setSensitivityCalculator() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-04 13:17:18 UTC (rev 2582) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-09-04 14:59:18 UTC (rev 2583) @@ -47,6 +47,7 @@ import org.codelutin.log.UserLog; import org.codelutin.math.matrix.MatrixND; import org.codelutin.topia.TopiaContext; +import org.codelutin.util.FileUtil; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; @@ -568,7 +569,7 @@ } public void updateDirectory() { - param.setExportDirectory(org.codelutin.util.FileUtil.getDirectory()); + param.setExportDirectory(FileUtil.getDirectory()); } public void saveExport() { @@ -687,8 +688,8 @@ public void addSensitivityExport(String name) { try { - ExportStorage storage = ExportStorage.getExport(name); - SensitivityExport sensitivityExport = (SensitivityExport) storage.getNewExportInstance(); + SensitivityExportStorage storage = SensitivityExportStorage.getSensitivityExport(name); + SensitivityExport sensitivityExport = storage.getNewSensitivityExportInstance(); param.getSensitivityExport().add(sensitivityExport); } catch (IsisFishException e) { if (log.isErrorEnabled()) { @@ -719,7 +720,7 @@ String paramName, Object value) { if (value != null) { try { - ExportStorage.setParameterValue(export, paramName, value); + SensitivityExportStorage.setParameterValue(export, paramName, value); } catch (IsisFishException e) { if (log.isErrorEnabled()) { log.error("Can't set sensitivity export param value", e); @@ -741,7 +742,7 @@ } /** - * Return sensitivity calculator name without .java extention + * Return sensitivity calculator name without .java extension. * * @return sensitivity calculator names list */ @@ -769,7 +770,7 @@ /** * Build a new sensitivity calculator instance by his name. * - * @param name calcultor name + * @param name calculator name * @return instance */ public SensitivityCalculator getSensivitityCalculatorInstance(String name) {