Various enhancements of the result tree viewer

git-svn-id: https://svn.argeo.org/slc/trunk@5715 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/plugins/org.argeo.slc.client.ui/icons/executionError.gif b/plugins/org.argeo.slc.client.ui/icons/executionError.gif
new file mode 100644 (file)
index 0000000..e861399
Binary files /dev/null and b/plugins/org.argeo.slc.client.ui/icons/executionError.gif differ

diff --git a/plugins/org.argeo.slc.client.ui/icons/myResult.png b/plugins/org.argeo.slc.client.ui/icons/myResult.png
new file mode 100644 (file)
index 0000000..93053b7
Binary files /dev/null and b/plugins/org.argeo.slc.client.ui/icons/myResult.png differ

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java
index 18f4b944fce4712ffd28cf2bc0f4ec95d9bf42e9..053c1fa2e18dcf380232e55c8a0d420adfd830cf 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcImages.java
@@ -26,6 +26,7 @@ public class SlcImages {
        public final static Image MODULE = img("icons/module.png");
        public final static Image MODULE_STOPPED = img("icons/module_stopped.gif");
        public final static Image FOLDER = img("icons/folder.gif");
+       public final static Image MY_RESULTS_FOLDER = img("icons/myResult.png");
        public final static Image FLOW = img("icons/flow.png");
        public final static Image PROCESSES = img("icons/processes.gif");
        public final static Image PASSED = img("icons/passed.gif");

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
index 073c16e5594116a0c52d6e37cebd6d000ea5062f..a187ecd8c8484dca492fce5120ac437959682b52 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/SlcUiConstants.java
@@ -18,6 +18,11 @@ package org.argeo.slc.client.ui;
 /** SLC UI common constants */
 public interface SlcUiConstants {
 
+       /*
+        * Labels
+        */
+       public final static String DEFAULT_MY_RESULTS_FOLDER_LABEL = "My Results";
+       
        /*
         * MISCEALLENEOUS
         */

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteResult.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteResult.java
index 94cdd3e94f332bb4f375af1ff871b2bc14286614..b6ab1ea1d3357a05088db9a4d64a4dc97462e00f 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteResult.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/DeleteResult.java
@@ -28,7 +28,6 @@ import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.slc.client.ui.model.ResultFolder;\r
 import org.argeo.slc.client.ui.model.ResultParentUtils;\r
 import org.argeo.slc.client.ui.model.SingleResultNode;\r
-import org.argeo.slc.jcr.SlcNames;\r
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
index 64c759b77db6f8edbe66831f83aa86992d6a0d54..7878f85a25977a893aeba405dd0c87f28b1f0420 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/decorators/ResultFailedDecorator.java
@@ -15,8 +15,17 @@
  */
 package org.argeo.slc.client.ui.decorators;
 
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.model.ResultParent;
+import org.argeo.slc.client.ui.model.SingleResultNode;
+import org.argeo.slc.jcr.SlcNames;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.DecorationOverlayIcon;
 import org.eclipse.jface.viewers.IDecoration;
@@ -31,6 +40,9 @@ public class ResultFailedDecorator extends LabelProvider implements
        // private final static Log log = LogFactory
        // .getLog(ResultFailedDecorator.class);
 
+       private final static DateFormat dateFormat = new SimpleDateFormat(
+                       "yyyy-MM-dd HH:mm");
+
        public ResultFailedDecorator() {
                super();
        }
@@ -58,6 +70,22 @@ public class ResultFailedDecorator extends LabelProvider implements
 
        // Method to decorate Text
        public String decorateText(String label, Object object) {
-               return null;
+               if (object instanceof SingleResultNode) {
+                       SingleResultNode srNode = (SingleResultNode) object;
+                       Node node = srNode.getNode();
+                       String decoration = null;
+                       try {
+                               if (node.hasProperty(SlcNames.SLC_COMPLETED))
+                                       decoration = dateFormat.format(node
+                                                       .getProperty(SlcNames.SLC_COMPLETED).getDate()
+                                                       .getTime());
+                       } catch (RepositoryException re) {
+                               throw new SlcException(
+                                               "Unexpected defining text decoration for result", re);
+                       }
+                       return label + " [" + decoration + "]";
+               } else
+                       return null;
        }
+
 }

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java
index fc4eec77f640d08926851b0c4e15cba36b33ee85..519dd3aeae337464c712f6ef37d7c6ec9ba1ca4d 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultParentUtils.java
@@ -14,15 +14,14 @@ import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 import javax.jcr.query.QueryResult;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcJcrResultUtils;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 
 public class ResultParentUtils {
-       private final static Log log = LogFactory.getLog(ResultParentUtils.class);
+       // private final static Log log =
+       // LogFactory.getLog(ResultParentUtils.class);
 
        public static Object[] orderChildren(Object[] children) {
                List<ResultFolder> folders = new ArrayList<ResultFolder>();

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
index 251f066ead13975dc673c735c8a44a0a6458b0cb..bae1c9dc039ede8738eeac43cf492b01700b902a 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/providers/ResultTreeLabelProvider.java
@@ -2,6 +2,7 @@ package org.argeo.slc.client.ui.providers;
 
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.client.ui.SlcImages;
+import org.argeo.slc.client.ui.SlcUiConstants;
 import org.argeo.slc.client.ui.model.ResultParent;
 import org.argeo.slc.client.ui.model.SingleResultNode;
 import org.eclipse.jface.viewers.LabelProvider;
@@ -9,6 +10,8 @@ import org.eclipse.swt.graphics.Image;
 
 /** Basic label provider for a tree of result */
 public class ResultTreeLabelProvider extends LabelProvider {
+       // private final static Log log = LogFactory
+       // .getLog(ResultTreeLabelProvider.class);
 
        @Override
        public String getText(Object element) {
@@ -22,9 +25,13 @@ public class ResultTreeLabelProvider extends LabelProvider {
                        // Node resultNode = ((SingleResultNode) obj).getNode();
                        // int status = SlcJcrUtils.aggregateTestStatus(resultNode);
                        return SlcImages.PROCESS_COMPLETED;
-               } else if (obj instanceof ResultParent)
-                       return SlcImages.FOLDER;
-               else
+               } else if (obj instanceof ResultParent) {
+                       ResultParent rParent = (ResultParent) obj;
+                       if (SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL.equals(rParent.getName()))
+                               return SlcImages.MY_RESULTS_FOLDER;
+                       else
+                               return SlcImages.FOLDER;
+               } else
                        return null;
        }
 }

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 1dbeb6c5783700e1354bd570c13ab5a12de5b82e..bef8f208260e15f48333ff02c5753e6f919df4c4 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -24,7 +24,10 @@ import org.argeo.jcr.JcrUtils;
 import org.argeo.jcr.UserJcrUtils;\r
 import org.argeo.slc.SlcException;\r
 import org.argeo.slc.client.ui.ClientUiPlugin;\r
+import org.argeo.slc.client.ui.SlcUiConstants;\r
 import org.argeo.slc.client.ui.commands.AddResultFolder;\r
+import org.argeo.slc.client.ui.editors.ProcessEditor;\r
+import org.argeo.slc.client.ui.editors.ProcessEditorInput;\r
 import org.argeo.slc.client.ui.model.ParentNodeFolder;\r
 import org.argeo.slc.client.ui.model.ResultFolder;\r
 import org.argeo.slc.client.ui.model.ResultParent;\r
@@ -41,6 +44,8 @@ import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;\r
 import org.eclipse.jface.viewers.ColumnLabelProvider;\r
 import org.eclipse.jface.viewers.DecoratingLabelProvider;\r
+import org.eclipse.jface.viewers.DoubleClickEvent;\r
+import org.eclipse.jface.viewers.IDoubleClickListener;\r
 import org.eclipse.jface.viewers.ILabelDecorator;\r
 import org.eclipse.jface.viewers.ISelectionChangedListener;\r
 import org.eclipse.jface.viewers.IStructuredContentProvider;\r
@@ -66,7 +71,9 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;\r
 import org.eclipse.swt.widgets.Menu;\r
 import org.eclipse.ui.ISharedImages;\r
+import org.eclipse.ui.IWorkbenchPage;\r
 import org.eclipse.ui.IWorkbenchWindow;\r
+import org.eclipse.ui.PlatformUI;\r
 import org.eclipse.ui.part.ViewPart;\r
 \r
 /** SLC generic JCR Result tree view. */\r
@@ -90,8 +97,9 @@ public class JcrResultTreeView extends ViewPart {
                        NodeType.NT_UNSTRUCTURED };\r
 \r
        // FIXME cache to ease refresh after D&D\r
-       private ResultParent lastSelectedElement;\r
-       private ResultParent lastSelectedElementParent;\r
+       private ResultParent lastSelectedTargetElement;\r
+       private ResultParent lastSelectedTargetElementParent;\r
+       private ResultParent lastSelectedSourceElementParent;\r
 \r
        /**\r
         * To be overridden to adapt size of form and result frames.\r
@@ -141,6 +149,8 @@ public class JcrResultTreeView extends ViewPart {
                                .getDecoratorManager().getLabelDecorator();\r
                viewer.setLabelProvider(new DecoratingLabelProvider(rtLblProvider,\r
                                decorator));\r
+               viewer.addDoubleClickListener(new ViewDoubleClickListener());\r
+\r
                // viewer.setLabelProvider(rtLblProvider);\r
                getSite().setSelectionProvider(viewer);\r
 \r
@@ -175,8 +185,8 @@ public class JcrResultTreeView extends ViewPart {
                                                                                .getNode());\r
                                        else\r
                                                propertiesViewer.setInput(null);\r
-                                       lastSelectedElement = (ResultParent) firstItem;\r
-                                       lastSelectedElementParent = (ResultParent) ((ResultParent) firstItem)\r
+                                       lastSelectedTargetElement = (ResultParent) firstItem;\r
+                                       lastSelectedTargetElementParent = (ResultParent) ((ResultParent) firstItem)\r
                                                        .getParent();\r
                                }\r
                        }\r
@@ -250,6 +260,33 @@ public class JcrResultTreeView extends ViewPart {
                return propertiesViewer;\r
        }\r
 \r
+       /**\r
+        * Override to provide specific behaviour. Typically to enable the display\r
+        * of a result file.\r
+        * \r
+        * @param evt\r
+        */\r
+       protected void processDoubleClick(DoubleClickEvent evt) {\r
+               Object obj = ((IStructuredSelection) evt.getSelection())\r
+                               .getFirstElement();\r
+               try {\r
+                       if (obj instanceof SingleResultNode) {\r
+                               SingleResultNode srNode = (SingleResultNode) obj;\r
+                               Node node = srNode.getNode();\r
+                               // FIXME: open a default result editor\r
+                               if (node.isNodeType(SlcTypes.SLC_PROCESS)) {\r
+                                       IWorkbenchPage activePage = PlatformUI.getWorkbench()\r
+                                                       .getActiveWorkbenchWindow().getActivePage();\r
+                                       activePage.openEditor(\r
+                                                       new ProcessEditorInput(node.getPath()),\r
+                                                       ProcessEditor.ID);\r
+                               }\r
+                       }\r
+               } catch (Exception e) {\r
+                       throw new SlcException("Cannot open " + obj, e);\r
+               }\r
+       }\r
+\r
        @Override\r
        public void setFocus() {\r
        }\r
@@ -322,7 +359,7 @@ public class JcrResultTreeView extends ViewPart {
                                ResultFolder currFolder = (ResultFolder) resultParent;\r
                                jcrRefresh(currFolder.getNode());\r
                                currFolder.forceFullRefresh();\r
-                               resultTreeViewer.refresh(lastSelectedElement);\r
+                               resultTreeViewer.refresh(lastSelectedTargetElement);\r
                        }\r
                }\r
        }\r
