avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer ComponentViewer.java Main.java
Date Fri, 11 Apr 2003 07:36:21 GMT
donaldp     2003/04/11 00:36:21

  Modified:    fortress/examples/src/java/org/apache/avalon/fortress/examples/components
                        TranslatorImpl.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/extended
                        ExtendedContainer.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/components
                        ExtendedComponentImpl.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/extensions
                        Extensions.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/servlet
                        ServletContainer.java servlet.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/swing
                        Main.java SwingContainer.java
               fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer
                        ComponentViewer.java Main.java
  Log:
  styled and optimized imports
  
  Revision  Changes    Path
  1.7       +1 -2      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/components/TranslatorImpl.java
  
  Index: TranslatorImpl.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/components/TranslatorImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TranslatorImpl.java	22 Mar 2003 12:46:31 -0000	1.6
  +++ TranslatorImpl.java	11 Apr 2003 07:36:20 -0000	1.7
  @@ -52,7 +52,6 @@
   import java.util.HashMap;
   import java.util.Map;
   import java.util.Set;
  -
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.excalibur.instrument.AbstractLogEnabledInstrumentable;
  
  
  
  1.7       +0 -1      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/ExtendedContainer.java
  
  Index: ExtendedContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/ExtendedContainer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ExtendedContainer.java	22 Mar 2003 12:46:31 -0000	1.6
  +++ ExtendedContainer.java	11 Apr 2003 07:36:20 -0000	1.7
  @@ -51,7 +51,6 @@
   
   import org.apache.avalon.fortress.examples.extended.extensions.Extensions;
   
  -
   public final class ExtendedContainer
       extends org.apache.avalon.fortress.impl.DefaultContainer
   {
  
  
  
  1.6       +1 -2      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/components/ExtendedComponentImpl.java
  
  Index: ExtendedComponentImpl.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/components/ExtendedComponentImpl.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ExtendedComponentImpl.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ ExtendedComponentImpl.java	11 Apr 2003 07:36:20 -0000	1.6
  @@ -49,7 +49,6 @@
   */
   package org.apache.avalon.fortress.examples.extended.components;
   
  -
   /**
    * <code>TestComponentImpl</code>, demonstrating the use of a custom
    * lifecycle stage <code>SecurityManageable</code>. This code does
  
  
  
  1.7       +1 -2      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/extensions/Extensions.java
  
  Index: Extensions.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/extended/extensions/Extensions.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Extensions.java	22 Mar 2003 12:46:32 -0000	1.6
  +++ Extensions.java	11 Apr 2003 07:36:20 -0000	1.7
  @@ -52,7 +52,6 @@
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.lifecycle.AbstractAccessor;
   
  -
   /**
    * Some custom extensions for this container's components.
    *
  
  
  
  1.6       +1 -3      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/servlet/ServletContainer.java
  
  Index: ServletContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/servlet/ServletContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ServletContainer.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ ServletContainer.java	11 Apr 2003 07:36:20 -0000	1.6
  @@ -50,11 +50,9 @@
   package org.apache.avalon.fortress.examples.servlet;
   
   import java.io.IOException;
  -
   import javax.servlet.ServletException;
   import javax.servlet.ServletRequest;
   import javax.servlet.ServletResponse;
  -
   
   /**
    * Fortress based servlet example. Presents a simple page to the user
  
  
  
  1.6       +3 -5      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/servlet/servlet.java
  
  Index: servlet.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/servlet/servlet.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- servlet.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ servlet.java	11 Apr 2003 07:36:20 -0000	1.6
  @@ -50,13 +50,11 @@
   package org.apache.avalon.fortress.examples.servlet;
   
   import java.io.IOException;
  -
   import javax.servlet.ServletException;
   import javax.servlet.ServletRequest;
   import javax.servlet.ServletResponse;
   import javax.servlet.http.HttpServlet;
   
  -
   /**
    * Servlet based Fortress container example.
    *
  @@ -89,7 +87,7 @@
               config.setRoleManagerConfiguration( "resource://org/avalon/excalibur/fortress/examples/servlet/ServletContainer.roles"
);
   
               m_containerManager = new org.apache.avalon.fortress.impl.DefaultContainerManager(
config.getContext() );
  -            org.apache.avalon.framework.container.ContainerUtil.initialize(m_containerManager);
  +            org.apache.avalon.framework.container.ContainerUtil.initialize( m_containerManager
);
   
               m_container = (ServletContainer)m_containerManager.getContainer();
           }
  @@ -121,6 +119,6 @@
        */
       public void destroy()
       {
  -        org.apache.avalon.framework.container.ContainerUtil.dispose(m_containerManager);
  +        org.apache.avalon.framework.container.ContainerUtil.dispose( m_containerManager
);
       }
   }
  
  
  
  1.6       +2 -2      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/Main.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Main.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ Main.java	11 Apr 2003 07:36:21 -0000	1.6
  @@ -90,7 +90,7 @@
            * you to defer proper shutdown of Fortress resources when your
            * application is closed.
            */
  -        ((SwingContainer)cm.getContainer()).run();
  +        ( (SwingContainer)cm.getContainer() ).run();
   
           // Properly clean up when we are done
           org.apache.avalon.framework.container.ContainerUtil.dispose( cm );
  
  
  
  1.6       +4 -5      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.java
  
  Index: SwingContainer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/swing/SwingContainer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SwingContainer.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ SwingContainer.java	11 Apr 2003 07:36:21 -0000	1.6
  @@ -49,7 +49,6 @@
   */
   package org.apache.avalon.fortress.examples.swing;
   
  -
   /**
    * Simple Fortress based container containing a Swing implementation of Hello World.
    * This container creates a small Swing based GUI displaying a combobox of available
  @@ -126,15 +125,15 @@
   
       public void run()
       {
  -        while ( m_frame.isVisible() )
  +        while( m_frame.isVisible() )
           {
               try
               {
  -                Thread.sleep(1000);
  +                Thread.sleep( 1000 );
               }
               catch( InterruptedException ie )
               {
  -                m_frame.setVisible(false);
  +                m_frame.setVisible( false );
               }
           }
       }
  
  
  
  1.6       +19 -20    avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.java
  
  Index: ComponentViewer.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/ComponentViewer.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ComponentViewer.java	22 Mar 2003 12:46:32 -0000	1.5
  +++ ComponentViewer.java	11 Apr 2003 07:36:21 -0000	1.6
  @@ -3,34 +3,34 @@
    ============================================================================
                      The Apache Software License, Version 1.1
    ============================================================================
  - 
  +
    Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  - 
  +
    Redistribution and use in source and binary forms, with or without modifica-
    tion, are permitted provided that the following conditions are met:
  - 
  +
    1. Redistributions of  source code must  retain the above copyright  notice,
       this list of conditions and the following disclaimer.
  - 
  +
    2. Redistributions in binary form must reproduce the above copyright notice,
       this list of conditions and the following disclaimer in the documentation
       and/or other materials provided with the distribution.
  - 
  +
    3. The end-user documentation included with the redistribution, if any, must
       include  the following  acknowledgment:  "This product includes  software
       developed  by the  Apache Software Foundation  (http://www.apache.org/)."
       Alternately, this  acknowledgment may  appear in the software itself,  if
       and wherever such third-party acknowledgments normally appear.
  - 
  - 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"  
  -    must not be used to endorse or promote products derived from this  software 
  -    without  prior written permission. For written permission, please contact 
  +
  + 4. The names "Jakarta", "Avalon", "Excalibur" and "Apache Software Foundation"
  +    must not be used to endorse or promote products derived from this  software
  +    without  prior written permission. For written permission, please contact
       apache@apache.org.
  - 
  +
    5. Products  derived from this software may not  be called "Apache", nor may
       "Apache" appear  in their name,  without prior written permission  of the
       Apache Software Foundation.
  - 
  +
    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
    FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
  @@ -41,15 +41,14 @@
    ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
    (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - 
  +
    This software  consists of voluntary contributions made  by many individuals
  - on  behalf of the Apache Software  Foundation. For more  information on the 
  + on  behalf of the Apache Software  Foundation. For more  information on the
    Apache Software Foundation, please see <http://www.apache.org/>.
  - 
  +
   */
   package org.apache.avalon.fortress.examples.viewer;
   
  -
   /**
    * Simple Fortress container containing a Swing based viewer for performing
    * lookups on registered components.
  @@ -201,15 +200,15 @@
   
       public void run()
       {
  -        while (m_frame.isVisible())
  +        while( m_frame.isVisible() )
           {
               try
               {
  -                Thread.sleep(1000);
  +                Thread.sleep( 1000 );
               }
  -            catch (InterruptedException ie)
  +            catch( InterruptedException ie )
               {
  -                m_frame.setVisible(false);
  +                m_frame.setVisible( false );
               }
           }
       }
  
  
  
  1.7       +2 -2      avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/examples/src/java/org/apache/avalon/fortress/examples/viewer/Main.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Main.java	22 Mar 2003 12:46:32 -0000	1.6
  +++ Main.java	11 Apr 2003 07:36:21 -0000	1.7
  @@ -83,7 +83,7 @@
               cm = new DefaultContainerManager( config.getContext() );
               org.apache.avalon.framework.container.ContainerUtil.initialize( cm );
   
  -            ((org.apache.avalon.fortress.examples.viewer.ComponentViewer)cm.getContainer()).run();
  +            ( (org.apache.avalon.fortress.examples.viewer.ComponentViewer)cm.getContainer()
).run();
           }
           catch( org.apache.avalon.framework.CascadingException e )
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message