Author: tchemit Date: 2008-01-24 11:11:42 +0000 (Thu, 24 Jan 2008) New Revision: 485 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: suppression interface inutile + nettoyage 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:09:10 UTC (rev 484) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 11:11:42 UTC (rev 485) @@ -40,7 +40,7 @@ * * @author chemit */ -public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction implements ActionParameter { +public abstract class SimExplorerAbstractTabAction extends SimExplorerAbstractAction { private SimExplorerTab tab; protected String param; @@ -104,32 +104,44 @@ return s.substring(s.lastIndexOf(".") + 1) + "<tab: " + tab + ", param: " + param + ">"; } - protected int getCount(boolean remote, String token, String query) throws Exception { + protected JComponent getUIObject(String name) { + 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 = getStorageService(remote).findApplicationsCount(token, false); + size = service.findApplicationsCount(token, false); } else { - size = getStorageService(remote).findFullTextCount(token, query, false); + size = service.findFullTextCount(token, query, false); } return size; } - protected MetaDataEntity[] getData(boolean remote, boolean onlyLatest, String query, int width, long newFirstIndex, int rowOrder) throws Exception { + 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(null, onlyLatest, (int) newFirstIndex, width, rowOrder); + data = service.findApplications(token, onlyLatest, (int) newFirstIndex, width, rowOrder); } else { - data = service.findFullText(null, query, onlyLatest, (int) newFirstIndex, width, rowOrder); - + 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().getStorageService(); + service = remote ? getContext().getRemoteStorageService() : getContext().getLocalStorageService(); return service; } @@ -137,17 +149,6 @@ return getContext().getAuthenticationService(); } - protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { - StorageService service = getStorageService(remote); - LoggableElement data; - data = service.getElement(null, uuid, version); - return data; - } - - protected JComponent getUIObject(String name) { - return getUIObject(name, getUI()); - } - protected void setTab(SimExplorerTab tab) { this.tab = tab; }