Author: mfortun Date: 2011-06-29 15:01:25 +0200 (Wed, 29 Jun 2011) New Revision: 1002 Url: http://nuiton.org/repositories/revision/wikitty/1002 Log: * add log element Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/ExtensionFieldStrutsBean.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -54,6 +54,12 @@ opt.setValeur(val); this.listOption.add(opt); } + @Override + public String toString() { + return "ExtensionFieldStrutsBean [name=" + name + ", type=" + type + + ", value=" + value + ", label=" + label + ", listOption=" + + listOption + "]"; + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/Option.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -24,6 +24,12 @@ this.valeur = valeur; this.description = description; } + + @Override + public String toString() { + return "Option [valeur=" + valeur + ", description=" + description + + "]"; + } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/WikittyFieldHandler.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -121,6 +121,8 @@ if ((excludeMap.containsKey(extName) && excludeMap.get(extName) .contains("*")) || (includeEnable && !includeMap.containsKey(extName))) { + log.debug("extension: "+extName + " Skipped"); + continue; } @@ -136,6 +138,7 @@ .contains(fieldName)) || (includeEnable && !includeMap.get(extName).contains( fieldName)) || fieldAdded.contains(extName+"."+fieldName)) { + log.debug("field: "+extName+"."+fieldName + " Skipped"); continue; } @@ -183,6 +186,7 @@ } } + log.debug("Add field : " + temp ); mapField.put(temp.getName(), temp); } } @@ -195,7 +199,9 @@ * of the wikitty field and when it close the wikitty field */ if( orderBefore ){ - fieldAdded.addAll(mapField.keySet()); + log.debug("Order before select, add field to addedfield set: " + + mapField.keySet()); + fieldAdded.addAll(mapField.keySet()); } @@ -260,6 +266,7 @@ } public void addAddedField(String field) { + log.debug("Field added : " +field); fieldAdded.add(field); } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/AbstractWikittyComponent.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -26,6 +26,7 @@ .get(WikittyTagBean.WIKITTY_STACK_KEY); if (handler == null) { + log.info("Handler not found in the stack"); // TODO mfortun-2011-06-29 throw exception if handler not in the stack } Modified: trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java =================================================================== --- trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 12:35:42 UTC (rev 1001) +++ trunk/wikitty-struts/src/main/java/org/nuiton/wikitty/struts/component/WikittyTagBean.java 2011-06-29 13:01:25 UTC (rev 1002) @@ -48,6 +48,17 @@ super.evaluateExtraParams(); + /* this methode is called two times: + * - first when the wikitty open tag is red + * - second when the wikitty closing tag is red + * + * for the first called this create an object wikittyfieldhandler + * that will be store inside the stack and used by the included tag ( + * inside the wikitty tags to store) + * + * + */ + if (action != null) { addParameter("action", findString(action)); } @@ -75,7 +86,13 @@ Object temp = stack.getContext().get(WIKITTY_STACK_KEY); WikittyFieldHandler handler; if (temp == null) { + + // construct wikitty field handler withh + // all required param and put it in the stack handler = new WikittyFieldHandler(); + + log.info(handler + " Added to the stack"); + stack.getContext().put(WIKITTY_STACK_KEY, handler); handler.setExclude(exclude); @@ -88,18 +105,10 @@ } else { handler = (WikittyFieldHandler) temp; } + // add field that have to be write inside the page + log.info("add wikitty fields to the parametters"); addParameter("wikittyfields", handler.getWikittyField()); - /* - * - * si l'élément key est null on l'initialise en y mettant tout les - * éléments du wikitty que l'on veut affiché avec type et tout. - * seulemement dans le contexte on met tout dans un super objet qui - * s'occupe de tout - * - * si il est pas null c'est que on est à la fin donc on va add les - * parametters à écrire dans le template on va correctement ajouter le - * tout. - */ + } public String getDefaultOpenTemplate() {