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

r474 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:32:04 +0000 (Thu, 24 Jan 2008) New Revision: 474 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx Log: un peu plus grand Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-24 00:31:49 UTC (rev 473) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/SimExplorerUI.jaxx 2008-01-24 00:32:04 UTC (rev 474) @@ -1,5 +1,5 @@ <JFrame name="mainFrame" title='{_("simexplorer.main.ui.title")}' - defaultCloseOperation='DISPOSE_ON_CLOSE' width='800' height='600'> + defaultCloseOperation='DISPOSE_ON_CLOSE' width='900' height='720'> <script> import static org.codelutin.i18n.I18n._; import static jaxx.runtime.UIHelper.createImageIcon;

1 0

r473 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:31:49 +0000 (Thu, 24 Jan 2008) New Revision: 473 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: i18n actions Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-01-24 00:31:33 UTC (rev 472) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-01-24 00:31:49 UTC (rev 473) @@ -1,4 +1,4 @@ -#Wed Jan 23 21:11:49 GMT 2008 +#Thu Jan 24 00:19:30 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog @@ -8,6 +8,9 @@ simexplorer.action.application.collapseAll=collapseAll simexplorer.action.application.collapseAll.help= simexplorer.action.application.collapseAll.tooltip=Collapse all nodes +simexplorer.action.application.download=Download +simexplorer.action.application.download.help= +simexplorer.action.application.download.tooltip=Click here to download the library or the result simexplorer.action.application.expandAll=expandAll simexplorer.action.application.expandAll.help=Expand all nodes simexplorer.action.application.expandAll.tooltip= @@ -34,6 +37,7 @@ simexplorer.action.connect=Connect simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Connect to remote server +simexplorer.action.dowload2=Download ''{0}'' simexplorer.action.groups=Groups simexplorer.action.groups.help= simexplorer.action.groups.tooltip=Show Groups admin screen Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-01-24 00:31:33 UTC (rev 472) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-01-24 00:31:49 UTC (rev 473) @@ -1,4 +1,4 @@ -#Wed Jan 23 21:11:49 GMT 2008 +#Thu Jan 24 00:19:30 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits @@ -8,6 +8,9 @@ simexplorer.action.application.collapseAll=tout r\u00E9duire simexplorer.action.application.collapseAll.help= simexplorer.action.application.collapseAll.tooltip=R\u00E9duire tous les noeuds +simexplorer.action.application.download=T\u00E9l\u00E9charger +simexplorer.action.application.download.help= +simexplorer.action.application.download.tooltip=Cliquer pour t\u00E9l\u00E9charger la librairie ou le r\u00E9sultat simexplorer.action.application.expandAll=tout d\u00E9rouler simexplorer.action.application.expandAll.help= simexplorer.action.application.expandAll.tooltip=\u00E9taler tous les noeuds @@ -34,6 +37,7 @@ simexplorer.action.connect=Connexion simexplorer.action.connect.help= simexplorer.action.connect.tooltip=Se connecter au serveur distant +simexplorer.action.dowload2=T\u00E9l\u00E9charger ''{0}'' simexplorer.action.groups=Groupes simexplorer.action.groups.help= simexplorer.action.groups.tooltip=Afficher le gestionnaire des groupes

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:31:33 +0000 (Thu, 24 Jan 2008) New Revision: 472 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java Log: ajout m?\195?\169thode pour savoir si le noeud est t?\195?\169l?\195?\169chargeable + possibilit?\195?\169 d'afficher un text et d'avoir un userObject diff?\195?\169rent 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-24 00:30:41 UTC (rev 471) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeNode.java 2008-01-24 00:31:33 UTC (rev 472) @@ -18,7 +18,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.model; +import fr.cemagref.simexplorer.is.entities.data.Library; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.data.Result; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,14 +42,26 @@ private static final long serialVersionUID = -7544097600554338499L; + protected String text; + public LoggableElementTreeNode(LoggableElementTreeNode parent, Object userObject, boolean allowedChildren) { + this(parent, userObject.toString(), userObject, allowedChildren); + } + + public LoggableElementTreeNode(LoggableElementTreeNode parent, String i18n, Object userObject, boolean allowedChildren) { super(userObject, allowedChildren); if (parent != null) { parent.add(this); } + text = i18n; log.debug("Parent " + parent + ", userObject : " + userObject + ", type : " + userObject.getClass().getSimpleName()); } + @Override + public String toString() { + return text; + } + public void collaspeAll(JTree tree) { if (isLeaf()) { return; @@ -71,4 +85,8 @@ public boolean isLoggableElement() { return userObject != null && userObject instanceof LoggableElement; } + + public boolean isDownloadableElement() { + return userObject != null && (userObject instanceof Result || userObject instanceof Library); + } }

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:30:41 +0000 (Thu, 24 Jan 2008) New Revision: 471 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: ajout m?\195?\169thode pour obtenir le storage service Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 00:30:09 UTC (rev 470) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 00:30:41 UTC (rev 471) @@ -123,8 +123,7 @@ } protected MetaDataEntity[] getData(boolean remote, boolean onlyLatest, String query, int width, long newFirstIndex, int rowOrder) throws Exception { - StorageService service; - service = remote ? SimExplorer.getRemoteStorageService() : SimExplorer.getStorageService(); + StorageService service = getStorageService(remote); MetaDataEntity[] data; if (query == null || query.isEmpty()) { @@ -136,9 +135,14 @@ return data; } - protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { + protected StorageService getStorageService(boolean remote) { StorageService service; service = remote ? SimExplorer.getRemoteStorageService() : SimExplorer.getStorageService(); + return service; + } + + protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { + StorageService service = getStorageService(remote); LoggableElement data; data = service.getElement(null, uuid, version); return data;

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:30:09 +0000 (Thu, 24 Jan 2008) New Revision: 470 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java Log: code dangeureux? a revoir Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 00:29:24 UTC (rev 469) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-01-24 00:30:09 UTC (rev 470) @@ -56,9 +56,6 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e)) { - return false; - } JTabbedPane tabbedPane = getTabContainer(); JAXXObject ui = getUI(); @@ -78,7 +75,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(); paginationModel.setFirstIndex(0); @@ -87,7 +84,7 @@ model.setPagination(paginationModel); // obtain datas from service - data = getData(false, false,query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); + data = getData(false, false, query, paginationModel.getWidth(), (int) paginationModel.getFirstIndex(), -1); // save in model model.setList(data); @@ -98,9 +95,7 @@ @Override protected void afterAction(ActionEvent e) { ListTabModel model = (ListTabModel) getModel(); - if (firstTime) { - // push model into tableModel JApplicationListTab container = (JApplicationListTab) getUI(); JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel();

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:29:24 +0000 (Thu, 24 Jan 2008) New Revision: 469 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java Log: ajout listener sur tree pour agir lors de la selection d'un node 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-24 00:28:51 UTC (rev 468) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-01-24 00:29:24 UTC (rev 469) @@ -25,13 +25,20 @@ 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.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.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; import java.awt.event.ActionEvent; +import static org.codelutin.i18n.I18n.*; + /** * Action pour afficher le tab de détail d'un LoggableElement * @@ -50,6 +57,7 @@ private static final long serialVersionUID = 6643631041114311643L; + protected Boolean firstTime; public ShowDetailTabAction(String name) { super(name); @@ -57,9 +65,6 @@ @Override protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e)) { - return false; - } ListTabModel listModel; DetailTabModel model = (DetailTabModel) getModel(); if (model.isRemote()) { @@ -67,6 +72,9 @@ } else { listModel = (ListTabModel) SimExplorerTab.local.getModel(); } + // mark it, after action will push table model + firstTime = getUI() == null; + MetaDataEntity data = listModel.get(model.getIndex()); String uuid = data.getUuid(); Version version = data.getVersion(); @@ -88,16 +96,84 @@ TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getBean()); // push tree model - TreeModel modelTree = ui.getTree().getModel(); + JTree tree = getTree(); + TreeModel modelTree = tree.getModel(); if (modelTree instanceof DefaultTreeModel) { DefaultTreeModel t = (DefaultTreeModel) modelTree; t.setRoot(root); } else { DefaultTreeModel t = new DefaultTreeModel(root); - ui.getTree().setModel(t); + tree.setModel(t); } + if (firstTime) { + // add a listener of tree model + tree.addTreeSelectionListener(new TreeSelectionListener() { + public void valueChanged(TreeSelectionEvent e) { + TreePath path = e.getNewLeadSelectionPath(); + boolean download = false; + boolean export = false; + boolean detail = false; + boolean history = false; + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + + LoggableElementTreeNode node = null; + if (path != null) { + node = (LoggableElementTreeNode) path.getLastPathComponent(); + if (node.isDownloadableElement()) { + download = true; + } + if (node.isLoggableElement()) { + detail = history = true; + } + if (node.isRoot()) { + export = true; + } + } + ui.getDownload().setEnabled(download); + if (download) { + ui.getDownload().setToolTipText(_("simexplorer.action.dowload2",node.getUserObject())); + } else { + ui.getDownload().setToolTipText(null); + } + + ui.getExportApplication().setEnabled(export); + if (detail) { + showDetail(node); + } + if (history) { + showHistory(node); + } + } + }); + } + // by default select the root node (to display info about the exploration) + tree.setSelectionRow(0); + // refresh ui getMainUI().refreshDetailTabUI(model, ui); } + @Override + protected void clear() { + super.clear(); + firstTime = null; + } + + protected void showDetail(final LoggableElementTreeNode node) { + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + ui.getDetailFake().setText("detail [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject()); + } + + protected void showHistory(LoggableElementTreeNode node) { + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + ui.getHistoryFake().setText("history [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject()); + ui.repaint(); + } + + protected JTree getTree() { + JTree tree; + tree = ((JApplicationDetailTab) getUI()).getTree(); + return tree; + } + }

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:28:51 +0000 (Thu, 24 Jan 2008) New Revision: 468 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java Log: action d'export, a finir Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-24 00:27:41 UTC (rev 467) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-01-24 00:28:51 UTC (rev 468) @@ -18,8 +18,20 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; -import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractAction; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +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 java.awt.event.ActionEvent; +import java.io.File; +import java.text.MessageFormat; + /** * Action pour exporter une application * @@ -34,17 +46,57 @@ mnemonic = 'x', hideActionText = false ) -public class ExportApplicationAction extends SimExplorerAbstractAction { +public class ExportApplicationAction extends SimExplorerAbstractTabAction { private static final long serialVersionUID = 7535647131305304738L; + private static final MessageFormat FILENAME_PATTERN = new MessageFormat("export-{0}.xml"); + JTree tree; + LoggableElementTreeNode node; + File file; + LoggableElement element; + String uuid; + Version version; + public ExportApplicationAction(String name) { - super(name); + super(name, null); } @Override - public void actionPerformed(java.awt.event.ActionEvent e) { - super.actionPerformed(e); - //TODO + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + tree = ui.getTree(); + node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); + boolean result; + result = node != null && node.isLoggableElement(); + if (result) { + element = (LoggableElement) node.getUserObject(); + uuid = element.getMetaData().getUuid(); + version = element.getMetaData().getVersion(); + } + return result; } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + + //TODO Where to save (if local to remote and vice-versa ?) + StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); + service.exportElement(getContext().getToken(), null, uuid, version.toString()); + } + + @Override + protected void clear() { + super.clear(); + tree = null; + node = null; + file = null; + element = null; + version=null; + uuid=null; + } } \ No newline at end of file

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:27:41 +0000 (Thu, 24 Jan 2008) New Revision: 467 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java Log: nouvelle action download, a finir Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 00:27:41 UTC (rev 467) @@ -0,0 +1,110 @@ +/* +* ##% 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.action.application; + +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.swing.action.SimExplorerAbstractTabAction; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; +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 java.awt.event.ActionEvent; +import java.io.File; +import java.text.MessageFormat; + +/** + * Action pour downloader un résultat ou une librairie + * + * @author chemit + */ + at jaxx.runtime.builder.ActionConfig( + actionCommand = "download", + name = "simexplorer.action.application.download", + shortDescription = "simexplorer.action.application.download.tooltip", + longDescription = "simexplorer.action.application.download.help", + smallIcon = "action/download.png", + mnemonic = 'x', + hideActionText = false +) +public class DownloadAction extends SimExplorerAbstractTabAction { + + private static final long serialVersionUID = 7535647131305304738L; + + private static final MessageFormat FILENAME_PATTERN = new MessageFormat("{0}.xml"); + JTree tree; + LoggableElementTreeNode node; + File file; + LoggableElement element; + String uuid; + Version version; + + public DownloadAction(String name) { + super(name, null); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + if (!super.beforeAction(e)) { + return false; + } + JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + tree = ui.getTree(); + node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); + boolean result; + result = node != null && node.isDownloadableElement(); + if (result) { + // ask user path where to save data + String dir = org.codelutin.util.FileUtil.getDirectory(); + if (dir == null) { + // user cancel action + return false; + } + + element = (LoggableElement) node.getUserObject(); + + uuid = element.getMetaData().getUuid(); + version = element.getMetaData().getVersion(); + file = new File(FILENAME_PATTERN.format(uuid + "-" + version)); + } + return result; + } + + @Override + protected void doAction(ActionEvent e) throws Exception { + super.doAction(e); + //StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); + //TODO Where to save ??? + + } + + @Override + protected void clear() { + super.clear(); + tree = null; + node = null; + file = null; + element = null; + version=null; + uuid=null; + } +} \ No newline at end of file

1 0

r466 - in trunk/simexplorer-is-swing/src: resources resources/icons/action uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:27:23 +0000 (Thu, 24 Jan 2008) New Revision: 466 Added: trunk/simexplorer-is-swing/src/resources/icons/action/download.png Modified: trunk/simexplorer-is-swing/src/resources/actions.properties trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: nouvelle action download Modified: trunk/simexplorer-is-swing/src/resources/actions.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-24 00:26:51 UTC (rev 465) +++ trunk/simexplorer-is-swing/src/resources/actions.properties 2008-01-24 00:27:23 UTC (rev 466) @@ -35,6 +35,7 @@ action.collapseAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.CollapseAllAction action.expandAllApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExpandAllAction +action.download=fr.cemagref.simexplorer.is.ui.swing.action.application.DownloadAction action.exportApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ExportApplicationAction action.importApplication=fr.cemagref.simexplorer.is.ui.swing.action.application.ImportApplicationAction Added: trunk/simexplorer-is-swing/src/resources/icons/action/download.png =================================================================== (Binary files differ) Property changes on: trunk/simexplorer-is-swing/src/resources/icons/action/download.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-24 00:26:51 UTC (rev 465) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-01-24 00:27:23 UTC (rev 466) @@ -6,25 +6,26 @@ <JButton id='collapseAllApplication' enabled='false'/> <JButton id='expandAllApplication' enabled='false'/> <JButton id='exportApplication' enabled='false'/> + <JButton id='download' enabled='false'/> </JToolBar> </cell> </row> <row fill="both" weightx="1" weighty="1"> <cell> - <JSplitPane orientation="horizontal" resizeWeight="0.5" oneTouchExpandable='true'> - <JScrollPane width='100' columnHeaderView='{toolbar}'> + <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> + <JScrollPane columnHeaderView='{toolbar}'> <JTree id="tree"/> </JScrollPane> - <JScrollPane id="scrollPane" horizontalScrollBarPolicy="horizontal_scrollbar_never"> - <JSplitPane orientation="vertical" resizeWeight="0.5" oneTouchExpandable='true'> + <JScrollPane id="scrollPane"> + <JSplitPane id='splitTwo' orientation="vertical" resizeWeight="0.6" oneTouchExpandable='true'> <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> <JPanel id="detail"> - <JLabel text="DetailPanel"/> + <JLabel id='detailFake' text="DetailPanel"/> </JPanel> </JScrollPane> <JScrollPane horizontalScrollBarPolicy="horizontal_scrollbar_never"> <JPanel id="history"> - <JLabel text="HistoryPanel"/> + <JLabel id='historyFake' text="HistoryPanel"/> </JPanel> </JScrollPane> </JSplitPane>

1 0

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

24 Jan '08

Author: tchemit Date: 2008-01-24 00:26:51 +0000 (Thu, 24 Jan 2008) New Revision: 465 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: suppression tooltip sur toute la tab Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-24 00:25:53 UTC (rev 464) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-01-24 00:26:51 UTC (rev 465) @@ -30,6 +30,7 @@ import javax.swing.AbstractButton; import javax.swing.JComboBox; +import javax.swing.JTree; import javax.swing.SwingUtilities; import java.util.regex.Matcher; @@ -66,14 +67,14 @@ } } - public void refreshDetailTabUI(final DetailTabModel model, final JApplicationDetailTab ui) { + public void refreshDetailTabUI(final DetailTabModel model, final JApplicationDetailTab ui) { SwingUtilities.invokeLater(new Runnable() { public void run() { - ui.getTree().setToolTipText(model.getBean().getMetaData().getUuid()+" version "+model.getBean().getMetaData().getVersion()+" remote ?"+model.isRemote()); + JTree tree = ui.getTree(); // tree data model may have changed, must revalidate - ui.getTree().invalidate(); + tree.invalidate(); // parent must be repaint (will revalidate layout for tree) ui.repaint();

1 0