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/07 23:01:41 UTC
svn commit: r674636 - in
/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts:
AbstractGenerateSourcesMojo.java ListRTSWriter.java UnicodeEscapes.java
XRTSParser.java
Author: skitching
Date: Mon Jul 7 14:01:41 2008
New Revision: 674636
URL: http://svn.apache.org/viewvc?rev=674636&view=rev
Log:
Code style fixes only
Modified:
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java
myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java?rev=674636&r1=674635&r2=674636&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/AbstractGenerateSourcesMojo.java Mon Jul 7 14:01:41 2008
@@ -141,7 +141,9 @@
try
{
if (targetFile.exists())
+ {
targetFile.delete();
+ }
SAXParser parser = factory.newSAXParser();
targetFile.getParentFile().mkdirs();
@@ -170,7 +172,9 @@
else
{
if ("list".equals(targetType))
+ {
return new ListRTSWriter();
+ }
throw new MojoExecutionException("Unknown bundle type: " + targetType);
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java?rev=674636&r1=674635&r2=674636&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/ListRTSWriter.java Mon Jul 7 14:01:41 2008
@@ -74,7 +74,9 @@
String rtsFileType = "xrts";
if (meta != null)
+ {
rtsFileType = (String)meta.get("fileType");
+ }
_pw.println("// Edit " + srcName + "." + rtsFileType + " and run the " +
rtsFileType.toUpperCase() + "MakeBundle tool instead.");
_pw.println("// ");
@@ -82,9 +84,15 @@
String packageName = (String)parms.get("pkgName");
boolean validPackage = false;
if (packageName == null)
+ {
if (meta != null)
+ {
if (meta.get("package") != null)
+ {
packageName = (String)meta.get("package");
+ }
+ }
+ }
if (packageName != null &&
(!packageName.equals("") || !packageName.trim().equals("")))
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java?rev=674636&r1=674635&r2=674636&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/UnicodeEscapes.java Mon Jul 7 14:01:41 2008
@@ -74,10 +74,10 @@
else
{
buffer.append("\\u");
- buffer.append(_hex[(c>>12)& 0x0f]);
- buffer.append(_hex[(c>>8)& 0x0f]);
- buffer.append(_hex[(c>>4)& 0x0f]);
- buffer.append(_hex[c & 0x0f]);
+ buffer.append(_HEX[(c>>12)& 0x0f]);
+ buffer.append(_HEX[(c>>8)& 0x0f]);
+ buffer.append(_HEX[(c>>4)& 0x0f]);
+ buffer.append(_HEX[c & 0x0f]);
}
}
return buffer.toString();
@@ -100,7 +100,7 @@
// return byteToHex(hi) + byteToHex(lo);
// }
- private static final String[] _hex =
+ private static final String[] _HEX =
{"0", "1", "2", "3", "4", "5", "6", "7",
"8", "9", "a", "b", "c", "d", "e", "f"};
}
Modified: myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java?rev=674636&r1=674635&r2=674636&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-plugins/myfaces-xrts-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/xrts/XRTSParser.java Mon Jul 7 14:01:41 2008
@@ -131,9 +131,13 @@
{
_metaHt.put("package", atts.getValue("package"));
if (atts.getValue("version") != null)
+ {
_metaHt.put("version", atts.getValue("version"));
+ }
if (atts.getValue("baseversion") != null)
+ {
_metaHt.put("baseVersion", atts.getValue("baseversion"));
+ }
}
}