svn commit: r934279 - in /cxf/branches/2.2.x-fixes: ./ maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java

[dkulp]

Author: dkulp
Date: Thu Apr 15 03:31:03 2010
New Revision: 934279

URL: http://svn.apache.org/viewvc?rev=934279&view=rev
Log:
Merged revisions 934271 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r934271 | dkulp | 2010-04-14 23:04:05 -0400 (Wed, 14 Apr 2010) | 1 line
  
  [CXF-2763] Properly merge in options from the defaultOptions
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java?rev=934279&r1=934278&r2=934279&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/Option.java
 Thu Apr 15 03:31:03 2010
@@ -379,27 +379,30 @@ public class Option {
         destination.setWsdlVersion(getWsdlVersion());
     }
     
-    private void setIfNull(Object dest, Object source) {
+    private <T> T setIfNull(T dest, T source) {
         if (dest == null) {
             dest = source;
         }
+        return dest;
     }
     
     public void merge(Option defaultOptions) {
-        setIfNull(wsdlList, defaultOptions.wsdlList);
-        setIfNull(extendedSoapHeaders, defaultOptions.extendedSoapHeaders);
-        setIfNull(validateWsdl, defaultOptions.validateWsdl);
-        setIfNull(autoNameResolution, defaultOptions.autoNameResolution);
-        setIfNull(noAddressBinding, defaultOptions.noAddressBinding);
-        setIfNull(allowElementRefs, defaultOptions.allowElementRefs);
-        setIfNull(defaultExcludesNamespace, 
defaultOptions.defaultExcludesNamespace);
-        setIfNull(defaultNamespacePackageMapping, 
defaultOptions.defaultNamespacePackageMapping);
-        setIfNull(frontEnd, defaultOptions.frontEnd);
-        setIfNull(dataBinding, defaultOptions.dataBinding);
-        setIfNull(wsdlVersion, defaultOptions.wsdlVersion);
-        setIfNull(catalog, defaultOptions.catalog);
-        setIfNull(serviceName, defaultOptions.serviceName);
-        setIfNull(outputDir, defaultOptions.outputDir);
+        wsdlList = setIfNull(wsdlList, defaultOptions.wsdlList);
+        extendedSoapHeaders = setIfNull(extendedSoapHeaders, 
defaultOptions.extendedSoapHeaders);
+        validateWsdl = setIfNull(validateWsdl, defaultOptions.validateWsdl);
+        autoNameResolution = setIfNull(autoNameResolution, 
defaultOptions.autoNameResolution);
+        noAddressBinding = setIfNull(noAddressBinding, 
defaultOptions.noAddressBinding);
+        allowElementRefs = setIfNull(allowElementRefs, 
defaultOptions.allowElementRefs);
+        defaultExcludesNamespace = setIfNull(defaultExcludesNamespace, 
+                                             
defaultOptions.defaultExcludesNamespace);
+        defaultNamespacePackageMapping = 
setIfNull(defaultNamespacePackageMapping,
+                                                   
defaultOptions.defaultNamespacePackageMapping);
+        frontEnd = setIfNull(frontEnd, defaultOptions.frontEnd);
+        dataBinding = setIfNull(dataBinding, defaultOptions.dataBinding);
+        wsdlVersion = setIfNull(wsdlVersion, defaultOptions.wsdlVersion);
+        catalog = setIfNull(catalog, defaultOptions.catalog);
+        serviceName = setIfNull(serviceName, defaultOptions.serviceName);
+        outputDir = setIfNull(outputDir, defaultOptions.outputDir);
         extraargs.addAll(defaultOptions.extraargs);
         xjcargs.addAll(defaultOptions.xjcargs);
         bindingFiles = mergeList(bindingFiles, defaultOptions.bindingFiles, 
String.class);