Author: tchemit Date: 2008-01-24 11:36:47 +0000 (Thu, 24 Jan 2008) New Revision: 490 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: suppression des appels aux services dans les actions (utiliser ServiceStorageHelper) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 11:36:18 UTC (rev 489) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 11:36:47 UTC (rev 490) @@ -18,11 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.security.service.AuthenticationService; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabModel; import org.apache.commons.beanutils.Converter; @@ -40,7 +36,7 @@ * * @author chemit */ -public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction { +public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction { private SimExplorerTab tab; protected String param; @@ -108,47 +104,6 @@ return getUIObject(name, getUI()); } - protected int getCount(boolean remote, String query) throws Exception { - StorageService service = getStorageService(remote); - String token = getContext().getToken(); - int size; - if (query == null || query.isEmpty()) { - size = service.findApplicationsCount(token, false); - } else { - size = service.findFullTextCount(token, query, false); - } - return size; - } - - protected MetaDataEntity[] getData(boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) throws Exception { - StorageService service = getStorageService(remote); - String token = getContext().getToken(); - MetaDataEntity[] data; - if (query == null || query.isEmpty()) { - data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); - } else { - data = service.findFullText(token, query, onlyLatest, (int) newFirstIndex, width, rowOrder); - } - return data; - } - - protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { - StorageService service = getStorageService(remote); - LoggableElement data; - data = service.getElement(getContext().getToken(), uuid, version); - return data; - } - - protected StorageService getStorageService(boolean remote) { - StorageService service; - service = remote ? getContext().getRemoteStorageService() : getContext().getLocalStorageService(); - return service; - } - - protected AuthenticationService getAuthenticationService() { - return getContext().getAuthenticationService(); - } - protected void setTab(SimExplorerTab tab) { this.tab = tab; }