Author: tchemit Date: 2008-01-24 13:14:21 +0000 (Thu, 24 Jan 2008) New Revision: 496 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java Log: utilisation m?\195?\169thode updateTabModel Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 13:13:23 UTC (rev 495) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-24 13:14:21 UTC (rev 496) @@ -18,9 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -78,28 +76,20 @@ final ListTabModel model = (ListTabModel) getModel(); final PaginationModel pagination = model.getPagination(); - MetaDataEntity[] data; int width = pagination.getWidth(); long newFirstIndex = newPage * width; - //long newLastIndex = newFirstIndex + width; - //long oldFirstindex = pagination.getFirstIndex(); - //long oldLastIndex = oldFirstindex + model.size(); + // save new firstIndex in model + pagination.setFirstIndex(newFirstIndex); - //TODO optimiser l'algo - data = getData(getTab() == SimExplorerTab.remote, false, model.getQuery(), width, newFirstIndex, -1); + model.updateTabModel(isRemote(), getContext()); - // save in model - model.setList(data); - + // update table model JApplicationListTab container = (JApplicationListTab) getUI(); JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); - modelTab.setData(data); + modelTab.setData(model.getList()); - // save new firstIndex in model - pagination.setFirstIndex(newFirstIndex); - // refresh ui getMainUI().refreshListTabUI(model, container); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 13:13:23 UTC (rev 495) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-24 13:14:21 UTC (rev 496) @@ -18,8 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.pagination; -import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; @@ -77,28 +75,18 @@ // pour le moment, chaque retaille de fenetre repositionne // la liste à zero pour simplifier + pagination.setWidth(newWidth); + pagination.setFirstIndex(0); - long firstIndex = 0; - long lastIndex = newWidth; - if (lastIndex >= pagination.getSize()) { - lastIndex = pagination.getSize() - 1; - } - int size = (int) (lastIndex - firstIndex); + model.updateTabModel(isRemote(), getContext()); - MetaDataEntity[] data = getData(getTab() == SimExplorerTab.remote, false, model.getQuery(), size, (int) firstIndex, -1); - // save list - model.setList(data); // save in TableModel JApplicationListTab container = (JApplicationListTab) getUI(); JTable jApplicationTable = container.getTable(); JApplicationTableModel modelTab = (JApplicationTableModel) jApplicationTable.getModel(); - modelTab.setData(data); + modelTab.setData(model.getList()); - // save pagination - pagination.setWidth(newWidth); - pagination.setFirstIndex(0); - // refresh ui getMainUI().refreshListTabUI(model, container); }