Some cleanup in oat.rdc.dm package -- unused variable, Javadoc warning, remove deprecation etc.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/taglibs/proper/rdc/trunk@733560 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java
index 99bd6a7..7b1bcd9 100755
--- a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java
+++ b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java
@@ -76,7 +76,7 @@
/**
* Return true if the given component or container is done.
*
- * @param BaseModel
+ * @param model The {@link BaseModel} to check.
*/
public static boolean isChildDone(BaseModel model) {
if (model instanceof GroupModel) {
diff --git a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
index 8b578ec..66a9ab3 100755
--- a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
+++ b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
@@ -156,7 +156,6 @@
public void confirm() {
GroupModel groupModel = (GroupModel) stateMap.get(groupTag.getId());
- Map modelMap = groupModel.getLocalMap();
if (groupModel.getState() == Constants.GRP_STATE_RUNNING) {
if (groupState == Constants.GRP_ALL_CHILDREN_DONE) {
diff --git a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
index 95dc05c..57024c8 100755
--- a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
+++ b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
@@ -167,7 +167,7 @@
Set conditionNames = new HashSet();
conditionNames.add("condition");
for (int i = 0; i < conditionsList.getLength(); i++) {
- String name = name = ((Element)conditionsList.item(i)).
+ String name = ((Element)conditionsList.item(i)).
getAttribute("name");
RDCUtils.mustExist(name, "RuleBasedDirectedDialog: Cannot" +
" add condition with empty name");
diff --git a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java
index 1f76d3c..45fd0b1 100644
--- a/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java
+++ b/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java
@@ -32,7 +32,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.commons.scxml.Context;
import org.apache.commons.scxml.Evaluator;
import org.apache.commons.scxml.EventDispatcher;
@@ -45,16 +44,14 @@
import org.apache.commons.scxml.env.jsp.ELEvaluator;
import org.apache.commons.scxml.env.jsp.RootContext;
import org.apache.commons.scxml.env.servlet.ServletContextResolver;
-import org.apache.commons.scxml.io.SCXMLDigester;
+import org.apache.commons.scxml.io.SCXMLParser;
import org.apache.commons.scxml.model.ModelException;
import org.apache.commons.scxml.model.SCXML;
import org.apache.commons.scxml.model.State;
-
import org.apache.taglibs.rdc.core.BaseModel;
import org.apache.taglibs.rdc.core.Constants;
import org.apache.taglibs.rdc.core.GroupModel;
import org.apache.taglibs.rdc.core.GroupTag;
-
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXParseException;
@@ -105,7 +102,7 @@
SCXML scxml = null;
ServletContext sc = ((PageContext) ctx).getServletContext();
try {
- scxml = SCXMLDigester.digest(sc.getRealPath(groupTag.getConfig()),
+ scxml = SCXMLParser.parse(sc.getRealPath(groupTag.getConfig()),
new SCXMLErrorHandler(), new ServletContextResolver(sc));
} catch (Exception e) {
MessageFormat msgFormat = new MessageFormat(ERR_DIGESTER_FAIL);
