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

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:25:53 +0000 (Thu, 24 Jan 2008) New Revision: 464 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: nouvelles m?\195?\169thodes du service 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 22:14:08 UTC (rev 463) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-01-24 00:25:53 UTC (rev 464) @@ -85,6 +85,10 @@ checkImplemented(); } + public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { + return null; + } + public int findFullTextCount(String token, String query, boolean onlyLatest) throws Exception { //TODO Changer return findApplicationsCount(token,onlyLatest); @@ -121,7 +125,12 @@ return explorationApplication; } - public String loginUser(String login, String password) { + public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + //TODO + return new MetaDataEntity[0]; + } + + public String loginUser(String login, String password) { return (String) checkImplemented(); }

1 0

r463 - 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 22:14:08 +0000 (Wed, 23 Jan 2008) New Revision: 463 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 trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java Log: format 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 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangePageAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -87,7 +87,7 @@ //long oldLastIndex = oldFirstindex + model.size(); //TODO optimiser l'algo - data = getData(getTab()== SimExplorerTab.remote,false, model.getQuery(),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 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/ChangeSizorAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -19,12 +19,12 @@ 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; 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; @@ -85,7 +85,7 @@ } int size = (int) (lastIndex - firstIndex); - MetaDataEntity[] data = getData(getTab()== SimExplorerTab.remote,false, model.getQuery(),size, (int) firstIndex, -1); + MetaDataEntity[] data = getData(getTab() == SimExplorerTab.remote, false, model.getQuery(), size, (int) firstIndex, -1); // save list model.setList(data); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-23 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -24,7 +24,7 @@ import java.awt.event.ActionEvent; /** - * Action pour afficher la première page + * Action pour afficher la première page * * @author chemit */ Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-23 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -21,11 +21,10 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import javax.swing.Action; -import javax.swing.JButton; import java.awt.event.ActionEvent; /** - * Action pour afficher la dernière page + * Action pour afficher la dernière page * * @author chemit */ @@ -55,7 +54,7 @@ Integer oldPage = model.getPagination().getCurrentPage(); boolean b = oldPage < model.getPagination().getNbPages(); if (b) { - newPage = getChangePageComboBox().getItemCount() - 1; + newPage = getChangePageComboBox().getItemCount() - 1; } return b; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-23 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -21,7 +21,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import javax.swing.Action; -import javax.swing.JButton; import java.awt.event.ActionEvent; /** Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-23 22:11:10 UTC (rev 462) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-23 22:14:08 UTC (rev 463) @@ -21,7 +21,6 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import javax.swing.Action; -import javax.swing.JButton; import java.awt.event.ActionEvent; /**

1 0

r462 - 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 22:11:10 +0000 (Wed, 23 Jan 2008) New Revision: 462 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/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: ajout appel a super classe 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 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -57,7 +57,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } ListTabModel listModel; DetailTabModel model = (DetailTabModel) getModel(); if (model.isRemote()) { 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 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -56,7 +56,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } JTabbedPane tabbedPane = getTabContainer(); JAXXObject ui = getUI(); 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 22:08:36 UTC (rev 461) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-01-23 22:11:10 UTC (rev 462) @@ -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; @@ -57,7 +56,9 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - + if (!super.beforeAction(e)) { + return false; + } JTabbedPane tabbedPane = getTabContainer(); JAXXObject ui = getUI(); @@ -77,7 +78,7 @@ if (data == null) { // first local query, build model String query = model.getQuery(); - long size= getCount(false, null, query); + long size = getCount(false, null, query); // init pagination PaginationModel paginationModel = new PaginationModel(); @@ -87,7 +88,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(true,false, query,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

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

23 Jan '08

Author: tchemit Date: 2008-01-23 22:08:36 +0000 (Wed, 23 Jan 2008) New Revision: 461 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: factorisation code Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-23 21:58:29 UTC (rev 460) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractAction.java 2008-01-23 22:08:36 UTC (rev 461) @@ -82,9 +82,8 @@ return (String) getValue(NAME); } - protected boolean beforeAction(ActionEvent e) throws Exception { - // nothing by default - return true; + protected boolean beforeAction(ActionEvent e) throws Exception { + return isEnabled(); } protected void doAction(ActionEvent e) throws Exception { Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-23 21:58:29 UTC (rev 460) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-23 22:08:36 UTC (rev 461) @@ -19,11 +19,11 @@ package fr.cemagref.simexplorer.is.ui.swing.action.application; import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import javax.swing.JTree; -import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; /** @@ -52,32 +52,20 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e) || !isEnabled()) { + if (!super.beforeAction(e)) { return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); - TreePath path = tree.getSelectionPath(); - if (path != null) { - Object o = path.getLastPathComponent(); - if (o != null && !(o instanceof LoggableElementTreeNode)) { - return false; - } - node = (LoggableElementTreeNode) o; - } - if (node == null) { - // take the root node - node = (LoggableElementTreeNode) tree.getModel().getRoot(); - } + node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = node != null && !node.isLeaf(); + result = !(node == null || node.isLeaf()); return result; } @Override protected void doAction(ActionEvent e) throws Exception { - + node.collaspeAll(tree); } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-23 21:58:29 UTC (rev 460) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-23 22:08:36 UTC (rev 461) @@ -20,10 +20,10 @@ import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import javax.swing.JTree; -import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; /** @@ -52,26 +52,14 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e) || !isEnabled()) { + if (!super.beforeAction(e)) { return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); - TreePath path = tree.getSelectionPath(); - if (path != null) { - Object o = path.getLastPathComponent(); - if (o != null && !(o instanceof LoggableElementTreeNode)) { - return false; - } - node = (LoggableElementTreeNode) o; - } - if (node == null) { - // take the root node - node = (LoggableElementTreeNode) tree.getModel().getRoot(); - } + node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = node != null && !node.isLeaf(); + result = !(node == null || node.isLeaf()); return result; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-01-23 21:58:29 UTC (rev 460) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-01-23 22:08:36 UTC (rev 461) @@ -32,6 +32,8 @@ import static org.codelutin.i18n.I18n._; import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; +import javax.swing.JTree; /** * Une classe d'utilitaire pour construire les arbres de LoggableElement @@ -40,6 +42,26 @@ * @see LoggableElementTreeNode */ public class LoggableElementTreeHelper { + public static LoggableElementTreeNode getSelectedNodeOrRootNode(JTree tree) { + TreePath path = tree.getSelectionPath(); + LoggableElementTreeNode node = null; + if (path != null) { + Object o = path.getLastPathComponent(); + if (o != null && !(o instanceof LoggableElementTreeNode)) { + return null; + } + node = (LoggableElementTreeNode) o; + } + if (node == null) { + // take the root node + Object root = tree.getModel().getRoot(); + if (root == null || !(root instanceof LoggableElementTreeNode)) { + return null; + } + node = (LoggableElementTreeNode) root; + } + return node; + } public enum TypeNode { explorationApplication(ExplorationApplication.class),

1 0

r460 - 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 21:58:29 +0000 (Wed, 23 Jan 2008) New Revision: 460 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: javadoc 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 21:58:15 UTC (rev 459) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 21:58:29 UTC (rev 460) @@ -33,7 +33,7 @@ import java.awt.event.ActionEvent; /** - * Action pour afficher le tab local + * Action pour afficher le tab de détail d'un LoggableElement * * @author chemit */

1 0

r459 - 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 21:58:15 +0000 (Wed, 23 Jan 2008) New Revision: 459 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: ajout m?\195?\169thode pour distinguer les noeud de LoggableElement (sera utilis?\195?\169 pour les actions sp?\195?\169cifiques ?\195?\160 ces noeuds : affichage d?\195?\169tail, accessibilit?\195?\169 export,...) Modified: 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 2008-01-23 21:57:05 UTC (rev 458) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 21:58:15 UTC (rev 459) @@ -18,6 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -67,4 +68,7 @@ } } + public boolean isLoggableElement() { + return userObject != null && userObject instanceof LoggableElement; + } }

