Author: mfortun Date: 2011-05-09 17:48:29 +0200 (Mon, 09 May 2011) New Revision: 879 Url: http://nuiton.org/repositories/revision/wikitty/879 Log: * correct view * add skeleton of edit action Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-09 15:48:29 UTC (rev 879) @@ -0,0 +1,21 @@ +package org.nuiton.wikitty.publication.action; + +import com.opensymphony.xwork2.ActionContext; + +public class PublicationActionEdit extends PublicationBaseAction{ + + /** + * + */ + private static final long serialVersionUID = -590087371230933701L; + + + static public PublicationActionEdit getAction() { + return (PublicationActionEdit) ActionContext.getContext().get( + CONTEXT_ACTION_KEY); + } + + + + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-09 15:48:29 UTC (rev 879) @@ -10,6 +10,7 @@ public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; + protected Wikitty wikittyResult; /** * @@ -24,10 +25,15 @@ @Override public String execute() throws Exception { - System.out.println(ActionContext.getContext().getParameters()); + String id = getArgument("id", ""); + System.out.println(id); + if (!"".equals(id)) { + wikittyResult = getWikittyPublicationProxy().restore(id); + } + SearchForAllWikitty(); - + return SUCCESS; } @@ -54,7 +60,12 @@ this.pagedResult = pagedResult; } - - - + public Wikitty getWikittyResult() { + return wikittyResult; + } + + public void setWikittyResult(Wikitty wikittyResult) { + this.wikittyResult = wikittyResult; + } + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-09 15:48:29 UTC (rev 879) @@ -1,8 +1,12 @@ package org.nuiton.wikitty.publication.action; +import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Map.Entry; + import org.apache.struts2.interceptor.SessionAware; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -158,11 +162,22 @@ } public String getArgument(String key, String defaultValue) { - String result = ActionContext.getContext().getParameters().get(key) - .toString(); + Object temp = ActionContext.getContext().getParameters().get(key); - if (result == null) { + String result = ""; + // TODO mfortun-2011-05-09 fix this with something clean + if (temp == null) { result = defaultValue; + } else { + if (temp instanceof String[]) { + for (String t : (String[]) temp) { + result += t; + } + } else { + result = temp.toString(); + + } + } return result; } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 15:48:29 UTC (rev 879) @@ -13,18 +13,20 @@ <package name="test" extends="struts-default"> - <action name="editPage"> - + <action name="editPage" + class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + <param name="context">{1}</param> + <param name="args">{2}</param> <result>/WEB-INF/jsp/edit.jsp</result> </action> + <action name="*/view/*" class="org.nuiton.wikitty.publication.action.PublicationActionView"> - <param name="context">{1}</param> <param name="args">{2}</param> <result>/WEB-INF/jsp/view.jsp</result> </action> - + <action name="*/raw/*" class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> <param name="context">{1}</param> @@ -35,8 +37,6 @@ </result> </action> - - <action name="*/eval/*" class="org.nuiton.wikitty.publication.action.PublicationActionEval"> <param name="context">{1}</param> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-09 15:48:29 UTC (rev 879) @@ -28,7 +28,8 @@ Author : poussin --%> -<%@page import="org.nuiton.wikitty.publication.action.PublicationActionView"%> +<%@page + import="org.nuiton.wikitty.publication.action.PublicationActionView"%> <%@page import="org.nuiton.util.StringUtil"%> <%@page import="org.nuiton.wikitty.search.Criteria"%> <%@page import="org.nuiton.wikitty.search.Search"%> @@ -47,38 +48,41 @@ WikittyPublicationSession wpSession = WikittyPublicationSession .getWikittyPublicationSession(session); + PublicationActionView action = PublicationActionView + .getAction(); + out.println(action.getPagedResult().size()); + /* + WikittyPublicationContext context = (WikittyPublicationContext) request + .getAttribute(ActionEval.CONTEXT_VAR); + PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>) request + .getAttribute("pagedResult"); + Wikitty wikitty = (Wikitty) request + .getAttribute(ActionEval.WIKITTY_VAR); -PublicationActionView action = PublicationActionView.getAction(); + ActionEdit actionEdit = context.getAction(ActionEdit.class); + */ + Wikitty wikit = action.getWikittyResult(); +%> +<% +if (wikit!=null){ + out.print(wikit); +} -out.println( action.getPagedResult().size()); - -/* - WikittyPublicationContext context = (WikittyPublicationContext) request - .getAttribute(ActionEval.CONTEXT_VAR); - PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>) request - .getAttribute("pagedResult"); - Wikitty wikitty = (Wikitty) request - .getAttribute(ActionEval.WIKITTY_VAR); - - ActionEdit actionEdit = context.getAction(ActionEdit.class); - */ - - %> -<form action="view" method="post"> +<form action="view.action" method="post"> <div> <textarea name="r" rows="4" cols="20"><%=action.getArgument("r", "*")%></textarea> </div> <label for="first">First</label> <input type="text" name="first" value="<%=action.getArgument("first", "0")%>" /> <label for="first">First</label> <input type="text" name="end" - value="<%=action.getArgument("end", "100")%>" /> <input - type="submit" name="id" value="Search" /> + value="<%=action.getArgument("end", "100")%>" /> <input type="submit" + name="id" value="Search" /> <pre> </pre> @@ -88,10 +92,8 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><a ">edit</a> - </td> - <td><input type="submit" name="id" value="<%=w.getId()%>" /> - </td> + <td><a">edit</a></td> + <td><input type="submit" name="id" value="<%=w.getId()%>" /></td> <td><%=w.getExtensionNames()%></td> </tr> <%