svn commit: r486121 - in /struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles: definition/util/DefinitionsFactoryUtil.java filter/TilesFilter.java

[ap...@apache.org]

Author: apetrelli
Date: Tue Dec 12 04:58:28 2006
New Revision: 486121

URL: http://svn.apache.org/viewvc?view=rev&rev=486121
Log:
Moved DefinitionsFactory reload in a utility class.

Added:
    struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java   (with props)
Modified:
    struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java

Added: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java?view=auto&rev=486121
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java (added)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java Tue Dec 12 04:58:28 2006
@@ -0,0 +1,66 @@
+/*
+ * $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.definition.util;
+
+import org.apache.tiles.TilesContainer;
+import org.apache.tiles.access.TilesAccess;
+import org.apache.tiles.definition.DefinitionsFactory;
+import org.apache.tiles.definition.DefinitionsFactoryException;
+import org.apache.tiles.definition.ReloadableDefinitionsFactory;
+import org.apache.tiles.impl.BasicTilesContainer;
+
+/**
+ * Various {@link DefinitionsFactory} utilities.
+ *
+ * @version $Rev$ $Date$
+ */
+public class DefinitionsFactoryUtil {
+
+    /**
+     * Private constructor to avoid instatiation.
+     */
+    private DefinitionsFactoryUtil() {
+    }
+
+    /**
+     * Reloads the definitions factory content, if necessary.
+     *
+     * @param context The context object to use
+     * @throws DefinitionsFactoryException If something goes wrong during
+     * reload.
+     */
+    public static void reloadDefinitionsFactory(Object context)
+            throws DefinitionsFactoryException {
+        TilesContainer container = TilesAccess.getContainer(context);
+        if (container instanceof BasicTilesContainer) {
+            BasicTilesContainer basic = (BasicTilesContainer) container;
+            DefinitionsFactory factory = basic.getDefinitionsFactory();
+            if (factory instanceof ReloadableDefinitionsFactory) {
+                ReloadableDefinitionsFactory rFactory = (ReloadableDefinitionsFactory) factory;
+                if (rFactory.refreshRequired()) {
+                    rFactory.refresh();
+                }
+            }
+        }
+    }
+}

Propchange: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/definition/util/DefinitionsFactoryUtil.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java?view=diff&rev=486121&r1=486120&r2=486121
==============================================================================
--- struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java (original)
+++ struts/sandbox/trunk/tiles/tiles-core/src/main/java/org/apache/tiles/filter/TilesFilter.java Tue Dec 12 04:58:28 2006
@@ -28,6 +28,7 @@
 import org.apache.tiles.access.TilesAccess;
 import org.apache.tiles.definition.DefinitionsFactory;
 import org.apache.tiles.definition.ReloadableDefinitionsFactory;
+import org.apache.tiles.definition.util.DefinitionsFactoryUtil;
 import org.apache.tiles.impl.BasicTilesContainer;
 import org.apache.tiles.servlet.TilesServlet;
 
@@ -67,17 +68,8 @@
         throws IOException, ServletException {
 
         try {
-            TilesContainer container = TilesAccess.getContainer(getServletContext());
-            if (container instanceof BasicTilesContainer) {
-                BasicTilesContainer basic = (BasicTilesContainer) container;
-                DefinitionsFactory factory = basic.getDefinitionsFactory();
-                if (factory instanceof ReloadableDefinitionsFactory) {
-                    ReloadableDefinitionsFactory rFactory = (ReloadableDefinitionsFactory) factory;
-                    if (rFactory.refreshRequired()) {
-                        rFactory.refresh();
-                    }
-                }
-            }
+            DefinitionsFactoryUtil.reloadDefinitionsFactory(
+                    getServletContext());
             chain.doFilter(request, response);
         } catch (Exception e) {
             throw new ServletException("Error processing request.", e);