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

r445 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 16:39:45 +0000 (Wed, 23 Jan 2008) New Revision: 445 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: ajout du model de Node pour les LoggableElement 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-23 16:16:27 UTC (rev 444) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 16:39:45 UTC (rev 445) @@ -18,15 +18,18 @@ * \#\#% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; 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; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @@ -59,16 +62,15 @@ DetailTabModel model = (DetailTabModel) getModel(); if (model.isRemote()) { listModel = (ListTabModel) SimExplorerTab.remote.getModel(); - } else { listModel = (ListTabModel) SimExplorerTab.local.getModel(); } MetaDataEntity data = listModel.get(model.getIndex()); String uuid = data.getUuid(); Version version = data.getVersion(); - log.info("show detail uuid:" + uuid + ", version:" + version+" (remote ?"+model.isRemote()+")"); + 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 = getElement(model.isRemote(), uuid, version.toString()); // push dans le model model.setBean(element); return true; @@ -80,6 +82,8 @@ DetailTabModel model = (DetailTabModel) getModel(); // get ui JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + TreeNode root = new LoggableElementTreeNode(null, model.getBean(), true); + ui.getTree().setModel(new DefaultTreeModel(root)); // refresh ui getMainUI().refreshDetailTabUI(model, ui); }

1 0

r444 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 16:16:27 +0000 (Wed, 23 Jan 2008) New Revision: 444 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: ajout du model de Node pour les LoggableElement Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 16:16:27 UTC (rev 444) @@ -0,0 +1,152 @@ +/* +* ##% 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.swing.model; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; + +import javax.swing.JTree; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; +import java.util.Arrays; +import java.util.Enumeration; +import java.util.LinkedList; +import java.util.Queue; + +/** + * Le TreeNode de base pour afficher des LoggableElement dans un arbre. + * + * @author chemit + */ +public class LoggableElementTreeNode implements TreeNode { + + protected LoggableElementTreeNode parent; + + protected LoggableElementTreeNode[] childs; + + protected boolean allowedChildren; + + protected LoggableElement userObject; + + public LoggableElementTreeNode(LoggableElementTreeNode parent, LoggableElement root, boolean allowedChildren) { + this.parent = parent; + this.allowedChildren = allowedChildren; + this.userObject = root; + } + + + public void collaspeAll(JTree tree) { + if (isLeaf()) { + return; + } + for (LoggableElementTreeNode child : childs) { + child.collaspeAll(tree); + } + tree.collapsePath(new TreePath(getPath())); + } + + public void expandAll(JTree tree) { + if (isLeaf()) { + return; + } + tree.expandPath(new TreePath(getPath())); + for (LoggableElementTreeNode child : childs) { + child.expandAll(tree); + } + } + + public TreeNode getChildAt(int childIndex) { + if (childIndex < 0 || childIndex > getChildCount()) { + return null; + } + return childs[childIndex]; + } + + @Override + public int getChildCount() { + return childs == null ? 0 : childs.length; + } + + public TreeNode getParent() { + return parent; + } + + public int getIndex(TreeNode node) { + if (getChildCount() == 0) { + return -1; + } + for (int i = 0; i < childs.length; i++) { + LoggableElementTreeNode child = childs[i]; + if (node.equals(child)) { + return i; + } + } + return -1; + } + + public boolean getAllowsChildren() { + return false; + } + + @Override + public boolean isLeaf() { + return getChildCount() == 0; + } + + public Enumeration children() { + return childs == null ? DefaultMutableTreeNode.EMPTY_ENUMERATION : new MyEnumeration<LoggableElementTreeNode>(childs); + } + + public TreeNode[] getPath() { + return getPathToRoot(this, 0); + } + + + protected TreeNode[] getPathToRoot(TreeNode aNode, int depth) { + TreeNode[] retNodes; + if (aNode == null) { + if (depth == 0) + return null; + else + retNodes = new TreeNode[depth]; + } else { + depth++; + retNodes = getPathToRoot(aNode.getParent(), depth); + retNodes[retNodes.length - depth] = aNode; + } + return retNodes; + } + + class MyEnumeration<T> implements Enumeration<T> { + + Queue<T> queue; + + MyEnumeration(T[] queue) { + this.queue = new LinkedList<T>(Arrays.asList(queue)); + } + + public boolean hasMoreElements() { + return !queue.isEmpty(); + } + + public T nextElement() { + return queue.poll(); + } + } +}

1 0

