Author: kcardineaud Date: 2011-07-01 16:18:01 +0200 (Fri, 01 Jul 2011) New Revision: 154 Url: http://nuiton.org/repositories/revision/scmwebeditor/154 Log: Use taglib to display save result Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java trunk/src/main/resources/struts.xml trunk/src/main/webapp/Save.jsp Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SaveAction.java 2011-07-01 14:18:01 UTC (rev 154) @@ -1,14 +1,22 @@ package org.nuiton.scmwebeditor.actions; +import java.util.Date; +import java.util.GregorianCalendar; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.opensymphony.xwork2.Action; -import com.opensymphony.xwork2.ActionContext; + public class SaveAction extends ScmWebEditorCommitAction { String result; + Date date; + + + + private static final Log log = LogFactory.getLog(SaveAction.class); @@ -20,8 +28,12 @@ public void setResult(String result) { this.result = result; } + + public Date getDate() { + return date; + } + - /** * */ @@ -42,14 +54,16 @@ } result = execute(); + date = new Date(); + log.info("Date : "+date.getTime()); return Action.SUCCESS; } - static public SaveAction getAction() { - return (SaveAction) ActionContext.getContext() - .get(CONTEXT_ACTION_KEY); + public String getFormatDate() { + return date.toString(); } + } Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorCommitAction.java 2011-07-01 14:18:01 UTC (rev 154) @@ -186,7 +186,7 @@ if(log.isErrorEnabled()) { log.error("Can't write in file " , e); } - return "erreur"; + return "error"; } @@ -231,7 +231,7 @@ //Suppression du repertoire temporaire delTempDirectory(svnSess); request.setAttribute(ATTRIBUTE_REDIRECT_URL, getRedirectUrl(svnSess)); - return "erreur"; + return "error"; } Modified: trunk/src/main/resources/struts.xml =================================================================== --- trunk/src/main/resources/struts.xml 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/resources/struts.xml 2011-07-01 14:18:01 UTC (rev 154) @@ -15,7 +15,7 @@ <action name="commit" class="org.nuiton.scmwebeditor.actions.ScmWebEditorCommitAction" method="execute"> <result name="success" >/Redirect.jsp</result> <result name="authError" >/ModificationViewer.jsp</result> - <result name="erreur">/BadFileRedirect.jsp</result> + <result name="error">/BadFileRedirect.jsp</result> </action> <action name="save" class="org.nuiton.scmwebeditor.actions.SaveAction" method="save"> Modified: trunk/src/main/webapp/Save.jsp =================================================================== --- trunk/src/main/webapp/Save.jsp 2011-07-01 13:19:08 UTC (rev 153) +++ trunk/src/main/webapp/Save.jsp 2011-07-01 14:18:01 UTC (rev 154) @@ -1,22 +1,17 @@ -<%@page - import="org.nuiton.scmwebeditor.actions.SaveAction"%> -<%@page import="java.util.Date" %> - <% - SaveAction action = SaveAction.getAction(); - - String result = action.getResult(); - %> - - - - <%if(result.equals("authError")) { %> - <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> - <% } else if(result.equals("erreur")) { %> - <h4> Can't save modification </h4> - <% } else if(result.equals("uselessSave")) { %> - <h4> It's useless to save the file, it is not modify</h4> - <% } else { %> - <h4>Last change save <%=new Date()%> </h4> - <% } %> + <%@ taglib prefix="s" uri="/struts-tags"%> + <%@ taglib prefix="sj" uri="/struts-jquery-tags"%> + + - \ No newline at end of file + <s:if test="result=='authError'" > + <h4> <font color="red"> Bad username or password, can't save modification</font> </h4> + </s:if> + <s:elseif test="result=='error'" > + <h4> Can't save modification </h4> + </s:elseif> + <s:elseif test="result=='uselessSave'" > + <h4> It's useless to save the file, it is not modify</h4> + </s:elseif> + <s:else> + <h4>Last change save <s:property value="getFormatDate" /> </h4> + </s:else> \ No newline at end of file