henning     2002/12/08 09:34:35

  Modified:    src/java/org/apache/turbine/modules ScreenLoader.java
               src/java/org/apache/turbine/modules/actions/sessionvalidator
                        DefaultSessionValidator.java
               src/java/org/apache/turbine/modules/navigations
                        DefaultBottomNavigation.java
               src/java/org/apache/turbine/modules/screens
                        JspErrorScreen.java VelocityDirectScreen.java
               src/java/org/apache/turbine/services package.html
               src/java/org/apache/turbine/services/assemblerbroker
                        TurbineAssemblerBrokerService.java
               src/java/org/apache/turbine/services/assemblerbroker/util/python
                        PythonBaseFactory.java PythonPageFactory.java
               src/java/org/apache/turbine/services/intake IntakeTool.java
               src/java/org/apache/turbine/services/template
                        BaseTemplateEngineService.java
               src/java/org/apache/turbine/util SecurityCheck.java
                        TurbineConfig.java
               src/java/org/apache/turbine/util/velocity
                        VelocityActionEvent.java
  Log:
  More Checkstyle Fixes from our repository. Still shouldn't change any
  functionality.
  
  Revision  Changes    Path
  1.3       +5 -4      
jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java
  
  Index: ScreenLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/ScreenLoader.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ScreenLoader.java 8 Dec 2002 14:25:54 -0000       1.2
  +++ ScreenLoader.java 8 Dec 2002 17:34:34 -0000       1.3
  @@ -74,6 +74,7 @@
    * Screen modules.
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
  + * @author <a href="mailto:[EMAIL PROTECTED]";>Henning P. Schmiedehausen</a>
    * @version $Id$
    */
   public class ScreenLoader extends GenericLoader
  @@ -148,10 +149,10 @@
       }
   
       /**
  -     * Pulls out an instance of the object by name.  Name is just the
  -     * single name of the object.
  +     * Pulls out an instance of the Screen by name.  Name is just the
  +     * single name of the Screen.
        *
  -     * @param name Name of object instance.
  +     * @param name Name of requested Screen.
        * @return A Screen with the specified name, or null.
        * @exception Exception a generic exception.
        */
  
  
  
  1.6       +3 -2      
jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java
  
  Index: DefaultSessionValidator.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/actions/sessionvalidator/DefaultSessionValidator.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultSessionValidator.java      8 Dec 2002 14:25:55 -0000       1.5
  +++ DefaultSessionValidator.java      8 Dec 2002 17:34:34 -0000       1.6
  @@ -91,7 +91,8 @@
        * set in the tr.props).
        *
        * @see org.apache.turbine.modules.screens.error.InvalidState
  -     * @param data Turbine RunData context information.     * @exception Exception, 