r443 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 16:10:02 +0000 (Wed, 23 Jan 2008) New Revision: 443 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java Log: la m?\195?\169thode toString est bizarre! Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-01-23 16:09:23 UTC (rev 442) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/metadata/Version.java 2008-01-23 16:10:02 UTC (rev 443) @@ -113,7 +113,7 @@ @Override public String toString() { - StringBuffer result = new StringBuffer(""); + StringBuffer result = new StringBuffer(); for (Integer i : pointedVersion) { result.append(i).append("."); }

1 0

r442 - trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 16:09:23 +0000 (Wed, 23 Jan 2008) New Revision: 442 Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java Log: surcharge de la m?\195?\169thode toString + ajout serialVersionUid car l'objet est s?\195?\169rialisable. Modified: trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java =================================================================== --- trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-01-23 15:14:07 UTC (rev 441) +++ trunk/simexplorer-is-entities/src/java/fr/cemagref/simexplorer/is/entities/data/LoggableElement.java 2008-01-23 16:09:23 UTC (rev 442) @@ -22,6 +22,7 @@ public abstract class LoggableElement extends DataEntity { private MetaDataEntity metaData; + private static final long serialVersionUID = 2000267650904269217L; /** * @return the metaData @@ -38,4 +39,11 @@ this.metaData = metaData; } + @Override + public String toString() { + if (metaData==null) { + return super.toString(); + } + return metaData.getName()+" ["+metaData.getVersion()+']'; + } }

1 0

r441 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:14:07 +0000 (Wed, 23 Jan 2008) New Revision: 441 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: suppression imports inutiles Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-23 15:13:43 UTC (rev 440) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-23 15:14:07 UTC (rev 441) @@ -29,10 +29,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import javax.ejb.Remote; -import javax.ejb.Stateless; -import org.jboss.annotation.ejb.RemoteBinding; import org.w3c.dom.Document; import org.w3c.dom.Element;

1 0

