refactoring of the Metrics and the chain Renderer

7 files changed, 223 insertions, 284 deletions

diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java
index c225c6c16..ba69c0ee4 100644
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java
+++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Chain.java
@@ -6,10 +6,12 @@ import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.OperationCanceledException;
 import org.eclipse.jubula.client.analyze.definition.IAnalyze;
+import org.eclipse.jubula.client.analyze.impl.standard.i18n.Messages;
 import org.eclipse.jubula.client.analyze.internal.AnalyzeParameter;
 import org.eclipse.jubula.client.analyze.internal.AnalyzeResult;
 import org.eclipse.jubula.client.analyze.internal.helper.PortableNodeInformationHelper;
 import org.eclipse.jubula.client.analyze.internal.helper.ProjectContextHelper;
+import org.eclipse.jubula.client.core.model.IEventExecTestCasePO;
 import org.eclipse.jubula.client.core.model.IExecTestCasePO;
 import org.eclipse.jubula.client.core.model.INodePO;
 import org.eclipse.jubula.client.core.model.IProjectPO;
@@ -19,22 +21,23 @@ import org.eclipse.jubula.client.core.persistence.NodePM;
 import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOperation;
 import org.eclipse.jubula.client.core.utils.ITreeTraverserContext;
 import org.eclipse.jubula.client.core.utils.TreeTraverser;
