From: Bruno Sinou Date: Thu, 15 Nov 2012 11:38:20 +0000 (+0000) Subject: Fix last issues on ResultTreeViewer before the release X-Git-Tag: argeo-slc-2.1.7~532 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=ebd53b4434140425f5ed3d10d3059ff95c0dba0f;p=gpl%2Fargeo-slc.git Fix last issues on ResultTreeViewer before the release git-svn-id: https://svn.argeo.org/slc/trunk@5828 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- 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 e8f10bffa..d569167dc 100644 --- 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 @@ -165,46 +165,4 @@ public class ResultParentUtils { throw new SlcException("Cannot update result passed status", e); } } - - public static void updateStatusOnRemoval(Node node) { - try { - if (!node.hasNode(SlcNames.SLC_STATUS)) - // nothing to do - return; - boolean pStatus = node.getNode(SlcNames.SLC_STATUS) - .getProperty(SlcNames.SLC_SUCCESS).getBoolean(); - if (pStatus == true) - // nothing to update - return; - else { - // success we must first check if all siblings have also - // successfully completed - boolean success = true; - NodeIterator ni = node.getNodes(); - children: while (ni.hasNext()) { - Node currNode = ni.nextNode(); - if ((currNode.isNodeType(SlcTypes.SLC_DIFF_RESULT) || currNode - .isNodeType(SlcTypes.SLC_RESULT_FOLDER)) - && !currNode.getNode(SlcNames.SLC_STATUS) - .getProperty(SlcNames.SLC_SUCCESS) - .getBoolean()) { - success = false; - break children; - } - } - if (success) { - node.getNode(SlcNames.SLC_STATUS).setProperty( - SlcNames.SLC_SUCCESS, true); - updatePassedStatus(node, true); - } else - // one of the siblings had also the failed status so - // above tree remains unchanged. - return; - } - } catch (RepositoryException e) { - throw new SlcException( - "Unexpected error while updating status on removal", e); - } - } - }