r440 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:13:43 +0000 (Wed, 23 Jan 2008) New Revision: 440 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: implantation m?\195?\169thode getElement dans le service de Mock Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-23 15:13:19 UTC (rev 439) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-23 15:13:43 UTC (rev 440) @@ -86,11 +86,13 @@ } public int findFullTextCount(String token, String query, boolean onlyLatest) throws Exception { - return (Integer) checkImplemented(); + //TODO Changer + return findApplicationsCount(token,onlyLatest); } public MetaDataEntity[] findFullText(String token, String query, boolean onlyLatest, int indexStart, int count, int dateOrder) throws Exception { - return (MetaDataEntity[]) checkImplemented(); + //TODO Changer + return findApplications(token,onlyLatest,indexStart,count,dateOrder); } public int findApplicationsCount(String token, boolean onlyLatest) throws Exception { @@ -112,16 +114,7 @@ return result; } - public ElementGenerator getGenerator() { - if (generator == null) { - generator = new ElementGenerator(); - } - return generator; - } - public LoggableElement getElement(String token, String uuid, String version) throws Exception { - - ExplorationApplication explorationApplication = getGenerator().generateRandomEA(); explorationApplication.getMetaData().setUuid(uuid); explorationApplication.getMetaData().setVersion(version); @@ -131,4 +124,11 @@ public String loginUser(String login, String password) { return (String) checkImplemented(); } + + protected ElementGenerator getGenerator() { + if (generator == null) { + generator = new ElementGenerator(); + } + return generator; + } }

1 0

r439 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:13:19 +0000 (Wed, 23 Jan 2008) New Revision: 439 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: utilisation m?\195?\169thode getElement(qui encapsule l'appel au bon service) 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-23 15:12:58 UTC (rev 438) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 15:13:19 UTC (rev 439) @@ -20,6 +20,7 @@ import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; @@ -63,25 +64,24 @@ listModel = (ListTabModel) SimExplorerTab.local.getModel(); } MetaDataEntity data = listModel.get(model.getIndex()); - - model.setBean(data); String uuid = data.getUuid(); Version version = data.getVersion(); - log.info("show detail uuid:" + uuid + ", version:" + version); + 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()); + // push dans le model + model.setBean(element); return true; } @Override protected void afterAction(ActionEvent e) { - + // get model DetailTabModel model = (DetailTabModel) getModel(); - - // push model into tree model - JApplicationDetailTab container = (JApplicationDetailTab) getUI(); - + // get ui + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); // refresh ui - getMainUI().refreshDetailTabUI(model, container); - + getMainUI().refreshDetailTabUI(model, ui); } }

1 0

r438 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:12:58 +0000 (Wed, 23 Jan 2008) New Revision: 438 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 m?\195?\169thode getCount (qui encapsule le bon appel au bon service) 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-23 15:11:55 UTC (rev 437) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-23 15:12:58 UTC (rev 438) @@ -19,7 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.ui.SimExplorer; 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; @@ -76,8 +75,8 @@ if (data == null) { // first local query, build model - long size = SimExplorer.getStorageService().findApplicationsCount(null, false); - + String query = model.getQuery(); + long size= getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); paginationModel.setFirstIndex(0); @@ -86,7 +85,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); + data = getData(false, false,query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -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-23 15:11:55 UTC (rev 437) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-23 15:12:58 UTC (rev 438) @@ -55,6 +55,7 @@ super(name); } + @Override protected boolean beforeAction(ActionEvent e) throws Exception { JTabbedPane tabbedPane = getTabContainer(); @@ -75,7 +76,8 @@ if (data == null) { // first local query, build model - long size = SimExplorer.getRemoteStorageService().findApplicationsCount(null, false); + String query = model.getQuery(); + long size= getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -85,7 +87,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); + data = getData(true,false, query,paginationModel.getWidth(),(int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data);

1 0

r437 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:11:55 +0000 (Wed, 23 Jan 2008) New Revision: 437 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java Log: ajout du token dans le context + documentation des champs du context 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-23 15:06:31 UTC (rev 436) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-23 15:11:55 UTC (rev 437) @@ -38,12 +38,27 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SimExplorerContext.class); + /** + * le parseur utilisaé au démarrage pour récupérer les options passées + * par l'utilisateur + */ + protected SimExplorerOptionParser parser; - private SimExplorerOptionParser parser; - private boolean quit; - private boolean launchUI = true; - private boolean firstLaunch; + /** flag pour indiquer si 'lon veut quitter l'appli après les options */ + protected boolean quit; + /** flag pour indiquer si l'on affiche ou non l'ui principale */ + protected boolean launchUI = true; + + /** + * flag pour indiquer une première utilisation de l'application (pas de + * fichier de configuration) + */ + protected boolean firstLaunch; + + /** le token pour la connexion au serveur distant */ + protected String token; + public SimExplorerOptionParser getParser() { if (parser == null) { // creation du parseur @@ -82,28 +97,36 @@ } } + public boolean isQuit() { + return quit; + } + + public boolean isLaunchUI() { + return launchUI; + } + + public boolean isFirstLaunch() { + return firstLaunch; + } + + public String getToken() { + return token; + } + public void setQuit(boolean quit) { this.quit = quit; } - public boolean isQuit() { - return quit; - } - public void setLaunchUI(boolean launchUI) { this.launchUI = launchUI; } - public boolean isLaunchUI() { - return launchUI; - } - public void setFirstLaunch(boolean firstLaunch) { this.firstLaunch = firstLaunch; } - public boolean isFirstLaunch() { - return firstLaunch; + public void setToken(String token) { + this.token = token; } /** restricted access constructor */

1 0

r436 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination
by tchemit＠users.labs.libre-entreprise.org 23 Jan '08

23 Jan '08

Author: tchemit Date: 2008-01-23 15:06:31 +0000 (Wed, 23 Jan 2008) New Revision: 436 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 nouveau prototype pour la m?\195?\169thode getData 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-23 15:03:14 UTC (rev 435) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-23 15:06:31 UTC (rev 436) @@ -20,6 +20,7 @@ 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; @@ -86,7 +87,7 @@ //long oldLastIndex = oldFirstindex + model.size(); //TODO optimiser l'algo - data = getData(false, width, newFirstIndex, -1); + data = getData(getTab()== SimExplorerTab.remote,false, model.getQuery(),width, newFirstIndex, -1); // save in model model.setList(data); 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-23 15:03:14 UTC (rev 435) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-23 15:06:31 UTC (rev 436) @@ -24,6 +24,7 @@ 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 fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import javax.swing.Action; import javax.swing.JComboBox; @@ -84,7 +85,7 @@ } int size = (int) (lastIndex - firstIndex); - MetaDataEntity[] data = getData(false, size, (int) firstIndex, -1); + MetaDataEntity[] data = getData(getTab()== SimExplorerTab.remote,false, model.getQuery(),size, (int) firstIndex, -1); // save list model.setList(data);

1 0