You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by ha...@apache.org on 2002/11/06 00:56:03 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet ManifestSubTask.java PhoenixXDoclet.java

hammant     2002/11/05 15:56:03

  Modified:    src/java/org/apache/avalon/phoenix/tools/punit
                        PUnitBlock.java PUnitComponentManager.java
                        PUnitResourceProvider.java PUnitTestCase.java
               src/java/org/apache/avalon/phoenix/tools/xdoclet
                        ManifestSubTask.java PhoenixXDoclet.java
  Log:
  Checkstyle compliance.
  
  Revision  Changes    Path
  1.4       +0 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlock.java
  
  Index: PUnitBlock.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitBlock.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PUnitBlock.java	5 Nov 2002 23:50:50 -0000	1.3
  +++ PUnitBlock.java	5 Nov 2002 23:56:03 -0000	1.4
  @@ -7,7 +7,6 @@
    */
   package org.apache.avalon.phoenix.tools.punit;
   
  -import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
   
   public class PUnitBlock
  
  
  
  1.2       +1 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitComponentManager.java
  
  Index: PUnitComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitComponentManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PUnitComponentManager.java	5 Nov 2002 23:50:50 -0000	1.1
  +++ PUnitComponentManager.java	5 Nov 2002 23:56:03 -0000	1.2
  @@ -41,7 +41,7 @@
           return m_serviceManager.hasService(key);
       }
   
  -    public void release( Component Component )
  +    public void release( Component component )
       {
   
       }
  
  
  
  1.4       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitResourceProvider.java
  
  Index: PUnitResourceProvider.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitResourceProvider.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PUnitResourceProvider.java	5 Nov 2002 23:50:50 -0000	1.3
  +++ PUnitResourceProvider.java	5 Nov 2002 23:56:03 -0000	1.4
  @@ -25,7 +25,8 @@
       private PUnitComponentManager m_pUnitComponentManager;
       private Configuration m_configuration;
   
  -    public PUnitResourceProvider(PUnitServiceManager pUnitServiceManager, Configuration configuration)
  +    public PUnitResourceProvider( PUnitServiceManager pUnitServiceManager,
  +                                  Configuration configuration )
       {
           m_pUnitServiceManager = pUnitServiceManager;
           m_pUnitComponentManager = new PUnitComponentManager(pUnitServiceManager);
  
  
  
  1.2       +2 -1      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java
  
  Index: PUnitTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/punit/PUnitTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PUnitTestCase.java	5 Nov 2002 23:50:50 -0000	1.1
  +++ PUnitTestCase.java	5 Nov 2002 23:56:03 -0000	1.2
  @@ -33,7 +33,8 @@
           super( name );
       }
   
  -    protected void addBlock( String blockName, String serviceName, Object block , Configuration configuration)
  +    protected void addBlock( String blockName, String serviceName,
  +                             Object block , Configuration configuration )
       {
           PUnitBlock pBlock = new PUnitBlock( blockName, block,
                   new PUnitResourceProvider(m_pUnitServiceManager, configuration) );
  
  
  
  1.14      +1 -3      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java
  
  Index: ManifestSubTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/ManifestSubTask.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ManifestSubTask.java	2 Oct 2002 19:39:07 -0000	1.13
  +++ ManifestSubTask.java	5 Nov 2002 23:56:03 -0000	1.14
  @@ -7,8 +7,6 @@
    */
   package org.apache.avalon.phoenix.tools.xdoclet;
   
  -import java.io.File;
  -
   /**
    * Generates Manifest file for Blocks
    *
  
  
  
  1.14      +12 -12    jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java
  
  Index: PhoenixXDoclet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/xdoclet/PhoenixXDoclet.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- PhoenixXDoclet.java	22 Oct 2002 05:58:17 -0000	1.13
  +++ PhoenixXDoclet.java	5 Nov 2002 23:56:03 -0000	1.14
  @@ -37,10 +37,10 @@
       private String m_mxinfoSubTask;
       private ManifestSubTask m_manifestSubTask;
       private Class m_metaGenerateQDoxClass;
  -    private Object m_MetaGenerateTask;
  +    private Object m_metaGenerateTask;
       private File m_destDir;
   
  -    private static boolean WARNING_SENT;
  +    private static boolean c_warningSent;
   
   
       /**
  @@ -54,7 +54,7 @@
           {
               m_metaGenerateQDoxClass =
                   Class.forName("org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask");
  -            m_MetaGenerateTask = m_metaGenerateQDoxClass.newInstance();
  +            m_metaGenerateTask = m_metaGenerateQDoxClass.newInstance();
           }
           catch (Exception e)
           {
  @@ -92,14 +92,14 @@
           "*                                                                                    *",
           "**************************************************************************************" };
   
  -        if (!WARNING_SENT)
  +        if (!c_warningSent)
           {
               for (int i = 0; i < message.length; i++)
               {
                   String s = message[i];
                   System.out.println(s);
               }
  -            WARNING_SENT = true;
  +            c_warningSent = true;
           }
       }
   
  @@ -113,7 +113,7 @@
           {
               Method addFileSet =
                       m_metaGenerateQDoxClass.getMethod("addFileset", new Class[] {FileSet.class});
  -            addFileSet.invoke(m_MetaGenerateTask, new Object[] {set});
  +            addFileSet.invoke(m_metaGenerateTask, new Object[] {set});
   
           }
           catch (InvocationTargetException ite)
  @@ -146,7 +146,7 @@
           try
           {
               Method setDir = m_metaGenerateQDoxClass.getMethod("setDest", new Class[] {File.class});
  -            setDir.invoke(m_MetaGenerateTask, new Object[] {dir});
  +            setDir.invoke(m_metaGenerateTask, new Object[] {dir});
   
           }
           catch (InvocationTargetException ite)
  @@ -240,7 +240,7 @@
           {
   
               Method execute = m_metaGenerateQDoxClass.getMethod("execute", new Class[] {});
  -            execute.invoke(m_MetaGenerateTask, new Object[] {});
  +            execute.invoke(m_metaGenerateTask, new Object[] {});
   
           }
           catch (InvocationTargetException ite)
  @@ -273,7 +273,7 @@
           {
               Method setTaskName = m_metaGenerateQDoxClass.getMethod("setTaskName",
                       new Class[] {String.class});
  -            setTaskName.invoke(m_MetaGenerateTask, new Object[] {s});
  +            setTaskName.invoke(m_metaGenerateTask, new Object[] {s});
           }
           catch (InvocationTargetException ite)
           {
  @@ -303,7 +303,7 @@
           try
           {
               Method init = m_metaGenerateQDoxClass.getMethod("init", new Class[] {});
  -            init.invoke(m_MetaGenerateTask, new Object[] {});
  +            init.invoke(m_metaGenerateTask, new Object[] {});
   
           }
           catch (InvocationTargetException ite)
  @@ -337,7 +337,7 @@
           {
               Method setProject = m_metaGenerateQDoxClass.getMethod("setProject",
                       new Class[] {Project.class});
  -            setProject.invoke(m_MetaGenerateTask, new Object[] {project});
  +            setProject.invoke(m_metaGenerateTask, new Object[] {project});
   
           }
           catch (InvocationTargetException ite)
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>