From d982ffa9b1bdf3cf1fa2b19737134d4714569a5a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 29 Aug 2014 08:07:09 +0000
Subject: [PATCH] Code cleanup
---
opends/src/server/org/opends/server/core/WorkflowTopology.java | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/WorkflowTopology.java b/opends/src/server/org/opends/server/core/WorkflowTopology.java
index 32b609a..cd61382 100644
--- a/opends/src/server/org/opends/server/core/WorkflowTopology.java
+++ b/opends/src/server/org/opends/server/core/WorkflowTopology.java
@@ -22,14 +22,13 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2014 ForgeRock AS
*/
package org.opends.server.core;
-
import org.opends.server.types.DN;
import org.opends.server.types.SearchScope;
-
/**
* This class is the base class used to build the workflow topology.
* A workflow topology is a tree of workflows. Each node in the tree
@@ -40,30 +39,10 @@
* nodes in the workflow topology (WorkflowTopologyNode) and the second
* one is used to implement the root DSE node (RootDseWorkflowTopology).
*/
-
public abstract class WorkflowTopology implements Workflow
{
- // The workflow implementation containing the task tree (ie. the processing)
- private WorkflowImpl workflowImpl = null;
-
-
- /**
- * Each workflow node may have specific tasks to be executed before
- * the workflow task tree. The tasks to execute before are stored in
- * the following array, which is empty at the moment (implementation
- * will come later on when needed).
- */
- // private WorkflowElement[] preWorkflowElements = null;
-
-
- /**
- * Each workflow node may have specific tasks to be executed after
- * the workflow task tree. The tasks to execute after are stored in
- * the following array, which is empty at the moment (implementation
- * will come later on when needed).
- */
- // private WorkflowElement[] postWorkflowElements = null;
-
+ /** The workflow implementation containing the task tree (ie. the processing). */
+ private WorkflowImpl workflowImpl;
/**
* Create a new instance of the workflow topology base class.
@@ -97,6 +76,7 @@
*
* @return the base DN of the workflow containing the processing.
*/
+ @Override
public DN getBaseDN()
{
return getWorkflowImpl().getBaseDN();
@@ -112,10 +92,7 @@
* @return the new scope to use for searches on subordinate workflows,
* <code>null</code> when current scope is 'base'
*/
-
- protected SearchScope elaborateScopeForSearchInSubordinates(
- SearchScope currentScope
- )
+ protected SearchScope elaborateScopeForSearchInSubordinates(SearchScope currentScope)
{
switch (currentScope)
{
@@ -131,4 +108,11 @@
}
}
+ /** {@inheritDoc} */
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + " " + workflowImpl;
+ }
+
}
--
Gitblit v1.10.0