[jbossws-commits] JBossWS SVN: r18141 - spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config.
Author: asoldano
Date: 2013-12-05 09:49:08 -0500 (Thu, 05 Dec 2013)
New Revision: 18141
Modified:
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
Log:
minor change of parameter names
Modified:
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java
===================================================================
---
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java 2013-12-05
10:44:03 UTC (rev 18140)
+++
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/AbstractCommonConfig.java 2013-12-05
14:49:08 UTC (rev 18141)
@@ -75,21 +75,21 @@
}
}
- protected AbstractCommonConfig(AbstractCommonConfig base, AbstractCommonConfig conf)
+ protected AbstractCommonConfig(AbstractCommonConfig base, AbstractCommonConfig addon)
{
super();
this.configName = base.getConfigName();
- if (conf.features != null && !conf.features.isEmpty())
+ if (addon.features != null && !addon.features.isEmpty())
{
Map<String, Feature> map;
if (base.features.isEmpty())
{
- map = conf.features;
+ map = addon.features;
}
else
{
map = new HashMap<String, Feature>(base.features);
- map.putAll(conf.features);
+ map.putAll(addon.features);
}
this.features = Collections.unmodifiableMap(map);
}
@@ -97,17 +97,17 @@
{
this.features = Collections.emptyMap();
}
- if (conf.properties != null && !conf.properties.isEmpty())
+ if (addon.properties != null && !addon.properties.isEmpty())
{
Map<String, String> map;
if (base.properties.isEmpty())
{
- map = conf.properties;
+ map = addon.properties;
}
else
{
map = new HashMap<String, String>(base.properties);
- map.putAll(conf.properties);
+ map.putAll(addon.properties);
}
this.properties = Collections.unmodifiableMap(map);
}
@@ -115,17 +115,17 @@
{
this.properties = Collections.emptyMap();
}
- if (conf.preHandlerChains != null && !conf.preHandlerChains.isEmpty())
+ if (addon.preHandlerChains != null && !addon.preHandlerChains.isEmpty())
{
List<UnifiedHandlerChainMetaData> list;
if (base.preHandlerChains.isEmpty())
{
- list = conf.preHandlerChains;
+ list = addon.preHandlerChains;
}
else
{
list = new
ArrayList<UnifiedHandlerChainMetaData>(base.preHandlerChains);
- list.addAll(conf.preHandlerChains);
+ list.addAll(addon.preHandlerChains);
}
this.preHandlerChains = Collections.unmodifiableList(list);
}
@@ -133,12 +133,12 @@
{
this.preHandlerChains = Collections.emptyList();
}
- if (conf.postHandlerChains != null && !conf.postHandlerChains.isEmpty())
+ if (addon.postHandlerChains != null && !addon.postHandlerChains.isEmpty())
{
List<UnifiedHandlerChainMetaData> list;
if (base.postHandlerChains.isEmpty())
{
- list = conf.postHandlerChains;
+ list = addon.postHandlerChains;
}
else
{
Modified:
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java
===================================================================
---
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2013-12-05
10:44:03 UTC (rev 18140)
+++
spi/branches/JBWS-3739/src/main/java/org/jboss/wsf/spi/metadata/config/ClientConfig.java 2013-12-05
14:49:08 UTC (rev 18141)
@@ -43,7 +43,7 @@
super(configName, preHandlerChains, postHandlerChains, properties, features);
}
- public ClientConfig(ClientConfig base, ClientConfig conf) {
- super(base, conf);
+ public ClientConfig(ClientConfig base, ClientConfig addon) {
+ super(base, addon);
}
}