You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by ep...@apache.org on 2003/09/28 19:35:03 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/modules/actions VelocityAction.java

epugh       2003/09/28 10:35:03

  Modified:    src/java/org/apache/turbine/modules/actions
                        VelocityAction.java
  Log:
  Remove tabs for spaces..
  
  Revision  Changes    Path
  1.7       +69 -69    jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/VelocityAction.java
  
  Index: VelocityAction.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/VelocityAction.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- VelocityAction.java	26 Sep 2003 17:54:09 -0000	1.6
  +++ VelocityAction.java	28 Sep 2003 17:35:03 -0000	1.7
  @@ -71,76 +71,76 @@
    */
   public abstract class VelocityAction extends VelocityActionEvent
   {
  -	/**
  -	 * You SHOULD NOT override this method and implement it in your
  -	 * action.
  -	 *
  -	 * @param data Turbine information.
  -	 * @throws Exception a generic exception.
  -	 */
  -	public void doPerform(RunData data)
  -			throws Exception
  -	{
  -		doPerform(data, getContext(data));
  -	}
  +  /**
  +   * You SHOULD NOT override this method and implement it in your
  +   * action.
  +   *
  +   * @param data Turbine information.
  +   * @throws Exception a generic exception.
  +   */
  +  public void doPerform(RunData data)
  +      throws Exception
  +  {
  +    doPerform(data, getContext(data));
  +  }
   
  -	/**
  -	 * You SHOULD override this method and implement it in your
  -	 * action.
  -	 *
  -	 * @param data Turbine information.
  -	 * @param context Context for web pages.
  -	 * @throws Exception a generic exception.
  -	 */
  -	public abstract void doPerform(RunData data,
  -								   Context context)
  -			throws Exception;
  +  /**
  +   * You SHOULD override this method and implement it in your
  +   * action.
  +   *
  +   * @param data Turbine information.
  +   * @param context Context for web pages.
  +   * @throws Exception a generic exception.
  +   */
  +  public abstract void doPerform(RunData data,
  +                   Context context)
  +      throws Exception;
   
  -	/**
  -	 * Sets up the context and then calls super.perform(); thus,
  -	 * subclasses don't have to worry about getting a context
  -	 * themselves!  If a subclass throws an exception then depending
  -	 * on whether action.event.bubbleexception is true, then it bubbles
  -	 * it farther up, or traps it there.
  -	 *
  -	 * @param data Turbine information.
  -	 * @throws Exception a generic exception.
  -	 */
  -	protected void perform(RunData data)
  -			throws Exception
  -	{
  -		try {
  -		  super.perform(data);
  -		}
  -		catch (Exception e){
  -		  if(bubbleUpException){
  -			throw e;
  -		  }
  -    	
  -		}
  -	}
  +  /**
  +   * Sets up the context and then calls super.perform(); thus,
  +   * subclasses don't have to worry about getting a context
  +   * themselves!  If a subclass throws an exception then depending
  +   * on whether action.event.bubbleexception is true, then it bubbles
  +   * it farther up, or traps it there.
  +   *
  +   * @param data Turbine information.
  +   * @throws Exception a generic exception.
  +   */
  +  protected void perform(RunData data)
  +      throws Exception
  +  {
  +    try {
  +      super.perform(data);
  +    }
  +    catch (Exception e){
  +      if(bubbleUpException){
  +      throw e;
  +      }
   
  -	/**
  -	 * This method is used when you want to short circuit an Action
  -	 * and change the template that will be executed next.
  -	 *
  -	 * @param data Turbine information.
  -	 * @param template The template that will be executed next.
  -	 */
  -	public void setTemplate(RunData data,
  -							String template)
  -	{
  -		TemplateScreen.setTemplate(data, template);
  -	}
  +    }
  +  }
   
  -	/**
  -	 * Return the Context needed by Velocity.
  -	 *
  -	 * @param data Turbine information.
  -	 * @return Context, a context for web pages.
  -	 */
  -	protected Context getContext(RunData data)
  -	{
  -		return TurbineVelocity.getContext(data);
  -	}
  +  /**
  +   * This method is used when you want to short circuit an Action
  +   * and change the template that will be executed next.
  +   *
  +   * @param data Turbine information.
  +   * @param template The template that will be executed next.
  +   */
  +  public void setTemplate(RunData data,
  +              String template)
  +  {
  +    TemplateScreen.setTemplate(data, template);
  +  }
  +
  +  /**
  +   * Return the Context needed by Velocity.
  +   *
  +   * @param data Turbine information.
  +   * @return Context, a context for web pages.
  +   */
  +  protected Context getContext(RunData data)
  +  {
  +    return TurbineVelocity.getContext(data);
  +  }
   }