Browse Source

i18n.

I have no words but I must commit.


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269635 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
a71d6f91ad
2 changed files with 27 additions and 10 deletions
  1. +21
    -10
      proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
  2. +6
    -0
      proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties

+ 21
- 10
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java View File

@@ -11,6 +11,8 @@ import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager; import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable; import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.context.Context;
import org.apache.avalon.excalibur.i18n.ResourceManager;
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLoggable; import org.apache.avalon.framework.logger.AbstractLoggable;
import org.apache.myrmidon.components.converter.MasterConverter; import org.apache.myrmidon.components.converter.MasterConverter;
import org.apache.myrmidon.components.type.TypeException; import org.apache.myrmidon.components.type.TypeException;
@@ -28,6 +30,9 @@ public class DefaultMasterConverter
extends AbstractLoggable extends AbstractLoggable
implements MasterConverter, Composable implements MasterConverter, Composable
{ {
private static final Resources REZ =
ResourceManager.getPackageResources( DefaultMasterConverter.class );

private final static boolean DEBUG = false; private final static boolean DEBUG = false;


private ConverterRegistry m_registry; private ConverterRegistry m_registry;
@@ -48,7 +53,8 @@ public class DefaultMasterConverter
try { m_factory = typeManager.getFactory( Converter.ROLE ); } try { m_factory = typeManager.getFactory( Converter.ROLE ); }
catch( final TypeException te ) catch( final TypeException te )
{ {
throw new ComponentException( "Unable to retrieve factory from TypeManager", te );
final String message = REZ.getString( "no-converter-factory.error" );
throw new ComponentException( message, te );
} }
} }


@@ -73,8 +79,11 @@ public class DefaultMasterConverter


if( DEBUG ) if( DEBUG )
{ {
getLogger().debug( "Looking for converter from " + originalClass.getName() +
" to " + destination.getName() );
final String message =
REZ.getString( "converter-lookup.notice",
originalClass.getName(),
destination.getName() );
getLogger().debug( message );
} }


//TODO: Start searching inheritance hierarchy for converter //TODO: Start searching inheritance hierarchy for converter
@@ -83,9 +92,11 @@ public class DefaultMasterConverter


if( null == name ) if( null == name )
{ {
throw new ConverterException( "Unable to find converter for " +
originalClass.getName() + " to " +
destination.getName() + " conversion" );
final String message =
REZ.getString( "no-converter.notice",
originalClass.getName(),
destination.getName() );
throw new ConverterException( message );
} }


try try
@@ -93,18 +104,18 @@ public class DefaultMasterConverter
//TODO: Start caching converters instead of repeatedly instantiating em. //TODO: Start caching converters instead of repeatedly instantiating em.
final Converter converter = (Converter)m_factory.create( name ); final Converter converter = (Converter)m_factory.create( name );



if( DEBUG ) if( DEBUG )
{ {
getLogger().debug( "Found Converter: " + converter );
final String message = REZ.getString( "found-converter.notice", converter );
getLogger().debug( message );
} }


return converter.convert( destination, original, context ); return converter.convert( destination, original, context );
} }
catch( final TypeException te ) catch( final TypeException te )
{ {
throw new ConverterException( "Badly configured TypeManager missing " +
"converter definition", te );
final String message = REZ.getString( "bad-typemanager.error" );
throw new ConverterException( message, te );
} }
} }
} }

+ 6
- 0
proposal/myrmidon/src/java/org/apache/myrmidon/components/converter/Resources.properties View File

@@ -0,0 +1,6 @@
converter-lookup.notice=Looking for converter from {0} to {1}.
found-converter.notice=Found Converter: {0}.

no-converter-factory.error=Unable to retrieve Converter factory from TypeManager.
no-converter.error=Unable to find converter for {0} to {1} conversion.
bad-typemanager.error=Badly configured TypeManager missing converter definition.

Loading…
Cancel
Save