Author: tchemit Date: 2012-07-30 19:34:31 +0200 (Mon, 30 Jul 2012) New Revision: 2451 Url: http://nuiton.org/repositories/revision/jaxx/2451 Log: fixes #2213: NPE when no file selected within the FileCellEditor Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java =================================================================== --- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-30 13:47:18 UTC (rev 2450) +++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/editor/config/ConfigTableEditor.java 2012-07-30 17:34:31 UTC (rev 2451) @@ -26,15 +26,6 @@ package jaxx.runtime.swing.editor.config; import com.google.common.io.Files; -import java.awt.Component; -import java.io.File; -import java.util.EventObject; -import java.util.Locale; -import javax.swing.DefaultCellEditor; -import javax.swing.JTable; -import javax.swing.KeyStroke; -import javax.swing.event.CellEditorListener; -import javax.swing.table.TableCellEditor; import jaxx.runtime.swing.JAXXWidgetUtil; import jaxx.runtime.swing.editor.ClassCellEditor; import jaxx.runtime.swing.editor.EnumEditor; @@ -44,6 +35,16 @@ import jaxx.runtime.swing.editor.config.model.OptionModel; import org.apache.commons.lang3.StringUtils; +import javax.swing.DefaultCellEditor; +import javax.swing.JTable; +import javax.swing.KeyStroke; +import javax.swing.event.CellEditorListener; +import javax.swing.table.TableCellEditor; +import java.awt.Component; +import java.io.File; +import java.util.EventObject; +import java.util.Locale; + /** * L'éditeur des valeurs des propriétés d'une configuration * @@ -146,7 +147,7 @@ @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - String fileExtension = Files.getFileExtension(((File)value).getName()); + String fileExtension = value == null ? null : Files.getFileExtension(((File) value).getName()); if (StringUtils.isNotEmpty(fileExtension)) { fileEditor.setExts(fileExtension); fileEditor.setAcceptAllFileFilterUsed(true);