+
 /**
  * 
  * @author volker
- *
+ * 
  */
 public class Chain implements IAnalyze {
     /**
      * Contains the found chains
      */
     private List<Object> m_chains = new ArrayList<Object>();
-    
+
     /**
      * Contains every chainParent
      */
-    private List<ISpecTestCasePO> m_chainParents; 
-    
+    private List<ISpecTestCasePO> m_chainParents;
+
     /**
      * the currently parent SpecTestCase
      */
@@ -44,83 +47,91 @@ public class Chain implements IAnalyze {
      * the given ProgressMonitor
      */
     private IProgressMonitor m_monitor;
-    
+
     /**
      * represents a chain
      */
     private List<String> m_chain;
-    
+
     /**
      * contains The lists that represent the found chains
      */
     private List<List<String>> m_lists;
-    
+
     /**
      * @return The lists that contains the chains lists
      */
     public List<List<String>> getLists() {
         return m_lists;
     }
-    
+
     /**
-     * @param lists The List that contains the Lists that represent the chains
+     * @param lists
+     *            The List that contains the Lists that represent the chains
      */
     public void setLists(List<List<String>> lists) {
         this.m_lists = lists;
     }
+
     /**
      * @return The chain
      */
     public List<String> getChain() {
         return m_chain;
     }
-    
+
     /**
-     * @param chain The List that is going to be set as the actual chain
+     * @param chain
+     *            The List that is going to be set as the actual chain
      */
     public void setChain(List<String> chain) {
         this.m_chain = chain;
     }
+
     /**
      * @return The ProgressMonitor
      */
     public IProgressMonitor getMonitor() {
         return m_monitor;
     }
-    
+
     /**
-     * @param monitor The given ProgressMonitor
+     * @param monitor
+     *            The given ProgressMonitor
      */
     public void setMonitor(IProgressMonitor monitor) {
         this.m_monitor = monitor;
     }
+
     /**
      * @return The parent SpecTestCase
      */
     public ISpecTestCasePO getParentSpecTC() {
         return m_parentSpecTC;
     }
-    
+
     /**
-     * @param parent The parent SpecTestCase that is to be set
+     * @param parent
+     *            The parent SpecTestCase that is to be set
      */
     public void setParentSpecTC(ISpecTestCasePO parent) {
         this.m_parentSpecTC = parent;
     }
+
     /**
      * @return ArrayList that contains the parent SpecTestCases of a chain
      */
     public List<ISpecTestCasePO> getParents() {
         return m_chainParents;
     }
-    
+
     /**
-     * @param parents The given List with ISpecTestCasePOs
+     * @param parents
+     *            The given List with ISpecTestCasePOs
      */
     public void setParents(List<ISpecTestCasePO> parents) {
         this.m_chainParents = parents;
     }
-    
 
     /**
      * @return ArrayList that contains every chain that has been found
@@ -140,26 +151,30 @@ public class Chain implements IAnalyze {
          * the given ProgressMonitor
          */
         private IProgressMonitor m_monitor;
-        
+
         /** local cache */
         private List<String> m_singleUseNodeGUID = new ArrayList<String>();
-        
+
         /**
          * Constructor
-         * @param monitor The given ProgressMonitor
+         * 
+         * @param monitor
+         *            The given ProgressMonitor
          */
         public NodeOperation(IProgressMonitor monitor) {
             setMonitor(monitor);
         }
+
         /**
          * @return The ProgressMonitor
          */
         public IProgressMonitor getMonitor() {
             return m_monitor;
         }
-        
+
         /**
-         * @param monitor The given ProgressMonitor
+         * @param monitor
+         *            The given ProgressMonitor
          */
         public void setMonitor(IProgressMonitor monitor) {
             this.m_monitor = monitor;
@@ -177,42 +192,64 @@ public class Chain implements IAnalyze {
          */
         public boolean operate(ITreeTraverserContext<INodePO> ctx,
                 INodePO parent, INodePO node, boolean alreadyVisited) {
+            if (!(node instanceof IEventExecTestCasePO)) {
+
+                if (node instanceof ISpecTestCasePO) {
 
-//            System.out.println("nodename: " + node.getName());
-            if (node instanceof ISpecTestCasePO) {
-                
-                ISpecTestCasePO spec = (ISpecTestCasePO) node;
+                    ISpecTestCasePO spec = (ISpecTestCasePO) node;
 
-                // save the Guid and the matching parentProjectGuid 
-                PortableNodeInformationHelper.getNodeInformation().put(
-                        spec.getGuid(), spec.getParentProjectId());
+                    // save the Guid and the matching parentProjectGuid
+                    PortableNodeInformationHelper.getNodeInformation().put(
+                            spec.getGuid(), spec.getParentProjectId());
+
+                    // check if the SpecTestCase is referenced only one time
+                    // and has only one child
+                    if ((!getSingleUsedNodeGUIDs().contains(spec.getGuid()))
+                            && (NodePM.getInternalExecTestCases(spec.getGuid(),
+                                    (spec.getParentProjectId()))).size() == 1
+                            && ((spec.getUnmodifiableNodeList().size() <= 1))) {
+
+                        getSingleUsedNodeGUIDs().add(spec.getGuid());
+                        return !alreadyVisited;
+                    }
+                }
 
-                // check if the SpecTestCase is referenced only one time 
-                // and has only one child
-                if ((!getSingleUsedNodeGUIDs().contains(spec.getGuid()))
-                        && (NodePM.getInternalExecTestCases(spec.getGuid(),
-                                (spec.getParentProjectId()))).size() == 1
-                        && ((spec.getUnmodifiableNodeList().size() <= 1))) {
+                if (node instanceof IExecTestCasePO) {
 
-                    getSingleUsedNodeGUIDs().add(spec.getGuid());
+                    IExecTestCasePO exec = (IExecTestCasePO) node;
+                    exec.getSpecTestCase();
+                    if (exec.getSpecTestCase() != null) {
+
+                        ISpecTestCasePO spec = exec.getSpecTestCase();
+
+                        if (spec.getParentProjectId() != GeneralStorage
+                                .getInstance().getProject().getId()) {
+                            PortableNodeInformationHelper.getNodeInformation()
+                                    .put(spec.getGuid(),
+                                            spec.getParentProjectId());
+
+                            if ((!getSingleUsedNodeGUIDs().contains(
+                                    spec.getGuid()))
+                                    && (NodePM.getInternalExecTestCases(
+                                            spec.getGuid(),
+                                            (spec.getParentProjectId())))
+                                            .size() == 1
+                                    && (spec.getParentProjectId().toString()
+                                            .equals(GeneralStorage
+                                                    .getInstance().getProject()
+                                                    .getId().toString()))) {
+                                getSingleUsedNodeGUIDs().add(spec.getGuid());
+                                return !alreadyVisited;
+                            }
+                        }
+                    }
                     return !alreadyVisited;
                 }
-            } 
-            
-            if (node instanceof IExecTestCasePO) {
-                IExecTestCasePO exec = (IExecTestCasePO) node;
-                ISpecTestCasePO spec = exec.getSpecTestCase();
-                if (spec.getParentProjectId() != GeneralStorage.getInstance()
-                        .getProject().getId()) {
-                    PortableNodeInformationHelper.getNodeInformation().put(
-                            spec.getGuid(), spec.getParentProjectId());
+                getMonitor().worked(1);
+                if (getMonitor().isCanceled()) {
+                    getMonitor().done();
+                    throw new OperationCanceledException();
                 }
-                return !alreadyVisited;
-            }
-            getMonitor().worked(1);
-            if (getMonitor().isCanceled()) {
-                getMonitor().done();
-                throw new OperationCanceledException();
             }
             return !alreadyVisited;
         }
@@ -228,26 +265,48 @@ public class Chain implements IAnalyze {
         // get the number of nodes from the NodePersistenceManager to have a
         // representative workAmount value for the ProgressMonitor
         if (obj2analyze instanceof IProjectPO) {
-            workAmount = ((int) NodePM.getNumNodes(
-                    ((IProjectPO) obj2analyze).getId(),
+            workAmount = 3 + ((int) NodePM.getNumNodes(
+                    ((IProjectPO) obj2analyze).getId(), 
                     GeneralStorage.getInstance().getMasterSession()));
         } else if (obj2analyze instanceof INodePO) {
-            workAmount = ((int) NodePM.getNumNodes(
+            workAmount = 3 + ((int) NodePM.getNumNodes(
                     ((INodePO) obj2analyze).getParentProjectId(),
                     GeneralStorage.getInstance().getMasterSession()));
         }
         monitor.beginTask("", workAmount);
-        monitor.subTask(analyzeName);
+        monitor.subTask(Messages.AnalysingProjects);
+        
 
         NodeOperation nodeOp = new NodeOperation(monitor);
-        
+
         traverse(obj2analyze, nodeOp, ProjectContextHelper.getObjContType());
-        // set the parents  List
+
+        monitor.subTask(Messages.ChainBeginning);
+        // set the parents List
         setParents(new ArrayList<ISpecTestCasePO>());
+        monitor.worked(1);
+        if (monitor.isCanceled()) {
+            monitor.done();
+            throw new OperationCanceledException();
+        }
+        
+        monitor.subTask(Messages.PossibleChilds);
         anlayzePossibleChainElements(nodeOp);
+        if (monitor.isCanceled()) {
+            monitor.done();
+            throw new OperationCanceledException();
+        }
 
+        
+        List<ISpecTestCasePO> l = getParents();
+        l.size();
+        monitor.subTask(Messages.ConstructChains);
         constructChains();
-
+        
+        if (monitor.isCanceled()) {
+            monitor.done();
+            throw new OperationCanceledException();
+        }
         return new AnalyzeResult(resultType, getLists());
     }
 
@@ -262,9 +321,9 @@ public class Chain implements IAnalyze {
      * @param objContType
      *            The given ObjContType
      */
-    private void traverse(Object obj, NodeOperation nodeOp,
+    private void traverse(Object obj, NodeOperation nodeOp, 
             String objContType) {
-        
+
         if (obj instanceof INodePO && objContType.equals("IExecObjContPO")) {
             final INodePO root = (INodePO) obj;
             TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) {
@@ -279,7 +338,7 @@ public class Chain implements IAnalyze {
         } else if (obj instanceof INodePO
                 && objContType.equals("ISpecObjContPO")) {
             final INodePO root = (INodePO) obj;
-            TreeTraverser tt = new TreeTraverser(root, nodeOp, true, false) {
+            TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) {
                 @Override
                 protected void traverseReusedProjectSpecPart(
                         ITreeTraverserContext<INodePO> context,
@@ -288,7 +347,7 @@ public class Chain implements IAnalyze {
                 }
             };
             tt.traverse(true);
-        }    else if (obj instanceof INodePO && objContType.equals("project")) {
+        } else if (obj instanceof INodePO && objContType.equals("project")) {
             final INodePO root = (INodePO) obj;
             TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) {
                 @Override
@@ -299,7 +358,7 @@ public class Chain implements IAnalyze {
                 }
             };
             tt.traverse(true);
-        }    else if (obj instanceof INodePO && objContType.equals("")) {
+        } else if (obj instanceof INodePO && objContType.equals("")) {
             final INodePO root = (INodePO) obj;
             TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) {
                 @Override
@@ -321,52 +380,69 @@ public class Chain implements IAnalyze {
      *            The given NodeOperation
      */
     private void anlayzePossibleChainElements(NodeOperation nodeOp) {
-        
+        boolean isParent;
+
         for (String guid : nodeOp.getSingleUsedNodeGUIDs()) {
+            isParent = true;
             ISpecTestCasePO toCheck = NodePM.getSpecTestCase(
-                    GeneralStorage.getInstance().getProject().getId(), guid);
-            findParents(nodeOp, toCheck);
-        }
-    }
-    /**
-     * @param nodeOp The given NodeOp
-     * @param toCheck The given Node that is to be checked
-     */
-    private void findParents(NodeOperation nodeOp, ISpecTestCasePO toCheck) {
+                    PortableNodeInformationHelper.getNodeInformation()
+                            .get(guid), guid);
+            if (toCheck != null) {
 
-        long projectID = GeneralStorage.getInstance().getProject().getId();
-        
-        for (String guid : nodeOp.getSingleUsedNodeGUIDs()) {
-           
-            ISpecTestCasePO current = NodePM.getSpecTestCase(projectID, guid);
-
-            if (current.getUnmodifiableNodeList().size() == 1) {
-                
-                IExecTestCasePO exec = (IExecTestCasePO) current.
-                        getUnmodifiableNodeList().get(0);
-                ISpecTestCasePO spec = exec.getSpecTestCase();
-                
-                if (spec.getGuid().equals(toCheck.getGuid())) {
-                    setParentSpecTC(current);
-                    findParents(nodeOp, current);
+                for (String ppGuid : nodeOp.getSingleUsedNodeGUIDs()) {
+
+                    ISpecTestCasePO possibleParent = NodePM.getSpecTestCase(
+                            PortableNodeInformationHelper.getNodeInformation()
+                                    .get(ppGuid), ppGuid);
+                    if (possibleParent != null
+                            && possibleParent.getUnmodifiableNodeList().
+                                size() == 1) {
+
+                        IExecTestCasePO exec = (IExecTestCasePO) possibleParent
+                                .getUnmodifiableNodeList().get(0);
+                        if (exec != null) {
+
+                            ISpecTestCasePO spec = exec.getSpecTestCase();
+
+                            if (spec != null) {
+
+                                if ((spec.getGuid().equals(toCheck.getGuid()))
+                                        || (NodePM.getInternalExecTestCases(
+                                                toCheck.getGuid(),
+                                                toCheck.getParentProjectId())
+                                                .size() == 0)
+                                        || toCheck.getUnmodifiableNodeList()
+                                                .size() == 0) {
+                                    isParent = false;
+                                }
+                            }
+                        }
+                    }
+                }
+                if (isParent
+                        && (!getParents().contains(toCheck))
+                        && (toCheck.getUnmodifiableNodeList().size() == 1)
+                        && (NodePM.getInternalExecTestCases(toCheck.getGuid(),
+                                toCheck.getParentProjectId()).size() == 1)) {
+                    getParents().add(toCheck);
                 }
             }
         }
-        if ((getParentSpecTC() != null) 
-                && (!getParents().contains(getParentSpecTC()))) {
-            getParents().add(getParentSpecTC());
-        }
     }
+
     /**
      * 
      */
     private void constructChains() {
 
         setLists(new ArrayList<List<String>>());
-        
+
+        List<ISpecTestCasePO> l = getParents();
+//        System.out.println("parents");
+
         ISpecTestCasePO currentSTC;
         for (ISpecTestCasePO curr : getParents()) {
-        
+
             setChain(new ArrayList<String>());
             // add the parent as the first element of the chain
             getChain().add(curr.getGuid());
@@ -374,22 +450,30 @@ public class Chain implements IAnalyze {
             getLists().add(getChain());
         }
     }
+
     /**
      * get the childs of this parent and add them to the chainList
-     * @param parent the parentSpecTC
-     * @param chain The given chainList
+     * 
+     * @param parent
+     *            the parentSpecTC
+     * @param chain
+     *            The given chainList
      * @return the childnode
      */
     private ISpecTestCasePO getChainChildren(ISpecTestCasePO parent,
             List<String> chain) {
         if (parent.getUnmodifiableNodeList().size() == 1) {
-    
-            IExecTestCasePO exec = 
-                    (IExecTestCasePO) parent.getUnmodifiableNodeList().get(0);
-            ISpecTestCasePO child = exec.getSpecTestCase();
-            
-            chain.add(child.getGuid());
-            getChainChildren(child, chain);
+
+            if (parent.getUnmodifiableNodeList().get(0) 
+                    instanceof IExecTestCasePO) {
+
+                IExecTestCasePO exec = (IExecTestCasePO) parent
+                        .getUnmodifiableNodeList().get(0);
+                ISpecTestCasePO child = exec.getSpecTestCase();
+
+                chain.add(child.getGuid());
+                getChainChildren(child, chain);
+            }
         }
         return null;
     }
diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Hierarchy.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Hierarchy.java
deleted file mode 100644
index b0dfa24b5..000000000
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Hierarchy.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.eclipse.jubula.client.analyze.impl.standard.analyze;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jubula.client.analyze.definition.IAnalyze;
-import org.eclipse.jubula.client.analyze.internal.AnalyzeParameter;
-import org.eclipse.jubula.client.analyze.internal.AnalyzeResult;
-import org.eclipse.jubula.client.core.model.IExecTestCasePO;
-import org.eclipse.jubula.client.core.model.INodePO;
-import org.eclipse.jubula.client.core.model.IProjectPO;
-import org.eclipse.jubula.client.core.model.ISpecTestCasePO;
-import org.eclipse.jubula.client.core.persistence.GeneralStorage;
-import org.eclipse.jubula.client.core.persistence.NodePM;
-import org.eclipse.jubula.client.core.utils.AbstractNonPostOperatingTreeNodeOperation;
-import org.eclipse.jubula.client.core.utils.ITreeTraverserContext;
-import org.eclipse.jubula.client.core.utils.TreeTraverser;
-
-/**
- * @author volker
- * 
- */
-public class Hierarchy implements IAnalyze {
-
-//
-//    /**
-//     * contains The TopNodes of an empty chain
-//     */
-//    private Map<String, ISpecTestCasePO> m_chainTopNodes = 
-//            new HashMap<String, ISpecTestCasePO>();
-//    
-//    /**
-//     * @return The Map that contains the SpecTestCasePOs that are TopNodes of an empty chain 
-//     */
-//    private Map<String, ISpecTestCasePO> getChainTopNodes() {
-//        return this.m_chainTopNodes;
-//    }
-//    
-//    private ISpecTestCasePO m_parent;
-//    
-//    private ISpecTestCasePO getParent() {
-//        return this.m_parent;
-//    }
-//    
-//    private void setParent(ISpecTestCasePO parent) {
-//        this.m_parent = parent;
-//    }
-
-    /**
-     * @author volker
-     * 
-     */
-    static class NodeOperation extends
-            AbstractNonPostOperatingTreeNodeOperation<INodePO> {
-
-        /** local cache */
-        private List<String> m_singleUseNodeGUID = new ArrayList<String>();
-        
-        /**
-         * @return The Map that contains the singleUsedNodeGUIDs
-         */
-        private List<String> getSingelUsedNodeGUIDs() {
-            return this.m_singleUseNodeGUID;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        public boolean operate(ITreeTraverserContext<INodePO> ctx,
-                INodePO parent, INodePO node, boolean alreadyVisited) {
-
-            if (node instanceof IExecTestCasePO) {
-                ISpecTestCasePO spec = ((IExecTestCasePO) node)
-                        .getSpecTestCase();
-
-                if ((!getSingelUsedNodeGUIDs().contains(spec.getGuid()))
-                        && (NodePM.getInternalExecTestCases(spec.getGuid(),
-                                (spec.getParentProjectId()))).size() == 1
-                        && ((spec.getUnmodifiableNodeList().size() <= 1))) {
-
-                    getSingelUsedNodeGUIDs().add(spec.getGuid());
-                    return !alreadyVisited;
-                }
-            } else if (node instanceof ISpecTestCasePO) {
-
-                ISpecTestCasePO spec = (ISpecTestCasePO) node;
-
-                if ((!getSingelUsedNodeGUIDs().contains(spec.getGuid()))
-                        && (NodePM.getInternalExecTestCases(spec.getGuid(),
-                                (spec.getParentProjectId()))).size() == 1
-                        && ((spec.getUnmodifiableNodeList().size() <= 1))) {
-
-                    getSingelUsedNodeGUIDs().add(spec.getGuid());
-                    return !alreadyVisited;
-                }
-            }
-            return !alreadyVisited;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public AnalyzeResult execute(Object obj2analyze, IProgressMonitor monitor,
-            String resultType, List<AnalyzeParameter> param, 
-            String analyzeName) {
-        int workAmount = 1;
-        // get the number of nodes from the NodePersistenceManager to have a
-        // representative workAmount value for the ProgressMonitor
-        if (obj2analyze instanceof IProjectPO) {
-            workAmount = (int) NodePM.getNumNodes(((IProjectPO) obj2analyze)
-                    .getId(), GeneralStorage.getInstance().getMasterSession());
-        } else if (obj2analyze instanceof INodePO) {
-            workAmount = (int) NodePM.getNumNodes(
-                    ((INodePO) obj2analyze).getParentProjectId(),
-                    GeneralStorage.getInstance().getMasterSession());
-        }
-        monitor.beginTask("", workAmount);
-        monitor.subTask(analyzeName);
-
-        NodeOperation nodeOp = new NodeOperation();
-        traverse(obj2analyze, nodeOp);
-
-        System.out.println(nodeOp.getSingelUsedNodeGUIDs().size());
-        return null;
-    }
-
-    /**
-     * Creates a new instance of the TreeTraverser, adds the given Operation and
-     * traverses
-     * 
-     * @param obj2analyze
-     *            The given Selection
-     * @param nodeOp
-     *            The given NodeOperation
-     */
-    private void traverse(Object obj2analyze, NodeOperation nodeOp) {
-
-        if (obj2analyze instanceof INodePO) {
-            INodePO root = (INodePO) obj2analyze;
-
-            TreeTraverser tt = new TreeTraverser(root, nodeOp, true, true) {
-                @Override
-                protected void traverseReusedProjectSpecPart(
-                        ITreeTraverserContext<INodePO> context,
-                        IProjectPO project) {
-                    // ignore reused Projects
-                }
-            };
-            tt.traverse(true);
-        }
-    }
-
-}
diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java
index cabf4562a..a14c4242f 100644
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java
+++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/NumericalProjectElementCounter.java
@@ -215,25 +215,18 @@ public class NumericalProjectElementCounter implements IAnalyze {
             };
             tt.traverse(true);
         }
-//        if (obj2analyze instanceof INodePO) {
-//            final INodePO root = (INodePO) obj2analyze;
-//
-//            TreeTraverser tt = new TreeTraverser(root, count, true, true) {
-//                @Override
-//                protected void traverseReusedProjectSpecPart(
-//                        ITreeTraverserContext<INodePO> context,
-//                        IProjectPO project) {
-//                    // ignore reused Projects
-//                }
-//            };
-//            tt.traverse(true);
-//        }
-        
-//        if (obj instanceof INodePO) {
-//            final INodePO root = (INodePO) obj;
-//            TreeTraverser tt = new TreeTraverser(root);
-//            tt.addOperation(count);
-//            tt.traverse();
-//        }
+        if (obj instanceof INodePO && objContType.equals("")) {
+            final INodePO root = (INodePO) obj;
+            
+            TreeTraverser tt = new TreeTraverser(root, count, true, true) {
+                @Override
+                protected void traverseReusedProjectSpecPart(
+                        ITreeTraverserContext<INodePO> context,
+                        IProjectPO project) {
+                    // ignore reused Projects
+                }
+            };
+            tt.traverse(true);
+        }
     }
 }
diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java
index 52426cf4e..b79585ef2 100644
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java
+++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/analyze/Ratio.java
@@ -350,6 +350,19 @@ public class Ratio implements IAnalyze {
             };
             tt.traverse(true);
         }
+        if (obj instanceof INodePO && objContType.equals("")) {
+            final INodePO root = (INodePO) obj;
+            
+            TreeTraverser tt = new TreeTraverser(root, count, true, true) {
+                @Override
+                protected void traverseReusedProjectSpecPart(
+                        ITreeTraverserContext<INodePO> context,
+                        IProjectPO project) {
+                    // ignore reused Projects
+                }
+            };
+            tt.traverse(true);
+        }
         // checks if there are Referenced TestSuites that have to be considered
         if (count.getRefTestSuites().size() != 0) {
             for (int i = 0; i < count.getRefTestSuites().size(); i++) {
diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/Messages.java b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/Messages.java
index ee7a13e55..5cd453371 100644
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/Messages.java
+++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/Messages.java
@@ -21,9 +21,11 @@ public class Messages extends NLS {
     public static String MonitorCanceled;
     public static String Running;
     public static String General;
-
+    public static String AnalysingProjects;
+    public static String ChainBeginning;
+    public static String PossibleChilds;
+    public static String ConstructChains;
     
-
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/messages.properties b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/messages.properties
index ce2b4c31c..f2336c584 100644
--- a/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/messages.properties
+++ b/org.eclipse.jubula.client.analyze.impl.standard/src/org/eclipse/jubula/client/analyze/impl/standard/i18n/messages.properties
@@ -1,3 +1,7 @@
 MonitorCanceled=Monitor canceled
 Running=Running: 
-General=general 
\ No newline at end of file
+General=general 
+AnalysingProjects=Show empty chains: Analyzing the Project
+ChainBeginning=Show empty chains: Getting the possible beginnings of chains.
+PossibleChilds=Show empty chains: Analyzing the possible child elements.
+ConstructChains=Show empty chains: Constructing the chains.
\ No newline at end of file
diff --git a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java
index 48f56c2ee..7cc3d26c4 100644
--- a/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java
+++ b/org.eclipse.jubula.client.analyze.ui/src/org/eclipse/jubula/client/analyze/ui/renderer/ChainRenderer.java
@@ -293,8 +293,6 @@ public class ChainRenderer implements IResultRendererUI {
                     prev = guid;
                 }
             }
-//                
-//            }
             return null;
         }
         /**