rdonkin 2002/09/26 12:29:34
Modified: betwixt/src/java/org/apache/commons/betwixt XMLBeanInfo.java
betwixt/src/test/org/apache/commons/betwixt/recursion
ElementBean.java TestRecursion.java
Log:
Fix bug with id generation when bean already had an id property.
Revision Changes Path
1.4 +10 -3
jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLBeanInfo.java
Index: XMLBeanInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLBeanInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLBeanInfo.java 1 Jul 2002 18:44:15 -0000 1.3
+++ XMLBeanInfo.java 26 Sep 2002 19:29:33 -0000 1.4
@@ -124,10 +124,17 @@
/** Search attributes for one matching <code>ID</code> attribute name */
public AttributeDescriptor getIDAttribute() {
- if ( cachedIDAttribute = false ) {
+ //
+ // XXX for some reason caching isn't working at the moment
+ // it could be that this method is called too early
+ // and not reset when attributes change
+ // on the other hand, the speed gain is likely to be too
+ // small to bother about
+ //
+ //if ( cachedIDAttribute = false ) {
idAttributeDescriptor = findIDAttribute();
- cachedIDAttribute = true;
- }
+ // cachedIDAttribute = true;
+ //}
return idAttributeDescriptor;
}
1.2 +62 -1
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/ElementBean.java
Index: ElementBean.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/ElementBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementBean.java 30 Jul 2002 22:47:41 -0000 1.1
+++ ElementBean.java 26 Sep 2002 19:29:34 -0000 1.2
@@ -1,10 +1,71 @@
+/*
+ * $Header$
+ * $Revision$
+ * $Date$
+ *
+ * ====================================================================
+ *
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 1999-2002 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ * any, must include the following acknowlegement:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowlegement may appear in the software itself,
+ * if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * Foundation" must not be used to endorse or promote products derived
+ * from this software without prior written permission. For written
+ * permission, please contact [EMAIL PROTECTED]
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ * nor may "Apache" appear in their names without prior written
+ * permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * $Id$
+ */
package org.apache.commons.betwixt.recursion;
import java.util.ArrayList;
import java.util.List;
/**
- * @author Administrator
+ * @author Robert Burrell Donkin
*/
public class ElementBean
{
1.2 +17 -8
jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java
Index: TestRecursion.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/betwixt/src/test/org/apache/commons/betwixt/recursion/TestRecursion.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRecursion.java 30 Jul 2002 22:47:41 -0000 1.1
+++ TestRecursion.java 26 Sep 2002 19:29:34 -0000 1.2
@@ -164,8 +164,17 @@
return introspector;
}
-
-
-
+
+ /**
+ */
+ public void testBeanWithIdProperty() throws Exception
+ {
+ System.out.println("****************************************************");
+ IdBean bean = new IdBean("Hello, World");
+ BeanWriter writer = new BeanWriter();
+ writer.getXMLIntrospector().setAttributesForPrimitives(true);
+ writer.setWriteIDs(true);
+ writer.write(bean);
+ }
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
