Author: mfortun Date: 2011-06-08 17:21:30 +0200 (Wed, 08 Jun 2011) New Revision: 937 Url: http://nuiton.org/repositories/revision/wikitty/937 Log: * correct a bug with creation of new wikittypubtext * comment + cosmetic Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-06-07 20:09:58 UTC (rev 936) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-06-08 15:21:30 UTC (rev 937) @@ -75,12 +75,13 @@ public String modeForMime(String mime) { // TODO mfortun-2011-05-30 really implements this - - for (SelectOption opt : langages) { - if (mime.endsWith(opt.value)){ - return opt.value; + if (mime != null) { + for (SelectOption opt : langages) { + if (mime.endsWith(opt.value)) { + return opt.value; + } + } - } return "javascript"; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-06-07 20:09:58 UTC (rev 936) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/SelectOption.java 2011-06-08 15:21:30 UTC (rev 937) @@ -1,5 +1,10 @@ package org.nuiton.wikitty.publication; +/** + * Class used inside view page to load langage supported by code mirror + * @author mfortun + * + */ public class SelectOption { protected String value; 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-06-07 20:09:58 UTC (rev 936) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-06-08 15:21:30 UTC (rev 937) @@ -1,6 +1,5 @@ package org.nuiton.wikitty.publication.action; - import java.util.List; import java.util.Map; import org.apache.struts2.interceptor.SessionAware; @@ -57,7 +56,6 @@ this.session = sess; } - /** * Retourne le critere pour recherche l'objet sur lequel faire l'action. Le * nom du critere doit etre convenablement positionné avec la chaine qui a @@ -92,8 +90,6 @@ return result; } - - protected String getError(PublicationContext context) { context.setContentType("text/html"); String result = String.format("<h1>bad query %s</h1>"); @@ -121,15 +117,14 @@ return result; } + public String getContextArgs() { + return (String) ActionContext.getContext().getParameters() + .get(CONTEXT_KEY); + } - - public String getContextArgs(){ - return (String) ActionContext.getContext().getParameters().get(CONTEXT_KEY); + public String getArgs() { + return (String) ActionContext.getContext().getParameters() + .get(ARGS_KEY); } - - public String getArgs(){ - return (String) ActionContext.getContext().getParameters().get(ARGS_KEY); - } - - + }