enhance management of context menus and commands. Remove a few bugs.

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / model / ResultFolder.java

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java
index a5c43168ec18ce34e518bd379d0ed9faf9606976..c564492d889f87b6c6febef4e210f5e7a861b8d9 100644 (file)
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/model/ResultFolder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * 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.
@@ -16,20 +16,16 @@
 package org.argeo.slc.client.ui.model;
 
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
 import org.argeo.slc.SlcException;
 import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 
 /**
  * UI Tree component that wrap a node of type ResultFolder. list either other
  * folders and/or a list of results. keeps a reference to its parent.
  */
-public class ResultFolder extends ResultParent implements Comparable<ResultFolder> {
-
-       private Node node = null;
+public class ResultFolder extends ParentNodeFolder {
 
        /**
         * 
@@ -38,68 +34,29 @@ public class ResultFolder extends ResultParent implements Comparable<ResultFolde
         *            throws an exception if null
         * @param name
         */
-       public ResultFolder(ResultParent parent, Node node, String name) {
-               super(name);
+       public ResultFolder(ParentNodeFolder parent, Node node, String name) {
+               super(parent, node, name);
                try {
-                       if (node == null)
-                               throw new SlcException("Node Object cannot be null");
-                       setParent(parent);
-                       this.node = node;
                        // initialize passed status if possible
-                       if (node.hasNode(SlcNames.SLC_STATUS))
-                               setPassed(node.getNode(SlcNames.SLC_STATUS)
+                       if (node.hasNode(SlcNames.SLC_AGGREGATED_STATUS))
+                               setPassed(node.getNode(SlcNames.SLC_AGGREGATED_STATUS)
                                                .getProperty(SlcNames.SLC_SUCCESS).getBoolean());
                } catch (RepositoryException re) {
                        throw new SlcException(
                                        "Unexpected error while initializing result folder : "
                                                        + getName(), re);
                }
-
-       }
-
-       @Override
-       protected void initialize() {
-               try {
-                       NodeIterator ni = node.getNodes();
-                       while (ni.hasNext()) {
-                               Node currNode = ni.nextNode();
-                               if (currNode.isNodeType(SlcTypes.SLC_TEST_RESULT)) {
-                                       SingleResultNode srn = new SingleResultNode(this, currNode,
-                                                       currNode.getProperty(SlcNames.SLC_TEST_CASE)
-                                                                       .getString());
-                                       addChild(srn);
-                               } else if (currNode.isNodeType(SlcTypes.SLC_RESULT_FOLDER)) {
-                                       // FIXME change label
-                                       ResultFolder rf = new ResultFolder(this, currNode,
-                                                       currNode.getName());
-                                       addChild(rf);
-                               }
-                       }
-               } catch (RepositoryException re) {
-                       throw new SlcException(
-                                       "Unexpected error while initializing result folder : "
-                                                       + getName(), re);
-               }
        }
 
-       @Override
-       public synchronized void dispose() {
-               super.dispose();
-       }
-
-       public Node getNode() {
-               return node;
-       }
-
-       /**
-        * Overriden to return an ordered list of children
-        */
-       public synchronized Object[] getChildren() {
-               Object[] children = super.getChildren();
-               return ResultParentUtils.orderChildren(children);
-       }
-
-       public int compareTo(ResultFolder o) {
-               return super.compareTo(o);
-       }
+       // /**
+       // * Overriden to return an ordered list of children
+       // */
+       // public synchronized Object[] getChildren() {
+       // Object[] children = super.getChildren();
+       // return ResultParentUtils.orderChildren(children);
+       // }
+       //
+       // public int compareTo(ResultFolder o) {
+       // return super.compareTo(o);
+       // }
 }
\ No newline at end of file