Author: tchemit Date: 2008-01-23 14:38:32 +0000 (Wed, 23 Jan 2008) New Revision: 433 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: implantation m?\195?\169thode getElement appelant le service 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-23 14:14:21 UTC (rev 432) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-23 14:38:32 UTC (rev 433) @@ -18,10 +18,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.SimExplorer; +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.SimExplorer; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabModel; import org.apache.commons.beanutils.Converter; @@ -82,7 +83,7 @@ break; } } - if (tab==null) { + if (tab == null) { throw new IllegalStateException("could not found tab to match for action " + this); } } @@ -103,14 +104,46 @@ return s.substring(s.lastIndexOf(".") + 1) + "<tab: " + tab + ", param: " + param + ">"; } - protected MetaDataEntity[] getData(boolean onlyLatest,int width, long newFirstIndex,int rowOrder) throws Exception { + protected int getCount(boolean remote, String token, String query) throws Exception { + int size; + if (query == null || query.isEmpty()) { + if (remote) { + size = SimExplorer.getRemoteStorageService().findApplicationsCount(token, false); + } else { + size = SimExplorer.getStorageService().findApplicationsCount(token, false); + } + } else { + if (remote) { + size = SimExplorer.getRemoteStorageService().findFullTextCount(token, query, false); + } else { + size = SimExplorer.getStorageService().findFullTextCount(token, query, false); + } + } + return size; + } + + protected MetaDataEntity[] getData(boolean remote, boolean onlyLatest, String query, int width, long newFirstIndex, int rowOrder) throws Exception { StorageService service; - service = getTab() == SimExplorerTab.local ? SimExplorer.getStorageService() : SimExplorer.getRemoteStorageService(); + service = remote ? SimExplorer.getRemoteStorageService() : SimExplorer.getStorageService(); MetaDataEntity[] data; - data = service.findApplications(null, onlyLatest, (int) newFirstIndex, width, rowOrder); + if (query == null || query.isEmpty()) { + + data = service.findApplications(null, onlyLatest, (int) newFirstIndex, width, rowOrder); + } else { + data = service.findFullText(null, query, onlyLatest, (int) newFirstIndex, width, rowOrder); + + } return data; } - + + protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { + StorageService service; + service = remote ? SimExplorer.getRemoteStorageService() : SimExplorer.getStorageService(); + LoggableElement data; + data = service.getElement(null, uuid, version); + return data; + } + protected JComponent getUIObject(String name) { return getUIObject(name, getUI()); }