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

r895 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:51:00 +0000 (Wed, 13 Feb 2008) New Revision: 895 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java Log: interaction avec la synchronisation, a revoir Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-13 02:49:43 UTC (rev 894) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowDetailTabAction.java 2008-02-13 02:51:00 UTC (rev 895) @@ -36,6 +36,7 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; @@ -88,7 +89,10 @@ protected void initUI(JDetailTab ui, DetailTabModel model) { SimExplorerUIRefreshHelper.refreshTreeDetailActions(ui, null); - SimExplorerUIRefreshHelper.updateDetailNavigationTree(ui, model); + // create navigation tree + TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); + model.getHistory().add(root); + SimExplorerUIRefreshHelper.updateDetailNavigationTree(ui, model.getHistory()); } /** @@ -110,6 +114,7 @@ if (path != null) { node = (LoggableElementTreeNode) path.getLastPathComponent(); } + //TODO on ne doit pas modifier les ui dans cette méthode // on rafraichit toujours ici les actions de l'arbre qui sont // indépendantes du model et dépendent juste dunoeud sélectionné SimExplorerUIRefreshHelper.refreshTreeDetailActions(getTabUI(), node); @@ -151,7 +156,6 @@ model.setSelectedAttachmentIndex(selectedAttachment); // preparation de l'action de synchronisation - ShowSynchronizeTabAction synchronizeAction; synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); if (element == null) { @@ -187,10 +191,15 @@ versionListener.setEnabled(wasEnable); attachmentListener.setEnabled(wasEnable2); // update actions on toolbar - LoggableElementTreeNode node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(ui.getNavigationTree()); + LoggableElementTreeNode node = LoggableElementTreeHelper.getSelectedNode(ui.getNavigationTree()); SimExplorerUIRefreshHelper.refreshDetailActions(ui, model, node); + + LoggableElementTreeNode rootNode = LoggableElementTreeHelper.getRootNode(ui.getNavigationTree()); + if (model.getDetail() != null && !node.equals(rootNode)) { + // refresh detail to tree button only if required + SimExplorerUIRefreshHelper.refreshDetailToTreeAction(ui, model); + } } - } private class VersionSelectionListener implements PropertyChangeListener, ItemListener { @@ -238,9 +247,11 @@ // preparation de l'action de synchronisation ShowSynchronizeTabAction synchronizeAction; synchronizeAction = (ShowSynchronizeTabAction) SimExplorerActionManager.newAction("showTab_synchronize", (AbstractButton) null); - synchronizeAction.setRemote(isRemote()); + synchronizeAction.setRemote(model.isRemote()); synchronizeAction.setUuid(metas.getUuid()); synchronizeAction.setVersion(metas.getVersion()); + // refresh detail to tree button + SimExplorerUIRefreshHelper.refreshDetailToTreeAction(ui, model); } /** Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-13 02:49:43 UTC (rev 894) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ShowSynchronizeTabAction.java 2008-02-13 02:51:00 UTC (rev 895) @@ -28,9 +28,11 @@ import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; +import javax.swing.JTabbedPane; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; +import java.awt.Component; import java.awt.event.ActionEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -83,7 +85,14 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { + //TODO cela ne va pas, car unefois l'action consumée, les données sont + //TODO effacées, alors que l'onpeut vouloir revenir dessus... if (!super.beforeAction(e) || remote == null || uuid == null || version == null) { + JTabbedPane tabbedPane = getTabContainer(); + if (getTab().isTabVisible(tabbedPane)) { + // tab is already visible, just select it + tabbedPane.setSelectedComponent((Component) getUI()); + } return false; } LoggableElement source = StorageServiceHelper.getElement(getContext(), remote, uuid, version.toString());

1 0

r894 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:49:43 +0000 (Wed, 13 Feb 2008) New Revision: 894 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java Log: ajout methode pour rafraichir les actions d'historique Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-13 02:48:51 UTC (rev 893) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUIRefreshHelper.java 2008-02-13 02:49:43 UTC (rev 894) @@ -26,6 +26,7 @@ import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.actions.util.ChangeI18nAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.HistoryModel; import fr.cemagref.simexplorer.is.ui.swing.model.JDetailTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; @@ -47,6 +48,7 @@ import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeNode; +import javax.swing.tree.DefaultMutableTreeNode; import java.awt.Dimension; import java.awt.Rectangle; import java.text.SimpleDateFormat; @@ -259,6 +261,23 @@ updateButton(ui.getDownloadAttachment(), enabled, tooltip); } + public static void refreshDetailToTreeAction(JDetailTab ui, DetailTabModel model) { + MetaData detail = model.getDetail(); + DefaultMutableTreeNode rootNode = (DefaultMutableTreeNode) model.getHistory().getCurrent(); + LoggableElement rootElement = (LoggableElement) rootNode.getUserObject(); + MetaData data = rootElement.getMetaData(); + Version version = model.getSelectedVersion(); + if (version==null) { + // la version peut être null, ce qui veut dire que l'on vient d'un changement + // de node dans l'arbre de navigation et donc la version est celle du detai + version = detail.getVersion(); + } + boolean enabled = !(detail.getName().equals(data.getName()) && data.getVersion().equals(version)); + + String tooltip = !enabled ? null : _("simexplorer.action.detailToTree.tooltip", detail.getName() + " [" + version + "]"); + updateButton(ui.getDetailToTree(), enabled, tooltip); + } + public static void refreshSynchroniseElementAction(JDetailTab ui, DetailTabModel model) { MetaData detail = model.getDetail(); boolean enabled = detail != null; @@ -310,7 +329,7 @@ TreeNode sourceRoot = LoggableElementTreeHelper.buildLoggableElementNode(model.getSource()); TreeNode destinationRoot = model.getDestination() == null ? null : LoggableElementTreeHelper.buildLoggableElementNode(model.getDestination()); - + JTree sourceTree, destinationTree; if (model.isRemote()) { // source is remote @@ -399,15 +418,19 @@ } ui.getDetailVersions().setToolTipText(text); } + // can not synchronize to tree + updateButton(ui.getDetailToTree(), false, null); } - public static void updateDetailNavigationTree(JDetailTab ui, DetailTabModel model) { - // create navigation tree - TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); + public static void updateDetailNavigationTree(JDetailTab ui, HistoryModel<TreeNode> model) { // push it in tree model - ((DefaultTreeModel) ui.getNavigationTree().getModel()).setRoot(root); + ((DefaultTreeModel) ui.getNavigationTree().getModel()).setRoot(model.getCurrent()); // by default select the root node ui.getNavigationTree().setSelectionRow(0); + boolean hasPrevious = model.size() > 1 && model.hastPrevious(); + updateButton(ui.getHistoryPrevious(), hasPrevious, hasPrevious? _("simexplorer.action.historyPrevious.tooltip",model.getPrevious()) : null); + boolean hasNext = model.size() > 1 && model.hasNext(); + updateButton(ui.getHistoryNext(), hasNext, hasNext ? _("simexplorer.action.historyNext.tooltip",model.getNext()) : null); } public static void resetDetailPanel(final JDetailTab ui) {

1 0

r893 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:48:51 +0000 (Wed, 13 Feb 2008) New Revision: 893 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: m?\195?\169thodes pour avoir le noeud selectionne, root Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-13 02:48:21 UTC (rev 892) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-13 02:48:51 UTC (rev 893) @@ -31,9 +31,9 @@ import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; import static org.codelutin.i18n.I18n._; +import javax.swing.JTree; import javax.swing.tree.TreeNode; import javax.swing.tree.TreePath; -import javax.swing.JTree; /** * Une classe d'utilitaire pour construire les arbres de LoggableElement @@ -82,6 +82,30 @@ return node; } + public static LoggableElementTreeNode getSelectedNode(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; + } + return node; + } + + public static LoggableElementTreeNode getRootNode(JTree tree) { + LoggableElementTreeNode node; + // take the root node + Object root = tree.getModel().getRoot(); + if (root == null || !(root instanceof LoggableElementTreeNode)) { + return null; + } + node = (LoggableElementTreeNode) root; + return node; + } + public static boolean isLoggableElement(LoggableElementTreeNode node) { return node != null && node.isLoggableElement(); } @@ -135,7 +159,7 @@ LoggableElementTreeNode tmpNode; // build components node and his childs tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.components"), true); - if (element.getComponents()!=null) { + if (element.getComponents() != null) { for (Component component : element.getComponents()) { buildComponentNode(tmpNode, component); } @@ -143,7 +167,7 @@ // build explorations node and his childs tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.explorations"), true); - if (element.getExplorations()!=null) { + if (element.getExplorations() != null) { for (ExplorationData explorationData : element.getExplorations()) { buildExplorationDataNode(tmpNode, explorationData); } @@ -158,7 +182,7 @@ // build constantes nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constants"), true); - if (element.getConstants()!=null) { + if (element.getConstants() != null) { for (Constant constante : element.getConstants()) { buildConstantNode(tmpNode, constante); } @@ -166,7 +190,7 @@ // build structures nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.structures"), true); - if (element.getStructures()!=null) { + if (element.getStructures() != null) { for (Structure structure : element.getStructures()) { buildStructureNode(tmpNode, structure); } @@ -174,7 +198,7 @@ // build Codes nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.codes"), true); - if (element.getCodes()!=null) { + if (element.getCodes() != null) { for (Code code : element.getCodes()) { buildCodeNode(tmpNode, code); } @@ -182,7 +206,7 @@ // build libraries nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.libraries"), true); - if (element.getLibraries()!=null) { + if (element.getLibraries() != null) { for (Library library : element.getLibraries()) { buildLibraryNode(tmpNode, library); } @@ -196,13 +220,13 @@ LoggableElementTreeNode tmpNode; // build constant values nodes tmpNode = new LoggableElementTreeNode(result, _("simexplorer.node.constantvalues"), true); - if (element.getValuesMap()!=null) { + if (element.getValuesMap() != null) { for (ConstantValue library : element.getValuesMap()) { buildConstantValueNode(tmpNode, library); } } // build result node - if (element.getResult()!=null) { + if (element.getResult() != null) { buildResultNode(result, element.getResult()); } return result;

1 0

r892 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:48:21 +0000 (Wed, 13 Feb 2008) New Revision: 892 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: ajout d'un historique dans le model de detail Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-13 02:47:46 UTC (rev 891) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-13 02:48:21 UTC (rev 892) @@ -18,15 +18,16 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.attachment.Attachment; import jaxx.runtime.builder.TabModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import javax.swing.tree.TreeNode; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; @@ -38,8 +39,6 @@ * @author chemit */ public class DetailTabModel implements TabModel { - /** ? */ - protected SimExplorerTab tab; public enum Properties { SELECTED_NODE_PROPERTY_CHANGED, @@ -47,10 +46,15 @@ SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED } + private static final int HISTORY_CAPACITY = 20; + private static final long serialVersionUID = 4851121531481734868L; static protected Log log = LogFactory.getLog(DetailTabModel.class); + /** ? */ + protected SimExplorerTab tab; + /** flag pour savoir si on est dans le cas local ou remote */ protected boolean remote; @@ -88,11 +92,12 @@ */ protected MetaData detail; + protected HistoryModel<TreeNode> history; + public String getName() { return tab.name(); } - public boolean isRemote() { return remote; } @@ -129,6 +134,13 @@ return detail; } + public HistoryModel<TreeNode> getHistory() { + if (history == null) { + history = new HistoryModel<TreeNode>(HISTORY_CAPACITY); + } + return history; + } + public void setRemote(boolean remote) { this.remote = remote; } @@ -163,6 +175,11 @@ firePropertyChange(Properties.SELECTED_ATTACHMENT_INDEX_PROPERTY_CHANGED, oldSelectedAttachmentIndex, selectedAttachmentIndex); } + public void clear() { + getHistory().clear(); + reset(); + } + protected Integer getVersionIndex(Version version) { if (versions != null && version != null) { for (int i = 0; i < versions.length; i++) { @@ -197,7 +214,7 @@ public void resetSelectedVersion() { selectedVersionIndex = null; - selectedAttachmentIndex=null; + selectedAttachmentIndex = null; } protected PropertyChangeSupport changeSupport;

1 0

r891 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:47:46 +0000 (Wed, 13 Feb 2008) New Revision: 891 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java Log: modele generique pour l'historique Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/HistoryModel.java 2008-02-13 02:47:46 UTC (rev 891) @@ -0,0 +1,175 @@ +/* +* \#\#% 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 java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * Modèle d'un historique générique. + * + * @author chemit + */ +public class HistoryModel<E> implements Serializable { + + /** la liste de données */ + protected List<E> data; + + /** la position actuellement utilisée */ + protected Integer currentIndex; + + /** la capacité de l'historique */ + protected int capacity; + + private static final long serialVersionUID = -6436315419371336090L; + + public HistoryModel(int capacity) { + this.capacity = capacity; + } + + /** + * Ajoute à l'historique une donnée après la position courante s'il y avait + * déjà des données ou en première position le cas échéant. + * <p/> + * Les données suivant la position courante sont supprimées. + * <p/> + * Si l'historique dépasse la capacité, on supprime la première donnée de + * l'historique + * + * @param e la donnée à ajouter + */ + public void add(E e) { + + if (size()>0) { + int newIndex = currentIndex + 1; + // il faut supprimer tous les elements au dela de la position courante + while (data.size() > newIndex) { + //TODO utiliser un container plus optimiserpour cette opération + // car ArrayList recopie à chaque fois l'ensemble du contenu + data.remove(newIndex); + } + } else { + data = new ArrayList<E>(); + } + data.add(e); + incrementIndex(); + if (data.size() > capacity) { + // on supprime le premier element de l'historique + data.remove(0); + } + } + + /** + * @return l'elemenet precedent par rapport a l'element courant + * @throws IllegalStateException si pas de data ou deja sur le premier element + */ + public E getPrevious() throws IllegalStateException { + checkHaveData(); + if (currentIndex == 0) { + throw new IllegalStateException("can not have previous data, already on first data in history"); + } + return data.get(currentIndex-1); + } + + /** + * @return l'elemenet precedent par rapport a l'element courant + * @throws IllegalStateException si pas de data ou deja sur le premier element + */ + public E gotoPrevious() throws IllegalStateException { + checkHaveData(); + if (currentIndex == 0) { + throw new IllegalStateException("can not have previous data, already on first data in history"); + } + decrementIndex(); + return data.get(currentIndex); + } + + /** + * @return l'element suivant par rapport a l'élément courant + * @throws IllegalStateException si pas de donnes ou deja sur le dernier + */ + public E getNext() throws IllegalStateException { + checkHaveData(); + if (currentIndex == data.size() - 1) { + throw new IllegalStateException("can not have next data, already on last data in history"); + } + return data.get(currentIndex+1); + } + + /** + * @return l'element suivant par rapport a l'élément courant + * @throws IllegalStateException si pas de donnes ou deja sur le dernier + */ + public E gotoNext() throws IllegalStateException { + checkHaveData(); + if (currentIndex == data.size() - 1) { + throw new IllegalStateException("can not have next data, already on last data in history"); + } + incrementIndex(); + return data.get(currentIndex); + } + + public E getCurrent() { + return size() == 0 || currentIndex == null ? null : data.get(currentIndex); + } + + public int size() { + return data == null ? 0 : data.size(); + } + + public boolean hasNext() { + return size() > 0 && currentIndex < data.size() - 1; + } + + public boolean hastPrevious() { + return size() > 0 && currentIndex > 0; + } + + public void clear() { + if (data != null) { + data.clear(); + } + currentIndex = null; + } + + /** + * Verifie s'il existe des donnees dans l'historique et declanche une exception + * si telle n'est pas le cas. + * + * @throws IllegalStateException si pas de donnees + */ + protected void checkHaveData() throws IllegalStateException { + if (data == null || data.isEmpty()) { + throw new IllegalStateException("no data in history"); + } + } + + protected void decrementIndex() { + currentIndex--; + } + + protected void incrementIndex() { + if (currentIndex == null) { + currentIndex = 0; + } else { + currentIndex++; + } + } +}

1 0

r890 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:45:46 +0000 (Wed, 13 Feb 2008) New Revision: 890 Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java Log: mise en place des actions d'historique Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-02-13 02:45:10 UTC (rev 889) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java 2008-02-13 02:45:46 UTC (rev 890) @@ -26,7 +26,9 @@ import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; +import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; +import javax.swing.tree.TreeNode; import java.awt.event.ActionEvent; /** @@ -73,7 +75,11 @@ @Override protected void doAction(ActionEvent e) throws Exception { model.setRootNode(element); - SimExplorerUIRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model); + // create navigation tree + TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getRootNode()); + model.getHistory().add(root); + // push it in tree + SimExplorerUIRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); } @Override Copied: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java (from rev 880, trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DetailToTreeAction.java) =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryNextAction.java 2008-02-13 02:45:46 UTC (rev 890) @@ -0,0 +1,72 @@ +/* +* ##% 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.actions; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; + +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeNode; +import java.awt.event.ActionEvent; + +/** @author chemit */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "historyNext", + name = "simexplorer.action.historyNext", + shortDescription = "simexplorer.action.historyNext.tooltip", + longDescription = "simexplorer.action.historyNext.help", + smallIcon = "action/history-next.png", + mnemonic = 'N', + hideActionText = true +) +public class HistoryNextAction extends SimExplorerAbstractTabAction { + + DetailTabModel model; + + private static final long serialVersionUID = 2165684159831076054L; + + public HistoryNextAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + model = (DetailTabModel) getModel(); + return model.getHistory().hasNext(); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + TreeNode node = model.getHistory().gotoNext(); + model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject()); + SimExplorerUIRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); + } + + @Override + protected void clear() { + super.clear(); + model = null; + } +} \ No newline at end of file Added: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/HistoryPreviousAction.java 2008-02-13 02:45:46 UTC (rev 890) @@ -0,0 +1,75 @@ +/* +* ##% 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.actions; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; + +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.TreeNode; +import java.awt.event.ActionEvent; + +/** + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "historyPrevious", + name = "simexplorer.action.historyPrevious", + shortDescription = "simexplorer.action.historyPrevious.tooltip", + longDescription = "simexplorer.action.historyPrevious.help", + smallIcon = "action/history-previous.png", + mnemonic = 'N', + hideActionText = true +) +public class HistoryPreviousAction extends SimExplorerAbstractTabAction { + + DetailTabModel model; + + private static final long serialVersionUID = 2165684159831076054L; + + public HistoryPreviousAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + model = (DetailTabModel) getModel(); + return model.getHistory().hastPrevious(); + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + TreeNode node = model.getHistory().gotoPrevious(); + model.setRootNode((LoggableElement) ((DefaultMutableTreeNode) node).getUserObject()); + SimExplorerUIRefreshHelper.updateDetailNavigationTree((JDetailTab) getUI(), model.getHistory()); + } + + @Override + protected void clear() { + super.clear(); + model = null; + } +} \ No newline at end of file

1 0

r889 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:45:10 +0000 (Wed, 13 Feb 2008) New Revision: 889 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java Log: a la fermeture de l'onglet detail, on doit nettoyer le model Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-13 02:42:51 UTC (rev 888) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CloseTabAction.java 2008-02-13 02:45:10 UTC (rev 889) @@ -18,7 +18,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import java.awt.event.ActionEvent; @@ -46,5 +48,8 @@ @Override protected void doAction(ActionEvent e) throws Exception { getTab().closeTab(getMainUI().getContent()); + if (getTab() == SimExplorerTab.detail) { + ((DetailTabModel) getModel()).clear(); + } } }

1 0

r888 - trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:42:51 +0000 (Wed, 13 Feb 2008) New Revision: 888 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx Log: actions de l'historique Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-13 02:42:18 UTC (rev 887) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-13 02:42:51 UTC (rev 888) @@ -11,8 +11,9 @@ </cell> <cell anchor="east"> <JToolBar> + <JButton id='historyPrevious'/> + <JButton id='historyNext'/> <JButton id='collapseAllDetail'/> - <JButton id='collapseAllDetail'/> <JButton id='expandAllDetail'/> </JToolBar> </cell>

1 0

r887 - trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:42:18 +0000 (Wed, 13 Feb 2008) New Revision: 887 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java Log: javadoc + suppress unused import Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-13 02:41:48 UTC (rev 886) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-13 02:42:18 UTC (rev 887) @@ -21,9 +21,6 @@ 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.SynchronizeTabModel; -import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.JListTab; -import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabContentConfig; import jaxx.runtime.builder.TabFactory; @@ -32,7 +29,11 @@ import javax.swing.JComponent; import javax.swing.JTabbedPane; -/** @author tony */ +/** + * La défintion des onglets utilisés dans l'application + * + * @author tony + */ public enum SimExplorerTab {

1 0

r886 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 02:41:48 +0000 (Wed, 13 Feb 2008) New Revision: 886 Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-next.png trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-previous.png Log: icones des actions de l'historique et detailToTree Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-next.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-next.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-previous.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is/simexplorer-is-swing/src/resources/icons/action/history-previous.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0