Author: ernst
Date: 2009-05-18 14:16:04 +0200 (Mon, 18 May 2009)
New Revision: 35253
Added:
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/Option.java
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/OptionlistBean.java
Modified:
mmbase/trunk/applications/vpro-wizards/pom.xml
mmbase/trunk/applications/vpro-wizards/tagfiles/form/option.tag
mmbase/trunk/applications/vpro-wizards/tagfiles/form/queryoptionlist.tag
mmbase/trunk/applications/vpro-wizards/tagfiles/form/resourcebundleoptionlist.tag
mmbase/trunk/applications/vpro-wizards/tagfiles/form/simpleoptionlist.tag
mmbase/trunk/applications/vpro-wizards/tagfiles/util/cleanHTML.tag
mmbase/trunk/applications/vpro-wizards/tagfiles/util/flushnamefilter.tag
Log:
fixed some bugs
Modified: mmbase/trunk/applications/vpro-wizards/pom.xml
===================================================================
--- mmbase/trunk/applications/vpro-wizards/pom.xml 2009-05-18 12:15:44 UTC
(rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/pom.xml 2009-05-18 12:16:04 UTC
(rev 35253)
@@ -32,10 +32,8 @@
creating, deleting and updating nods and
relations,
as
- well as sortinging
- lists of related nodes. It is trvial to extend the
- system
- with your custom actions.
+ well as sorting lists of related nodes. It is easy to extend the
+ system your own custom actions.
</description>
<repositories>
</repositories>
@@ -159,6 +157,24 @@
</execution>
</executions>
</plugin>
+
+ <!--
+ copy the tag files into the WEB-INF folder
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <!-- this is relative to the pom.xml directory -->
+ <directory>tagfiles</directory>
+ <targetPath>WEB-INF/tags/vpro-wizards</targetPath>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
</project>
Added:
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/Option.java
===================================================================
---
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/Option.java
(rev 0)
+++
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/Option.java
2009-05-18 12:16:04 UTC (rev 35253)
@@ -0,0 +1,31 @@
+package org.mmbase.applications.vprowizards.spring.util;
+
+public class Option {
+ private String label;
+ private String value;
+
+ public Option(String value, String label) {
+ this.label = label;
+ this.value = value;
+ }
+
+ public Option() {
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
\ No newline at end of file
Property changes on:
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/Option.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/OptionlistBean.java
===================================================================
---
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/OptionlistBean.java
(rev 0)
+++
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/OptionlistBean.java
2009-05-18 12:16:04 UTC (rev 35253)
@@ -0,0 +1,51 @@
+package org.mmbase.applications.vprowizards.spring.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
+
+
+
+/**
+ * this class is used to create option lists for fields in vpro-wizards forms
+ * @author ebunders
+ *
+ */
+public class OptionlistBean {
+ private List<Option> options = new ArrayList<Option>();
+ Logger log = Logging.getLoggerInstance(OptionlistBean.class);
+ String value = null;
+ String label = null;
+
+ public void setLabel(String label){
+ this.label = label;
+ addOption();
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ addOption();
+ }
+
+ private void addOption() {
+ if(label != null && value != null){
+ options.add(new Option(value, label));
+ label = null;
+ value = null;
+ }
+ }
+
+ public List<Option> getList(){
+ return options;
+ }
+
+ public Option getNewOption(){
+ return new Option();
+ }
+
+ public void setNewOption(Option option){
+ options.add(option);
+ }
+}
\ No newline at end of file
Property changes on:
mmbase/trunk/applications/vpro-wizards/src/org/mmbase/applications/vprowizards/spring/util/OptionlistBean.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: mmbase/trunk/applications/vpro-wizards/tagfiles/form/option.tag
===================================================================
--- mmbase/trunk/applications/vpro-wizards/tagfiles/form/option.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/tagfiles/form/option.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -1,4 +1,4 @@
-<%@ tag import="java.util.*, nl.vpro.redactie.util.*" body-content="empty" %>
+<%@ tag import="java.util.*,
org.mmbase.applications.vprowizards.spring.util.*" body-content="empty" %>
<%@ attribute name="value" required="true" %>
<%@ attribute name="label" required="true" %>
<jsp:setProperty name="_options" property="value" value="${value}"/>
Modified:
mmbase/trunk/applications/vpro-wizards/tagfiles/form/queryoptionlist.tag
===================================================================
--- mmbase/trunk/applications/vpro-wizards/tagfiles/form/queryoptionlist.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/tagfiles/form/queryoptionlist.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -1,4 +1,4 @@
-<%@ tag import="java.util.*, nl.vpro.redactie.util.*" body-content="empty" %>
+<%@ tag import="java.util.*,
org.mmbase.applications.vprowizards.spring.util.*" body-content="empty" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
<%@ taglib prefix="mm" uri="http://www.mmbase.org/mmbase-taglib-1.0"; %>
@@ -13,7 +13,7 @@
<%@ attribute name="directions" %>
<%@ attribute name="distinct" %>
-<jsp:useBean id="_options"
scope="request"class="nl.vpro.redactie.util.OptionlistBean"/>
+<jsp:useBean id="_options"
scope="request"class="org.mmbase.applications.vprowizards.spring.util.OptionlistBean"/>
<mm:cloud method="asis">
<c:choose>
<%--list with more steps then one.--%>
Modified:
mmbase/trunk/applications/vpro-wizards/tagfiles/form/resourcebundleoptionlist.tag
===================================================================
---
mmbase/trunk/applications/vpro-wizards/tagfiles/form/resourcebundleoptionlist.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++
mmbase/trunk/applications/vpro-wizards/tagfiles/form/resourcebundleoptionlist.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -1,4 +1,4 @@
-<%@ tag import="java.util.*, nl.vpro.redactie.util.*" body-content="empty" %>
+<%@ tag import="java.util.*,
org.mmbase.applications.vprowizards.spring.util.*" body-content="empty" %>
<%...@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ attribute name="bundle" description="a fully qualified resourcename
pointing to a resource bundle. when empty the value of the fields 'guitype' is
assumed to be a pointer to a resourcebundle" %>
Modified:
mmbase/trunk/applications/vpro-wizards/tagfiles/form/simpleoptionlist.tag
===================================================================
--- mmbase/trunk/applications/vpro-wizards/tagfiles/form/simpleoptionlist.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/tagfiles/form/simpleoptionlist.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -1,4 +1,4 @@
-<%@ tag import="java.util.*, nl.vpro.redactie.util.*" %>
+<%@ tag import="java.util.*,
org.mmbase.applications.vprowizards.spring.util.*" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"; %>
<%...@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ attribute name="options" description="a comma separated list of
value/lable pairs example: 1=een,2=twee" %>
@@ -6,7 +6,7 @@
<%--
use this optionlist with some nested option tags, to create an optionlist
manually.
--%>
-<jsp:useBean id="_options"
scope="request"class="nl.vpro.redactie.util.OptionlistBean"/>
+<jsp:useBean id="_options"
scope="request"class="org.mmbase.applications.vprowizards.spring.util.OptionlistBean"/>
<c:choose>
<c:when test="${empty options}"> <jsp:doBody var="_dummy"/> </c:when>
Modified: mmbase/trunk/applications/vpro-wizards/tagfiles/util/cleanHTML.tag
===================================================================
--- mmbase/trunk/applications/vpro-wizards/tagfiles/util/cleanHTML.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/tagfiles/util/cleanHTML.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -1,11 +1,12 @@
<%--
deze tag maakt gebruik van necohtml om de body te html-cleanen
--%>
-<jsp:doBody var="body"/>
+
+<%...@tag
import="org.mmbase.applications.vprowizards.spring.util.HTMLFilterUtils"%><jsp:doBody
var="body"/>
<%
String body = (String) jspContext.getAttribute("body");
try{
- body = nl.vpro.dvt.communities.util.HTMLFilterUtils.filter(body);
+ body = HTMLFilterUtils.filter(body);
}catch(Exception e){}
out.write(body);
%>
Modified:
mmbase/trunk/applications/vpro-wizards/tagfiles/util/flushnamefilter.tag
===================================================================
--- mmbase/trunk/applications/vpro-wizards/tagfiles/util/flushnamefilter.tag
2009-05-18 12:15:44 UTC (rev 35252)
+++ mmbase/trunk/applications/vpro-wizards/tagfiles/util/flushnamefilter.tag
2009-05-18 12:16:04 UTC (rev 35253)
@@ -4,20 +4,19 @@
This tag is used to alter the flushname value(s), by replacing place
holders with dynamic values.
This is done in the list result, and the purpose is to be able to create
cache identifiers with specific
node values.
- for instance: a cache idenitfier
+ for instance: a cache identifier
page_[page]
will be converted to
page_[page:13455]
where 13455 is the value of the number field of the current page node in
the list.
this is only done when the type of the nodes listed by the caller list is
matching the type
- in the placeholder.
+ in the place holder.
The template is preserved in the cache identifier, so if you go back to
the same list later
- the idenitifier is still recognized as a placeholder, and it can be reused.
+ the identifier is still recognized as a place holder, and it can be reused.
- Thet template will finally be cleaned out of the identifier in
- nl.vpro.mmbase.applications.portalettes.util.ThemasitesOSCachenameResolver
- So the abouve example will turn out as:
+ The template will finally be cleaned out of the identifier,
+ So the above example will turn out as:
page_13455
--%>
@@ -26,7 +25,8 @@
<%@ attribute name="nodenr" required="true" %>
<%@ attribute name="type" required="true" %>
<%@ variable name-given="result" scope="AT_END" %>
-<c:if test="${ not empty flushname}">
+
+<%...@tag
import="org.mmbase.applications.vprowizards.spring.cache.FlushNameTemplateBean"%><c:if
test="${ not empty flushname}">
<mm:cloud jspvar="cloud">
<%jspContext.setAttribute("cloud", cloud);%>
<mm:node number="${nodenr}" notfound="skipbody">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
