Author: tchemit Date: 2008-01-22 06:47:47 +0000 (Tue, 22 Jan 2008) New Revision: 388 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: supression du container + s?\195?\169curisation d'une conversion (si il n'y avait aucune valeur s?\195?\169lectionn?\195?\169e dans la combo) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 06:46:48 UTC (rev 387) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-22 06:47:47 UTC (rev 388) @@ -22,7 +22,6 @@ import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUI; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -41,7 +40,6 @@ */ @jaxx.runtime.builder.SelectActionConfig( actionCommand = "changeSizor", - container = SimExplorerUI.class, name = "simexplorer.action.pagination.changeSizor", shortDescription = "simexplorer.action.pagination.changeSizor.tooltip", longDescription = "simexplorer.action.pagination.changeSizor.help", @@ -59,15 +57,17 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - ListTabModel model = (ListTabModel) getModel(); JComboBox jComboBox = getComboBox(); - if (!jComboBox.isEnabled()) { return false; } + ListTabModel model = (ListTabModel) getModel(); Integer oldIndex = model.getPagination().getWidth(); - newWidth = Integer.valueOf(jComboBox.getSelectedItem() + ""); + Object o = jComboBox.getSelectedItem(); + if (o!=null) { + newWidth = Integer.valueOf(o + ""); + } return !oldIndex.equals(newWidth); }