You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ra...@apache.org on 2005/08/10 23:11:40 UTC

svn commit: r231329 [9/13] - in /jakarta/taglibs/proper/rdc/trunk/src: META-INF/tags/rdc/ org/apache/taglibs/rdc/ org/apache/taglibs/rdc/core/ org/apache/taglibs/rdc/dm/ org/apache/taglibs/rdc/resources/ org/apache/taglibs/rdc/sampleapps/mortgage/ org/...

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/MainMenuAction.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/MainMenuAction.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/MainMenuAction.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/MainMenuAction.java Wed Aug 10 14:10:59 2005
@@ -57,16 +57,16 @@
   public ActionForward execute(ActionMapping mapping, ActionForm form,
     HttpServletRequest request, HttpServletResponse response)
     throws Exception {
-    	
+        
     HttpSession session = request.getSession();
     MusicStoreAppBean msBean = (MusicStoreAppBean)
       session.getAttribute(MusicStoreAppBean.SESSION_KEY);
 
     if (msBean == null) {
-		  String subscriptionId = session.getServletContext().
-			getInitParameter("com.amazon.ecs.subscriptionId");
-		  msBean = new MusicStoreAppBean(subscriptionId);
-		  session.setAttribute(MusicStoreAppBean.SESSION_KEY, msBean);
+          String subscriptionId = session.getServletContext().
+            getInitParameter("com.amazon.ecs.subscriptionId");
+          msBean = new MusicStoreAppBean(subscriptionId);
+          session.setAttribute(MusicStoreAppBean.SESSION_KEY, msBean);
       
       // Initialize channel information
       String userAgent = request.getHeader(USERAGENT);
@@ -80,7 +80,7 @@
       } else {
         msBean.setChannel(MusicStoreAppBean.VOICE_APP);
       }
-	  }
+      }
     
     if (msBean.getChannel() == MusicStoreAppBean.GUI_APP) {
       // GUI Channel
@@ -115,8 +115,8 @@
       if(ph == null) {
         ph = new ProactiveHelp();
         ResourceBundle rb = ResourceBundle.
-      	  getBundle("org.apache.taglibs.rdc.sampleapps.musicstore.resources.MusicHints", 
-      	    Locale.US);
+            getBundle("org.apache.taglibs.rdc.sampleapps.musicstore.resources.MusicHints", 
+              Locale.US);
         ph.setHints(rb);
         ph.setThreshold(60);
         ph.setUsageWeighted(true);
@@ -124,19 +124,19 @@
       }
       
       if (ph.strike()) {
-    	  request.setAttribute("proactiveHelp_hint", ph.nextHint());
+          request.setAttribute("proactiveHelp_hint", ph.nextHint());
       }
       
-	    //cleanup RDC history
-	    session.removeAttribute("dialogMap");
-	    //populate amazon menu template grammars
-	    Grammar[] grammarList = new Grammar[] {
-	      new Grammar("../../grammar/musicstore-app/genre_or_category.grxml", 
+        //cleanup RDC history
+        session.removeAttribute("dialogMap");
+        //populate amazon menu template grammars
+        Grammar[] grammarList = new Grammar[] {
+          new Grammar("../../grammar/musicstore-app/genre_or_category.grxml", 
                     Boolean.FALSE, Boolean.FALSE, "mainGrammar"),
-	      new Grammar("../../grammar/musicstore-app/genre_or_category.grxml#category_only", 
+          new Grammar("../../grammar/musicstore-app/genre_or_category.grxml#category_only", 
                     Boolean.FALSE, Boolean.FALSE, "categoryGrammar")
-	    };
-	    request.setAttribute("grammarList", grammarList);
+        };
+        request.setAttribute("grammarList", grammarList);
     }
     return mapping.findForward("OK");
   }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/ReviewAlbumAction.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/ReviewAlbumAction.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/ReviewAlbumAction.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/ReviewAlbumAction.java Wed Aug 10 14:10:59 2005
@@ -37,44 +37,44 @@
  */
 public class ReviewAlbumAction extends Action {
 
-	public ReviewAlbumAction() {
-		super();
-	}
+    public ReviewAlbumAction() {
+        super();
+    }
 
-	public ActionForward execute(ActionMapping mapping,	ActionForm form,
-		HttpServletRequest request, HttpServletResponse response)
-		throws Exception {
-			
-		IndividualAlbumForm iaForm = (IndividualAlbumForm) form;
-		String asin = iaForm.getAsin();
-		HttpSession session = request.getSession();
-		MusicStoreAppBean msBean = (MusicStoreAppBean) session.
-			getAttribute(MusicStoreAppBean.SESSION_KEY);
-		MusicAlbum[] albums = msBean.getAlbums();
-		if (albums == null) {
-			msBean.setErrorDescription("Albums array not found in session");
-			return mapping.findForward("notFound");
-		}		
-		MusicAlbum currentAlbum = null;
-		for (int i = 0; i < albums.length; i++) {
-			if (asin.equals(albums[i].getASIN())) {
-				currentAlbum = albums[i];
-				break;
-			}
-		}
+    public ActionForward execute(ActionMapping mapping,    ActionForm form,
+        HttpServletRequest request, HttpServletResponse response)
+        throws Exception {
+            
+        IndividualAlbumForm iaForm = (IndividualAlbumForm) form;
+        String asin = iaForm.getAsin();
+        HttpSession session = request.getSession();
+        MusicStoreAppBean msBean = (MusicStoreAppBean) session.
+            getAttribute(MusicStoreAppBean.SESSION_KEY);
+        MusicAlbum[] albums = msBean.getAlbums();
+        if (albums == null) {
+            msBean.setErrorDescription("Albums array not found in session");
+            return mapping.findForward("notFound");
+        }        
+        MusicAlbum currentAlbum = null;
+        for (int i = 0; i < albums.length; i++) {
+            if (asin.equals(albums[i].getASIN())) {
+                currentAlbum = albums[i];
+                break;
+            }
+        }
     
     if (msBean.getChannel() == MusicStoreAppBean.VOICE_APP) {
-		  //cleanup RDC history
-		  session.removeAttribute("dialogMap");
+          //cleanup RDC history
+          session.removeAttribute("dialogMap");
     }
 
-		if (currentAlbum == null) {
-			msBean.setErrorDescription("Album (" + asin + ") not found.");
-			return mapping.findForward("notFound");
-		} else {
-			msBean.setCurrentAlbum(currentAlbum);
-			return mapping.findForward("albumfound");
-		}
-	}
+        if (currentAlbum == null) {
+            msBean.setErrorDescription("Album (" + asin + ") not found.");
+            return mapping.findForward("notFound");
+        } else {
+            msBean.setCurrentAlbum(currentAlbum);
+            return mapping.findForward("albumfound");
+        }
+    }
 
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Cart.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Cart.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Cart.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Cart.java Wed Aug 10 14:10:59 2005
@@ -27,36 +27,36 @@
  */
 public final class Cart implements Serializable {
 
-	protected String   cartId;
-	protected String   hMAC;
-	protected String   purchaseURL;
-	protected CartItem cartItems[];
-
-	public Cart(String cartId, String hmac, String purchaseURL) {
-		this.cartId	= cartId;
-		this.hMAC  = hmac;
-		this.purchaseURL = purchaseURL;
-		this.cartItems = null;
-	}
-
-	public String getCartId() {
-		return cartId;
-	}
-
-	public String getHMAC() {
-		return hMAC;
-	}
-
-	public String getPurchaseURL() {
-		return purchaseURL;
-	}
-
-	public CartItem[] getCartItems() {
-		return cartItems;
-	}
+    protected String   cartId;
+    protected String   hMAC;
+    protected String   purchaseURL;
+    protected CartItem cartItems[];
+
+    public Cart(String cartId, String hmac, String purchaseURL) {
+        this.cartId    = cartId;
+        this.hMAC  = hmac;
+        this.purchaseURL = purchaseURL;
+        this.cartItems = null;
+    }
+
+    public String getCartId() {
+        return cartId;
+    }
+
+    public String getHMAC() {
+        return hMAC;
+    }
 
-	public void setCartItems(CartItem[] aCartItems) {
-		cartItems = aCartItems;
+    public String getPurchaseURL() {
+        return purchaseURL;
+    }
+
+    public CartItem[] getCartItems() {
+        return cartItems;
+    }
+
+    public void setCartItems(CartItem[] aCartItems) {
+        cartItems = aCartItems;
   }
 
   /**
@@ -71,15 +71,15 @@
     
     if (cartItems != null) {
       for (int i=0; i < cartItems.length; i++) {
-	    sb.append(cartItems[i]);
-	    if (i + 1 < cartItems.length)
-	      sb.append(", ");
+        sb.append(cartItems[i]);
+        if (i + 1 < cartItems.length)
+          sb.append(", ");
       }
     }
 
     sb.append("])");   
     return sb.toString();  
   }
-	
+    
 
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/CartItem.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/CartItem.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/CartItem.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/CartItem.java Wed Aug 10 14:10:59 2005
@@ -38,7 +38,7 @@
    * @param label
    */
   public CartItem(String cartitemId, String asin, String merchantId,
-  				  int quantity, String title, String group, int listPrice)  {
+                    int quantity, String title, String group, int listPrice)  {
     super(asin, group, title, listPrice, 0);
     this.cartitemId = cartitemId;
     this.merchantId = merchantId;

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java Wed Aug 10 14:10:59 2005
@@ -25,39 +25,39 @@
 
 public class Image implements java.io.Serializable {
 
-	protected String url;
-	protected int height;
-	protected int width;
-	
-	
-	/**
-	 * Constructor
-	 * @param url
-	 * @param height
-	 * @param width
-	 */
-	public Image(String url, int height, int width) {
-		this.url = url;
-		this.height = height;
-		this.width = width;
-	}
-	
-	/**
-	 * @return Returns the height.
-	 */
-	public int getHeight() {
-		return height;
-	}
-	/**
-	 * @return Returns the url.
-	 */
-	public String getUrl() {
-		return url;
-	}
-	/**
-	 * @return Returns the width.
-	 */
-	public int getWidth() {
-		return width;
-	}
+    protected String url;
+    protected int height;
+    protected int width;
+    
+    
+    /**
+     * Constructor
+     * @param url
+     * @param height
+     * @param width
+     */
+    public Image(String url, int height, int width) {
+        this.url = url;
+        this.height = height;
+        this.width = width;
+    }
+    
+    /**
+     * @return Returns the height.
+     */
+    public int getHeight() {
+        return height;
+    }
+    /**
+     * @return Returns the url.
+     */
+    public String getUrl() {
+        return url;
+    }
+    /**
+     * @return Returns the width.
+     */
+    public int getWidth() {
+        return width;
+    }
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Item.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Item.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Item.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Item.java Wed Aug 10 14:10:59 2005
@@ -44,7 +44,7 @@
    * @param rank
    */
   public Item(String asin, String productGroup, String title, 
-  			  int listPrice, int rank) {
+                int listPrice, int rank) {
     this.aSIN = asin;
     this.productGroup = productGroup;
     this.title = title;

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicAlbum.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicAlbum.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicAlbum.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicAlbum.java Wed Aug 10 14:10:59 2005
@@ -132,36 +132,36 @@
         this.offerSummary = offerSummary;
     }
 
-	/**
-	 * Get the album summary
-	 * 
-	 * @return java.lang.String The album summary
-	 */  
-	public String getSummary() {
-	  String priceString = Integer.toString(this.listPrice);
-	  int delim = priceString.length() - 2;
-	  priceString = "$" + priceString.substring(0, delim) + "." + 
-		  priceString.substring(delim);
-	  StringBuffer sb = new StringBuffer();
-	  sb.append(this.title).append(" by ").append(this.artist);
-	  sb.append(" is available for ").append(priceString);
-	  return sb.toString();
-	}
+    /**
+     * Get the album summary
+     * 
+     * @return java.lang.String The album summary
+     */  
+    public String getSummary() {
+      String priceString = Integer.toString(this.listPrice);
+      int delim = priceString.length() - 2;
+      priceString = "$" + priceString.substring(0, delim) + "." + 
+          priceString.substring(delim);
+      StringBuffer sb = new StringBuffer();
+      sb.append(this.title).append(" by ").append(this.artist);
+      sb.append(" is available for ").append(priceString);
+      return sb.toString();
+    }
   
-	/**
-	 * Get the album details
-	 * 
-	 * @return java.lang.String The album details
-	 */
-	public String getDetails() {
-	  java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("MMMMM dd yyyy");
-	  String date = sdf.format(this.releaseDate);
-	  StringBuffer sb = new StringBuffer();
-	  sb.append(this.title).append(" has  been released by ").append(this.label);
-	  sb.append(" on ").append(date);
-	  return sb.toString();
-	}
-	
+    /**
+     * Get the album details
+     * 
+     * @return java.lang.String The album details
+     */
+    public String getDetails() {
+      java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat("MMMMM dd yyyy");
+      String date = sdf.format(this.releaseDate);
+      StringBuffer sb = new StringBuffer();
+      sb.append(this.title).append(" has  been released by ").append(this.label);
+      sb.append(" on ").append(date);
+      return sb.toString();
+    }
+    
     /**
      * @return java.lang.String
      */

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicStore.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicStore.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicStore.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/MusicStore.java Wed Aug 10 14:10:59 2005
@@ -49,24 +49,24 @@
     protected static final String XMLNS_NS = "http://www.w3.org/2000/xmlns/";
     protected static final String RESPONSE_GRP = "ItemAttributes,Images,SalesRank,OfferSummary";
 
-	protected String subscriptionId;
-	
+    protected String subscriptionId;
+    
     private static Log log = LogFactory.getLog(MusicStore.class);
     private static final boolean info = false;
 
-	/**
-	 * @param subscriptionId Amazon ECS subscription ID
-	 */
-	public MusicStore(String subscriptionId) {
-		if (subscriptionId == null || subscriptionId.trim().length() == 0) {
-			String errDescription = "RDC MusicStore instantiated without an " +
-				"Amazon web services subscription ID. Read application " +
-				"README file.";
-			log.error(errDescription);
-			throw new IllegalArgumentException(errDescription);
-		}
-		this.subscriptionId = subscriptionId;   
-	}
+    /**
+     * @param subscriptionId Amazon ECS subscription ID
+     */
+    public MusicStore(String subscriptionId) {
+        if (subscriptionId == null || subscriptionId.trim().length() == 0) {
+            String errDescription = "RDC MusicStore instantiated without an " +
+                "Amazon web services subscription ID. Read application " +
+                "README file.";
+            log.error(errDescription);
+            throw new IllegalArgumentException(errDescription);
+        }
+        this.subscriptionId = subscriptionId;   
+    }
 
     /**
      * Retrurns an array of music genres (styles) listed on Amazon

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Context.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Context.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Context.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Context.java Wed Aug 10 14:10:59 2005
@@ -36,7 +36,7 @@
      * @param name The variable name
      * @param value The variable value
      */
-	public void set(String name, Object value);
+    public void set(String name, Object value);
 
     /**
      * Assigns a new value to an existing variable or creates a new one.
@@ -46,15 +46,15 @@
      * @param name The variable name
      * @param value The variable value
      */
-	public void setLocal(String name, Object value);
+    public void setLocal(String name, Object value);
 
-	/**
-	 * Get the value of this variable; delegating to parent
-	 * 
+    /**
+     * Get the value of this variable; delegating to parent
+     * 
      * @param name The name of the variable
      * @return The value (or null)
      */
-	public Object get(String name);
+    public Object get(String name);
 
     /**
      * Check if this variable exists, delegating to parent
@@ -62,7 +62,7 @@
      * @param name The name of the variable
      * @return Whether a variable with the name exists in this Context
      */
-	public boolean has(String name);
+    public boolean has(String name);
 
     /**
      * Get an Iterator over all variables in this Context
@@ -71,12 +71,12 @@
      * To get parent entries, call getParent().iterator().
      * @see #getParent()
      */
-	public Iterator iterator();
+    public Iterator iterator();
 
     /**
      * Clear this Context
      */
-	public void reset();
+    public void reset();
 
     /**
      * Get the parent Context, may be null

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/ErrorReporter.java Wed Aug 10 14:10:59 2005
@@ -27,59 +27,59 @@
  */
 public interface ErrorReporter {
 
-	/**
-	 * @param errCode
-	 *            one of the ErrorReporter's constants
-	 * @param errDetail
-	 *            human readable description
-	 * @param errCtx
-	 *            typically an SCXML element which caused an error, 
-	 *            may be accompanied by additional information
-	 */
-	public void onError(String errCode, String errDetail, Object errCtx);
+    /**
+     * @param errCode
+     *            one of the ErrorReporter's constants
+     * @param errDetail
+     *            human readable description
+     * @param errCtx
+     *            typically an SCXML element which caused an error, 
+     *            may be accompanied by additional information
+     */
+    public void onError(String errCode, String errDetail, Object errCtx);
 
-	/**
-	 * Missing initial state for a composite state or for the smxml root.
-	 * 
-	 * @see org.apache.taglibs.rdc.scxml.model.SCXML#getInitialState()
-	 * @see org.apache.taglibs.rdc.scxml.model.State#getInitial()
-	 */
-	public static final String NO_INITIAL = "NO_INITIAL";
-	
-	/**
-	 * An initial state for a composite state whose Transition does not
-	 * Map to a descendant of the composite state.
-	 * 
-	 */
-	public static final String ILLEGAL_INITIAL = "ILLEGAL_INITIAL";
+    /**
+     * Missing initial state for a composite state or for the smxml root.
+     * 
+     * @see org.apache.taglibs.rdc.scxml.model.SCXML#getInitialState()
+     * @see org.apache.taglibs.rdc.scxml.model.State#getInitial()
+     */
+    public static final String NO_INITIAL = "NO_INITIAL";
+    
+    /**
+     * An initial state for a composite state whose Transition does not
+     * Map to a descendant of the composite state.
+     * 
+     */
+    public static final String ILLEGAL_INITIAL = "ILLEGAL_INITIAL";
 
-	/**
-	 * Unknown action - unsupported executable content. List of supported
-	 * actions: assign, cancel, elseif, else, if, log, send, var
-	 */
-	public static final String UNKNOWN_ACTION = "UNKNOWN_ACTION";
-	
-	/**
-	 * Illegal state machine configuration.
-	 * Either a parallel exists which does not have all its AND sub-states 
-	 * active or there are multiple enabled OR states on the same level.  
-	 */
-	public static final String ILLEGAL_CONFIG = "ILLEGAL_CONFIG";
-	
-	/**
-	 * Non-deterministic situation has occured - there are more than
-	 * one enabled transitions in conflict.
-	 */
-	public static final String NON_DETERMINISTIC = "NON_DETERMINISTIC";
-	
-	/**
-	 * A variable reffered to by assign@name is undefined.
-	 */
-	public static final String UNDEFINED_VARIABLE = "UNDEFINED_VARIABLE";
-	
-	/**
-	 * An expression language error. 
-	 */
-	public static final String EXPRESSION_ERROR = "EXPRESSION_ERROR";
-	
+    /**
+     * Unknown action - unsupported executable content. List of supported
+     * actions: assign, cancel, elseif, else, if, log, send, var
+     */
+    public static final String UNKNOWN_ACTION = "UNKNOWN_ACTION";
+    
+    /**
+     * Illegal state machine configuration.
+     * Either a parallel exists which does not have all its AND sub-states 
+     * active or there are multiple enabled OR states on the same level.  
+     */
+    public static final String ILLEGAL_CONFIG = "ILLEGAL_CONFIG";
+    
+    /**
+     * Non-deterministic situation has occured - there are more than
+     * one enabled transitions in conflict.
+     */
+    public static final String NON_DETERMINISTIC = "NON_DETERMINISTIC";
+    
+    /**
+     * A variable reffered to by assign@name is undefined.
+     */
+    public static final String UNDEFINED_VARIABLE = "UNDEFINED_VARIABLE";
+    
+    /**
+     * An expression language error. 
+     */
+    public static final String EXPRESSION_ERROR = "EXPRESSION_ERROR";
+    
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Evaluator.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Evaluator.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Evaluator.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Evaluator.java Wed Aug 10 14:10:59 2005
@@ -25,7 +25,7 @@
  * @author Rahul Akolkar
  */
 public interface Evaluator {
-	
+    
     /**
      * Evaluate an expression
      * 
@@ -34,7 +34,7 @@
      * @return a result of the evaluation
      * @throws SCXMLExpressionException
      */
-	public Object eval(Context ctx, String exp) throws SCXMLExpressionException;
+    public Object eval(Context ctx, String exp) throws SCXMLExpressionException;
 
     /**
      * Create a new child context.

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/EventDispatcher.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/EventDispatcher.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/EventDispatcher.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/EventDispatcher.java Wed Aug 10 14:10:59 2005
@@ -29,27 +29,27 @@
  * @author Rahul Akolkar
  */
 public interface EventDispatcher {
-	
-	/**
-	 * Cancel the specified send message
-	 * 
-	 * @param sendId The ID of the send message to cancel
-	 */
-	public void cancel(String sendId);
+    
+    /**
+     * Cancel the specified send message
+     * 
+     * @param sendId The ID of the send message to cancel
+     */
+    public void cancel(String sendId);
 
-	/**
-	 * @param sendId The ID of the send message
-	 * @param target An expression returning the target location of the event
-	 * @param targetType The type of the Event I/O Processor that the event
-	 *  should be dispatched to
-	 * @param event The type of event being generated.
-	 * @param params A list of zero or more whitespace separated variable
-	 *  names to be included with the event.
-	 * @param hints The data containing information which may be 
-	 *  used by the implementing platform to configure the event processor
-	 * @param delay The event is dispatched after the delay interval elapses
-	 */
-	public void send(String sendId, String target, String targetType,
-			String event, Map params, Object hints, long delay);
-	
+    /**
+     * @param sendId The ID of the send message
+     * @param target An expression returning the target location of the event
+     * @param targetType The type of the Event I/O Processor that the event
+     *  should be dispatched to
+     * @param event The type of event being generated.
+     * @param params A list of zero or more whitespace separated variable
+     *  names to be included with the event.
+     * @param hints The data containing information which may be 
+     *  used by the implementing platform to configure the event processor
+     * @param delay The event is dispatched after the delay interval elapses
+     */
+    public void send(String sendId, String target, String targetType,
+            String event, Map params, Object hints, long delay);
+    
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/NotificationRegistry.java Wed Aug 10 14:10:59 2005
@@ -33,29 +33,29 @@
  * @author Rahul Akolkar
  */
 public class NotificationRegistry {
-	
-	private HashMap regs = new HashMap();
-	
-	/**
-	 * Constructor
-	 */
-	public NotificationRegistry(){
-		super();
-	}
-	
+    
+    private HashMap regs = new HashMap();
+    
+    /**
+     * Constructor
+     */
+    public NotificationRegistry(){
+        super();
+    }
+    
     /**
      * Register this SCXMLListener for this Observable
      * 
      * @param source The observable this listener wants to listen to 
      * @param lst The listener
      */
-	public void addListener(Observable source, SCXMLListener lst) {
-		HashSet entries = (HashSet)regs.get(source);
-		if(entries == null) {
-			entries = new HashSet();
-			regs.put(source, entries);
-		}
-		entries.add(lst);
+    public void addListener(Observable source, SCXMLListener lst) {
+        HashSet entries = (HashSet)regs.get(source);
+        if(entries == null) {
+            entries = new HashSet();
+            regs.put(source, entries);
+        }
+        entries.add(lst);
     }
 
     /**
@@ -64,13 +64,13 @@
      * @param source The observable this listener wants to stop listening to
      * @param lst The listener
      */
-	public void removeListener(Observable source, SCXMLListener lst) {
+    public void removeListener(Observable source, SCXMLListener lst) {
         HashSet entries = (HashSet)regs.get(source);
         if(entries != null) {
-        	entries.remove(lst);
-        	if(entries.size() == 0){
-        		regs.remove(source);
-        	}
+            entries.remove(lst);
+            if(entries.size() == 0){
+                regs.remove(source);
+            }
         }
     }
 
@@ -81,13 +81,13 @@
      * @param source The Observable
      * @param state The TransitionTarget that was entered
      */
-	public void fireOnEntry(Observable source, TransitionTarget state) {
+    public void fireOnEntry(Observable source, TransitionTarget state) {
         HashSet entries = (HashSet)regs.get(source);
         if(entries != null) {
-        	for (Iterator iter = entries.iterator(); iter.hasNext();) {
-        		SCXMLListener lst = (SCXMLListener)iter.next();
-        		lst.onEntry(state);
-        	}
+            for (Iterator iter = entries.iterator(); iter.hasNext();) {
+                SCXMLListener lst = (SCXMLListener)iter.next();
+                lst.onEntry(state);
+            }
         }
     }
 
@@ -98,13 +98,13 @@
      * @param source The Observable
      * @param state The TransitionTarget that was exited
      */
-	public void fireOnExit(Observable source, TransitionTarget state) {
+    public void fireOnExit(Observable source, TransitionTarget state) {
         HashSet entries = (HashSet)regs.get(source);
         if(entries != null) {
-        	for (Iterator iter = entries.iterator(); iter.hasNext();) {
-        		SCXMLListener lst = (SCXMLListener)iter.next();
-        		lst.onExit(state);
-        	}
+            for (Iterator iter = entries.iterator(); iter.hasNext();) {
+                SCXMLListener lst = (SCXMLListener)iter.next();
+                lst.onExit(state);
+            }
         }
     }
 
@@ -116,14 +116,14 @@
      * @param to The destination TransitionTarget
      * @param transition The Transition that was taken
      */
-	public void fireOnTransition(Observable source, TransitionTarget from,
-			TransitionTarget to, Transition transition) {
+    public void fireOnTransition(Observable source, TransitionTarget from,
+            TransitionTarget to, Transition transition) {
         HashSet entries = (HashSet)regs.get(source);
         if(entries != null) {
-        	for (Iterator iter = entries.iterator(); iter.hasNext();) {
-        		SCXMLListener lst = (SCXMLListener)iter.next();
-        		lst.onTransition(from, to, transition);
-        	}
+            for (Iterator iter = entries.iterator(); iter.hasNext();) {
+                SCXMLListener lst = (SCXMLListener)iter.next();
+                lst.onTransition(from, to, transition);
+            }
         }
     }
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Observable.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Observable.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Observable.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/Observable.java Wed Aug 10 14:10:59 2005
@@ -26,21 +26,21 @@
  * @author Rahul Akolkar
  */
 public interface Observable {
-	
-	/**
-	 * Add this SCXMLListener to the list of listeners associated
-	 * with this SCXML model entity
-	 * 
-	 * @param lst The listener to be added
-	 */
-	public void addListener(SCXMLListener lst);
+    
+    /**
+     * Add this SCXMLListener to the list of listeners associated
+     * with this SCXML model entity
+     * 
+     * @param lst The listener to be added
+     */
+    public void addListener(SCXMLListener lst);
 
-	/**
-	 * Remove this SCXMLListener from the list of listeners associated
-	 * with this SCXML model entity.
-	 * 
-	 * @param lst The listener to be removed
-	 */
-	public void removeListener(SCXMLListener lst);
+    /**
+     * Remove this SCXMLListener from the list of listeners associated
+     * with this SCXML model entity.
+     * 
+     * @param lst The listener to be removed
+     */
+    public void removeListener(SCXMLListener lst);
 
 }

Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/PathResolver.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/PathResolver.java?rev=231329&r1=231328&r2=231329&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/PathResolver.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/scxml/PathResolver.java Wed Aug 10 14:10:59 2005
@@ -26,20 +26,20 @@
  */
 public interface PathResolver {
 
-	/**
-	 * Resolve this context sensitive path to an absolute URL.
-	 * 
-	 * @param ctxPath Context sensitive path, can be a relative URL
-	 * @return Resolved path (an absolute URL) or <code>null</code>
-	 */
-	public String resolvePath(String ctxPath);
-	
-	/**
-	 * Get a PathResolver rooted at this context sensitive path.
-	 * 
-	 * @param ctxPath Context sensitive path, can be a relative URL
-	 * @return Returns a new resolver rooted at ctxPath
-	 */
-	public PathResolver getResolver(String ctxPath);
+    /**
+     * Resolve this context sensitive path to an absolute URL.
+     * 
+     * @param ctxPath Context sensitive path, can be a relative URL
+     * @return Resolved path (an absolute URL) or <code>null</code>
+     */
+    public String resolvePath(String ctxPath);
+    
+    /**
+     * Get a PathResolver rooted at this context sensitive path.
+     * 
+     * @param ctxPath Context sensitive path, can be a relative URL
+     * @return Returns a new resolver rooted at ctxPath
+     */
+    public PathResolver getResolver(String ctxPath);
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org