Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv32577
Modified Files:
Tag: MMBase-1_8
FieldTag.java
Log Message:
MMB-1633, also removed some unused members
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1633
Index: FieldTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/FieldTag.java,v
retrieving revision 1.67.2.2
retrieving revision 1.67.2.3
diff -u -b -r1.67.2.2 -r1.67.2.3
--- FieldTag.java 22 Jan 2008 11:03:02 -0000 1.67.2.2
+++ FieldTag.java 31 Mar 2008 13:06:37 -0000 1.67.2.3
@@ -11,6 +11,7 @@
import org.mmbase.bridge.jsp.taglib.util.Attribute;
import org.mmbase.bridge.jsp.taglib.util.Notfound;
+import org.mmbase.bridge.jsp.taglib.editor.Editor;
import org.mmbase.bridge.jsp.taglib.editor.EditTag;
import javax.servlet.jsp.*;
import javax.servlet.jsp.tagext.*;
@@ -25,7 +26,7 @@
* The FieldTag can be used as a child of a 'NodeProvider' tag.
*
* @author Michiel Meeuwissen
- * @version $Id: FieldTag.java,v 1.67.2.2 2008/01/22 11:03:02 michiel Exp $
+ * @version $Id: FieldTag.java,v 1.67.2.3 2008/03/31 13:06:37 michiel Exp $
*/
public class FieldTag extends FieldReferrerTag implements FieldProvider,
Writer {
@@ -119,11 +120,10 @@
*/
protected void handleEditTag() {
// See if this FieldTag has a parent EditTag
- Tag t = findAncestorWithClass(this, EditTag.class);
- if (t == null) {
+ Editor editor = (Editor) pageContext.getAttribute(EditTag.KEY,
EditTag.SCOPE);
+ if (editor == null) {
if (log.isDebugEnabled()) log.debug("No EditTag as parent. We
don't want to edit, i presume.");
} else {
- EditTag et = (EditTag)t;
Query query = null;
try {
query = findNodeProvider().getGeneratingQuery();
@@ -178,7 +178,7 @@
// register stuff with EditTag
if (log.isDebugEnabled()) log.debug("Registering fieldName '" +
fieldName + "' with nodenr '" + nodenr + "' and query: " + query);
- et.registerField(query, nodenr, fieldName);
+ editor.registerField(query, nodenr, fieldName);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
