Added wrapper for Messages.properties bundle as a component

Author: oleg

pom.xml

@@ -7,7 +7,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>plexus-i18n</artifactId>
   <name>Plexus I18N Component</name>
-  <version>1.0-beta-9-SNAPSHOT</version>
+  <version>1.0-beta-10-SNAPSHOT</version>
   <build>
     <plugins>
       <plugin>

src/main/java/org/codehaus/plexus/i18n/DefaultLanguage.java

@@ -0,0 +1,63 @@
+package org.codehaus.plexus.i18n;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+
+/**
+ *
+ * 
+ * @author <a href="[email protected]">Oleg Gusakov</a>
+ * 
+ * @plexus.component
+ *   role="org.codehaus.plexus.i18n.Language"
+ */
+public class DefaultLanguage
+implements Language
+{
+	public static String DEFAULT_NAME = "Messages";
+	
+	private Class clazz;
+	ResourceBundle rb;
+	//-------------------------------------------------------------------------------------
+	public DefaultLanguage()
+	{
+	}
+	//-------------------------------------------------------------------------------------
+	public DefaultLanguage( Class clazz )
+	{
+		this( clazz, Locale.getDefault() );
+	}
+	//-------------------------------------------------------------------------------------
+	public DefaultLanguage( Class clazz, Locale locale )
+	{
+		this.clazz = clazz;
+		rb = ResourceBundle.getBundle( clazz.getPackage().getName()+"."+DEFAULT_NAME, locale, clazz.getClassLoader() );
+	}
+	//-------------------------------------------------------------------------------------
+	public Language init()
+	{
+		return new DefaultLanguage();
+	}
+	//-------------------------------------------------------------------------------------
+	public Language init(Class clazz, Locale locale)
+	{
+		return new DefaultLanguage( clazz, locale );
+	}
+	//-------------------------------------------------------------------------------------
+	public Language init(Class clazz)
+	{
+		return new DefaultLanguage( clazz );
+	}
+	//-------------------------------------------------------------------------------------
+	public String getMessage( String key )
+	throws LanguageException
+	{
+		if( rb == null )
+			throw new LanguageException("resourceBundle not initialized for "+(clazz==null?"null":clazz.getName() ) );
+		
+		return rb.getString(key);
+	}
+	//-------------------------------------------------------------------------------------
+	//-------------------------------------------------------------------------------------
+}

src/main/java/org/codehaus/plexus/i18n/Language.java

@@ -1,37 +1,22 @@
 package org.codehaus.plexus.i18n;
 
 import java.util.Locale;
-import java.util.ResourceBundle;
 
-public class Language
+public interface Language
 {
-	public static String DEFAULT_NAME = "Messages";
-	
-	private Class clazz;
-	ResourceBundle rb;
-	
-	public Language()
-	{
-	}
+    public static String ROLE = Language.class.getName();
+
+    /** look for Messages.properties in the clazz package by default */
+    public static final String DEFAULT_NAME = "Messages";
+
+    public Language init();
 
-	public Language( Class clazz )
-	{
-		this( clazz, Locale.getDefault() );
-	}
+	public Language init( Class clazz );
 
-	public Language( Class clazz, Locale locale )
-	{
-		this.clazz = clazz;
-		rb = ResourceBundle.getBundle( clazz.getPackage().getName()+"."+DEFAULT_NAME, locale, clazz.getClassLoader() );
-	}
+	public Language init( Class clazz, Locale locale );
 
 	public String getMessage( String key )
 	throws LanguageException
-	{
-		if( rb == null )
-			throw new LanguageException("resourceBundle not initialized for "+(clazz==null?"null":clazz.getName() ) );
-		
-		return rb.getString(key);
-	}
+	;
 
 }