a generic exception.
  +     * @param data Turbine RunData context information.
  +     * @exception Exception, a generic exception.
        */
       public void doPerform(RunData data) throws Exception
       {
  
  
  
  1.2       +11 -12    
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java
  
  Index: DefaultBottomNavigation.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/DefaultBottomNavigation.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultBottomNavigation.java      16 Aug 2001 05:08:35 -0000      1.1
  +++ DefaultBottomNavigation.java      8 Dec 2002 17:34:34 -0000       1.2
  @@ -54,23 +54,15 @@
    * <http://www.apache.org/>.
    */
   
  -// Java Core Classes
   import java.util.Enumeration;
   import java.util.Hashtable;
   import java.util.Iterator;
   
  -// Turbine Classes
  -import org.apache.turbine.modules.Navigation;
  -import org.apache.turbine.om.security.Permission;
  -import org.apache.turbine.om.security.Role;
  -import org.apache.turbine.util.DynamicURI;
  -import org.apache.turbine.util.RunData;
  -
  -// ECS Classes
  +import org.apache.ecs.AlignType;
   import org.apache.ecs.ConcreteElement;
   import org.apache.ecs.ElementContainer;
   import org.apache.ecs.HtmlColor;
  -import org.apache.ecs.AlignType;
  +
   import org.apache.ecs.html.B;
   import org.apache.ecs.html.BR;
   import org.apache.ecs.html.Font;
  @@ -79,10 +71,17 @@
   import org.apache.ecs.html.HR;
   import org.apache.ecs.html.Input;
   import org.apache.ecs.html.PRE;
  -import org.apache.ecs.html.Table;
   import org.apache.ecs.html.TD;
   import org.apache.ecs.html.TR;
  +import org.apache.ecs.html.Table;
   
  +import org.apache.turbine.modules.Navigation;
  +
  +import org.apache.turbine.om.security.Permission;
  +import org.apache.turbine.om.security.Role;
  +
  +import org.apache.turbine.util.DynamicURI;
  +import org.apache.turbine.util.RunData;
   
   /**
    * This is a sample navigation module.
  
  
  
  1.2       +2 -2      
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java
  
  Index: JspErrorScreen.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/JspErrorScreen.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JspErrorScreen.java       16 Aug 2001 05:08:37 -0000      1.1
  +++ JspErrorScreen.java       8 Dec 2002 17:34:34 -0000       1.2
  @@ -71,7 +71,7 @@
         * @param data Turbine information.
         * @exception Exception, a generic exception.
         */
  -     protected void doBuildTemplate( RunData data )
  +     protected void doBuildTemplate(RunData data)
            throws Exception
        {
            String errorTemplate = TurbineResources.getString("template.error",
  
  
  
  1.3       +8 -7      
jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java
  
  Index: VelocityDirectScreen.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/screens/VelocityDirectScreen.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VelocityDirectScreen.java 8 Dec 2002 14:25:55 -0000       1.2
  +++ VelocityDirectScreen.java 8 Dec 2002 17:34:34 -0000       1.3
  @@ -54,18 +54,19 @@
    * <http://www.apache.org/>.
    */
   
  -// Turbine/ECS Imports
   import org.apache.ecs.ConcreteElement;
   import org.apache.ecs.StringElement;
  -import org.apache.turbine.util.RunData;
  -import org.apache.turbine.util.StringUtils;
  +
   import org.apache.turbine.services.resources.TurbineResources;
  -import org.apache.turbine.services.velocity.TurbineVelocity;
  +
   import org.apache.turbine.services.template.TurbineTemplate;
   
  -// Velocity Stuff
  -import org.apache.velocity.context.Context;
  +import org.apache.turbine.services.velocity.TurbineVelocity;
   
  +import org.apache.turbine.util.RunData;
  +import org.apache.turbine.util.StringUtils;
  +
  +import org.apache.velocity.context.Context;
   
   /**
    * Base Velocity Screen.  The buildTemplate() assumes the template
  
  
  
  1.2       +2 -8      
jakarta-turbine-2/src/java/org/apache/turbine/services/package.html
  
  Index: package.html
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/package.html,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- package.html      16 Aug 2001 05:08:48 -0000      1.1
  +++ package.html      8 Dec 2002 17:34:34 -0000       1.2
  @@ -43,19 +43,13 @@
   <p>
   Early initialization is similar to the constructor. It is used
   to pass some information that the Service will need in it's
  -future operation. For example WebMacro Service uses ServletConfig
  -object to process it's own configuration options: getRealPath()
  -method is used to convert paths to WebMacro.properties and 
  -templates from relative to webapp root to absolute paths.
  +future operation. 
   UniqueId Service uses the HttpRequest object from the first Turbine
   invocation to determine URL this instance is runnign under, to 
   generate instance ID.
   Early initialization method should process the configuration, store
   some values, but NOT allocate resources. There is still a chance
   that the Service will not be used.
  -(Actually WebMacroService does this wrong, because it triggers 
  -it's late initializer inside early initializer. This needs
  -to be fixed eventually.)
   If the Service is ready to work (i.e. does not need any more objects
   being sent to it), and does not to allocate any resources during
   late initialization, the internal state can be changed so that
  
  
  
  1.2       +18 -11    
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java
  
  Index: TurbineAssemblerBrokerService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/TurbineAssemblerBrokerService.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TurbineAssemblerBrokerService.java        16 Aug 2001 05:08:48 -0000      1.1
  +++ TurbineAssemblerBrokerService.java        8 Dec 2002 17:34:34 -0000       1.2
  @@ -54,17 +54,19 @@
    * <http://www.apache.org/>.
    */
   
  -// JDK Stuff
  -import java.util.Vector;
   import java.util.Hashtable;
  +import java.util.Vector;
   
  -// Turbine Stuff
   import org.apache.turbine.modules.Assembler;
  -import org.apache.turbine.services.TurbineServices;
  -import org.apache.turbine.services.TurbineBaseService;
  +
   import org.apache.turbine.services.InitializationException;
  +import org.apache.turbine.services.TurbineBaseService;
  +import org.apache.turbine.services.TurbineServices;
  +
   import org.apache.turbine.services.assemblerbroker.util.AssemblerFactory;
  +
   import org.apache.turbine.services.resources.TurbineResources;
  +
   import org.apache.turbine.util.TurbineException;
   
   /**
  @@ -115,8 +117,8 @@
           {
               try
               {
  -                Object o = Class.forName ( names[i] ).newInstance();
  -                registerFactory ( type, (AssemblerFactory)o );
  +                Object o = Class.forName (names[i]).newInstance();
  +                registerFactory (type, (AssemblerFactory)o);
               }
               // these must be passed to the VM
               catch(ThreadDeath e)
  @@ -156,7 +158,7 @@
           }
           catch(TurbineException e) 
           {
  -            throw new InitializationException("AssemblerBrokerService failed to 
initailize", e);
  +            throw new InitializationException("AssemblerBrokerService failed to 
initialize", e);
           }
           setInit(true);
       }
  @@ -164,7 +166,7 @@
       /**
        * Register a new AssemblerFactory under a certain type
        */
  -    public void registerFactory( String type, AssemblerFactory factory )
  +    public void registerFactory(String type, AssemblerFactory factory)
       {
           getFactoryGroup(type).add (factory);
       }
  @@ -175,7 +177,7 @@
        * classes of type and retrun the first non-null assembly
        * found.  If an assembly was not found return null.
        */
  -    public Assembler getAssembler( String type, String name ) 
  +    public Assembler getAssembler(String type, String name) 
           throws TurbineException
       {
           Vector facs = getFactoryGroup(type);
  @@ -190,11 +192,16 @@
               }
               catch (Exception e)
               {
  -                throw new TurbineException("Failed to find the "+type+" named 
"+name, e);
  +                throw new TurbineException("Failed to find the " 
  +                                           + type 
  +                                           +" named "
  +                                           + name, e);
               }
   
               if (assembler != null) 
  +            {
                   return assembler;
  +            }
           }
           return null;
       }
  
  
  
  1.3       +14 -13    
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
  
  Index: PythonBaseFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PythonBaseFactory.java    7 Jun 2002 21:22:45 -0000       1.2
  +++ PythonBaseFactory.java    8 Dec 2002 17:34:34 -0000       1.3
  @@ -96,15 +96,16 @@
           String confName = null;
   
   
  -        Log.info ("Screen name for JPython "+name);
  +        Log.info ("Screen name for JPython " + name);
   
           try
           {
               String path = TurbineResources.getString (
  -                TurbineServices.SERVICE_PREFIX + 
  -                    AssemblerBrokerService.SERVICE_NAME + ".python.path")+"/";
  -            confName = path+"conf.py";
  -            fName = path+subDirectory+"/"+name.toLowerCase()+".py";
  +                TurbineServices.SERVICE_PREFIX 
  +                + AssemblerBrokerService.SERVICE_NAME 
  +                + ".python.path") + "/";
  +            confName = path + "conf.py";
  +            fName = path + subDirectory + "/" + name.toLowerCase() + ".py";
           }
           catch (Exception e)
           {
  @@ -139,23 +140,23 @@
                   try
                   {
                       // We create an instance of the screen class from the python 
script
  -                    interp.exec("scr = "+name+"()");
  +                    interp.exec("scr = " + name + "()");
                   }
                   catch (Throwable e)
                   {
  -                    throw new Exception ("\nCannot create an instance of the python 
class.\n"+
  -                                         "You probably gave your class the wrong 
name.\n"+
  -                                         "Your class should have the same name as 
your filename.\n"+
  -                                         "Filenames should be all lowercase and 
classnames should "+
  -                                         "start with a capital.\n"+
  -                                         "Expected class name: "+name+"\n");
  +                    throw new Exception ("\nCannot create an instance of the python 
class.\n"
  +                                         + "You probably gave your class the wrong 
name.\n"
  +                                         + "Your class should have the same name as 
your filename.\n"
  +                                         + "Filenames should be all lowercase and 
classnames should "
  +                                         + "start with a capital.\n"
  +                                         + "Expected class name: " + name + "\n");
                   }
   
   
   
                   // Here we convert the python sceen instance to a java instance.
   
  -                assembler = (Assembler)interp.get ("scr",Assembler.class);
  +                assembler = (Assembler) interp.get ("scr", Assembler.class);
   
               }
               catch (Exception e)
  
  
  
  1.4       +0 -2      
jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java
  
  Index: PythonPageFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonPageFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PythonPageFactory.java    7 Jun 2002 21:22:45 -0000       1.3
  +++ PythonPageFactory.java    8 Dec 2002 17:34:34 -0000       1.4
  @@ -65,8 +65,6 @@
    */
   public class PythonPageFactory extends PythonBaseFactory
   {
  -
  -
       public Assembler getAssembler( String name ) throws Exception
       {
           return getAssembler ("pages",name);
  
  
  
  1.8       +14 -14    
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java
  
  Index: IntakeTool.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- IntakeTool.java   16 Nov 2002 16:19:34 -0000      1.7
  +++ IntakeTool.java   8 Dec 2002 17:34:35 -0000       1.8
  @@ -91,7 +91,7 @@
           pullMap = new HashMap((int)(1.25*groupNames.length + 1));
           // omToolKey = TurbineResources.getString("tool.intake.om");
   
  -        for (int i=groupNames.length-1; i>=0; i--)
  +        for (int i = groupNames.length - 1; i >= 0; i--)
           {
               pullMap.put(groupNames[i], new PullHelper(groupNames[i]));
           }
  @@ -106,28 +106,28 @@
   
           String[] groupKeys = data.getParameters().getStrings("intake-grp");
           String[] groupNames = null;
  -        if ( groupKeys == null || groupKeys.length == 0 )
  +        if (groupKeys == null || groupKeys.length == 0)
           {
               groupNames = TurbineIntake.getGroupNames();
           }
           else
           {
               groupNames = new String[groupKeys.length];
  -            for ( int i=groupKeys.length-1; i>=0; i-- )
  +            for (int i = groupKeys.length - 1; i >= 0; i--)
               {
                   groupNames[i] = TurbineIntake.getGroupName(groupKeys[i]);
               }
   
           }
   
  -        for (int i=groupNames.length-1; i>=0; i--)
  +        for (int i = groupNames.length - 1; i >= 0; i--)
           {
               try
               {
                   List foundGroups = TurbineIntake.getGroup(groupNames[i])
                       .getObjects(data);
   
  -                if ( foundGroups != null )
  +                if (foundGroups != null)
                   {
                       Iterator iter = foundGroups.iterator();
                       while (iter.hasNext())
  @@ -157,9 +157,9 @@
       {
           allGroupsSB.setLength(0);
           Iterator i = groups.values().iterator();
  -        while ( i.hasNext() )
  +        while (i.hasNext())
           {
  -            declareGroup( (Group)i.next(), allGroupsSB );
  +            declareGroup((Group)i.next(), allGroupsSB);
           }
           return allGroupsSB.toString();
       }
  @@ -185,7 +185,7 @@
        */
       public void declareGroup(Group group, StringBuffer sb)
       {
  -        if ( !declaredGroups.containsKey(group.getIntakeGroupName()) )
  +        if (!declaredGroups.containsKey(group.getIntakeGroupName()))
           {
               declaredGroups.put(group.getIntakeGroupName(), null);
               sb.append("<input type=\"hidden\" name=\"")
  @@ -200,7 +200,7 @@
       {
           declaredGroups.clear();
           Iterator i = groups.values().iterator();
  -        while ( i.hasNext() )
  +        while (i.hasNext())
           {
                ((Group)i.next()).resetDeclared();
           }
  @@ -251,7 +251,7 @@
               Group g = null;
   
               String inputKey = TurbineIntake.getGroupKey(groupName) + key;
  -            if ( groups.containsKey(inputKey))
  +            if (groups.containsKey(inputKey))
               {
                   g = (Group)groups.get(inputKey);
               }
  @@ -284,7 +284,7 @@
               {
                   String inputKey = TurbineIntake.getGroupKey(groupName)
                       + obj.getQueryKey();
  -                if ( groups.containsKey(inputKey))
  +                if (groups.containsKey(inputKey))
                   {
                       g = (Group)groups.get(inputKey);
                   }
  @@ -355,7 +355,7 @@
       public void removeAll()
       {
           Object[] allGroups = groups.values().toArray();
  -        for (int i=allGroups.length-1; i>=0; i-- )
  +        for (int i = allGroups.length - 1; i >= 0; i--)
           {
               Group group = (Group)allGroups[i];
               remove(group);
  @@ -399,7 +399,7 @@
       public void dispose()
       {
           Iterator iter = groups.values().iterator();
  -        while ( iter.hasNext() )
  +        while (iter.hasNext())
           {
               Group g = (Group)iter.next();
               TurbineIntake.releaseGroup(g);
  
  
  
  1.6       +2 -2      
jakarta-turbine-2/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
  
  Index: BaseTemplateEngineService.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseTemplateEngineService.java    14 Aug 2002 16:58:20 -0000      1.5
  +++ BaseTemplateEngineService.java    8 Dec 2002 17:34:35 -0000       1.6
  @@ -155,7 +155,7 @@
               DEFAULT_LAYOUT_TEMPLATE
           };
           
  -        for(int i = 0; i < copyParams.length; i++)
  +        for (int i = 0; i < copyParams.length; i++)
           {
               configuration.put(copyParams[i], config.getString(copyParams[i]));
           }
  
  
  
  1.2       +8 -8      
jakarta-turbine-2/src/java/org/apache/turbine/util/SecurityCheck.java
  
  Index: SecurityCheck.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/SecurityCheck.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SecurityCheck.java        16 Aug 2001 05:09:41 -0000      1.1
  +++ SecurityCheck.java        8 Dec 2002 17:34:35 -0000       1.2
  @@ -66,7 +66,7 @@
    * <code>
    * SecurityCheck mycheck =
    *   new SecurityCheck(data, "Unauthorized to do this!", "WrongPermission");
  - * if ( !mycheck.hasPermission("add_user");
  + * if (!mycheck.hasPermission("add_user");
    *   return;
    *</code>
    *
  @@ -106,8 +106,8 @@
           throws Exception
       {
           boolean value = false;
  -        if ( data.getACL() == null ||
  -             !data.getACL().hasRole(role) )
  +        if (data.getACL() == null ||
  +             !data.getACL().hasRole(role))
           {
               data.setScreen(failScreen);
               data.setMessage(message);
  @@ -129,7 +129,7 @@
       public boolean hasRole(String role)
           throws Exception
       {
  -        return hasRole( TurbineSecurity.getRole(role) );
  +        return hasRole(TurbineSecurity.getRole(role));
       }
   
       /**
  @@ -143,8 +143,8 @@
           throws Exception
       {
           boolean value = false;
  -        if ( data.getACL() == null ||
  -             !data.getACL().hasPermission(permission) )
  +        if (data.getACL() == null ||
  +             !data.getACL().hasPermission(permission))
           {
               data.setScreen(failScreen);
               data.setMessage(message);
  @@ -166,7 +166,7 @@
       public boolean hasPermission(String permission)
           throws Exception
       {
  -        return hasPermission( TurbineSecurity.getPermission(permission) );
  +        return hasPermission(TurbineSecurity.getPermission(permission));
       }
   
       /**
  
  
  
  1.4       +9 -9      
jakarta-turbine-2/src/java/org/apache/turbine/util/TurbineConfig.java
  
  Index: TurbineConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/TurbineConfig.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TurbineConfig.java        24 Jul 2002 15:01:34 -0000      1.3
  +++ TurbineConfig.java        8 Dec 2002 17:34:35 -0000       1.4
  @@ -239,7 +239,7 @@
        * @return An absolute version of the supplied path, or <code>null</code>
        * if the translated path doesn't map to a file or directory.
        */
  -    public String getRealPath( String path )
  +    public String getRealPath(String path)
       {
           File f = new File(root, path);
           if (DEBUG)
  @@ -305,7 +305,7 @@
        * @return a URL pointing to the resource
        * @exception MalformedURLException
        */
  -    public URL getResource( String s )
  +    public URL getResource(String s)
           throws MalformedURLException
       {
           return new URL("file://" + getRealPath(s));
  @@ -318,7 +318,7 @@
        * @param s the path to the resource
        * @return an InputStream object from which the resource can be read
        */
  -    public InputStream getResourceAsStream( String s )
  +    public InputStream getResourceAsStream(String s)
       {
           try
           {
  @@ -362,7 +362,7 @@
        * @param t a Throwable object.
        * @param m a message.
        */
  -    public void log( String m, Throwable t )
  +    public void log(String m, Throwable t)
       {
           // cannot use Turbine logging yet.
           System.err.println(m);
  @@ -444,7 +444,7 @@
        * implemented and will throw <code>UnsuportedOperationException</code>
        * upon invocation
        */
  -    public RequestDispatcher getNamedDispatcher( String s)
  +    public RequestDispatcher getNamedDispatcher(String s)
       {
           throw new UnsupportedOperationException();
       }
  @@ -456,7 +456,7 @@
        * implemented and will throw <code>UnsuportedOperationException</code>
        * upon invocation
        */
  -    public RequestDispatcher getRequestDispatcher( String s )
  +    public RequestDispatcher getRequestDispatcher(String s)
       {
           throw new UnsupportedOperationException();
       }
  @@ -545,7 +545,7 @@
        * implemented and will throw <code>UnsuportedOperationException</code>
        * upon invocation
        */
  -    public void removeAttribute( String s )
  +    public void removeAttribute(String s)
       {
           throw new UnsupportedOperationException();
       }
  @@ -557,7 +557,7 @@
        * implemented and will throw <code>UnsuportedOperationException</code>
        * upon invocation
        */
  -    public void setAttribute( String s, Object o )
  +    public void setAttribute(String s, Object o)
       {
           throw new UnsupportedOperationException();
       }
  
  
  
  1.3       +3 -1      
jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
  
  Index: VelocityActionEvent.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- VelocityActionEvent.java  11 Jul 2002 16:53:19 -0000      1.2
  +++ VelocityActionEvent.java  8 Dec 2002 17:34:35 -0000       1.3
  @@ -141,7 +141,9 @@
           }
   
           if (theButton == null)
  +        {
               throw new NoSuchMethodException("ActionEvent: The button was null");
  +        }
   
           try
           {
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to