Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv31678
Modified Files:
Tag: MMBase-1_8
CloudReferrerTag.java ContextReferrerTag.java ContextTag.java
DataTypeTag.java EscaperTag.java NodeListHelper.java
mmbase-taglib.xml
Log Message:
MMB-1742
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1742
Index: CloudReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/CloudReferrerTag.java,v
retrieving revision 1.29.2.3
retrieving revision 1.29.2.4
diff -u -b -r1.29.2.3 -r1.29.2.4
--- CloudReferrerTag.java 12 Sep 2007 17:02:56 -0000 1.29.2.3
+++ CloudReferrerTag.java 26 Nov 2008 14:08:02 -0000 1.29.2.4
@@ -32,7 +32,7 @@
* class.
*
* @author Michiel Meeuwissen
- * @version $Id: CloudReferrerTag.java,v 1.29.2.3 2007/09/12 17:02:56 michiel
Exp $
+ * @version $Id: CloudReferrerTag.java,v 1.29.2.4 2008/11/26 14:08:02 michiel
Exp $
*/
public abstract class CloudReferrerTag extends ContextReferrerTag {
@@ -88,8 +88,10 @@
* @return a Cloud
*/
public Cloud getCloudVar() throws JspTagException {
+ if (! "".equals(cloudId.getString(this))) {
CloudProvider provider = findCloudProvider(false);
if (provider != null) return provider.getCloudVar();
+ }
Cloud c = (Cloud) pageContext.getAttribute(CloudTag.KEY,
CloudTag.SCOPE);
if (c != null) return c;
throw new JspTagException("Could not find parent cloud provider");
Index: ContextReferrerTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContextReferrerTag.java,v
retrieving revision 1.90.2.9
retrieving revision 1.90.2.10
diff -u -b -r1.90.2.9 -r1.90.2.10
--- ContextReferrerTag.java 2 May 2008 07:44:08 -0000 1.90.2.9
+++ ContextReferrerTag.java 26 Nov 2008 14:08:02 -0000 1.90.2.10
@@ -33,7 +33,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ContextReferrerTag.java,v 1.90.2.9 2008/05/02 07:44:08
nklasens Exp $
+ * @version $Id: ContextReferrerTag.java,v 1.90.2.10 2008/11/26 14:08:02
michiel Exp $
* @see ContextTag
*/
@@ -164,7 +164,7 @@
}
if (log.isDebugEnabled()) {
- log.debug("setting page context: " + this.getClass().getName());
+ log.debug("setting page context: " + this.getClass().getName() + "
" + pc);
}
setPageContextOnly(pc); // make pageContext availabe
pageContextTag = null;
@@ -266,8 +266,8 @@
writerid = Attribute.NULL;
}
- public void doCatch(Throwable e) throws Throwable {
- log.debug("Caught throwable: " + e.getMessage());
+ public final void doCatch(Throwable e) throws Throwable {
+ log.debug("Caught throwable: " + e.getClass() + ": " + e.getMessage());
throw e;
}
@@ -721,4 +721,7 @@
}
return formTag;
}
+
+
+
}
Index: ContextTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ContextTag.java,v
retrieving revision 1.87.2.3
retrieving revision 1.87.2.4
diff -u -b -r1.87.2.3 -r1.87.2.4
--- ContextTag.java 13 Oct 2008 11:42:57 -0000 1.87.2.3
+++ ContextTag.java 26 Nov 2008 14:08:02 -0000 1.87.2.4
@@ -45,7 +45,7 @@
* </p>
*
* @author Michiel Meeuwissen
- * @version $Id: ContextTag.java,v 1.87.2.3 2008/10/13 11:42:57 michiel Exp $
+ * @version $Id: ContextTag.java,v 1.87.2.4 2008/11/26 14:08:02 michiel Exp $
* @see ImportTag
* @see WriteTag
*/
@@ -193,9 +193,10 @@
if (id == null) {
id = referid.getString(this);
}
- //ContextContainer storedContainer = new
StandaloneContextContainer(null, id, null);
- //storedContainer.getBacking().putAll(container.getBacking());
- pageContext.setAttribute(id, container, s);
+ ContextContainer storedContainer = new
StandaloneContextContainer(null, id, null);
+ storedContainer.getBacking().putAll(container.getBacking());
+ log.info("Storing " + storedContainer.getBacking());
+ pageContext.setAttribute(id, storedContainer, s);
}
setCloudContext(getContextTag().cloudContext);
if (getId() != null) {
Index: DataTypeTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/DataTypeTag.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- DataTypeTag.java 19 Aug 2008 11:44:16 -0000 1.1.2.3
+++ DataTypeTag.java 26 Nov 2008 14:08:02 -0000 1.1.2.4
@@ -32,7 +32,7 @@
/**
* This tags produces request scoped new datatypes. (To be used in conjuction
with mm:fieldinfo datatype='')
* @author Michiel Meeuwissen
- * @version $Id: DataTypeTag.java,v 1.1.2.3 2008/08/19 11:44:16 michiel Exp $
+ * @version $Id: DataTypeTag.java,v 1.1.2.4 2008/11/26 14:08:02 michiel Exp $
* @since MMBase-1.8.7
*/
public class DataTypeTag extends CloudReferrerTag {
@@ -44,6 +44,7 @@
private Attribute base = Attribute.NULL;
private Attribute nodeManager = Attribute.NULL;
private Attribute field = Attribute.NULL;
+ private Attribute register = Attribute.NULL;
public void setBase(String b) throws JspTagException {
base = getAttribute(b);
@@ -55,6 +56,9 @@
public void setField(String f) throws JspTagException {
field = getAttribute(f);
}
+ public void setRegister(String r) throws JspTagException {
+ register = getAttribute(r);
+ }
protected DataTypeCollector getCollector() {
DataTypeCollector collector = (DataTypeCollector)
pageContext.getAttribute(KEY, SCOPE);
@@ -113,11 +117,11 @@
BasicDataType dt = DataTypeReader.readDataType(element,
getBaseDataType(collector), collector).dataType;
collector.finish(dt);
getContextProvider().getContextContainer().register(getId(), dt);
+ BasicDataType old = collector.addDataType(dt);
if (log.isDebugEnabled()) {
log.debug("Created " + dt);
log.debug("In " + collector.getDataTypes());
}
- BasicDataType old = collector.addDataType(dt);
} catch (org.mmbase.datatypes.util.xml.DependencyException de) {
throw new TaglibException(de);
Index: EscaperTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/EscaperTag.java,v
retrieving revision 1.9.2.1
retrieving revision 1.9.2.2
diff -u -b -r1.9.2.1 -r1.9.2.2
--- EscaperTag.java 24 Apr 2007 12:46:20 -0000 1.9.2.1
+++ EscaperTag.java 26 Nov 2008 14:08:02 -0000 1.9.2.2
@@ -21,7 +21,7 @@
* Configures a new Escaper on this page.
*
* @author Michiel Meeuwissen
- * @version $Id: EscaperTag.java,v 1.9.2.1 2007/04/24 12:46:20 michiel Exp $
+ * @version $Id: EscaperTag.java,v 1.9.2.2 2008/11/26 14:08:02 michiel Exp $
* @since MMBase-1.8
*/
Index: NodeListHelper.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeListHelper.java,v
retrieving revision 1.28.2.1
retrieving revision 1.28.2.2
diff -u -b -r1.28.2.1 -r1.28.2.2
--- NodeListHelper.java 28 Feb 2008 12:16:40 -0000 1.28.2.1
+++ NodeListHelper.java 26 Nov 2008 14:08:02 -0000 1.28.2.2
@@ -28,7 +28,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeListHelper.java,v 1.28.2.1 2008/02/28 12:16:40 michiel
Exp $
+ * @version $Id: NodeListHelper.java,v 1.28.2.2 2008/11/26 14:08:02 michiel
Exp $
* @since MMBase-1.7
*/
@@ -213,7 +213,7 @@
}
if (retain != Attribute.NULL) {
Object retainObject =
thisTag.getObjectConditional(retain.getString(thisTag));
- if (retainObject != null) {
+ if (retainObject != null && ! "".equals(retainObject)) {
if (retainObject instanceof Collection) {
nodes.retainAll((Collection) retainObject);
} else {
@@ -223,7 +223,7 @@
}
if (remove != Attribute.NULL) {
Object removeObject =
thisTag.getObjectConditional(remove.getString(thisTag));
- if (removeObject != null) {
+ if (removeObject != null && ! "".equals(removeObject)) {
if (removeObject instanceof Collection) {
nodes.removeAll((Collection) removeObject);
} else {
Index: mmbase-taglib.xml
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v
retrieving revision 1.374.2.32
retrieving revision 1.374.2.33
diff -u -b -r1.374.2.32 -r1.374.2.33
--- mmbase-taglib.xml 19 Aug 2008 10:09:34 -0000 1.374.2.32
+++ mmbase-taglib.xml 26 Nov 2008 14:08:02 -0000 1.374.2.33
@@ -39,7 +39,7 @@
Use one or more possiblevalue tags if you want to list all possible values. Use
one or more examplevalue tags is you want to give some example values.
-version: $Id: mmbase-taglib.xml,v 1.374.2.32 2008/08/19 10:09:34 michiel Exp $
+version: $Id: mmbase-taglib.xml,v 1.374.2.33 2008/11/26 14:08:02 michiel Exp $
-->
<taglib author="MMBase community">
@@ -5481,6 +5481,7 @@
<type>mmbase.list</type>
<extends>querycontainer</extends>
<extends>nodereferrer</extends>
+ <extends>contextreader</extends>
<tagclass>org.mmbase.bridge.jsp.taglib.containers.ListRelationsContainerTag</tagclass>
<teiclass>org.mmbase.bridge.jsp.taglib.containers.QueryTEI</teiclass>
<bodycontent>JSP</bodycontent>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
