You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/05 19:14:31 UTC
svn commit: r674212 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n:
./ uixtools/
Author: skitching
Date: Sat Jul 5 10:14:30 2008
New Revision: 674212
URL: http://svn.apache.org/viewvc?rev=674212&view=rev
Log:
Code style fixes only
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java?rev=674212&r1=674211&r2=674212&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateJavascriptLocalesMojo.java Sat Jul 5 10:14:30 2008
@@ -111,7 +111,9 @@
private String[] getLocaleStrings()
{
if ("en_US".equals(locale))
+ {
return new String[] { "" };
+ }
Locale[] locales = Locale.getAvailableLocales();
String[] localeStrings = new String[locales.length];
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java?rev=674212&r1=674211&r2=674212&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/GenerateLocaleElementsMojo.java Sat Jul 5 10:14:30 2008
@@ -99,7 +99,9 @@
private String[] getLocaleStrings()
{
if ("en_US".equals(locale))
+ {
return new String[] { "" };
+ }
Locale[] locales = Locale.getAvailableLocales();
String[] localeStrings = new String[locales.length];
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java?rev=674212&r1=674211&r2=674212&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/JSLocaleElementsGenerator.java Sat Jul 5 10:14:30 2008
@@ -55,8 +55,12 @@
System.out.println("\tprettyPrint=false\tTurns off pretty printed output");
System.out.println("\toutDir=[path]\t\tDirectory path to write JavaScript files to");
System.out.println("\tsourceDir=[path]\t\tRoot directory path to write Java source to");
- System.out.println("\tbundleOutDir=[path]\t\tRoot directory path to write Java ResourceBundles to (defaults to sourceDir).");
- System.out.println("\tvariant=[variant name]\t\tIf supplied utility will generate ResourceBundles for this variant, and nothing else.");
+ System.out.println(
+ "\tbundleOutDir=[path]\t\tRoot directory path to write " +
+ "Java ResourceBundles to (defaults to sourceDir).");
+ System.out.println(
+ "\tvariant=[variant name]\t\tIf supplied utility will generate " +
+ "ResourceBundles for this variant, and nothing else.");
System.out.println("\tverbose=true\t\tTurns on verbose output");
System.out.println("\tgenerateBundleBaseOnly=true\t\tGenerates the base LocaleElement.java file only");
System.exit(0);
@@ -111,7 +115,9 @@
String bundleOutDir = getArgStringValue(args, "bundleOutDir", null);
if (bundleOutDir == null)
+ {
bundleOutDir = sourceDir;
+ }
// The bundle output dir is the base of the heirarchy, we'll actually put
// the files into the appropriate sub directory for the package.
@@ -139,10 +145,14 @@
File localeListFile = null;
if (writeSource)
+ {
(new File(fullBundleOutDir)).mkdirs();
+ }
if (writeJavascript)
+ {
(new File(outDir)).mkdirs();
+ }
if (writeAll && writeSource && !generateBundleBaseOnly)
{
@@ -382,7 +392,9 @@
output.write(" = new LocaleSymbols({");
if (prettyPrint)
+ {
output.write('\n');
+ }
Enumeration zoneEnumeration =
new ArrayEnumeration(DATE_FORMAT_ZONE_GET_KEYS);
@@ -406,7 +418,9 @@
output.write("});");
if (prettyPrint)
+ {
output.write('\n');
+ }
}
@@ -431,9 +445,13 @@
Object data = null;
if("CurrencyElements".equals(currKey))
+ {
data = _getCurrencyData(targetLocale);
+ }
else
+ {
data = _getElementData(currKey, elementsData, targetLocale);
+ }
boolean wroteElement = _writeResourceElement(
output,
@@ -587,7 +605,9 @@
output.write("\n };\n\n");
}
else
+ {
output.write(" = null");
+ }
}
private static void _writeEscapedString(
@@ -615,9 +635,13 @@
&& (currChar < 128))
{
if (currChar == '\"')
+ {
output.write("\\\"");
+ }
else
+ {
output.write(currChar);
+ }
}
else
{
@@ -699,7 +723,9 @@
}
if (version == null)
+ {
return "LocaleElements_" + locale;
+ }
return "LocaleElements_" + locale + version;
}
@@ -757,7 +783,7 @@
// private static String _RESOURCES_PACKAGE = "java.text.resources";
// J2SE 1.4:
- private static String _RESOURCES_PACKAGE = "sun.text.resources";
+ private static final String _RESOURCES_PACKAGE = "sun.text.resources";
private static final String _DATE_FORMAT_ZONE_PATH =
_RESOURCES_PACKAGE + ".DateFormatZoneData";
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java?rev=674212&r1=674211&r2=674212&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-i18n-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/i18n/uixtools/VersionUtils.java Sat Jul 5 10:14:30 2008
@@ -26,7 +26,9 @@
static public String normalizeVersionSuffix(String version)
{
if (version == null)
+ {
return null;
+ }
return version.replace('.', '_');
}