Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv13465
Modified Files:
ComponentTag.java NodeProviderHelper.java SettingTag.java
UnRelatedNodesTag.java WriteTag.java
Log Message:
spacin and other details
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
Index: ComponentTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ComponentTag.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ComponentTag.java 16 Nov 2007 20:02:19 -0000 1.27
+++ ComponentTag.java 23 Feb 2008 16:00:44 -0000 1.28
@@ -22,7 +22,7 @@
* Renders a certain block of an mmbase component
*
* @author Michiel Meeuwissen
- * @version $Id: ComponentTag.java,v 1.27 2007/11/16 20:02:19 andre Exp $
+ * @version $Id: ComponentTag.java,v 1.28 2008/02/23 16:00:44 michiel Exp $
* @since MMBase-1.9
*/
public class ComponentTag extends CloudReferrerTag implements ParamHandler,
FrameworkParamHandler, Writer {
@@ -91,12 +91,16 @@
Renderer renderer = block.getRenderer(type);
Parameters params = block.createParameters();
+
fillStandardParameters(params);
params.setAutoCasting(true);
params.setAll(Referids.getReferids(referids, this));
for (Map.Entry<String, Object> entry : extraParameters) {
params.set(entry.getKey(), entry.getValue());
}
+ if (log.isDebugEnabled()) {
+ log.debug("Parameter for block " + block + " " + params + "
extra: " + extraParameters);
+ }
Framework fw = Framework.getInstance();
if (fw == null) throw new JspTagException("No MMBase Framework
found");
Parameters frameworkParams = fw.createParameters();
@@ -105,6 +109,9 @@
for (Map.Entry<String, Object> entry : extraFrameworkParameters) {
frameworkParams.set(entry.getKey(), entry.getValue());
}
+ if (log.isDebugEnabled()) {
+ log.debug("fw: " + frameworkParams);
+ }
State state = State.getState(pageContext.getRequest());
if (state.isRendering()) { // mm:component used during rending of
a component, that's fine, but use a new State.
state = new State(pageContext.getRequest());
Index: NodeProviderHelper.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/NodeProviderHelper.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NodeProviderHelper.java 20 Jun 2007 13:30:12 -0000 1.26
+++ NodeProviderHelper.java 23 Feb 2008 16:00:44 -0000 1.27
@@ -25,7 +25,7 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: NodeProviderHelper.java,v 1.26 2007/06/20 13:30:12 michiel
Exp $
+ * @version $Id: NodeProviderHelper.java,v 1.27 2008/02/23 16:00:44 michiel
Exp $
* @since MMBase-1.7
*/
@@ -210,7 +210,9 @@
}
}
pushed = 0;
+ node = null;
_Stack = null;
+ query = null;
checked = false;
return BodyTagSupport.EVAL_PAGE;
}
Index: SettingTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/SettingTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SettingTag.java 3 Feb 2008 17:33:56 -0000 1.5
+++ SettingTag.java 23 Feb 2008 16:00:44 -0000 1.6
@@ -21,7 +21,7 @@
* Returns the value of a certain component setting.
*
* @author Michiel Meeuwissen
- * @version $Id: SettingTag.java,v 1.5 2008/02/03 17:33:56 nklasens Exp $
+ * @version $Id: SettingTag.java,v 1.6 2008/02/23 16:00:44 michiel Exp $
*/
public class SettingTag extends CloudReferrerTag implements Writer {
@@ -39,11 +39,14 @@
protected Component getComponent() throws JspTagException {
String c = component.getString(this);
if (c.length() == 0) {
+ return null;
+ /*
State state = State.getState(pageContext.getRequest());
if (! state.isRendering()) {
throw new JspTagException("No current component found");
}
return state.getBlock().getComponent();
+ */
} else {
return ComponentRepository.getInstance().getComponent(c);
}
Index: UnRelatedNodesTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/UnRelatedNodesTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- UnRelatedNodesTag.java 10 Feb 2007 16:49:27 -0000 1.10
+++ UnRelatedNodesTag.java 23 Feb 2008 16:00:44 -0000 1.11
@@ -18,7 +18,7 @@
* Like listnodes tag, but is is also a node-referrer, and substracts the
related nodes of the referred node.
*
* @author Michiel Meeuwissen
- * @version $Id: UnRelatedNodesTag.java,v 1.10 2007/02/10 16:49:27 nklasens
Exp $
+ * @version $Id: UnRelatedNodesTag.java,v 1.11 2008/02/23 16:00:44 michiel Exp
$
* @since MMBase-1.7
*/
Index: WriteTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/WriteTag.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- WriteTag.java 10 Feb 2007 16:49:27 -0000 1.50
+++ WriteTag.java 23 Feb 2008 16:00:44 -0000 1.51
@@ -31,7 +31,7 @@
* of a 'Writer' tag.
*
* @author Michiel Meeuwissen
- * @version $Id: WriteTag.java,v 1.50 2007/02/10 16:49:27 nklasens Exp $
+ * @version $Id: WriteTag.java,v 1.51 2008/02/23 16:00:44 michiel Exp $
*/
public class WriteTag extends ContextReferrerTag implements Writer,
FunctionContainerReferrer {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
