Author: tchemit Date: 2008-01-23 15:12:58 +0000 (Wed, 23 Jan 2008) New Revision: 438 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/ShowRemoteTabAction.java Log: utilisation m?\195?\169thode getCount (qui encapsule le bon appel au bon service) 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 15:11:55 UTC (rev 437) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-23 15:12:58 UTC (rev 438) @@ -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; @@ -76,8 +75,8 @@ if (data == null) { // first local query, build model - long size = SimExplorer.getStorageService().findApplicationsCount(null, false); - + String query = model.getQuery(); + long size= getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); paginationModel.setFirstIndex(0); @@ -86,7 +85,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); + data = getData(false, false,query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data); 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 15:11:55 UTC (rev 437) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-23 15:12:58 UTC (rev 438) @@ -55,6 +55,7 @@ super(name); } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { JTabbedPane tabbedPane = getTabContainer(); @@ -75,7 +76,8 @@ if (data == null) { // first local query, build model - long size = SimExplorer.getRemoteStorageService().findApplicationsCount(null, false); + String query = model.getQuery(); + long size= getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -85,7 +87,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); + data = getData(true,false, query,paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data);