Author: jafl
Date: Fri Jun 3 00:17:27 2011
New Revision: 1130878
URL: http://svn.apache.org/viewvc?rev=1130878&view=rev
Log:
WW-3640 extend AbstractInterceptor
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
struts/struts2/trunk/pom.xml
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationWorkflowInterceptor.java
struts/struts2/trunk/xwork-core/src/main/java/com/opensymphony/xwork2/util/WildcardUtil.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java?rev=1130878&r1=1130877&r2=1130878&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/CheckboxInterceptor.java
Fri Jun 3 00:17:27 2011
@@ -24,7 +24,7 @@ package org.apache.struts2.interceptor;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import java.util.Map;
import java.util.Set;
@@ -48,7 +48,7 @@ import java.util.Iterator;
*
*
*/
-public class CheckboxInterceptor implements Interceptor {
+public class CheckboxInterceptor extends AbstractInterceptor {
/** Auto-generated serialization id */
private static final long serialVersionUID = -586878104807229585L;
@@ -57,12 +57,6 @@ public class CheckboxInterceptor impleme
private static final Logger LOG =
LoggerFactory.getLogger(CheckboxInterceptor.class);
-public void destroy() {
-}
-
-public void init() {
-}
-
public String intercept(ActionInvocation ai) throws Exception {
Map parameters = ai.getInvocationContext().getParameters();
Map newParams = new HashMap();
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java?rev=1130878&r1=1130877&r2=1130878&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
Fri Jun 3 00:17:27 2011
@@ -31,7 +31,7 @@ import org.apache.struts2.dispatcher.Ser
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionInvocation;
import com.opensymphony.xwork2.ValidationAware;
-import com.opensymphony.xwork2.interceptor.Interceptor;
+import com.opensymphony.xwork2.interceptor.AbstractInterceptor;
import com.opensymphony.xwork2.util.logging.Logger;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
@@ -145,7 +145,7 @@ import com.opensymphony.xwork2.util.logg
*
* @version $Date$ $Id$
*/
-public class MessageStoreInterceptor implements Interceptor {
+public class MessageStoreInterceptor extends AbstractInterceptor {
private static final long serialVersionUID = 4491997514314242420L;
@@ -164,8 +164,6 @@ public class MessageStoreInterceptor imp
public static final String actionErrorsSessionKey =
"__MessageStoreInterceptor_ActionErrors_SessionKey";
public static final String actionMessagesSessionKey =
"__MessageStoreInterceptor_ActionMessages_SessionKey";
-
-
public void setAllowRequestParameterSwitch(boolean
allowRequestParameterSwitch) {
this.allowRequestParameterSwitch = allowRequestParameterSwitch;
}
@@ -173,7 +171,6 @@ public class MessageStoreInterceptor imp
return this.allowRequestParameterSwitch;
}
-
public void setRequestParameterSwitch(String requestParameterSwitch) {
this.requestParameterSwitch = requestParameterSwitch;
}
@@ -181,8 +178,6 @@ public class MessageStoreInterceptor imp
return this.requestParameterSwitch;
}
-
-
public void setOperationMode(String operationMode) {
this.operationMode = operationMode;
}
@@ -190,13 +185,6 @@ public class MessageStoreInterceptor imp
return this.operationMode;
}
-
-public void destroy() {
-}
-
-public void init() {
-}
-
public String intercept(ActionInvoc