1 0

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

23 Jan '08

Author: tchemit Date: 2008-01-23 21:57:05 +0000 (Wed, 23 Jan 2008) New Revision: 458 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java Log: implantation collapse - expand (fonctionne sur le node s?\195?\169lectionn?\195?\169 :)) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-23 21:56:29 UTC (rev 457) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-01-23 21:57:05 UTC (rev 458) @@ -18,8 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import javax.swing.JTree; +import javax.swing.tree.TreePath; +import java.awt.event.ActionEvent; + /** * Pour réduire tous les noeuds de l'arbe d'une application * @@ -34,12 +40,52 @@ mnemonic = 'c', hideActionText = true ) -public class CollapseAllAction extends SimExplorerAbstractAction { +public class CollapseAllAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = -3254708595851406041L; + JTree tree; + LoggableElementTreeNode node; public CollapseAllAction(String name) { - super(name); + super(name, null); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e) || !isEnabled()) { + return false; + } + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + + tree = ui.getTree(); + TreePath path = tree.getSelectionPath(); + if (path != null) { + Object o = path.getLastPathComponent(); + if (o != null && !(o instanceof LoggableElementTreeNode)) { + return false; + } + node = (LoggableElementTreeNode) o; + } + if (node == null) { + // take the root node + node = (LoggableElementTreeNode) tree.getModel().getRoot(); + } + boolean result; + result = node != null && !node.isLeaf(); + return result; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + + node.collaspeAll(tree); + } + + @Override + protected void clear() { + super.clear(); + tree = null; + node = null; + } + } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-23 21:56:29 UTC (rev 457) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-01-23 21:57:05 UTC (rev 458) @@ -18,8 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; +import javax.swing.JTree; +import javax.swing.tree.TreePath; +import java.awt.event.ActionEvent; + /** * Pour dérouler tous les noeuds de l'arbre d'une application * @@ -34,12 +40,50 @@ mnemonic = 'e', hideActionText = true ) -public class ExpandAllAction extends SimExplorerAbstractAction { +public class ExpandAllAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 9033359716418852179L; + JTree tree; + LoggableElementTreeNode node; public ExpandAllAction(String name) { - super(name); + super(name, null); } - + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e) || !isEnabled()) { + return false; + } + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + + tree = ui.getTree(); + TreePath path = tree.getSelectionPath(); + if (path != null) { + Object o = path.getLastPathComponent(); + if (o != null && !(o instanceof LoggableElementTreeNode)) { + return false; + } + node = (LoggableElementTreeNode) o; + } + if (node == null) { + // take the root node + node = (LoggableElementTreeNode) tree.getModel().getRoot(); + } + boolean result; + result = node != null && !node.isLeaf(); + return result; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + node.expandAll(tree); + } + + @Override + protected void clear() { + super.clear(); + tree = null; + node = null; + } } \ No newline at end of file

1 0

r457 - 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 21:56:29 +0000 (Wed, 23 Jan 2008) New Revision: 457 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java Log: simplification + javadoc Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-23 21:29:54 UTC (rev 456) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoFirstPageAction.java 2008-01-23 21:56:29 UTC (rev 457) @@ -21,11 +21,10 @@ import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import javax.swing.Action; -import javax.swing.JButton; import java.awt.event.ActionEvent; /** - * Action pour lancer une recherche d'application + * Action pour afficher la première page * * @author chemit */ @@ -48,7 +47,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!getButton().isEnabled()) { + if (!getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)).isEnabled()) { return false; } ListTabModel model = (ListTabModel) getModel(); @@ -59,10 +58,4 @@ } return b; } - - protected JButton getButton() { - return (JButton) getUIObject((String) super.getValue(Action.ACTION_COMMAND_KEY)); - } - - } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-23 21:29:54 UTC (rev 456) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoLastPageAction.java 2008-01-23 21:56:29 UTC (rev 457) @@ -25,7 +25,7 @@ import java.awt.event.ActionEvent; /** - * Action pour lancer une recherche d'application + * Action pour afficher la dernière page * * @author chemit */ @@ -48,7 +48,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!getButton().isEnabled()) { + if (!getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)).isEnabled()) { return false; } ListTabModel model = (ListTabModel) getModel(); @@ -59,9 +59,4 @@ } return b; } - - protected JButton getButton() { - return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); - } - } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-23 21:29:54 UTC (rev 456) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoNextPageAction.java 2008-01-23 21:56:29 UTC (rev 457) @@ -25,7 +25,7 @@ import java.awt.event.ActionEvent; /** - * Action pour lancer une recherche d'application + * Action pour afficher la page suivante * * @author chemit */ @@ -48,7 +48,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!getButton().isEnabled()) { + if (!getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)).isEnabled()) { return false; } ListTabModel model = (ListTabModel) getModel(); @@ -59,8 +59,4 @@ } return b; } - - protected JButton getButton() { - return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); - } } \ No newline at end of file Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-23 21:29:54 UTC (rev 456) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/pagination/GoPreviousPageAction.java 2008-01-23 21:56:29 UTC (rev 457) @@ -25,7 +25,7 @@ import java.awt.event.ActionEvent; /** - * Action pour lancer une recherche d'application + * Action pour afficher la page précédente * * @author chemit */ @@ -48,7 +48,7 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!getButton().isEnabled()) { + if (!getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)).isEnabled()) { return false; } ListTabModel model = (ListTabModel) getModel(); @@ -59,10 +59,4 @@ } return b; } - - protected JButton getButton() { - return (JButton) getUIObject((String) getValue(Action.ACTION_COMMAND_KEY)); - } - - } \ No newline at end of file

