You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@roller.apache.org by Glen Mazza <gl...@gmail.com> on 2014/03/26 12:00:06 UTC
Re: svn commit: r1581738 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2:
editor/ util/
Cool! Looks sleek.
Glen
On 03/26/2014 04:15 AM, ghuber@apache.org wrote:
> Author: ghuber
> Date: Wed Mar 26 08:15:24 2014
> New Revision: 1581738
>
> URL: http://svn.apache.org/r1581738
> Log:
> Add a generic CANCEL rather than using "cancel" string for non chaining actions.
>
> Modified:
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
> roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkAdd.java Wed Mar 26 08:15:24 2014
> @@ -142,7 +142,7 @@ public class BookmarkAdd extends UIActio
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public void myValidate() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/BookmarkEdit.java Wed Mar 26 08:15:24 2014
> @@ -132,7 +132,7 @@ public class BookmarkEdit extends UIActi
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public void myValidate() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryAdd.java Wed Mar 26 08:15:24 2014
> @@ -107,7 +107,7 @@ public class CategoryAdd extends UIActio
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public void myValidate() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryEdit.java Wed Mar 26 08:15:24 2014
> @@ -137,7 +137,7 @@ public class CategoryEdit extends UIActi
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> // TODO: validation
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/CategoryRemove.java Wed Mar 26 08:15:24 2014
> @@ -141,7 +141,7 @@ public class CategoryRemove extends UIAc
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public String getRemoveId() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/EntryRemove.java Wed Mar 26 08:15:24 2014
> @@ -124,7 +124,7 @@ public class EntryRemove extends EntryBa
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public String getRemoveId() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderAdd.java Wed Mar 26 08:15:24 2014
> @@ -106,7 +106,7 @@ public class FolderAdd extends UIAction
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> // TODO: validation
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/FolderEdit.java Wed Mar 26 08:15:24 2014
> @@ -141,7 +141,7 @@ public class FolderEdit extends UIAction
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> // TODO: validation
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/MembersInvite.java Wed Mar 26 08:15:24 2014
> @@ -169,7 +169,7 @@ public class MembersInvite extends UIAct
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public String getUserName() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplateRemove.java Wed Mar 26 08:15:24 2014
> @@ -147,7 +147,7 @@ public class TemplateRemove extends UIAc
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> public String getRemoveId() {
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/editor/TemplatesRemove.java Wed Mar 26 08:15:24 2014
> @@ -215,7 +215,7 @@ public class TemplatesRemove extends UIA
> * @return the string
> */
> public String cancel() {
> - return "cancel";
> + return CANCEL;
> }
>
> /**
>
> Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java
> URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java?rev=1581738&r1=1581737&r2=1581738&view=diff
> ==============================================================================
> --- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java (original)
> +++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/struts2/util/UIAction.java Wed Mar 26 08:15:24 2014
> @@ -59,7 +59,10 @@ public abstract class UIAction extends A
>
> // a common result name used to indicate the result should list some data
> public static final String LIST = "list";
> -
> +
> + // a result for a cancel.
> + public static final String CANCEL = "cancel";
> +
> // the authenticated user accessing this action, or null if client is not logged in
> private User authenticatedUser = null;
>
>
>