You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by dd...@apache.org on 2006/12/19 15:23:59 UTC
svn commit: r488689 - in
/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory:
KeyedDefinitionsFactoryTilesContainerFactory.java TilesContainerFactory.java
Author: ddewolf
Date: Tue Dec 19 06:23:58 2006
New Revision: 488689
URL: http://svn.apache.org/viewvc?view=rev&rev=488689
Log:
Small tweaks to the defaults to make it more obvious what they provide and how they interact with the context.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java?view=diff&rev=488689&r1=488688&r2=488689
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/KeyedDefinitionsFactoryTilesContainerFactory.java Tue Dec 19 06:23:58 2006
@@ -70,8 +70,11 @@
param);
}
+ Map<String, String> config = new HashMap<String, String>(defaultConfiguration);
+ config.putAll(getInitParameterMap(context));
+
DefinitionsFactory defsFactory =
- (DefinitionsFactory) createFactory(getInitParameterMap(context),
+ (DefinitionsFactory) createFactory(config,
DEFINITIONS_FACTORY_INIT_PARAM);
((KeyedDefinitionsFactoryTilesContainer) container)
.setDefinitionsFactory(keys[i], defsFactory,
Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java?view=diff&rev=488689&r1=488688&r2=488689
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/factory/TilesContainerFactory.java Tue Dec 19 06:23:58 2006
@@ -117,9 +117,10 @@
public static TilesContainerFactory getFactory(Object context,
Map<String, String> defaults)
throws TilesException {
- Map<String, String> stuff = getInitParameterMap(context);
+ Map<String, String> configuration = new HashMap<String, String>(defaults);
+ configuration.putAll(getInitParameterMap(context));
TilesContainerFactory factory =
- (TilesContainerFactory) TilesContainerFactory.createFactory(stuff,
+ (TilesContainerFactory) TilesContainerFactory.createFactory(configuration,
CONTAINER_FACTORY_INIT_PARAM);
factory.setDefaultConfiguration(defaults);
return factory;
@@ -169,16 +170,19 @@
protected void storeContainerDependencies(Object context,
BasicTilesContainer container) throws TilesException {
+ Map<String, String> configuration = new HashMap<String, String>(defaultConfiguration);
+ configuration.putAll(getInitParameterMap(context));
+
TilesContextFactory contextFactory =
- (TilesContextFactory) createFactory(defaultConfiguration,
+ (TilesContextFactory) createFactory(configuration,
CONTEXT_FACTORY_INIT_PARAM);
DefinitionsFactory defsFactory =
- (DefinitionsFactory) createFactory(defaultConfiguration,
+ (DefinitionsFactory) createFactory(configuration,
DEFINITIONS_FACTORY_INIT_PARAM);
PreparerFactory prepFactory =
- (PreparerFactory) createFactory(defaultConfiguration,
+ (PreparerFactory) createFactory(configuration,
PREPARER_FACTORY_INIT_PARAM);
TilesApplicationContext tilesContext =