X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrResultTreeView.java;h=152e15c6e89bdf4f40cc44a1664d4a701b2ae0f2;hb=fa3ef281f77b9006aec8825e4a56840d78cff64f;hp=e1a5759eff3d92d3257a9998ad409893838e999d;hpb=30d79020a5436aced32f7744d9d07444d6297925;p=gpl%2Fargeo-slc.git 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 e1a5759ef..152e15c6e 100644 --- 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 @@ -1,6 +1,20 @@ +/* + * Copyright (C) 2007-2012 Argeo GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.argeo.slc.client.ui.views; -import java.awt.Window; import java.util.ArrayList; import java.util.Calendar; import java.util.List; @@ -18,13 +32,10 @@ import javax.jcr.observation.Event; import javax.jcr.observation.EventListener; import javax.jcr.observation.ObservationManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.argeo.ArgeoException; import org.argeo.eclipse.ui.jcr.AsyncUiEventListener; import org.argeo.eclipse.ui.utils.CommandUtils; import org.argeo.jcr.JcrUtils; -import org.argeo.jcr.UserJcrUtils; import org.argeo.slc.SlcException; import org.argeo.slc.client.ui.ClientUiPlugin; import org.argeo.slc.client.ui.SlcUiConstants; @@ -35,6 +46,8 @@ import org.argeo.slc.client.ui.editors.ProcessEditor; import org.argeo.slc.client.ui.editors.ProcessEditorInput; import org.argeo.slc.client.ui.model.ParentNodeFolder; import org.argeo.slc.client.ui.model.ResultFolder; +import org.argeo.slc.client.ui.model.ResultItemsComparator; +import org.argeo.slc.client.ui.model.ResultItemsComparer; import org.argeo.slc.client.ui.model.ResultParent; import org.argeo.slc.client.ui.model.ResultParentUtils; import org.argeo.slc.client.ui.model.SingleResultNode; @@ -88,7 +101,8 @@ import org.eclipse.ui.part.ViewPart; public class JcrResultTreeView extends ViewPart { public final static String ID = ClientUiPlugin.ID + ".jcrResultTreeView"; - private final static Log log = LogFactory.getLog(JcrResultTreeView.class); + // private final static Log log = + // LogFactory.getLog(JcrResultTreeView.class); /* DEPENDENCY INJECTION */ private Session session; @@ -97,15 +111,20 @@ public class JcrResultTreeView extends ViewPart { private TreeViewer resultTreeViewer; private TableViewer propertiesViewer; - private EventListener resultsObserver = null; + private EventListener myResultsObserver = null; + private EventListener allResultsObserver = null; - private final static String[] observedNodeTypes = { + // under My Results + private final static String[] observedNodeTypesUnderMyResult = { SlcTypes.SLC_TEST_RESULT, SlcTypes.SLC_RESULT_FOLDER, - NodeType.NT_UNSTRUCTURED }; + SlcTypes.SLC_MY_RESULT_ROOT_FOLDER }; + + private final static String[] observedNodeTypesUnderAllResults = { + SlcTypes.SLC_TEST_RESULT, NodeType.NT_UNSTRUCTURED }; // FIXME cache to ease D&D private boolean isActionUnderMyResult = false; - private ResultParent lastSelectedTargetElement; + // private ResultParent lastSelectedTargetElement; private ResultParent lastSelectedSourceElement; private ResultParent lastSelectedSourceElementParent; private boolean isResultFolder = false; @@ -142,21 +161,42 @@ public class JcrResultTreeView extends ViewPart { sashForm.setWeights(getWeights()); + setOrderedInput(resultTreeViewer); + + // Initialize observer try { ObservationManager observationManager = session.getWorkspace() .getObservationManager(); - resultsObserver = new ResultObserver(resultTreeViewer.getTree() - .getDisplay()); - observationManager.addEventListener(resultsObserver, - Event.NODE_MOVED | Event.NODE_ADDED | Event.NODE_REMOVED, - UserJcrUtils.getUserHome(session).getPath(), true, null, - observedNodeTypes, false); + myResultsObserver = new MyResultsObserver(resultTreeViewer + .getTree().getDisplay()); + allResultsObserver = new AllResultsObserver(resultTreeViewer + .getTree().getDisplay()); + + // observe tree changes under MyResults + observationManager.addEventListener(myResultsObserver, + Event.NODE_ADDED | Event.NODE_REMOVED, + SlcJcrResultUtils.getMyResultsBasePath(session), true, + null, observedNodeTypesUnderMyResult, false); + // observe tree changes under All results + observationManager.addEventListener(allResultsObserver, + Event.NODE_ADDED | Event.NODE_REMOVED, + SlcJcrResultUtils.getSlcResultsBasePath(session), true, + null, observedNodeTypesUnderAllResults, false); } catch (RepositoryException e) { throw new SlcException("Cannot register listeners", e); } + } - // Refresh the view to initialize it - refresh(null); + /** + * Override default behaviour so that default defined order remains + * unchanged on first level of the tree + */ + private void setOrderedInput(TreeViewer viewer) { + // Add specific ordering + resultTreeViewer.setInput(null); + viewer.setComparator(null); + resultTreeViewer.setInput(initializeResultTree()); + viewer.setComparator(new ResultItemsComparator()); } // The main tree viewer @@ -177,6 +217,12 @@ public class JcrResultTreeView extends ViewPart { decorator)); viewer.addDoubleClickListener(new ViewDoubleClickListener()); + // Override default behaviour to insure that 2 distincts results that + // have the same name will be correctly and distincly returned by + // corresponding + // TreeViewer.getSelection() method. + viewer.setComparer(new ResultItemsComparer()); + // viewer.setLabelProvider(rtLblProvider); getSite().setSelectionProvider(viewer); @@ -308,11 +354,13 @@ public class JcrResultTreeView extends ViewPart { * */ public void refresh(ResultParent resultParent) { - if (log.isDebugEnabled()) - log.debug("Refreshing '" + resultParent + "'..."); - // Thread.dumpStack(); if (resultParent == null) { - resultTreeViewer.setInput(initializeResultTree()); + if (!resultTreeViewer.getTree().isDisposed()) { + TreePath[] tps = resultTreeViewer.getExpandedTreePaths(); + setOrderedInput(resultTreeViewer); + resultTreeViewer.setExpandedTreePaths(tps); + } else + setOrderedInput(resultTreeViewer); } else { if (resultParent instanceof ParentNodeFolder) { ParentNodeFolder currFolder = (ParentNodeFolder) resultParent; @@ -320,10 +368,8 @@ public class JcrResultTreeView extends ViewPart { currFolder.forceFullRefresh(); } // FIXME: specific refresh does not work - // resultTreeViewer.refresh(currFolder, true); - TreePath[] tps = resultTreeViewer.getExpandedTreePaths(); - resultTreeViewer.setInput(initializeResultTree()); - resultTreeViewer.setExpandedTreePaths(tps); + // resultTreeViewer.refresh(resultParent, true); + refresh(null); } } @@ -335,8 +381,9 @@ public class JcrResultTreeView extends ViewPart { * */ public boolean jcrRefresh(Node node) { - if (log.isDebugEnabled()) - log.debug(" JCR refreshing " + node + "..."); + // if (log.isDebugEnabled()) + // log.debug(" JCR refreshing " + node + "..."); + // Thread.dumpStack(); boolean isPassed = true; try { if (node.isNodeType(SlcTypes.SLC_TEST_RESULT)) { @@ -344,9 +391,6 @@ public class JcrResultTreeView extends ViewPart { .getProperty(SlcNames.SLC_SUCCESS).getBoolean(); } else if (node.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) { NodeIterator ni = node.getNodes(); - // quicker but wrong : refresh will stop as soon as a failed - // test is found and the whole tree won't be refreshed - // while (isPassed && ni.hasNext()){ while (ni.hasNext()) { Node currChild = ni.nextNode(); isPassed = isPassed & jcrRefresh(currChild); @@ -368,56 +412,58 @@ public class JcrResultTreeView extends ViewPart { private ResultParent[] initializeResultTree() { try { - if (session.nodeExists(SlcJcrResultUtils - .getSlcResultsBasePath(session))) { - ResultParent[] roots = new ResultParent[5]; - - // My results - roots[0] = new ParentNodeFolder(null, - SlcJcrResultUtils.getMyResultParentNode(session), - SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL); - - // today - Calendar cal = Calendar.getInstance(); - String relPath = JcrUtils.dateAsPath(cal); - List datePathes = new ArrayList(); - datePathes.add(relPath); - roots[1] = new VirtualFolder(null, - ResultParentUtils.getResultsForDates(session, - datePathes), "Today"); - - // Yesterday - cal = Calendar.getInstance(); - cal.add(Calendar.DAY_OF_YEAR, -1); - relPath = JcrUtils.dateAsPath(cal); - datePathes = new ArrayList(); - datePathes.add(relPath); - roots[2] = new VirtualFolder(null, - ResultParentUtils.getResultsForDates(session, - datePathes), "Yesterday"); - // Last 7 days - - cal = Calendar.getInstance(); - datePathes = new ArrayList(); - - for (int i = 0; i < 7; i++) { - cal.add(Calendar.DAY_OF_YEAR, -i); - relPath = JcrUtils.dateAsPath(cal); - datePathes.add(relPath); - } - roots[3] = new VirtualFolder(null, - ResultParentUtils.getResultsForDates(session, - datePathes), "Last 7 days"); - - // All results - Node otherResultsPar = session.getNode(SlcJcrResultUtils - .getSlcResultsBasePath(session)); - roots[4] = new ParentNodeFolder(null, otherResultsPar, - "All results"); - return roots; - } else - // no test has yet been processed, we leave the viewer blank - return null; + // Force initialization of the tree structure if needed + SlcJcrResultUtils.getSlcResultsParentNode(session); + SlcJcrResultUtils.getMyResultParentNode(session); + // Remove yesterday and last 7 days virtual folders + // ResultParent[] roots = new ResultParent[5]; + ResultParent[] roots = new ResultParent[3]; + + // My results + roots[0] = new ParentNodeFolder(null, + SlcJcrResultUtils.getMyResultParentNode(session), + SlcUiConstants.DEFAULT_MY_RESULTS_FOLDER_LABEL); + + // today + Calendar cal = Calendar.getInstance(); + String relPath = JcrUtils.dateAsPath(cal); + List datePathes = new ArrayList(); + datePathes.add(relPath); + roots[1] = new VirtualFolder(null, + ResultParentUtils.getResultsForDates(session, datePathes), + "Today"); + + // // Yesterday + // cal = Calendar.getInstance(); + // cal.add(Calendar.DAY_OF_YEAR, -1); + // relPath = JcrUtils.dateAsPath(cal); + // datePathes = new ArrayList(); + // datePathes.add(relPath); + // roots[2] = new VirtualFolder(null, + // ResultParentUtils.getResultsForDates(session, datePathes), + // "Yesterday"); + // // Last 7 days + // + // cal = Calendar.getInstance(); + // datePathes = new ArrayList(); + // + // for (int i = 0; i < 7; i++) { + // cal.add(Calendar.DAY_OF_YEAR, -i); + // relPath = JcrUtils.dateAsPath(cal); + // datePathes.add(relPath); + // } + // roots[3] = new VirtualFolder(null, + // ResultParentUtils.getResultsForDates(session, datePathes), + // "Last 7 days"); + + // All results + Node otherResultsPar = session.getNode(SlcJcrResultUtils + .getSlcResultsBasePath(session)); + // roots[4] = new ParentNodeFolder(null, otherResultsPar, + // "All results"); + roots[2] = new ParentNodeFolder(null, otherResultsPar, + "All results"); + return roots; } catch (RepositoryException re) { throw new ArgeoException( "Unexpected error while initializing ResultTree.", re); @@ -432,27 +478,27 @@ public class JcrResultTreeView extends ViewPart { IWorkbenchWindow window = ClientUiPlugin.getDefault().getWorkbench() .getActiveWorkbenchWindow(); - // Building conditions IStructuredSelection selection = (IStructuredSelection) resultTreeViewer .getSelection(); boolean canAddSubfolder = false; + boolean canRenamefolder = false; boolean isSingleResultNode = false; + // Building conditions if (selection.size() == 1) { Object obj = selection.getFirstElement(); try { - // if (obj instanceof ResultFolder - // && (((ResultFolder) obj).getNode()) - // .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) - if (isResultFolder) - canAddSubfolder = true; - else if (obj instanceof SingleResultNode) + if (obj instanceof SingleResultNode) isSingleResultNode = true; - else if (obj instanceof ParentNodeFolder - && (((ParentNodeFolder) obj).getNode().getPath() - .startsWith(SlcJcrResultUtils - .getMyResultsBasePath(session)))) - canAddSubfolder = true; - + else if (obj instanceof ParentNodeFolder) { + Node cNode = ((ParentNodeFolder) obj).getNode(); + if (cNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) { + canAddSubfolder = true; + canRenamefolder = true; + } else if (cNode + .isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER)) { + canAddSubfolder = true; + } + } } catch (RepositoryException re) { throw new SlcException( "unexpected error while building condition for context menu", @@ -468,7 +514,7 @@ public class JcrResultTreeView extends ViewPart { CommandUtils.refreshCommand(menuManager, window, RenameResultFolder.ID, RenameResultFolder.DEFAULT_LABEL, - RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canAddSubfolder); + RenameResultFolder.DEFAULT_IMG_DESCRIPTOR, canRenamefolder); CommandUtils.refreshCommand(menuManager, window, RenameResultNode.ID, RenameResultNode.DEFAULT_LABEL, @@ -545,48 +591,51 @@ public class JcrResultTreeView extends ViewPart { @Override public boolean validateDrop(Object target, int operation, TransferData transferType) { - boolean validDrop = false; try { // We can only drop under myResults Node tpNode = null; - if (target instanceof ResultFolder) { + if (target instanceof SingleResultNode) { + Node currNode = ((SingleResultNode) target).getNode(); + String pPath = currNode.getParent().getPath(); + if (pPath.startsWith(SlcJcrResultUtils + .getMyResultsBasePath(session))) + tpNode = currNode.getParent(); + } else if (target instanceof ResultFolder) { tpNode = ((ResultFolder) target).getNode(); } else if (target instanceof ParentNodeFolder) { - if ((((ParentNodeFolder) target).getNode().getPath() - .startsWith(SlcJcrResultUtils - .getMyResultsBasePath(session)))) + Node node = ((ParentNodeFolder) target).getNode(); + if (node.isNodeType(SlcTypes.SLC_MY_RESULT_ROOT_FOLDER)) tpNode = ((ParentNodeFolder) target).getNode(); - } else if (target instanceof SingleResultNode) { - Node currNode = ((SingleResultNode) target).getNode(); - if (currNode - .getParent() - .getPath() - .startsWith( - SlcJcrResultUtils - .getMyResultsBasePath(session))) - tpNode = currNode.getParent(); } if (tpNode != null) { // Sanity check : we cannot move a folder to one of its sub + // folder or neither move an object in the same parent // folder boolean doit = true; + Node source = null; if (isResultFolder) { - Node source = ((ParentNodeFolder) lastSelectedSourceElement) + source = ((ParentNodeFolder) lastSelectedSourceElement) .getNode(); - String sourcePath = source.getPath(); - String targetPath = tpNode.getPath(); - if (targetPath.startsWith(sourcePath)) + if (tpNode.getPath().startsWith(source.getPath()) + || source.getParent().getPath() + .equals(tpNode.getPath())) + doit = false; + } else if (lastSelectedSourceElement instanceof SingleResultNode) { + source = ((SingleResultNode) lastSelectedSourceElement) + .getNode(); + String sourceParentPath = JcrUtils.parentPath(source + .getPath()); + if (tpNode.getPath().equals(sourceParentPath)) doit = false; } if (doit) { targetParentNode = tpNode; validDrop = true; - lastSelectedTargetElement = (ResultParent) target; + // lastSelectedTargetElement = (ResultParent) target; } } - } catch (RepositoryException re) { throw new SlcException( "unexpected error while validating drop target", re); @@ -601,7 +650,6 @@ public class JcrResultTreeView extends ViewPart { try { Node source = session.getNodeByIdentifier((String) data); - // Check is a node with same name already exists at destination String name; if (source.hasProperty(Property.JCR_TITLE)) name = source.getProperty(Property.JCR_TITLE).getString(); @@ -611,12 +659,16 @@ public class JcrResultTreeView extends ViewPart { else name = source.getName(); - if (targetParentNode.hasNode(name)) { + // Check if a user defined folder result with same name exists + // at target + if (targetParentNode.hasNode(name) + && targetParentNode.getNode(name).isNodeType( + SlcTypes.SLC_RESULT_FOLDER)) { ConfirmOverwriteWizard wizard = new ConfirmOverwriteWizard( name, targetParentNode); WizardDialog dialog = new WizardDialog(Display.getDefault() .getActiveShell(), wizard); - + if (dialog.open() == WizardDialog.CANCEL) return true; @@ -628,8 +680,10 @@ public class JcrResultTreeView extends ViewPart { } Node target; + boolean passedStatus = source.getNode(SlcNames.SLC_STATUS) + .getProperty(SlcNames.SLC_SUCCESS).getBoolean(); if (!isActionUnderMyResult) {// Copy - target = targetParentNode.addNode(name, source + target = targetParentNode.addNode(source.getName(), source .getPrimaryNodeType().getName()); JcrUtils.copy(source, target); } else {// move @@ -637,16 +691,18 @@ public class JcrResultTreeView extends ViewPart { String destPath = targetParentNode.getPath() + "/" + name; session.move(sourcePath, destPath); // session.save(); + // Update passed status of the parent source Node + ResultParentUtils.updatePassedStatus( + session.getNode(JcrUtils.parentPath(sourcePath)), + true); target = session.getNode(destPath); + } if (!target.isNodeType(NodeType.MIX_TITLE)) target.addMixin(NodeType.MIX_TITLE); target.setProperty(Property.JCR_TITLE, name); - ResultParentUtils - .updatePassedStatus(target, - target.getNode(SlcNames.SLC_STATUS) - .getProperty(SlcNames.SLC_SUCCESS) - .getBoolean()); + ResultParentUtils.updatePassedStatus(target.getParent(), + passedStatus); session.save(); } catch (RepositoryException re) { throw new SlcException( @@ -656,9 +712,9 @@ public class JcrResultTreeView extends ViewPart { } } - class ResultObserver extends AsyncUiEventListener { + class MyResultsObserver extends AsyncUiEventListener { - public ResultObserver(Display display) { + public MyResultsObserver(Display display) { super(display); } @@ -671,40 +727,42 @@ public class JcrResultTreeView extends ViewPart { protected void onEventInUiThread(List events) throws RepositoryException { - int i = 0; + List nodesToRefresh = new ArrayList(); for (Event event : events) { - i++; - // if (log.isDebugEnabled()) - // log.debug("Received event " + event); - int eventType = event.getType(); - if (eventType == Event.NODE_REMOVED) { - String path = event.getPath(); - String parPath = JcrUtils.parentPath(path); - if (session.nodeExists(parPath)) { - Node currNode = session.getNode(parPath); - if (currNode.isNodeType(NodeType.NT_UNSTRUCTURED)) { - // jcrRefresh(currNode); - refresh(lastSelectedSourceElementParent); - } - } - } else if (eventType == Event.NODE_ADDED) { - // refresh(lastSelectedTargetElement); - String path = event.getPath(); - if (session.nodeExists(path)) { - Node currNode = session.getNode(path); - if (currNode.isNodeType(SlcTypes.SLC_TEST_RESULT) - || currNode - .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) { - refresh(lastSelectedTargetElement); - // resultTreeViewer.expandToLevel( - // lastSelectedTargetElement, 1); - } + String parPath = JcrUtils.parentPath(event.getPath()); + if (session.nodeExists(parPath)) { + Node node = session.getNode(parPath); + if (!nodesToRefresh.contains(node)) { + nodesToRefresh.add(node); } } } - if (log.isDebugEnabled()) - log.debug("treated events: " + i); + + // Update check nodes + for (Node node : nodesToRefresh) + jcrRefresh(node); + refresh(null); + } + } + + class AllResultsObserver extends AsyncUiEventListener { + + public AllResultsObserver(Display display) { + super(display); + } + + @Override + protected Boolean willProcessInUiThread(List events) + throws RepositoryException { + // unfiltered for the time being + return true; + } + + protected void onEventInUiThread(List events) + throws RepositoryException { + if (lastSelectedSourceElementParent != null) + refresh(lastSelectedSourceElementParent); } } @@ -747,7 +805,7 @@ public class JcrResultTreeView extends ViewPart { else propertiesViewer.setInput(null); // update cache for Drag & drop - lastSelectedTargetElement = firstItem; + // lastSelectedTargetElement = firstItem; lastSelectedSourceElement = firstItem; lastSelectedSourceElementParent = (ResultParent) firstItem .getParent();