January 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r494 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:47:04 +0000 (Thu, 24 Jan 2008) New Revision: 494 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: isRemote : m?\195?\169thode utile 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:46:39 UTC (rev 493) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 11:47:04 UTC (rev 494) @@ -107,4 +107,8 @@ protected void setTab(SimExplorerTab tab) { this.tab = tab; } + + protected boolean isRemote() { + return getTab() == SimExplorerTab.remote; + } }

1 0

r493 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:46:39 +0000 (Thu, 24 Jan 2008) New Revision: 493 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java Log: ajout propri?\195?\169t?\195?\169 dateOrder + m?\195?\169thode updateTabModel pour faire un update du model (on va juste chercher les donn?\195?\169es ?\195?\160 partir du model) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-24 11:38:32 UTC (rev 492) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-24 11:46:39 UTC (rev 493) @@ -41,6 +41,8 @@ protected boolean onlyLatest; + protected int dateOrder; + private static final long serialVersionUID = -3623331875470531459L; public String getName() { @@ -76,6 +78,10 @@ return isEmpty() ? 0 : list.length; } + public int getDateOrder() { + return dateOrder; + } + private void checkSize(int index) { if (isEmpty() || size() < index) { throw new IllegalStateException(getClass() + " has size " + size() + " and was required index " + index); @@ -113,6 +119,10 @@ this.onlyLatest = onlyLatest; } + public void setDateOrder(int dateOrder) { + this.dateOrder = dateOrder; + } + public void initTabModel(boolean remote, SimExplorerContext context) throws Exception { // first local query, build model String query = getQuery(); @@ -126,9 +136,21 @@ setPagination(paginationModel); // obtain datas from service - MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); // save in model setList(data); } + + public void updateTabModel(boolean remote, SimExplorerContext context) throws Exception { + + // init pagination + PaginationModel paginationModel = getPagination(); + + // obtain datas from service + MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), getQuery(), (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), getDateOrder()); + + // save in model + setList(data); + } }

1 0

r492 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:38:32 +0000 (Thu, 24 Jan 2008) New Revision: 492 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: utilisation StorageServiceHelper Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 11:38:13 UTC (rev 491) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 11:38:32 UTC (rev 492) @@ -21,6 +21,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -80,7 +81,7 @@ Version version = data.getVersion(); log.info("show detail uuid:" + uuid + ", version:" + version + " (remote ?" + model.isRemote() + ")"); // chargement de l'élément à partir du service - LoggableElement element = getElement(model.isRemote(), uuid, version.toString()); + LoggableElement element = StorageServiceHelper.getElement(getContext(),model.isRemote(), uuid, version.toString()); // push dans le model model.setBean(element); return true;

1 0

r491 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:38:13 +0000 (Thu, 24 Jan 2008) New Revision: 491 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 de la m?\195?\169thode d'initialisation du model commune 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-24 11:36:47 UTC (rev 490) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 11:38:13 UTC (rev 491) @@ -22,7 +22,6 @@ 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; -import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import jaxx.runtime.JAXXObject; @@ -73,21 +72,8 @@ MetaDataEntity[] data = model.getList(); if (data == null) { - // first local query, build model - String query = model.getQuery(); - long size = getCount(false, query); - // init pagination - PaginationModel paginationModel = new PaginationModel(); - paginationModel.setFirstIndex(0); - paginationModel.setSize(size); - paginationModel.setWidth(getContext().getConfig().getSizor()); - model.setPagination(paginationModel); - - // obtain datas from service - data = getData(false, false, query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); - - // save in model - model.setList(data); + // first coming here, init model + model.initTabModel(false, getContext()); } return true; } 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-24 11:36:47 UTC (rev 490) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-24 11:38:13 UTC (rev 491) @@ -22,7 +22,6 @@ 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; -import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; import jaxx.runtime.JAXXObject; @@ -76,23 +75,8 @@ MetaDataEntity[] data = model.getList(); if (data == null) { - // first local query, build model - String query = model.getQuery(); - long size = getCount(false, query); - - // init pagination - PaginationModel paginationModel = new PaginationModel(); - paginationModel.setFirstIndex(0); - paginationModel.setSize(size); - // utilisation sizor par défaut - paginationModel.setWidth(getContext().getConfig().getSizor()); - model.setPagination(paginationModel); - - // obtain datas from service - data = getData(true, false, query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); - - // save in model - model.setList(data); + // first coming here, init model + model.initTabModel(true,getContext()); } return true; }

1 0

r490 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

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; }

1 0

r489 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:36:18 +0000 (Thu, 24 Jan 2008) New Revision: 489 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java Log: ajout propri?\195?\169t?\195?\169 onyLatest dans le model + ajout m?\195?\169thode pour initialiser la liste (ser autilis?\195?\169e lors du premier affichage de la liste ou ?\195?\160 chaque modification de la recherche). Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-24 11:35:23 UTC (rev 488) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/ListTabModel.java 2008-01-24 11:36:18 UTC (rev 489) @@ -19,8 +19,9 @@ package fr.cemagref.simexplorer.is.ui.swing.model; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.ui.SimExplorerContext; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.model.PaginationModel; import jaxx.runtime.builder.TabModel; /** @@ -38,6 +39,7 @@ protected MetaDataEntity[] list; + protected boolean onlyLatest; private static final long serialVersionUID = -3623331875470531459L; @@ -80,6 +82,10 @@ } } + public boolean isOnlyLatest() { + return onlyLatest; + } + @Override public String toString() { String s = super.toString(); @@ -102,4 +108,27 @@ public void setList(MetaDataEntity[] list) { this.list = list; } + + public void setOnlyLatest(boolean onlyLatest) { + this.onlyLatest = onlyLatest; + } + + public void initTabModel(boolean remote, SimExplorerContext context) throws Exception { + // first local query, build model + String query = getQuery(); + long size = StorageServiceHelper.getCount(context, remote, query, isOnlyLatest()); + // init pagination + PaginationModel paginationModel = new PaginationModel(); + paginationModel.setFirstIndex(0); + paginationModel.setSize(size); + // utilisation sizor par défaut + paginationModel.setWidth(context.getConfig().getSizor()); + setPagination(paginationModel); + + // obtain datas from service + MetaDataEntity[] data = StorageServiceHelper.getData(context, remote, isOnlyLatest(), query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); + + // save in model + setList(data); + } }

1 0

r488 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:35:23 +0000 (Thu, 24 Jan 2008) New Revision: 488 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java Log: ajout m?\195?\169thode getStorageService pour r?\195?\169cup?\195?\169rer le bon service (local ou remote) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 11:34:56 UTC (rev 487) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 11:35:23 UTC (rev 488) @@ -181,6 +181,12 @@ return remoteStorageService; } + public StorageService getStorageService(boolean remote) { + StorageService service; + service = remote ? getRemoteStorageService() : getLocalStorageService(); + return service; + } + /** @return le service d'authentification */ public AuthenticationService getAuthenticationService() { if (authenticationService == null) {

1 0

r487 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:34:56 +0000 (Thu, 24 Jan 2008) New Revision: 487 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java Log: ajout classe utilitaire pour effectuer des appels au bon service de storage Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-01-24 11:34:56 UTC (rev 487) @@ -0,0 +1,63 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit, Gabriel Landais +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* \#\#% */ +package fr.cemagref.simexplorer.is.ui; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import fr.cemagref.simexplorer.is.service.StorageService; + +/** + * Une classe pour encapsuler les appels aux services Sotrage + * + * @author chemit + */ +public class StorageServiceHelper { + + public static int getCount(SimExplorerContext context, boolean remote, String query, boolean onlyLatest) throws Exception { + StorageService service = context.getStorageService(remote); + String token = context.getToken(); + int size; + if (query == null || query.isEmpty()) { + size = service.findApplicationsCount(token, onlyLatest); + } else { + size = service.findFullTextCount(token, query, onlyLatest); + } + return size; + } + + public static MetaDataEntity[] getData(SimExplorerContext context, boolean remote, boolean onlyLatest, String query, long newFirstIndex, int width, int rowOrder) throws Exception { + StorageService service = context.getStorageService(remote); + String token = context.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; + } + + public static LoggableElement getElement(SimExplorerContext context, boolean remote, String uuid, String version) throws Exception { + StorageService service = context.getStorageService(remote); + LoggableElement data; + data = service.getElement(context.getToken(), uuid, version); + return data; + } + +}

1 0

r486 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

Author: tchemit Date: 2008-01-24 11:12:57 +0000 (Thu, 24 Jan 2008) New Revision: 486 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: suppression interface inutile + nettoyage + licence 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-24 11:11:42 UTC (rev 485) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 11:12:57 UTC (rev 486) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; @@ -75,7 +75,7 @@ if (data == null) { // first local query, build model String query = model.getQuery(); - long size = getCount(false, null, query); + long size = getCount(false, query); // init pagination PaginationModel paginationModel = new PaginationModel(); paginationModel.setFirstIndex(0); @@ -84,7 +84,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, false, query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); + data = getData(false, false, query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -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-24 11:11:42 UTC (rev 485) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-24 11:12:57 UTC (rev 486) @@ -1,5 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, * Tony Chemit, Gabriel Landais * * This program is free software; you can redistribute it and/or @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* \#\#% */ +* ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; @@ -78,17 +78,18 @@ if (data == null) { // first local query, build model String query = model.getQuery(); - long size = getCount(false, null, query); + long size = getCount(false, query); // init pagination PaginationModel paginationModel = new PaginationModel(); paginationModel.setFirstIndex(0); paginationModel.setSize(size); + // utilisation sizor par défaut paginationModel.setWidth(getContext().getConfig().getSizor()); model.setPagination(paginationModel); // obtain datas from service - data = getData(true, false, query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); + data = getData(true, false, query, (int) paginationModel.getFirstIndex(), paginationModel.getWidth(), -1); // save in model model.setList(data);

1 0

r485 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org Jan. 24, 2008

Jan. 24, 2008

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; }

1 0