Author: dkulp Date: Fri Oct 2 19:58:25 2009 New Revision: 821148 URL: http://svn.apache.org/viewvc?rev=821148&view=rev Log: Merged revisions 820869 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r820869 | dkulp | 2009-10-01 22:50:49 -0400 (Thu, 01 Oct 2009) | 12 lines Merged revisions 820431 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r820431 | dkulp | 2009-09-30 16:24:10 -0400 (Wed, 30 Sep 2009) | 4 lines Fix error message typo Make sure the -Xts plugin is added to the activePlugins. When run with params, it's not always added (thanks to TheDon on irc for discovering this) ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java?rev=821148&r1=821147&r2=821148&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java (original) +++ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/com/sun/tools/xjc/addon/apache_cxf/ts/ToStringPlugin.java Fri Oct 2 19:58:25 2009 @@ -69,6 +69,6 @@ public int parseArgument(Options opt, String[] args, int index) throws BadCommandLineException, IOException { - return impl.parseArgument(opt, args, index); + return impl.parseArgument(opt, args, index, this); } } Modified: cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java?rev=821148&r1=821147&r2=821148&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java (original) +++ cxf/branches/2.1.x-fixes/common/xjc/ts/src/main/java/org/apache/cxf/xjc/ts/ToStringPlugin.java Fri Oct 2 19:58:25 2009 @@ -61,7 +61,7 @@ + " -Xts:style:simple : Have toString produce single line terse output\n"; } - public int parseArgument(Options opt, String[] args, int index) + public int parseArgument(Options opt, String[] args, int index, com.sun.tools.xjc.Plugin plugin) throws BadCommandLineException, IOException { int ret = 0; if (args[index].equals("-Xts:style:multiline")) { @@ -71,6 +71,9 @@ styleFieldName = "SIMPLE_STYLE"; ret = 1; } + if (!opt.activePlugins.contains(plugin)) { + opt.activePlugins.add(plugin); + } return ret; }
