Author: tchemit Date: 2008-01-23 22:11:10 +0000 (Wed, 23 Jan 2008) New Revision: 462 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: ajout appel a super classe Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -57,7 +57,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } ListTabModel listModel; DetailTabModel model = (DetailTabModel) getModel(); if (model.isRemote()) { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-23 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -56,7 +56,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } JTabbedPane tabbedPane = getTabContainer(); JAXXObject ui = getUI(); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-23 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -19,7 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -57,7 +56,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } JTabbedPane tabbedPane = getTabContainer(); JAXXObject ui = getUI(); @@ -77,7 +78,7 @@ if (data == null) { // first local query, build model String query = model.getQuery(); - long size= getCount(false, null, query); + long size = getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -87,7 +88,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(true,false, query,paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); + data = getData(true, false, query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data);