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();