You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/06/02 14:47:19 UTC
struts git commit: Drops unneeded method
Repository: struts
Updated Branches:
refs/heads/support-2-3 34025eafe -> 3f526d630
Drops unneeded method
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3f526d63
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3f526d63
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3f526d63
Branch: refs/heads/support-2-3
Commit: 3f526d630aa56393233500c874293c29abec54ae
Parents: 34025ea
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Jun 2 16:46:40 2016 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Jun 2 16:46:40 2016 +0200
----------------------------------------------------------------------
.../src/main/java/com/opensymphony/xwork2/ActionSupport.java | 4 ----
.../test/java/com/opensymphony/xwork2/ActionSupportTest.java | 5 ++---
2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/3f526d63/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
index 31eb5d3..752ecbf 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java
@@ -178,10 +178,6 @@ public class ActionSupport implements Action, Validateable, ValidationAware, Tex
return INPUT;
}
- public String doDefault() throws Exception {
- return SUCCESS;
- }
-
/**
* A default implementation that does nothing an returns "success".
* <p/>
http://git-wip-us.apache.org/repos/asf/struts/blob/3f526d63/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
----------------------------------------------------------------------
diff --git a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
index 23206ab..fafc960 100644
--- a/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
+++ b/xwork-core/src/test/java/com/opensymphony/xwork2/ActionSupportTest.java
@@ -68,7 +68,6 @@ public class ActionSupportTest extends XWorkTestCase {
}
assertEquals(Action.INPUT, as.input());
- assertEquals(Action.SUCCESS, as.doDefault());
assertEquals(Action.SUCCESS, as.execute());
try {
as.clone();
@@ -169,7 +168,7 @@ public class ActionSupportTest extends XWorkTestCase {
ActionContext.getContext().setLocale(new Locale("da"));
MyActionSupport mas = new MyActionSupport();
- assertEquals("santa", mas.doDefault());
+ assertEquals("santa", mas.execute());
assertNotNull(mas.getTexts());
assertEquals(false, mas.hasActionMessages());
@@ -343,7 +342,7 @@ public class ActionSupportTest extends XWorkTestCase {
private Double val;
@Override
- public String doDefault() throws Exception {
+ public String execute() throws Exception {
return "santa";
}