Return-Path: Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org Received: (qmail 11610 invoked from network); 20 May 2002 11:46:44 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 20 May 2002 11:46:44 -0000 Received: (qmail 25405 invoked by uid 97); 20 May 2002 11:46:44 -0000 Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org Received: (qmail 25347 invoked by uid 97); 20 May 2002 11:46:43 -0000 Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Avalon CVS List" Reply-To: "Avalon Developers List" Delivered-To: mailing list avalon-cvs@jakarta.apache.org Received: (qmail 25336 invoked by uid 97); 20 May 2002 11:46:42 -0000 X-Antivirus: nagoya (v4198 created Apr 24 2002) Date: 20 May 2002 11:46:39 -0000 Message-ID: <20020520114639.68122.qmail@icarus.apache.org> From: donaldp@apache.org To: jakarta-avalon-phoenix-cvs@apache.org Subject: cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor DefaultEmbeddor.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N donaldp 02/05/20 04:46:39 Modified: src/java/org/apache/avalon/phoenix/components/embeddor DefaultEmbeddor.java Log: Fix checkstyle violations Revision Changes Path 1.66 +14 -6 jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java Index: DefaultEmbeddor.java =================================================================== RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/components/embeddor/DefaultEmbeddor.java,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- DefaultEmbeddor.java 18 May 2002 09:16:12 -0000 1.65 +++ DefaultEmbeddor.java 20 May 2002 11:46:39 -0000 1.66 @@ -47,7 +47,8 @@ */ public class DefaultEmbeddor extends AbstractLogEnabled - implements Embeddor, EmbeddorMBean, Contextualizable, Parameterizable, Configurable, Initializable, Disposable + implements Embeddor, EmbeddorMBean, Contextualizable, + Parameterizable, Configurable, Initializable, Disposable { private static final Resources REZ = ResourceManager.getPackageResources( DefaultEmbeddor.class ); @@ -240,7 +241,8 @@ // The server will shut itself down when all applications are disposed. if( emptyKernel() ) { - final String message = REZ.getString( "embeddor.shutdown.all-apps-disposed" ); + final String message = + REZ.getString( "embeddor.shutdown.all-apps-disposed" ); getLogger().info( message ); } break; @@ -473,7 +475,7 @@ { final String filename = file.getName(); int index = filename.lastIndexOf( '.' ); - if( -1 == index ) index = filename.length(); + if( -1 == index ) {index = filename.length();} final String name = filename.substring( 0, index ); final File canonicalFile = file.getCanonicalFile(); deployFile( name, canonicalFile ); @@ -535,7 +537,7 @@ for( int i = 0; i < m_entrys.length; i++ ) { final Object object = m_entrys[ i ].getObject(); - if( null == object ) continue; + if( null == object ) {continue;} ContainerUtil.shutdown( object ); } } @@ -557,7 +559,10 @@ final Object object = Class.forName( classname ).newInstance(); if( !service.isInstance( object ) ) { - final String message = REZ.getString( "bad-type.error", classname, service.getName() ); + final String message = + REZ.getString( "bad-type.error", + classname, + service.getName() ); throw new Exception( message ); } return object; @@ -569,7 +574,10 @@ } catch( final InstantiationException ie ) { - final String message = REZ.getString( "no-instantiate.error", service.getName(), classname ); + final String message = + REZ.getString( "no-instantiate.error", + service.getName(), + classname ); throw new CascadingException( message, ie ); } catch( final ClassNotFoundException cnfe ) -- To unsubscribe, e-mail: For additional commands, e-mail: