[jboss-svn-commits] JBL Code SVN: r16178 - labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook.

[jboss-svn-commits at lists.jboss.org]

Author: steve.ebersole at jboss.com
Date: 2007-10-30 17:57:34 -0400 (Tue, 30 Oct 2007)
New Revision: 16178

Modified:
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/CleanPoMojo.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/GenerationMojo.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/TranslationMojo.java
   labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/UpdatePoMojo.java
Log:
consolidate ability to limit the translations processed [jdocbook.lang]

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java	2007-10-30 21:44:16 UTC (rev 16177)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/AbstractDocBookMojo.java	2007-10-30 21:57:34 UTC (rev 16178)
@@ -287,6 +287,15 @@
 		return plans;
 	}
 
+	protected Locale getRequestedLocale() {
+		String requestedLocaleStr = project.getProperties().getProperty( "jdocbook.lang" );
+		Locale requestedLocale = requestedLocaleStr == null ? null : parseLocale( requestedLocaleStr );
+		if ( requestedLocale != null ) {
+			getLog().info( "requested processing limited to [" + stringify( requestedLocale ) + "] lang" ) ;
+		}
+		return requestedLocale;
+	}
+
 	protected MasterTranslationDescriptor getMasterTranslationDescriptor() {
 		return new MasterTranslationDescriptor( parseLocale( masterTranslation ) );
 	}

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/CleanPoMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/CleanPoMojo.java	2007-10-30 21:44:16 UTC (rev 16177)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/CleanPoMojo.java	2007-10-30 21:57:34 UTC (rev 16178)
@@ -32,9 +32,7 @@
  */
 public class CleanPoMojo extends AbstractDocBookMojo {
 	protected void doExecute() throws JDocBookProcessException {
-		String requestedTranslation = project.getProperties().getProperty( "jdocbook.po.lang" );
-		Locale requestedLocale = requestedTranslation == null ? null : parseLocale( requestedTranslation );
-
+		Locale requestedLocale = getRequestedLocale();
 		for ( I18nSource source : getI18nSources() ) {
 			if ( requestedLocale != null && !requestedLocale.equals( source.getLocale() ) ) {
 				continue;

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/GenerationMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/GenerationMojo.java	2007-10-30 21:44:16 UTC (rev 16177)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/GenerationMojo.java	2007-10-30 21:57:34 UTC (rev 16178)
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Locale;
 
 import org.apache.maven.artifact.Artifact;
 import org.jboss.jdocbook.profile.ProfilerFactory;
@@ -67,9 +68,15 @@
 		}
 
 		RendererFactory rendererFactory = new RendererFactory( options );
+		Locale requestedLocale = getRequestedLocale();
 
 		List<PublishingSource> sources = getPublishingSources();
 		for ( PublishingSource source : sources ) {
+			if ( requestedLocale != null && !requestedLocale.equals( source.getLocale() ) ) {
+				getLog().info( "skipping non-requested lang [" + stringify( source.getLocale() ) + "]" );
+				continue;
+			}
+
 			File sourceFile = source.resolveDocumentFile();
 			if ( !sourceFile.exists() ) {
 				getLog().info( "Source document [" + sourceFile.getAbsolutePath() + "] did not exist; skipping" );

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/TranslationMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/TranslationMojo.java	2007-10-30 21:44:16 UTC (rev 16177)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/TranslationMojo.java	2007-10-30 21:57:34 UTC (rev 16178)
@@ -30,11 +30,8 @@
  */
 public class TranslationMojo extends AbstractDocBookMojo {
 	protected void doExecute() throws JDocBookProcessException {
-		String requestedTranslation = project.getProperties().getProperty( "jdocbook.po.lang" );
-		Locale requestedLocale = requestedTranslation == null ? null : parseLocale( requestedTranslation );
-
+		Locale requestedLocale = getRequestedLocale();
 		MasterTranslationDescriptor masterTranslationDescriptor = getMasterTranslationDescriptor();
-
 		for ( I18nSource source : getI18nSources() ) {
 			if ( requestedLocale == null || requestedLocale.equals( source.getLocale() ) ) {
 				getLog().info( "Processing translation [" + stringify( source.getLocale() ) + "]" );

Modified: labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/UpdatePoMojo.java
===================================================================
--- labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/UpdatePoMojo.java	2007-10-30 21:44:16 UTC (rev 16177)
+++ labs/jbossbuild/maven-plugins/trunk/maven-jdocbook-plugin/src/main/java/org/jboss/maven/plugins/jdocbook/UpdatePoMojo.java	2007-10-30 21:57:34 UTC (rev 16178)
@@ -20,7 +20,6 @@
 
 import org.jboss.jdocbook.JDocBookProcessException;
 import org.jboss.jdocbook.i18n.actions.UpdatePoAction;
-import org.jboss.jdocbook.util.LocaleUtils;
 
 /**
  * UpdatePoMojo implementationslatable strings from the master translation source into the POT files.
@@ -32,13 +31,11 @@
  */
 public class UpdatePoMojo extends AbstractDocBookMojo {
 	protected void doExecute() throws JDocBookProcessException {
-		String requestedTranslation = project.getProperties().getProperty( "jdocbook.po.lang" );
-		Locale translationLocale = requestedTranslation == null ? null : LocaleUtils.parse( requestedTranslation, options.getLocaleSeparator() );
-
+		Locale translationLocale = getRequestedLocale();
 		List<I18nSource> sources = getI18nSources();
 		for ( I18nSource source : sources ) {
 			if ( translationLocale == null || translationLocale.equals( source.getLocale() ) ) {
-				getLog().info( "Updating PO file [" + LocaleUtils.render( source.getLocale(), options.getLocaleSeparator() ) + "]" );
+				getLog().info( "Updating PO file [" + stringify( source.getLocale() ) + "]" );
 				new UpdatePoAction( potDirectory, source.resolvePoDirectory(), source.getLocale(), options ).perform();
 			}
 		}