Author: apetrelli
Date: Mon Dec 18 10:07:53 2006
New Revision: 488379
URL: http://svn.apache.org/viewvc?view=rev&rev=488379
Log:
Corrected svn properties and added license disclaimers.
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
(contents, props changed)
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
(contents, props changed)
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java?view=diff&rev=488379&r1=488378&r2=488379
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
Mon Dec 18 10:07:53 2006
@@ -1,67 +1,89 @@
-package org.apache.tiles.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.definition.DefinitionsFactory;
-
-public class KeyedDefinitionsFactoryTilesContainer extends BasicTilesContainer
{
-
- protected Map<String, DefinitionsFactory> key2definitionsFactory;
-
- protected Map<String, Map<String, String>> key2initParams;
-
- public KeyedDefinitionsFactoryTilesContainer() {
- key2definitionsFactory = new HashMap<String,
DefinitionsFactory>();
- key2initParams = new HashMap<String, Map<String,String>>();
- }
-
- @Override
- public void init(Map<String, String> initParameters) throws
TilesException {
- super.init(initParameters);
-
- for (Map.Entry<String, DefinitionsFactory> entry:
- key2definitionsFactory.entrySet()) {
- String key = entry.getKey();
- initializeDefinitionsFactory(entry.getValue(),
- getResourceString(initParameters),
key2initParams.get(key));
- }
- }
-
- /**
- * Standard Getter
- *
- * @return the definitions factory used by this container.
- */
- public DefinitionsFactory getDefinitionsFactory(String key) {
- DefinitionsFactory retValue = null;
-
- if (key != null) {
- retValue = key2definitionsFactory.get(key);
- }
- if (retValue == null) {
- retValue = getDefinitionsFactory();
- }
-
- return retValue;
- }
-
- /**
- * Set the definitions factory. This method first ensures
- * that the container has not yet been initialized.
- *
- * @param definitionsFactory the definitions factory for this instance.
- */
- public void setDefinitionsFactory(String key,
- DefinitionsFactory definitionsFactory,
- Map<String, String> initParameters) {
- if (key != null) {
- checkInit();
- key2definitionsFactory.put(key, definitionsFactory);
- key2initParams.put(key, initParameters);
- } else {
- setDefinitionsFactory(definitionsFactory);
- }
- }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.tiles.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tiles.TilesException;
+import org.apache.tiles.definition.DefinitionsFactory;
+
+public class KeyedDefinitionsFactoryTilesContainer extends BasicTilesContainer
{
+
+ protected Map<String, DefinitionsFactory> key2definitionsFactory;
+
+ protected Map<String, Map<String, String>> key2initParams;
+
+ public KeyedDefinitionsFactoryTilesContainer() {
+ key2definitionsFactory = new HashMap<String,
DefinitionsFactory>();
+ key2initParams = new HashMap<String, Map<String,String>>();
+ }
+
+ @Override
+ public void init(Map<String, String> initParameters) throws
TilesException {
+ super.init(initParameters);
+
+ for (Map.Entry<String, DefinitionsFactory> entry:
+ key2definitionsFactory.entrySet()) {
+ String key = entry.getKey();
+ initializeDefinitionsFactory(entry.getValue(),
+ getResourceString(initParameters),
key2initParams.get(key));
+ }
+ }
+
+ /**
+ * Standard Getter
+ *
+ * @return the definitions factory used by this container.
+ */
+ public DefinitionsFactory getDefinitionsFactory(String key) {
+ DefinitionsFactory retValue = null;
+
+ if (key != null) {
+ retValue = key2definitionsFactory.get(key);
+ }
+ if (retValue == null) {
+ retValue = getDefinitionsFactory();
+ }
+
+ return retValue;
+ }
+
+ /**
+ * Set the definitions factory. This method first ensures
+ * that the container has not yet been initialized.
+ *
+ * @param definitionsFactory the definitions factory for this instance.
+ */
+ public void setDefinitionsFactory(String key,
+ DefinitionsFactory definitionsFactory,
+ Map<String, String> initParameters) {
+ if (key != null) {
+ checkInit();
+ key2definitionsFactory.put(key, definitionsFactory);
+ key2initParams.put(key, initParameters);
+ } else {
+ setDefinitionsFactory(definitionsFactory);
+ }
+ }
+}
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java?view=diff&rev=488379&r1=488378&r2=488379
==============================================================================
---
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
(original)
+++
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
Mon Dec 18 10:07:53 2006
@@ -1,67 +1,89 @@
-package org.apache.tiles.impl.mgmt;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tiles.TilesException;
-import org.apache.tiles.context.TilesRequestContext;
-import org.apache.tiles.definition.ComponentDefinition;
-import org.apache.tiles.definition.DefinitionsFactory;
-import org.apache.tiles.definition.DefinitionsFactoryException;
-import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
-import org.apache.tiles.mgmt.MutableTilesContainer;
-import org.apache.tiles.mgmt.TileDefinition;
-
-public class CachedKeyedDefinitionsFactoryTilesContainerFactory extends
- KeyedDefinitionsFactoryTilesContainer implements MutableTilesContainer
{
-
- private DefinitionManager mgr = new DefinitionManager();
-
- private Map<String, DefinitionManager> key2definitionManager
- = new HashMap<String, DefinitionManager>();
-
- public void register(TileDefinition definition)
- throws TilesException {
- ComponentDefinition def = new ComponentDefinition(definition);
- mgr.addDefinition(def);
- }
-
- @Override
- protected ComponentDefinition getDefinition(String definition,
- TilesRequestContext context)
- throws DefinitionsFactoryException {
- return mgr.getDefinition(definition, context);
- }
-
- @Override
- public DefinitionsFactory getDefinitionsFactory() {
- return mgr.getFactory();
- }
-
- @Override
- public DefinitionsFactory getDefinitionsFactory(String key) {
- DefinitionsFactory factory = key2definitionsFactory.get(key);
- if (factory == null) {
- factory = mgr.getFactory();
- }
-
- return factory;
- }
-
- @Override
- public void setDefinitionsFactory(DefinitionsFactory definitionsFactory) {
- super.setDefinitionsFactory(definitionsFactory);
- mgr.setFactory(definitionsFactory);
- }
-
- @Override
- public void setDefinitionsFactory(String key, DefinitionsFactory
definitionsFactory, Map<String, String> initParameters) {
- DefinitionManager mgr = key2definitionManager.get(key);
- if (mgr == null) {
- mgr = new DefinitionManager();
- key2definitionManager.put(key, mgr);
- }
- mgr.setFactory(definitionsFactory);
- }
-
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.tiles.impl.mgmt;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.tiles.TilesException;
+import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.definition.ComponentDefinition;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.impl.KeyedDefinitionsFactoryTilesContainer;
+import org.apache.tiles.mgmt.MutableTilesContainer;
+import org.apache.tiles.mgmt.TileDefinition;
+
+public class CachedKeyedDefinitionsFactoryTilesContainerFactory extends
+ KeyedDefinitionsFactoryTilesContainer implements MutableTilesContainer
{
+
+ private DefinitionManager mgr = new DefinitionManager();
+
+ private Map<String, DefinitionManager> key2definitionManager
+ = new HashMap<String, DefinitionManager>();
+
+ public void register(TileDefinition definition)
+ throws TilesException {
+ ComponentDefinition def = new ComponentDefinition(definition);
+ mgr.addDefinition(def);
+ }
+
+ @Override
+ protected ComponentDefinition getDefinition(String definition,
+ TilesRequestContext context)
+ throws DefinitionsFactoryException {
+ return mgr.getDefinition(definition, context);
+ }
+
+ @Override
+ public DefinitionsFactory getDefinitionsFactory() {
+ return mgr.getFactory();
+ }
+
+ @Override
+ public DefinitionsFactory getDefinitionsFactory(String key) {
+ DefinitionsFactory factory = key2definitionsFactory.get(key);
+ if (factory == null) {
+ factory = mgr.getFactory();
+ }
+
+ return factory;
+ }
+
+ @Override
+ public void setDefinitionsFactory(DefinitionsFactory definitionsFactory) {
+ super.setDefinitionsFactory(definitionsFactory);
+ mgr.setFactory(definitionsFactory);
+ }
+
+ @Override
+ public void setDefinitionsFactory(String key, DefinitionsFactory
definitionsFactory, Map<String, String> initParameters) {
+ DefinitionManager mgr = key2definitionManager.get(key);
+ if (mgr == null) {
+ mgr = new DefinitionManager();
+ key2definitionManager.put(key, mgr);
+ }
+ mgr.setFactory(definitionsFactory);
+ }
+
+}
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/impl/mgmt/CachedKeyedDefinitionsFactoryTilesContainerFactory.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
