Author: tchemit Date: 2008-01-22 07:32:58 +0000 (Tue, 22 Jan 2008) New Revision: 393 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: ajout m?\195?\169thode getData pour interroger le bon service (local ou remote), disponible pour toutes les actions Tab utilisation de la m?\195?\169thode 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-22 07:31:18 UTC (rev 392) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-22 07:32:58 UTC (rev 393) @@ -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.service.StorageService; 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; @@ -76,9 +75,8 @@ MetaDataEntity[] data = model.getList(); if (data == null) { - // first local query, build model - StorageService service = SimExplorer.getStorageService(); - long size = service.findApplicationsCount(false); + // first local query, build model + long size = SimExplorer.getStorageService().findApplicationsCount(false); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -88,7 +86,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = service.findApplications(false, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + data = getData(false, 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-22 07:31:18 UTC (rev 392) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-22 07:32:58 UTC (rev 393) @@ -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.service.StorageService; 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; @@ -76,8 +75,7 @@ if (data == null) { // first local query, build model - StorageService service = SimExplorer.getRemoteStorageService(); - long size = service.findApplicationsCount(false); + long size = SimExplorer.getRemoteStorageService().findApplicationsCount(false); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -87,7 +85,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = service.findApplications(false, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + data = getData(false, paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data);