@@ -336,7 +373,7 @@ public class JcrResultTreeView extends ViewPart {
                                // My results\r
                                roots[0] = new ParentNodeFolder(null,\r
                                                SlcJcrResultUtils.getMyResultParentNode(session),\r
-                                               "My results");\r
+                                               SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL);\r
 \r
                                // today\r
                                Calendar cal = Calendar.getInstance();\r
@@ -428,7 +465,6 @@ public class JcrResultTreeView extends ViewPart {
 \r
                public void dragStart(DragSourceEvent event) {\r
                        // Check if the drag action should start.\r
-\r
                        IStructuredSelection selection = (IStructuredSelection) resultTreeViewer\r
                                        .getSelection();\r
                        boolean doIt = false;\r
@@ -438,12 +474,16 @@ public class JcrResultTreeView extends ViewPart {
                                if (obj instanceof SingleResultNode) {\r
                                        Node tNode = ((SingleResultNode) obj).getNode();\r
                                        try {\r
+                                               // if (tNode.getPrimaryNodeType().isNodeType(\r
+                                               // SlcTypes.SLC_TEST_RESULT)\r
+                                               // && (tNode.getPath()\r
+                                               // .startsWith(SlcJcrResultUtils\r
+                                               // .getSlcResultsBasePath(session))))\r
                                                if (tNode.getPrimaryNodeType().isNodeType(\r
-                                                               SlcTypes.SLC_TEST_RESULT)\r
-                                                               && (tNode.getPath()\r
-                                                                               .startsWith(SlcJcrResultUtils\r
-                                                                                               .getSlcResultsBasePath(session))))\r
+                                                               SlcTypes.SLC_TEST_RESULT))\r
                                                        doIt = true;\r
+                                               lastSelectedSourceElementParent = (ResultParent) ((SingleResultNode) obj)\r
+                                                               .getParent();\r
                                        } catch (RepositoryException re) {\r
                                                throw new SlcException(\r
                                                                "unexpected error while validating drag source",\r
@@ -462,6 +502,7 @@ public class JcrResultTreeView extends ViewPart {
                                Node first = ((SingleResultNode) obj).getNode();\r
                                try {\r
                                        event.data = first.getIdentifier();\r
+\r
                                } catch (RepositoryException re) {\r
                                        throw new SlcException(\r
                                                        "unexpected error while setting data", re);\r
@@ -478,6 +519,7 @@ public class JcrResultTreeView extends ViewPart {
        protected class ViewDropListener extends ViewerDropAdapter {\r
 \r
                private Node currParentNode = null;\r
+               private boolean copyNode = true;\r
 \r
                public ViewDropListener(Viewer viewer) {\r
                        super(viewer);\r
@@ -512,10 +554,20 @@ public class JcrResultTreeView extends ViewPart {
                                        currParentNode = targetParentNode;\r
                                        validDrop = true;\r
                                        // FIXME\r
-                                       lastSelectedElement = (ResultParent) target;\r
-                                       lastSelectedElementParent = (ResultParent) ((ResultParent) target)\r
+                                       lastSelectedTargetElement = (ResultParent) target;\r
+                                       lastSelectedTargetElementParent = (ResultParent) ((ResultParent) target)\r
                                                        .getParent();\r
                                }\r
+                               // Check if it's a move or a copy\r
+                               if (validDrop) {\r
+                                       String pPath = "";\r
+                                       if (lastSelectedSourceElementParent instanceof ResultFolder)\r
+                                               pPath = ((ResultFolder) lastSelectedSourceElementParent)\r
+                                                               .getNode().getPath();\r
+                                       if ((pPath.startsWith(SlcJcrResultUtils\r
+                                                       .getMyResultsBasePath(session))))\r
+                                               copyNode = false;\r
+                               }\r
                        } catch (RepositoryException re) {\r
                                throw new SlcException(\r
                                                "unexpected error while validating drop target", re);\r
@@ -528,15 +580,31 @@ public class JcrResultTreeView extends ViewPart {
 \r
                        try {\r
                                Node source = session.getNodeByIdentifier((String) data);\r
-                               Node target = currParentNode.addNode(source.getName(), source\r
-                                               .getPrimaryNodeType().getName());\r
-                               JcrUtils.copy(source, target);\r
-                               ResultParentUtils\r
-                                               .updatePassedStatus(target,\r
-                                                               target.getNode(SlcNames.SLC_STATUS)\r
-                                                                               .getProperty(SlcNames.SLC_SUCCESS)\r
-                                                                               .getBoolean());\r
-                               target.getSession().save();\r
+                               if (copyNode) {\r
+                                       Node target = currParentNode.addNode(source.getName(),\r
+                                                       source.getPrimaryNodeType().getName());\r
+                                       JcrUtils.copy(source, target);\r
+                                       ResultParentUtils.updatePassedStatus(\r
+                                                       target,\r
+                                                       target.getNode(SlcNames.SLC_STATUS)\r
+                                                                       .getProperty(SlcNames.SLC_SUCCESS)\r
+                                                                       .getBoolean());\r
+                                       target.getSession().save();\r
+                               } else // move only\r
+                               {\r
+                                       String sourcePath = source.getPath();\r
+                                       String destPath = currParentNode.getPath() + "/"\r
+                                                       + source.getName();\r
+                                       session.move(sourcePath, destPath);\r
+                                       session.save();\r
+                                       Node target = session.getNode(destPath);\r
+                                       ResultParentUtils.updatePassedStatus(\r
+                                                       target,\r
+                                                       target.getNode(SlcNames.SLC_STATUS)\r
+                                                                       .getProperty(SlcNames.SLC_SUCCESS)\r
+                                                                       .getBoolean());\r
+                                       session.save();\r
+                               }\r
                        } catch (RepositoryException re) {\r
                                throw new SlcException(\r
                                                "unexpected error while copying dropped node", re);\r
@@ -589,7 +657,7 @@ public class JcrResultTreeView extends ViewPart {
                                                        jcrRefresh(currNode);\r
                                                        resultTreeViewer.refresh(true);\r
                                                        resultTreeViewer.expandToLevel(\r
-                                                                       lastSelectedElementParent, 1);\r
+                                                                       lastSelectedTargetElementParent, 1);\r
 \r
                                                }\r
                                        }\r
@@ -601,29 +669,16 @@ public class JcrResultTreeView extends ViewPart {
                                                                || currNode\r
                                                                                .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {\r
                                                        refresh(null);\r
-                                                       resultTreeViewer.expandToLevel(lastSelectedElement,\r
-                                                                       1);\r
+                                                       resultTreeViewer.expandToLevel(\r
+                                                                       lastSelectedTargetElement, 1);\r
                                                }\r
                                        }\r
                                }\r
-                               // String path = event.getPath();\r
-                               // int index = path.lastIndexOf('/');\r
-                               // String propertyName = path.substring(index + 1);\r
-                               // if (propertyName.equals(SlcNames.SLC_COMPLETED)\r
-                               // || propertyName.equals(SlcNames.SLC_UUID)) {\r
-                               // }\r
                        }\r
-\r
-                       // FIXME implement correct behaviour. treeViewer selection is\r
-                       // disposed by the drag & drop.\r
-                       // resultTreeViewer.refresh();\r
-                       // refresh(null);\r
-                       // log.warn("Implement refresh.");\r
                }\r
        }\r
 \r
        class PropertiesContentProvider implements IStructuredContentProvider {\r
-               // private JcrItemsComparator itemComparator = new JcrItemsComparator();\r
 \r
                public void dispose() {\r
                }\r
@@ -649,6 +704,13 @@ public class JcrResultTreeView extends ViewPart {
                }\r
        }\r
 \r
+       class ViewDoubleClickListener implements IDoubleClickListener {\r
+               public void doubleClick(DoubleClickEvent evt) {\r
+                       processDoubleClick(evt);\r
+               }\r
+\r
+       }\r
+\r
        /* DEPENDENCY INJECTION */\r
        public void setSession(Session session) {\r
                this.session = session;\r