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