Author: jmitchell
Date: Sat Apr 9 22:11:28 2005
New Revision: 160738
URL: http://svn.apache.org/viewcvs?view=rev&rev=160738
Log:
move protected messages to an intermediate base action
Added:
struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
(with props)
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
struts/core/trunk/src/share/org/apache/struts/actions/DownloadAction.java
struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java
struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java
struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java
Added: struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java?view=auto&rev=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
(added)
+++ struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java Sat
Apr 9 22:11:28 2005
@@ -0,0 +1,43 @@
+/*
+ * $Id: DispatchAction.java 54929 2004-10-16 16:38:42Z germuska $
+ *
+ * Copyright 2001-2004 The Apache Software Foundation.
+ *
+ * Licensed 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.struts.actions;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.util.MessageResources;
+
+/**
+ * <p>BaseAction is provided as an intermediate class for
+ * shared funtionality between <code>Action</code> and any
+ * stock implementation provided in this package.</p>
+ *
+ * @version $Rev$ $Date$
+ * @since Struts 1.3
+ */
+
+public abstract class BaseAction extends Action{
+
+ /**
+ * The message resources for this package.
+ */
+ static MessageResources messages = MessageResources.getMessageResources
+ ("org.apache.struts.actions.LocalStrings");
+
+
+}
Propchange:
struts/core/trunk/src/share/org/apache/struts/actions/BaseAction.java
------------------------------------------------------------------------------
svn:executable = *
Modified: struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/ChainAction.java Sat
Apr 9 22:11:28 2005
@@ -22,7 +22,6 @@
import org.apache.commons.chain.Catalog;
import org.apache.commons.chain.CatalogFactory;
import org.apache.commons.chain.Command;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -68,7 +67,7 @@
* </ul>
*/
-public class ChainAction extends Action {
+public class ChainAction extends BaseAction {
// ------------------------------------------------------- Instance
Varibles
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/DispatchAction.java
Sat Apr 9 22:11:28 2005
@@ -28,11 +28,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
/**
* <p>An abstract <strong>Action</strong> that dispatches to a public
@@ -89,7 +87,7 @@
*
* @version $Rev$ $Date$
*/
-public abstract class DispatchAction extends Action {
+public abstract class DispatchAction extends BaseAction {
// ----------------------------------------------------- Instance Variables
@@ -105,14 +103,6 @@
* Commons Logging instance.
*/
protected static Log log = LogFactory.getLog(DispatchAction.class);
-
-
- /**
- * The message resources for this package.
- */
- protected static MessageResources messages =
- MessageResources.getMessageResources
- ("org.apache.struts.actions.LocalStrings");
/**
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java?view=diff&r1=160737&r2=160738
==============================================================================
---
struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
(original)
+++
struts/core/trunk/src/share/org/apache/struts/actions/DispatchChainAction.java
Sat Apr 9 22:11:28 2005
@@ -22,7 +22,6 @@
import org.apache.commons.chain.Catalog;
import org.apache.commons.chain.CatalogFactory;
import org.apache.commons.chain.Command;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -67,7 +66,7 @@
* </ul>
*/
-public class DispatchChainAction extends Action {
+public class DispatchChainAction extends BaseAction {
// ------------------------------------------------------- Instance
Varibles
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/DownloadAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/DownloadAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/DownloadAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/DownloadAction.java
Sat Apr 9 22:11:28 2005
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -47,7 +46,7 @@
*
* @since Struts 1.2.6
*/
-public abstract class DownloadAction extends Action {
+public abstract class DownloadAction extends BaseAction {
/**
* If the <code>getBufferSize()</code> method is not overridden, this is
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/ForwardAction.java
Sat Apr 9 22:11:28 2005
@@ -22,11 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
/**
* <p>An <strong>Action</strong> that forwards to the context-relative
@@ -53,21 +51,10 @@
*
* @version $Rev$ $Date$
*/
-public class ForwardAction extends Action {
+public class ForwardAction extends BaseAction {
// ----------------------------------------------------- Instance Variables
-
-
- /**
- * The message resources for this package.
- */
- protected static MessageResources messages =
- MessageResources.getMessageResources
- ("org.apache.struts.actions.LocalStrings");
-
-
- // --------------------------------------------------------- Public Methods
/**
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/IncludeAction.java
Sat Apr 9 22:11:28 2005
@@ -23,12 +23,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.upload.MultipartRequestWrapper;
-import org.apache.struts.util.MessageResources;
/**
* <p>An <strong>Action</strong> that includes the context-relative
@@ -55,21 +53,10 @@
*
* @version $Rev$ $Date$
*/
-public class IncludeAction extends Action {
+public class IncludeAction extends BaseAction {
// ----------------------------------------------------- Instance Variables
-
-
- /**
- * The message resources for this package.
- */
- protected static MessageResources messages =
- MessageResources.getMessageResources
- ("org.apache.struts.actions.LocalStrings");
-
-
- // --------------------------------------------------------- Public Methods
/**
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/LocaleAction.java Sat
Apr 9 22:11:28 2005
@@ -29,10 +29,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
/**
@@ -41,7 +41,7 @@
* parameters that are set (language, country, & page).
*
*/
-public final class LocaleAction extends Action {
+public final class LocaleAction extends BaseAction {
/**
* Commons Logging instance.
Modified:
struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java?view=diff&r1=160737&r2=160738
==============================================================================
--- struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java
(original)
+++ struts/core/trunk/src/share/org/apache/struts/actions/SwitchAction.java Sat
Apr 9 22:11:28 2005
@@ -25,11 +25,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.Globals;
-import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ModuleUtils;
/**
@@ -52,7 +50,7 @@
* @version $Rev$ $Date$
* @since Struts 1.1
*/
-public class SwitchAction extends Action {
+public class SwitchAction extends BaseAction {
// ----------------------------------------------------- Instance Variables
@@ -62,17 +60,6 @@
* Commons Logging instance.
*/
protected static Log log = LogFactory.getLog(SwitchAction.class);
-
-
- /**
- * The message resources for this package.
- */
- protected static MessageResources messages =
- MessageResources.getMessageResources
- ("org.apache.struts.actions.LocalStrings");
-
-
- // --------------------------------------------------------- Public Methods
// See superclass for JavaDoc
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