1 0

r456 - 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 21:29:54 +0000 (Wed, 23 Jan 2008) New Revision: 456 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: on utilise toujours le m?\195?\170me mod?\195?\168le dans l'arbre, seul le node root change. peut-?\195?\170tre faudrait-il vide l'arbre avant ? ?\195?\160 voir. 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 21:29:02 UTC (rev 455) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-23 21:29:54 UTC (rev 456) @@ -1,6 +1,5 @@ /* -* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit, Gabriel Landais +* ##% Copyright (C) 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 @@ -15,7 +14,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.data.LoggableElement; @@ -25,10 +24,11 @@ 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.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationDetailTab; import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; @@ -82,8 +82,18 @@ DetailTabModel model = (DetailTabModel) getModel(); // get ui JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - TreeNode root = new LoggableElementTreeNode(null, model.getBean(), true); - ui.getTree().setModel(new DefaultTreeModel(root)); + + TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getBean()); + + // push tree model + TreeModel modelTree = ui.getTree().getModel(); + if (modelTree instanceof DefaultTreeModel) { + DefaultTreeModel t = (DefaultTreeModel) modelTree; + t.setRoot(root); + } else { + DefaultTreeModel t = new DefaultTreeModel(root); + ui.getTree().setModel(t); + } // refresh ui getMainUI().refreshDetailTabUI(model, ui); }

1 0

r455 - 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 21:29:02 +0000 (Wed, 23 Jan 2008) New Revision: 455 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: passage en debug du log Modified: 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 2008-01-23 21:24:59 UTC (rev 454) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-23 21:29:02 UTC (rev 455) @@ -44,7 +44,7 @@ if (parent != null) { parent.add(this); } - log.info("Parent " + parent + ", userObject : " + userObject + ", type : " + userObject.getClass().getSimpleName()); + log.debug("Parent " + parent + ", userObject : " + userObject + ", type : " + userObject.getClass().getSimpleName()); } public void collaspeAll(JTree tree) {

1 0