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