commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/betwixt/src/java/org/apache/commons/betwixt BeanProperty.java BindingConfiguration.java Descriptor.java ElementDescriptor.java Options.java TextDescriptor.java XMLIntrospector.java XMLUtils.java
Date Sun, 04 Jul 2004 16:59:14 GMT
rdonkin     2004/07/04 09:59:14

  Modified:    betwixt/src/java/org/apache/commons/betwixt
                        BeanProperty.java BindingConfiguration.java
                        Descriptor.java ElementDescriptor.java Options.java
                        TextDescriptor.java XMLIntrospector.java
                        XMLUtils.java
  Log:
  Added in changes from release branch
  
  Revision  Changes    Path
  1.7       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BeanProperty.java
  
  Index: BeanProperty.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BeanProperty.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- BeanProperty.java	13 Jun 2004 21:32:45 -0000	1.6
  +++ BeanProperty.java	4 Jul 2004 16:59:14 -0000	1.7
  @@ -37,7 +37,7 @@
     * is performed from the results of that introspection.
     *
     * @author Robert Burrell Donkin
  -  * @version $Id$
  +  * @since 0.5
     */
   public class BeanProperty {
   
  
  
  
  1.8       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BindingConfiguration.java
  
  Index: BindingConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/BindingConfiguration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- BindingConfiguration.java	28 Feb 2004 13:38:32 -0000	1.7
  +++ BindingConfiguration.java	4 Jul 2004 16:59:14 -0000	1.8
  @@ -35,7 +35,7 @@
     * can be shared.</p> 
     *
     * @author <a href="mailto:rdonkin@apache.org">Robert Burrell Donkin</a>
  -  * @version $Revision$
  +  * @since 0.5
     */
   public class BindingConfiguration implements Serializable {
   
  
  
  
  1.6       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Descriptor.java
  
  Index: Descriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Descriptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Descriptor.java	7 Apr 2004 21:16:27 -0000	1.5
  +++ Descriptor.java	4 Jul 2004 16:59:14 -0000	1.6
  @@ -22,7 +22,7 @@
     * Common superclass for types of <code>Descriptor</code></p>
     *
     * @author Robert Burrell Donkin
  -  * @version $Revision$
  +  * @since 0.5
     */
   public abstract class Descriptor {
   
  
  
  
  1.17      +7 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/ElementDescriptor.java
  
  Index: ElementDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/ElementDescriptor.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ElementDescriptor.java	13 Jun 2004 21:32:45 -0000	1.16
  +++ ElementDescriptor.java	4 Jul 2004 16:59:14 -0000	1.17
  @@ -29,7 +29,6 @@
     *
     * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
     * @author <a href="mailto:martin@mvdb.net">Martin van den Bemt</a>
  -  * @version $Revision$
     */
   public class ElementDescriptor extends NodeDescriptor {
   
  @@ -158,6 +157,7 @@
        * Returns true if this element has child content.
        * @return true if this element has either child mixed content or child elements
        * @see #getContentDescriptors
  +     * @since 0.5
        */
       public boolean hasContent() {
           return getContentDescriptors().length > 0; 
  @@ -339,6 +339,7 @@
        * Adds a descriptor for child content.
        * 
        * @param descriptor the <code>Descriptor</code> describing the child content
to add
  +     * @since 0.5
        */
       public void addContentDescriptor(Descriptor descriptor) {
           if ( contentList == null ) {
  @@ -352,6 +353,7 @@
        * Returns descriptors for the child content of the element this describes.
        * @return the <code>Descriptor</code> describing the child elements
        * of the element that this <code>ElementDescriptor</code> describes
  +     * @since 0.5
        */
       public Descriptor[] getContentDescriptors() {
           if ( contentDescriptors == null ) {
  @@ -378,6 +380,7 @@
        * found amongst the descriptors is returned.
        *
        * @return the primary descriptor or null if this element has no mixed body content
  +     * @since 0.5
        */
       public TextDescriptor getPrimaryBodyTextDescriptor() {
           // todo: this probably isn't the most efficent algorithm
  @@ -396,6 +399,7 @@
        * Sets the descriptors for the child content of the element this describes. 
        * @param contentDescriptors the <code>Descriptor</code>s of the element

        * that this describes
  +     * @since 0.5
        */
       public void setContentDescriptors(Descriptor[] contentDescriptors) {
           this.contentDescriptors = contentDescriptors;
  @@ -501,6 +505,7 @@
        *
        * @return list of <code>Descriptor</code>'s describe the child content
of 
        * the element that this <code>Descriptor</code> describes
  +     * @since 0.5
        */
       protected List getContentList() {
           if ( contentList == null ) {
  @@ -532,6 +537,7 @@
         * Sets the class which should be used for instantiation.
         * @param implementationClass the class which should be used for instantiation
         * or null to use the mapped type
  +      * @since 0.5
         */
       public void setImplementationClass(Class implementationClass) {
           this.implementationClass = implementationClass;
  
  
  
  1.2       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/Options.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Options.java	7 Apr 2004 21:13:31 -0000	1.1
  +++ Options.java	4 Jul 2004 16:59:14 -0000	1.2
  @@ -24,7 +24,7 @@
    * An option links a name with a value (both strings). 
    * 
    * @author <a href='http://jakarta.apache.org/'>Jakarta Commons Team</a>
  - * @version $Revision$
  + * @since 0.5
    */
   public class Options {
       /** Empty string array for use with toArray  */
  
  
  
  1.6       +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/TextDescriptor.java
  
  Index: TextDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/TextDescriptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TextDescriptor.java	28 Feb 2004 13:38:32 -0000	1.5
  +++ TextDescriptor.java	4 Jul 2004 16:59:14 -0000	1.6
  @@ -27,7 +27,7 @@
     * <p>This is really just a marker class - all functionality is inherited.</p>
     *
     * @author Robert Burrell Donkin
  -  * @version $Revision$
  +  * @since 0.5
     */
   public class TextDescriptor extends Descriptor {
       
  
  
  
  1.30      +17 -13    jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java
  
  Index: XMLIntrospector.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLIntrospector.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- XMLIntrospector.java	13 Jun 2004 21:32:45 -0000	1.29
  +++ XMLIntrospector.java	4 Jul 2004 16:59:14 -0000	1.30
  @@ -67,7 +67,6 @@
     * 
     * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
     * @author <a href="mailto:martin@mvdb.net">Martin van den Bemt</a>
  -  * @version $Id$
     */
   public class XMLIntrospector {
       /** 
  @@ -185,6 +184,7 @@
         * @return the <code>ClassNormalizer</code> used to determine the Class
to be introspected
         * for a given Object.
         * @deprecated use getConfiguration().getClassNormalizer
  +      * @since 0.5
         */
       public ClassNormalizer getClassNormalizer() {
           return getConfiguration().getClassNormalizer();
  @@ -198,6 +198,8 @@
         * @param classNormalizer the <code>ClassNormalizer</code> to be used
to determine 
         * the Class to be introspected for a given Object.
         * @deprecated use getConfiguration().setClassNormalizer
  +      * @since 0.5
  +      *
         */    
       public void setClassNormalizer(ClassNormalizer classNormalizer) {
           getConfiguration().setClassNormalizer(classNormalizer);
  @@ -206,7 +208,7 @@
       /** 
        * Is <code>XMLBeanInfo</code> caching enabled? 
        *
  -     * @deprecated replaced by XMlBeanInfoRegistry
  +     * @deprecated 0.5 replaced by XMlBeanInfoRegistry
        * @return true if caching is enabled
        */
       public boolean isCachingEnabled() {
  @@ -216,7 +218,7 @@
       /**
        * Set whether <code>XMLBeanInfo</code> caching should be enabled.
        *
  -     * @deprecated replaced by XMlBeanInfoRegistry
  +     * @deprecated 0.5 replaced by XMlBeanInfoRegistry
        * @param cachingEnabled ignored
        */    
       public void setCachingEnabled(boolean cachingEnabled) {
  @@ -288,7 +290,7 @@
        * Gets the name mapper strategy.
        * 
        * @return the strategy used to convert bean type names into element names
  -     * @deprecated getNameMapper is split up in 
  +     * @deprecated 0.5 getNameMapper is split up in 
        * {@link #getElementNameMapper()} and {@link #getAttributeNameMapper()}
        */
       public NameMapper getNameMapper() {
  @@ -298,7 +300,7 @@
       /** 
        * Sets the strategy used to convert bean type names into element names
        * @param nameMapper the NameMapper strategy to be used
  -     * @deprecated setNameMapper is split up in 
  +     * @deprecated 0.5 setNameMapper is split up in 
        * {@link #setElementNameMapper(NameMapper)} and {@link #setAttributeNameMapper(NameMapper)}
        */
       public void setNameMapper(NameMapper nameMapper) {
  @@ -375,7 +377,7 @@
       /**
        * Flush existing cached <code>XMLBeanInfo</code>'s.
        *
  -     * @deprecated use flushable registry instead
  +     * @deprecated 0.5 use flushable registry instead
        */
       public void flushCache() {}
       
  @@ -599,8 +601,7 @@
        * @param useAttributesForPrimitives write primitives as attributes (rather than elements)
        * @return a correctly configured <code>NodeDescriptor</code> for the property
        * @throws IntrospectionException when bean introspection fails
  -     * @deprecated use {@link #createXMLDescriptor}.
  -     * @since Alpha1
  +     * @deprecated 0.5 use {@link #createXMLDescriptor}.
        */
       public Descriptor createDescriptor(
           PropertyDescriptor propertyDescriptor, 
  @@ -616,6 +617,7 @@
        *
        * @param beanProperty the BeanProperty specifying the property
        * @return a correctly configured <code>NodeDescriptor</code> for the property
  +     * @since 0.5
        */
       public Descriptor createXMLDescriptor( BeanProperty beanProperty ) {
           return beanProperty.createXMLDescriptor( configuration );
  @@ -963,7 +965,7 @@
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @param contents Descriptor list to which mixed content will be added
        * @throws IntrospectionException if the bean introspection fails
  -     * @deprecated use {@link #addProperties(BeanProperty[], List, List,List)}
  +     * @deprecated 0.5 use {@link #addProperties(BeanProperty[], List, List,List)}
        */
       protected void addProperties(
                                       BeanInfo beanInfo, 
  @@ -991,6 +993,7 @@
        * @param elements ElementDescriptor list to which elements will be added
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @param contents Descriptor list to which mixed content will be added
  +     * @since 0.5
        */
       protected void addProperties(
                                       BeanProperty[] beanProperties, 
  @@ -1025,7 +1028,7 @@
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @param contents Descriptor list to which mixed content will be added
        * @throws IntrospectionException if the bean introspection fails
  -     * @deprecated BeanInfo is no longer required. 
  +     * @deprecated 0.5 BeanInfo is no longer required. 
        * Use {@link #addProperty(PropertyDescriptor, List, List, List)} instead.
        */
       protected void addProperty(
  @@ -1049,7 +1052,7 @@
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @param contents Descriptor list to which mixed content will be added
        * @throws IntrospectionException if the bean introspection fails
  -     * @deprecated use {@link #addProperty(BeanProperty, List, List, List)} instead
  +     * @deprecated 0.5 use {@link #addProperty(BeanProperty, List, List, List)} instead
        */
       protected void addProperty(
                                   PropertyDescriptor propertyDescriptor, 
  @@ -1070,6 +1073,7 @@
        * @param elements ElementDescriptor list to which elements will be added
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @param contents Descriptor list to which mixed content will be added
  +     * @since 0.5
        */
       protected void addProperty(
                                   BeanProperty beanProperty, 
  @@ -1096,7 +1100,7 @@
        * @param elements ElementDescriptor list to which elements will be added
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @throws IntrospectionException if the bean introspection fails
  -     * @deprecated this method does not support mixed content. 
  +     * @deprecated 0.5 this method does not support mixed content. 
        * Use {@link #addProperties(BeanInfo, List, List, List)} instead.
        */
       protected void addProperties(
  @@ -1127,7 +1131,7 @@
        * @param elements ElementDescriptor list to which elements will be added
        * @param attributes AttributeDescriptor list to which attributes will be added
        * @throws IntrospectionException if the bean introspection fails
  -     * @deprecated this method does not support mixed content. 
  +     * @deprecated 0.5 this method does not support mixed content. 
        * Use {@link #addProperty(BeanInfo, PropertyDescriptor, List, List, List)} instead.
        */
       protected void addProperty(
  
  
  
  1.10      +1 -1      jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLUtils.java
  
  Index: XMLUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/betwixt/src/java/org/apache/commons/betwixt/XMLUtils.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLUtils.java	24 Mar 2004 22:46:15 -0000	1.9
  +++ XMLUtils.java	4 Jul 2004 16:59:14 -0000	1.10
  @@ -29,7 +29,7 @@
     * @author Rahul Srivastava, Sun Microsystems Inc.  
     *
     * @author Robert Burrell Donkin
  -  * @version $Revision$
  +  * @since 0.5
     */
   public class XMLUtils {
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message