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

r605 - trunk/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 17:04:35 +0000 (Sat, 02 Feb 2008) New Revision: 605 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 pour export 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-02-02 17:04:18 UTC (rev 604) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-02 17:04:35 UTC (rev 605) @@ -1,4 +1,4 @@ -#Thu Jan 24 23:35:22 GMT 2008 +#Sat Feb 02 16:53:15 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog @@ -42,6 +42,7 @@ simexplorer.action.connect.tooltip=Connect to remote server simexplorer.action.delete2=Delete ''{0}'' simexplorer.action.dowload2=Download ''{0}'' +simexplorer.action.export2=Export ''{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-02-02 17:04:18 UTC (rev 604) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-02 17:04:35 UTC (rev 605) @@ -1,4 +1,4 @@ -#Thu Jan 24 23:35:22 GMT 2008 +#Sat Feb 02 16:53:15 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits @@ -42,6 +42,7 @@ simexplorer.action.connect.tooltip=Se connecter au serveur distant simexplorer.action.delete2=Supprimer ''{0}'' simexplorer.action.dowload2=T\u00E9l\u00E9charger ''{0}'' +simexplorer.action.export2=Exporter ''{0}'' simexplorer.action.groups=Groupes simexplorer.action.groups.help= simexplorer.action.groups.tooltip=Afficher le gestionnaire des groupes

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:04:18 +0000 (Sat, 02 Feb 2008) New Revision: 604 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java Log: changement de tree en navigationTree + changement type versions du model 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-02-02 17:03:53 UTC (rev 603) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerMainUI.java 2008-02-02 17:04:18 UTC (rev 604) @@ -18,7 +18,7 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.action.ChangeI18nAbstractAction; import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; @@ -75,7 +75,7 @@ SwingUtilities.invokeLater(new Runnable() { public void run() { - JTree tree = ui.getTree(); + JTree tree = ui.getNavigationTree(); // tree data model may have changed, must revalidate tree.invalidate(); @@ -84,14 +84,14 @@ DefaultListModel historyModel = (DefaultListModel) historyList.getModel(); - MetaData[] versions = model.getVersions(); + Version[] versions = model.getVersions(); if (versions == null) { historyModel.setSize(0); } else { historyModel.setSize(versions.length); for (int i = 0; i < versions.length; i++) { - MetaData version = versions[i]; + Version version = versions[i]; historyModel.setElementAt(version, i); } }

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:03:53 +0000 (Sat, 02 Feb 2008) New Revision: 603 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/DeleteAction.java 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/ExpandAllAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java Log: changement de tree en navigationTree + utilisation m?\195?\169thodes du model 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-02-02 17:02:53 UTC (rev 602) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/CollapseAllAction.java 2008-02-02 17:03:53 UTC (rev 603) @@ -56,7 +56,7 @@ return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); + tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; result = !(node == null || node.isLeaf()); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java 2008-02-02 17:02:53 UTC (rev 602) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DeleteAction.java 2008-02-02 17:03:53 UTC (rev 603) @@ -21,6 +21,7 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; 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; @@ -65,10 +66,10 @@ return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); + tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = node != null && node.isLoggableElement(); + result = ((DetailTabModel) getModel()).canDelete(node); if (result) { // ask user confirmation of node to delete element = (LoggableElement) node.getUserObject(); Modified: 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 2008-02-02 17:02:53 UTC (rev 602) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-02-02 17:03:53 UTC (rev 603) @@ -75,10 +75,10 @@ return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); + tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = node != null && node.isDownloadableElement(); + result = ((DetailTabModel) getModel()).canDownload(node); if (result) { // ask user path where to save data String dir = org.codelutin.util.FileUtil.getDirectory(); 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-02-02 17:02:53 UTC (rev 602) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExpandAllAction.java 2008-02-02 17:03:53 UTC (rev 603) @@ -56,7 +56,7 @@ return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); + tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; result = !(node == null || node.isLeaf()); 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-02-02 17:02:53 UTC (rev 602) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/ExportApplicationAction.java 2008-02-02 17:03:53 UTC (rev 603) @@ -66,10 +66,10 @@ return false; } JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - tree = ui.getTree(); + tree = ui.getNavigationTree(); node = LoggableElementTreeHelper.getSelectedNodeOrRootNode(tree); boolean result; - result = node != null && node.isLoggableElement(); + result = ((DetailTabModel) getModel()).canExport(node); if (result) { element = (LoggableElement) node.getUserObject(); uuid = element.getMetaData().getUuid();

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:02:53 +0000 (Sat, 02 Feb 2008) New Revision: 602 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/ShowSynchronizeTabAction.java Log: utilisation de l'action de base revisit?\195?\169 sur l'action de d?\195?\169tail, continue la gestion des versions 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-02-02 17:02:01 UTC (rev 601) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowDetailTabAction.java 2008-02-02 17:02:53 UTC (rev 602) @@ -34,13 +34,10 @@ import static org.codelutin.i18n.I18n._; import javax.swing.DefaultListModel; -import javax.swing.JList; import javax.swing.JTree; -import javax.swing.ListModel; 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; @@ -59,27 +56,24 @@ mnemonic = 'd', hideActionText = false ) -public class ShowDetailTabAction extends ShowTabAbstractAction { +public class ShowDetailTabAction extends ShowTabAbstractAction<JApplicationDetailTab, DetailTabModel> { private static final long serialVersionUID = 6643631041114311643L; - protected Boolean firstTime; - public ShowDetailTabAction(String name) { super(name); } @Override protected boolean beforeAction(ActionEvent e) throws Exception { + super.beforeAction(e); ListTabModel listModel; - DetailTabModel model = (DetailTabModel) getModel(); + DetailTabModel model = getTabModel(); if (model.isRemote()) { listModel = (ListTabModel) SimExplorerTab.remote.getModel(); } else { listModel = (ListTabModel) SimExplorerTab.local.getModel(); } - // mark it, after action will push table model - firstTime = getUI() == null; MetaData data = listModel.get(model.getIndex()); String uuid = data.getUuid(); @@ -92,131 +86,113 @@ return true; } - @Override - protected void afterAction(ActionEvent e) { - // get model - final DetailTabModel model = (DetailTabModel) getModel(); - // get ui - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + protected void initFirstUsage(final JApplicationDetailTab ui, final DetailTabModel model) { - // création de l'arbre - TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getBean()); + ui.getNavigationTree().setModel(new DefaultTreeModel(null)); - // push tree model - JTree tree = getTree(); - TreeModel modelTree = tree.getModel(); - if (modelTree instanceof DefaultTreeModel) { - DefaultTreeModel t = (DefaultTreeModel) modelTree; - t.setRoot(root); - } else { - DefaultTreeModel t = new DefaultTreeModel(root); - tree.setModel(t); - } + ui.getHistoryList().setModel(new DefaultListModel()); - JList historyTree = ui.getHistoryList(); - ListModel historyModel = historyTree.getModel(); + // add a listener of tree model + ui.getNavigationTree().addTreeSelectionListener(new TreeSelectionListener() { + public void valueChanged(TreeSelectionEvent e) { + TreePath path = e.getNewLeadSelectionPath(); + LoggableElementTreeNode node = null; + if (path != null) { + node = (LoggableElementTreeNode) path.getLastPathComponent(); + } + StorageService service = getContext().getStorageService(model.isRemote()); + String token = getContext().getToken(); - if (!(historyModel instanceof DefaultListModel)) { - DefaultListModel t = new DefaultListModel(); - historyTree.setModel(t); - } else { - DefaultListModel t = new DefaultListModel(); - t.setSize(0); - } - 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 delete = false; - boolean export = false; - boolean detail = false; - boolean history = false; - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); + // update download button + refreshDownloadAction(ui, node, model); + // update delete button + refreshDeleteAction(ui, node, model); + // update export button + refreshExportAction(ui, node, model); + // update detail panel + refreshDetail(ui, node, model, service, token); + // update history list + refreshHistory(ui, node, model, service, token); + // refresh ui + getMainUI().refreshDetailTabUI(ui, model); + } + }); + } - LoggableElementTreeNode node = null; - if (path != null) { - node = (LoggableElementTreeNode) path.getLastPathComponent(); - if (node.isDownloadableElement()) { - download = true; - } - if (node.isLoggableElement()) { - delete = 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.getDelete().setEnabled(delete); - if (delete) { - ui.getDelete().setToolTipText(_("simexplorer.action.delete2", node.getUserObject())); - } else { - ui.getDelete().setToolTipText(null); - } - - ui.getExportApplication().setEnabled(export); - - // update detail panel - if (detail) { - showDetail(node); - } - // update history list - showHistory(node, model, history); - - // refresh ui - getMainUI().refreshDetailTabUI(ui, model); - } - }); - } - // by default select the root node (to display info about the exploration) + protected void initUI(JApplicationDetailTab ui, DetailTabModel model) { + // création de l'arbre de navigation + TreeNode root = LoggableElementTreeHelper.buildLoggableElementNode(model.getBean()); + // push tree model + JTree tree = ui.getNavigationTree(); + DefaultTreeModel modelTree = (DefaultTreeModel) tree.getModel(); + modelTree.setRoot(root); + // by default select the root node (to display info about the exploration) tree.setSelectionRow(0); - // refresh ui getMainUI().refreshDetailTabUI(ui, model); } - @Override - protected void clear() { - super.clear(); - firstTime = null; + protected static void refreshExportAction(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model) { + boolean export = model.canExport(node); + ui.getExportApplication().setEnabled(export); + if (export) { + ui.getExportApplication().setToolTipText(_("simexplorer.action.export2", node.getUserObject())); + } else { + ui.getExportApplication().setToolTipText(null); + } } - protected void showDetail(final LoggableElementTreeNode node) { - JApplicationDetailTab ui = (JApplicationDetailTab) getUI(); - ui.getDetailFake().setText("detail [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject()); + protected static void refreshDeleteAction(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model) { + boolean delete = model.canDelete(node); + ui.getDelete().setEnabled(delete); + if (delete) { + ui.getDelete().setToolTipText(_("simexplorer.action.delete2", node.getUserObject())); + } else { + ui.getDelete().setToolTipText(null); + } } - protected void showHistory(LoggableElementTreeNode node, DetailTabModel model, boolean history) { + protected static void refreshDownloadAction(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model) { + boolean download = model.canDownload(node); + ui.getDownload().setEnabled(download); + if (download) { + ui.getDownload().setToolTipText(_("simexplorer.action.dowload2", node.getUserObject())); + } else { + ui.getDownload().setToolTipText(null); + } + } + + protected static void refreshDetail(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model, StorageService service, String token) { + boolean detail = model.isLoggableElement(node); + String text; + LoggableElement element = (LoggableElement) node.getUserObject(); + if (detail) { + text = "detail [" + node.getUserObject().getClass().getSimpleName() + "]" + node.getUserObject(); + } else { + text = "No detail"; + } + ui.getDetailFake().setText(text); + } + + protected static void refreshHistory(JApplicationDetailTab ui, LoggableElementTreeNode node, DetailTabModel model, StorageService service, String token) { + boolean history = model.isLoggableElement(node); if (!history) { model.setVersions(null); return; } - StorageService service = getContext().getStorageService(model.isRemote()); //TODO should use model.getBean() ??? LoggableElement element = (LoggableElement) node.getUserObject(); try { - MetaData[] versions; - versions = service.getVersions(getContext().getToken(), element.getMetaData().getUuid()); + MetaData[] metas; + metas = service.getVersions(token, element.getMetaData().getUuid()); + Version[] versions = new Version[metas.length]; + for (int i = 0; i < metas.length; i++) { + MetaData meta = metas[i]; + versions[i] = meta.getVersion(); + } model.setVersions(versions); } catch (SimExplorerServiceException e) { throw new SimExplorerRuntimeException(e); } - - } - - protected JTree getTree() { - JTree tree; - tree = ((JApplicationDetailTab) getUI()).getTree(); - return tree; - } - } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-02-02 17:02:01 UTC (rev 601) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowSynchronizeTabAction.java 2008-02-02 17:02:53 UTC (rev 602) @@ -19,7 +19,11 @@ package fr.cemagref.simexplorer.is.ui.swing.action.tab; import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationSynchronizeTab; +import java.awt.event.ActionEvent; + /** * Action pour afficher le tab de synchronisation * @@ -34,12 +38,25 @@ mnemonic = 'S', hideActionText = false ) -public class ShowSynchronizeTabAction extends ShowTabAbstractAction { +public class ShowSynchronizeTabAction extends ShowTabAbstractAction<JApplicationSynchronizeTab, SynchronizeTabModel> { + private static final long serialVersionUID = -3901398502496915785L; - private static final long serialVersionUID = -5349479338237813002L; - public ShowSynchronizeTabAction(String name) { super(name); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + //TODO + return super.beforeAction(e); + } + + protected void initFirstUsage(JApplicationSynchronizeTab ui, SynchronizeTabModel model) { + //TODO + } + + protected void initUI(JApplicationSynchronizeTab ui, SynchronizeTabModel model) { + //TODO + } + }

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:02:01 +0000 (Sat, 02 Feb 2008) New Revision: 601 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java Log: utilisation de l'action de base 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-02-02 17:01:43 UTC (rev 600) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowLocalTabAction.java 2008-02-02 17:02:01 UTC (rev 601) @@ -45,65 +45,10 @@ mnemonic = 'A', hideActionText = false ) -public class ShowLocalTabAction extends ShowTabAbstractAction { +public class ShowLocalTabAction extends ShowListTabAbstractAction { + private static final long serialVersionUID = 7009836674867908237L; - private static final long serialVersionUID = -5349479338237813002L; - - protected Boolean firstTime; - public ShowLocalTabAction(String name) { super(name); } - - @Override - protected boolean beforeAction(ActionEvent e) throws Exception { - JTabbedPane tabbedPane = getTabContainer(); - JAXXObject ui = getUI(); - - if (getTab().isTabVisible(tabbedPane)) { - // tab is already visible, just select it - tabbedPane.setSelectedComponent((Component) ui); - return false; - } - - // mark it, after action will push table model - firstTime = ui == null; - - ListTabModel model = (ListTabModel) getModel(); - - MetaData[] data = model.getList(); - - if (data == null) { - // first coming here, init model - model.initTabModel(false, getContext()); - } - return true; - } - - @Override - protected void afterAction(ActionEvent e) { - if (firstTime) { - final ListTabModel model = (ListTabModel) getModel(); - - // push model into tableModel - final JApplicationListTab container = (JApplicationListTab) getUI(); - JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); - modelTab.setData(model.getList()); - // add search actions listeners - container.getSearchText().addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - getMainUI().refreshSearchActions(container, model); - } - }); - // refresh ui - getMainUI().refreshListTabUI(model, container); - } - } - - @Override - protected void clear() { - super.clear(); - firstTime = null; - } } \ No newline at end of file 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-02-02 17:01:43 UTC (rev 600) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowRemoteTabAction.java 2008-02-02 17:02:01 UTC (rev 601) @@ -18,19 +18,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.tab; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -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; -import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; -import jaxx.runtime.JAXXObject; - -import javax.swing.JTabbedPane; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; - /** * Action pour afficher le tab local * @@ -45,71 +32,10 @@ mnemonic = 'p', hideActionText = false ) -public class ShowRemoteTabAction extends ShowTabAbstractAction { +public class ShowRemoteTabAction extends ShowListTabAbstractAction { + private static final long serialVersionUID = -5791049785753596347L; - private static final long serialVersionUID = -5349479338237813002L; - - protected Boolean firstTime; - public ShowRemoteTabAction(String name) { super(name); } - - @Override - protected boolean beforeAction(ActionEvent e) throws Exception { - if (!super.beforeAction(e)) { - return false; - } - JTabbedPane tabbedPane = getTabContainer(); - JAXXObject ui = getUI(); - - if (getTab().isTabVisible(tabbedPane)) { - // tab is already visible, just select it - tabbedPane.setSelectedComponent((Component) ui); - return false; - } - - // mark it, after action will push table model - firstTime = ui == null; - - ListTabModel model = (ListTabModel) getModel(); - - MetaData[] data = model.getList(); - - if (data == null) { - // first coming here, init model - model.initTabModel(true, getContext()); - } - return true; - } - - @Override - protected void afterAction(ActionEvent e) { - - if (firstTime) { - final ListTabModel model = (ListTabModel) getModel(); - // push model into TableModel - final JApplicationListTab container = (JApplicationListTab) getUI(); - JApplicationTableModel modelTab = (JApplicationTableModel) container.getTable().getModel(); - modelTab.setData(model.getList()); - - // add search actions listeners - container.getSearchText().addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - getMainUI().refreshSearchActions(container, model); - } - }); - - // refresh ui - getMainUI().refreshListTabUI(model, container); - } - } - - - @Override - protected void clear() { - super.clear(); - firstTime = null; - } } \ No newline at end of file

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:01:43 +0000 (Sat, 02 Feb 2008) New Revision: 600 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java Log: introduction d'une action de base d'ouverture de tab pour une liste Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/tab/ShowListTabAbstractAction.java 2008-02-02 17:01:43 UTC (rev 600) @@ -0,0 +1,85 @@ +/* +* ##% 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.tab; + +import fr.cemagref.simexplorer.is.ui.swing.tab.JApplicationListTab; +import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; +import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; +import fr.cemagref.simexplorer.is.ui.swing.action.ShowTabAbstractAction; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; + +import javax.swing.JTabbedPane; +import java.awt.event.ActionEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.Component; + +import jaxx.runtime.JAXXObject; + +/** @author chemit */ +public class ShowListTabAbstractAction extends ShowTabAbstractAction<JApplicationListTab, ListTabModel> { + private static final long serialVersionUID = 3813479850648257169L; + + public ShowListTabAbstractAction(String name) { + super(name); + } + + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + super.beforeAction(e); + JTabbedPane tabbedPane = getTabContainer(); + JAXXObject ui = getUI(); + + if (getTab().isTabVisible(tabbedPane)) { + // tab is already visible, just select it + tabbedPane.setSelectedComponent((Component) ui); + return false; + } + + // mark it, after action will push table model + firstTime = ui == null; + + ListTabModel model = (ListTabModel) getModel(); + + MetaData[] data = model.getList(); + + if (data == null) { + // first coming here, init model + model.initTabModel(false, getContext()); + } + return true; + } + + protected void initFirstUsage(final JApplicationListTab ui, final ListTabModel model) { + // push model into tableModel + JApplicationTableModel modelTab = (JApplicationTableModel) ui.getTable().getModel(); + modelTab.setData(model.getList()); + // add search actions listeners + ui.getSearchText().addKeyListener(new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + getMainUI().refreshSearchActions(ui, model); + } + }); + } + + protected void initUI(JApplicationListTab ui, ListTabModel model) { + getMainUI().refreshListTabUI(model, ui); + } +}

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 17:01:04 +0000 (Sat, 02 Feb 2008) New Revision: 599 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java Log: l'action de base d'ouverture de tab revisit?\195?\169 pour factoriser Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-02-02 16:59:48 UTC (rev 598) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ShowTabAbstractAction.java 2008-02-02 17:01:04 UTC (rev 599) @@ -18,23 +18,72 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action; +import jaxx.runtime.JAXXObject; +import jaxx.runtime.builder.TabModel; + import java.awt.event.ActionEvent; /** - * Action pour afficher une tab + * Action pour afficher une tab. * * * @author chemit */ -public abstract class ShowTabAbstractAction extends SimExplorerAbstractTabAction { +public abstract class ShowTabAbstractAction<U extends JAXXObject, M extends TabModel> extends SimExplorerAbstractTabAction { - private static final long serialVersionUID = -4030583314708934811L; + protected abstract void initFirstUsage(U ui, M model); + protected abstract void initUI(U ui, M model); + + protected Boolean firstTime; + + + private static final long serialVersionUID = -2050956371415306760L; + protected ShowTabAbstractAction(String name) { super(name, "showTab"); } + @Override + protected boolean beforeAction(ActionEvent e) throws Exception { + + // mark the first use of the tab + firstTime = getUI() == null; + + return true; + } + + @Override protected void doAction(ActionEvent e) throws Exception { getTab().showTab(getTabContainer()); } + + @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + U ui = getTabUI(); + M model = getTabModel(); + if (firstTime) { + initFirstUsage(ui, model); + } + initUI(ui,model); + + } + + @Override + protected void clear() { + super.clear(); + firstTime = null; + } + + @SuppressWarnings({"unchecked"}) + protected U getTabUI() { + return (U) getUI(); + } + + @SuppressWarnings({"unchecked"}) + protected M getTabModel() { + return (M) getModel(); + } + }

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 16:59:48 +0000 (Sat, 02 Feb 2008) New Revision: 598 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: ajout de tests sur les nodes (TODO d?\195?\169plcer dans le helper de Node) changement du type de versions en Version :) Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-02 16:58:45 UTC (rev 597) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-02 16:59:48 UTC (rev 598) @@ -19,7 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.model; 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 jaxx.runtime.builder.TabModel; @@ -43,7 +43,7 @@ /** l'élément dont on veut afficher le détail */ protected LoggableElement bean; /** la liste des versions disponibles pour un élément */ - protected MetaData[] versions; + protected Version[] versions; public String getName() { return tab.name(); @@ -69,10 +69,26 @@ return uuid; } - public MetaData[] getVersions() { + public Version[] getVersions() { return versions; } + public boolean isLoggableElement(LoggableElementTreeNode node) { + return node != null && node.isLoggableElement(); + } + + public boolean canExport(LoggableElementTreeNode node) { + return node != null && node.isRoot(); + } + + public boolean canDelete(LoggableElementTreeNode node) { + return node != null && node.isLoggableElement(); + } + + public boolean canDownload(LoggableElementTreeNode node) { + return node != null && node.isDownloadableElement(); + } + public void setRemote(boolean remote) { this.remote = remote; } @@ -89,7 +105,8 @@ this.bean = bean; } - public void setVersions(MetaData[] versions) { + public void setVersions(Version[] versions) { this.versions = versions; } + } \ No newline at end of file

1 0

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

02 Feb '08

Author: tchemit Date: 2008-02-02 16:58:45 +0000 (Sat, 02 Feb 2008) New Revision: 597 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: changement de tree en navigationTree 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-02-02 16:57:18 UTC (rev 596) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-02 16:58:45 UTC (rev 597) @@ -15,7 +15,7 @@ <cell> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> <JScrollPane columnHeaderView='{toolbar}'> - <JTree id="tree"/> + <JTree id="navigationTree"/> </JScrollPane> <JScrollPane id="scrollPane"> <JSplitPane id='splitTwo' orientation="vertical" resizeWeight="0.6" oneTouchExpandable='true'>

1 0

r596 - trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util
by tchemit＠users.labs.libre-entreprise.org 02 Feb '08

02 Feb '08

Author: tchemit Date: 2008-02-02 16:57:18 +0000 (Sat, 02 Feb 2008) New Revision: 596 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java Log: on indique dans les logs,le fichier de configuration utilis?\195?\169 Modified: trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java =================================================================== --- trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-02-02 16:56:53 UTC (rev 595) +++ trunk/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/util/Config.java 2008-02-02 16:57:18 UTC (rev 596) @@ -32,7 +32,7 @@ private static String propertiesLocation = "/properties/config.properties"; private static void initProperties() throws IOException { - log.info("Loading properties"); + log.info("Loading properties "+propertiesLocation); properties = new Properties();

1 0