Author: chatellier Date: 2009-06-08 15:35:11 +0000 (Mon, 08 Jun 2009) New Revision: 2339 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java Log: Always set text even if NPE happen Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 15:34:02 UTC (rev 2338) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2009-06-08 15:35:11 UTC (rev 2339) @@ -20,22 +20,26 @@ import static org.codelutin.i18n.I18n._; -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.entities.Equation; -import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; - -import javax.swing.JButton; -import javax.swing.JTable; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; -import javax.swing.table.TableCellEditor; import java.awt.Component; +import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.EventObject; import java.util.HashSet; import java.util.Iterator; +import javax.swing.JButton; +import javax.swing.JTable; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; +import javax.swing.table.TableCellEditor; + +import org.codelutin.widget.SwingUtil; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.Equation; +import fr.ifremer.isisfish.ui.input.EquationEditorPaneUI; + /** * Equation table cell editor. * @@ -61,7 +65,9 @@ public EquationTableEditor() { addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - getFrame().setVisible(true); + Window editorFrame = getFrame(); + SwingUtil.center(editorFrame); + editorFrame.setVisible(true); } }); } @@ -87,11 +93,7 @@ boolean isSelected, int row, int column) { equation = (Equation) value; - String name = _("isisfish.common.empty"); - if (equation != null) { - name = equation.getName(); - } - this.setText(name); + this.setText(equation.getName()); try { getFrame().setEquation(equation.getCategory(), equation.getName(), equation.getJavaInterface(), equation.getContent());