You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlbeans.apache.org by pc...@apache.org on 2004/06/04 02:23:55 UTC

cvs commit: xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation JavadocTagParser.java LineDelimitedTagParser.java

pcal        2004/06/03 17:23:55

  Modified:    v2/jam/src/org/apache/xmlbeans/impl/jam/annotation
                        JavadocTagParser.java LineDelimitedTagParser.java
  Log:
  updates to javadoctagparser
  
  Revision  Changes    Path
  1.3       +20 -3     xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/JavadocTagParser.java
  
  Index: JavadocTagParser.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/JavadocTagParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JavadocTagParser.java	30 May 2004 04:35:25 -0000	1.2
  +++ JavadocTagParser.java	4 Jun 2004 00:23:55 -0000	1.3
  @@ -36,11 +36,27 @@
     // Variables
   
     private JamServiceContext mContext = null;
  +  private boolean mAddSingleValueMembers = false;
   
     // ========================================================================
     // Public methods
   
     /**
  +   * <p>If true, all annotations will be given a single-member value whose
  +   * value is the full raw contents of the javadoc tag.  The name of this
  +   * member is JAnnotation.SINGLE_MEMBER_VALUE, or 'value'.  Note that this
  +   * member will be overrdden in the event that the tag contains an
  +   * explicit value named 'value'.</p>
  +   *
  +   * <p>The default for this setting is false.</p>
  +   *
  +   * @param b
  +   */
  +  public void setAddSingleValueMembers(boolean b) {
  +    mAddSingleValueMembers = b;
  +  }
  +
  +  /**
      * <p>Called by JAM to initialize the proxy.  Do not try to call this
      * yourself.</p>
      */
  @@ -69,8 +85,9 @@
       }
       MAnnotation literal = target.addLiteralAnnotation(tagName);
       setPosition(literal,tag);
  -//    setSingleValueText(literal,tag);
  -    return new MAnnotation[] {literal,current};
  +    MAnnotation[] out = new MAnnotation[] {literal,current};
  +    if (mAddSingleValueMembers) setSingleValueText(out,tag);
  +    return out;
     }
   
   
  @@ -100,7 +117,7 @@
     //course will be overridden if the tag contains a member value named
     //'value' - oh well
     protected void setSingleValueText(MAnnotation[] targets, Tag tag) {
  -    String tagText = tag.text().trim();
  +    String tagText = tag.text();
       for(int i=0; i<targets.length; i++) {
       targets[i].setSimpleValue
         (JAnnotation.SINGLE_VALUE_NAME,tagText,getStringType());
  
  
  
  1.3       +1 -2      xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/LineDelimitedTagParser.java
  
  Index: LineDelimitedTagParser.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/jam/src/org/apache/xmlbeans/impl/jam/annotation/LineDelimitedTagParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LineDelimitedTagParser.java	28 May 2004 17:02:51 -0000	1.2
  +++ LineDelimitedTagParser.java	4 Jun 2004 00:23:55 -0000	1.3
  @@ -16,7 +16,6 @@
   
   import org.apache.xmlbeans.impl.jam.mutable.MAnnotatedElement;
   import org.apache.xmlbeans.impl.jam.mutable.MAnnotation;
  -import org.apache.xmlbeans.impl.jam.JAnnotation;
   import java.util.StringTokenizer;
   import java.io.StringWriter;
   
  @@ -48,7 +47,7 @@
       while (st.hasMoreTokens()) {
         String pair = st.nextToken();
         int eq = pair.indexOf('=');
  -      if (eq <= 0) continue; // if abstent or is first character
  +      if (eq <= 0) continue; // if absent or is first character
         String name = pair.substring(0, eq).trim();
         if (eq < pair.length() - 1) {
           String value = pair.substring(eq + 1).trim();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xmlbeans-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xmlbeans-cvs-help@xml.apache.org