Update of /var/cvs/src/org/mmbase/util/xml
In directory james.mmbase.org:/tmp/cvs-serv8556/src/org/mmbase/util/xml
Modified Files:
Tag: MMBase-1_8
BuilderReader.java
Log Message:
MMB-1588 Cannot override state and readonly attributes of fields.
SYSTEM fields were default readonly
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util/xml
See also: http://www.mmbase.org/jira/browse/MMB-1588
Index: BuilderReader.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/xml/BuilderReader.java,v
retrieving revision 1.74.2.9
retrieving revision 1.74.2.10
diff -u -b -r1.74.2.9 -r1.74.2.10
--- BuilderReader.java 1 Feb 2008 17:15:57 -0000 1.74.2.9
+++ BuilderReader.java 16 Feb 2008 22:07:46 -0000 1.74.2.10
@@ -37,7 +37,7 @@
* @author Rico Jansen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BuilderReader.java,v 1.74.2.9 2008/02/01 17:15:57 michiel Exp
$
+ * @version $Id: BuilderReader.java,v 1.74.2.10 2008/02/16 22:07:46 nklasens
Exp $
*/
public class BuilderReader extends DocumentReader {
@@ -761,7 +761,13 @@
if (state != def.getState()) def.setState(state);
- boolean readOnly = "true".equalsIgnoreCase(fieldReadOnly);
+ boolean readOnly = false;
+ if ("".equals(fieldReadOnly)) {
+ readOnly = state == Field.STATE_SYSTEM || state ==
Field.STATE_SYSTEM_VIRTUAL;
+ }
+ else {
+ readOnly = "true".equalsIgnoreCase(fieldReadOnly);
+ }
if (def.isReadOnly() != readOnly) {
def.setReadOnly(readOnly);
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
