svn commit: r733560 - in /jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm: DMUtils.java DialogManagerImpl.java RuleBasedDirectedDialog.java SCXMLDialog.java

Author: rahul
Date: Sun Jan 11 17:00:17 2009
New Revision: 733560

URL: http://svn.apache.org/viewvc?rev=733560&view=rev
Log:
Some cleanup in oat.rdc.dm package -- unused variable, Javadoc warning, remove deprecation etc.

Modified:
    jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java
    jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
    jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
    jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java

Modified: jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java?rev=733560&r1=733559&r2=733560&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DMUtils.java Sun Jan 11 17:00:17 2009
@@ -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) {

Modified: jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java?rev=733560&r1=733559&r2=733560&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/DialogManagerImpl.java Sun Jan 11 17:00:17 2009
@@ -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) {

Modified: jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java?rev=733560&r1=733559&r2=733560&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java Sun Jan 11 17:00:17 2009
@@ -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");

Modified: jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java
URL: http://svn.apache.org/viewvc/jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java?rev=733560&r1=733559&r2=733560&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/taglibs-rdc/src/main/java/org/apache/taglibs/rdc/dm/SCXMLDialog.java Sun Jan 11 17:00:17 2009
@@ -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);