ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From peterrei...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/filters/util ChainReaderHelper.java
Date Tue, 25 Jan 2005 15:33:01 GMT
peterreilly    2005/01/25 07:33:01

  Modified:    src/main/org/apache/tools/ant/filters ClassConstants.java
                        EscapeUnicode.java ExpandProperties.java
                        HeadFilter.java LineContains.java
                        LineContainsRegExp.java PrefixLines.java
                        ReplaceTokens.java StripJavaComments.java
                        StripLineBreaks.java StripLineComments.java
                        TabsToSpaces.java TailFilter.java
               src/main/org/apache/tools/ant/filters/util
                        ChainReaderHelper.java
  Log:
  remove duplicate final
  
  Revision  Changes    Path
  1.13      +3 -3      ant/src/main/org/apache/tools/ant/filters/ClassConstants.java
  
  Index: ClassConstants.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ClassConstants.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ClassConstants.java	9 Mar 2004 16:48:02 -0000	1.12
  +++ ClassConstants.java	25 Jan 2005 15:33:00 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002,2004 The Apache Software Foundation
  + * Copyright  2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -83,7 +83,7 @@
        * during reading, or if the constants for the specified class cannot
        * be read (for example due to the class not being found).
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
   
           int ch = -1;
   
  @@ -150,7 +150,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           ClassConstants newFilter = new ClassConstants(rdr);
           return newFilter;
       }
  
  
  
  1.10      +2 -2      ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java
  
  Index: EscapeUnicode.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/EscapeUnicode.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- EscapeUnicode.java	14 Apr 2004 15:42:06 -0000	1.9
  +++ EscapeUnicode.java	25 Jan 2005 15:33:00 -0000	1.10
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2003-2004 The Apache Software Foundation
  + * Copyright  2003-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -121,7 +121,7 @@
       /**
        * Parses the parameters (currently unused)
        */
  -    private final void initialize() {
  +    private void initialize() {
       }
   }
   
  
  
  
  1.13      +3 -3      ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java
  
  Index: ExpandProperties.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ExpandProperties.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ExpandProperties.java	9 Mar 2004 16:48:02 -0000	1.12
  +++ ExpandProperties.java	25 Jan 2005 15:33:00 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002,2004 The Apache Software Foundation
  + * Copyright  2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -67,7 +67,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
   
           int ch = -1;
   
  @@ -104,7 +104,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           ExpandProperties newFilter = new ExpandProperties(rdr);
           newFilter.setProject(getProject());
           return newFilter;
  
  
  
  1.17      +8 -8      ant/src/main/org/apache/tools/ant/filters/HeadFilter.java
  
  Index: HeadFilter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/HeadFilter.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- HeadFilter.java	9 Mar 2004 16:48:02 -0000	1.16
  +++ HeadFilter.java	25 Jan 2005 15:33:00 -0000	1.17
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -94,7 +94,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -122,7 +122,7 @@
        *
        * @param lines the number of lines to be returned in the filtered stream
        */
  -    public final void setLines(final long lines) {
  +    public void setLines(final long lines) {
           this.lines = lines;
       }
   
  @@ -131,7 +131,7 @@
        *
        * @return the number of lines to be returned in the filtered stream
        */
  -    private final long getLines() {
  +    private long getLines() {
           return lines;
       }
   
  @@ -140,7 +140,7 @@
        *
        * @param skip the number of lines to be skipped in the filtered stream
        */
  -    public final void setSkip(final long skip) {
  +    public void setSkip(final long skip) {
           this.skip = skip;
       }
   
  @@ -149,7 +149,7 @@
        *
        * @return the number of lines to be skipped in the filtered stream
        */
  -    private final long getSkip() {
  +    private long getSkip() {
           return skip;
       }
   
  @@ -163,7 +163,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           HeadFilter newFilter = new HeadFilter(rdr);
           newFilter.setLines(getLines());
           newFilter.setSkip(getSkip());
  @@ -176,7 +176,7 @@
        * it to set the number of lines to be returned in the filtered stream.
        * also scan for skip parameter.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.17      +6 -6      ant/src/main/org/apache/tools/ant/filters/LineContains.java
  
  Index: LineContains.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/LineContains.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- LineContains.java	9 Mar 2004 16:48:02 -0000	1.16
  +++ LineContains.java	25 Jan 2005 15:33:00 -0000	1.17
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -88,7 +88,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -138,7 +138,7 @@
        * @param contains The <code>contains</code> element to add.
        *                 Must not be <code>null</code>.
        */
  -    public final void addConfiguredContains(final Contains contains) {
  +    public void addConfiguredContains(final Contains contains) {
           this.contains.addElement(contains.getValue());
       }
   
  @@ -162,7 +162,7 @@
        * returned object is "live" - in other words, changes made to the
        * returned object are mirrored in the filter.
        */
  -    private final Vector getContains() {
  +    private Vector getContains() {
           return contains;
       }
   
  @@ -176,7 +176,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           LineContains newFilter = new LineContains(rdr);
           newFilter.setContains(getContains());
           newFilter.setInitialized(true);
  @@ -186,7 +186,7 @@
       /**
        * Parses the parameters to add user-defined contains strings.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.14      +6 -6      ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java
  
  Index: LineContainsRegExp.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/LineContainsRegExp.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- LineContainsRegExp.java	9 Mar 2004 16:48:02 -0000	1.13
  +++ LineContainsRegExp.java	25 Jan 2005 15:33:00 -0000	1.14
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -87,7 +87,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -140,7 +140,7 @@
        * @param regExp The <code>regexp</code> element to add.
        *               Must not be <code>null</code>.
        */
  -    public final void addConfiguredRegexp(final RegularExpression regExp) {
  +    public void addConfiguredRegexp(final RegularExpression regExp) {
           this.regexps.addElement(regExp);
       }
   
  @@ -167,7 +167,7 @@
        * filter. The returned object is "live" - in other words, changes made to
        * the returned object are mirrored in the filter.
        */
  -    private final Vector getRegexps() {
  +    private Vector getRegexps() {
           return regexps;
       }
   
  @@ -181,7 +181,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           LineContainsRegExp newFilter = new LineContainsRegExp(rdr);
           newFilter.setRegexps(getRegexps());
           newFilter.setInitialized(true);
  @@ -191,7 +191,7 @@
       /**
        * Parses parameters to add user defined regular expressions.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.13      +6 -6      ant/src/main/org/apache/tools/ant/filters/PrefixLines.java
  
  Index: PrefixLines.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/PrefixLines.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- PrefixLines.java	9 Mar 2004 16:48:02 -0000	1.12
  +++ PrefixLines.java	25 Jan 2005 15:33:00 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002,2004 The Apache Software Foundation
  + * Copyright  2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -76,7 +76,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -115,7 +115,7 @@
        *               May be <code>null</code>, in which case no prefix
        *               is added.
        */
  -    public final void setPrefix(final String prefix) {
  +    public void setPrefix(final String prefix) {
           this.prefix = prefix;
       }
   
  @@ -124,7 +124,7 @@
        *
        * @return the prefix which will be added at the start of each input line
        */
  -    private final String getPrefix() {
  +    private String getPrefix() {
           return prefix;
       }
   
  @@ -138,7 +138,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           PrefixLines newFilter = new PrefixLines(rdr);
           newFilter.setPrefix(getPrefix());
           newFilter.setInitialized(true);
  @@ -148,7 +148,7 @@
       /**
        * Initializes the prefix if it is available from the parameters.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.17      +10 -10    ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
  
  Index: ReplaceTokens.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/ReplaceTokens.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- ReplaceTokens.java	9 Mar 2004 16:48:02 -0000	1.16
  +++ ReplaceTokens.java	25 Jan 2005 15:33:00 -0000	1.17
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -111,7 +111,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -177,7 +177,7 @@
        *
        * @param beginToken the character used to denote the beginning of a token
        */
  -    public final void setBeginToken(final char beginToken) {
  +    public void setBeginToken(final char beginToken) {
           this.beginToken = beginToken;
       }
   
  @@ -186,7 +186,7 @@
        *
        * @return the character used to denote the beginning of a token
        */
  -    private final char getBeginToken() {
  +    private char getBeginToken() {
           return beginToken;
       }
   
  @@ -195,7 +195,7 @@
        *
        * @param endToken the character used to denote the end of a token
        */
  -    public final void setEndToken(final char endToken) {
  +    public void setEndToken(final char endToken) {
           this.endToken = endToken;
       }
   
  @@ -204,7 +204,7 @@
        *
        * @return the character used to denote the end of a token
        */
  -    private final char getEndToken() {
  +    private char getEndToken() {
           return endToken;
       }
   
  @@ -214,7 +214,7 @@
        * @param token The token to add to the map of replacements.
        *              Must not be <code>null</code>.
        */
  -    public final void addConfiguredToken(final Token token) {
  +    public void addConfiguredToken(final Token token) {
           hash.put(token.getKey(), token.getValue());
       }
   
  @@ -234,7 +234,7 @@
        * @return a map (String->String) of token keys to replacement
        * values
        */
  -    private final Hashtable getTokens() {
  +    private Hashtable getTokens() {
           return hash;
       }
   
  @@ -248,7 +248,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           ReplaceTokens newFilter = new ReplaceTokens(rdr);
           newFilter.setBeginToken(getBeginToken());
           newFilter.setEndToken(getEndToken());
  @@ -260,7 +260,7 @@
       /**
        * Initializes tokens and loads the replacee-replacer hashtable.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.18      +3 -3      ant/src/main/org/apache/tools/ant/filters/StripJavaComments.java
  
  Index: StripJavaComments.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/StripJavaComments.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StripJavaComments.java	9 Mar 2004 16:48:02 -0000	1.17
  +++ StripJavaComments.java	25 Jan 2005 15:33:00 -0000	1.18
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -78,7 +78,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           int ch = -1;
           if (readAheadCh != -1) {
               ch = readAheadCh;
  @@ -137,7 +137,7 @@
        *         the specified reader
        */
   
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           StripJavaComments newFilter = new StripJavaComments(rdr);
           return newFilter;
       }
  
  
  
  1.14      +6 -6      ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
  
  Index: StripLineBreaks.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/StripLineBreaks.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- StripLineBreaks.java	9 Mar 2004 16:48:02 -0000	1.13
  +++ StripLineBreaks.java	25 Jan 2005 15:33:00 -0000	1.14
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002,2004 The Apache Software Foundation
  + * Copyright  2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -77,7 +77,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -100,7 +100,7 @@
        * @param lineBreaks A String containing all the characters to be
        *                   considered as line-breaking.
        */
  -    public final void setLineBreaks(final String lineBreaks) {
  +    public void setLineBreaks(final String lineBreaks) {
           this.lineBreaks = lineBreaks;
       }
   
  @@ -110,7 +110,7 @@
        * @return a String containing all the characters considered as
        *         line-breaking
        */
  -    private final String getLineBreaks() {
  +    private String getLineBreaks() {
           return lineBreaks;
       }
   
  @@ -124,7 +124,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           StripLineBreaks newFilter = new StripLineBreaks(rdr);
           newFilter.setLineBreaks(getLineBreaks());
           newFilter.setInitialized(true);
  @@ -134,7 +134,7 @@
       /**
        * Parses the parameters to set the line-breaking characters.
        */
  -    private final void initialize() {
  +    private void initialize() {
           String userDefinedLineBreaks = null;
           Parameter[] params = getParameters();
           if (params != null) {
  
  
  
  1.15      +6 -6      ant/src/main/org/apache/tools/ant/filters/StripLineComments.java
  
  Index: StripLineComments.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/StripLineComments.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- StripLineComments.java	9 Mar 2004 16:48:02 -0000	1.14
  +++ StripLineComments.java	25 Jan 2005 15:33:00 -0000	1.15
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -88,7 +88,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -138,7 +138,7 @@
        * @param comment The <code>comment</code> element to add to the
        * list of comment prefixes to strip. Must not be <code>null</code>.
        */
  -    public final void addConfiguredComment(final Comment comment) {
  +    public void addConfiguredComment(final Comment comment) {
           comments.addElement(comment.getValue());
       }
   
  @@ -157,7 +157,7 @@
        *
        * @return the list of comment prefixes to strip.
        */
  -    private final Vector getComments() {
  +    private Vector getComments() {
           return comments;
       }
   
  @@ -171,7 +171,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           StripLineComments newFilter = new StripLineComments(rdr);
           newFilter.setComments(getComments());
           newFilter.setInitialized(true);
  @@ -181,7 +181,7 @@
       /**
        * Parses the parameters to set the comment prefixes.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.13      +6 -6      ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
  
  Index: TabsToSpaces.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/TabsToSpaces.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- TabsToSpaces.java	9 Mar 2004 16:48:02 -0000	1.12
  +++ TabsToSpaces.java	25 Jan 2005 15:33:00 -0000	1.13
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002,2004 The Apache Software Foundation
  + * Copyright  2002,2004-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -78,7 +78,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -104,7 +104,7 @@
        *
        * @param tabLength the number of spaces to be used when converting a tab.
        */
  -    public final void setTablength(final int tabLength) {
  +    public void setTablength(final int tabLength) {
           this.tabLength = tabLength;
       }
   
  @@ -113,7 +113,7 @@
        *
        * @return the number of spaces used when converting a tab
        */
  -    private final int getTablength() {
  +    private int getTablength() {
           return tabLength;
       }
   
  @@ -127,7 +127,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           TabsToSpaces newFilter = new TabsToSpaces(rdr);
           newFilter.setTablength(getTablength());
           newFilter.setInitialized(true);
  @@ -137,7 +137,7 @@
       /**
        * Parses the parameters to set the tab length.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.20      +8 -8      ant/src/main/org/apache/tools/ant/filters/TailFilter.java
  
  Index: TailFilter.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/TailFilter.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- TailFilter.java	9 Mar 2004 16:48:02 -0000	1.19
  +++ TailFilter.java	25 Jan 2005 15:33:00 -0000	1.20
  @@ -1,5 +1,5 @@
   /*
  - * Copyright  2002-2004 The Apache Software Foundation
  + * Copyright  2002-2005 The Apache Software Foundation
    *
    *  Licensed under the Apache License, Version 2.0 (the "License");
    *  you may not use this file except in compliance with the License.
  @@ -100,7 +100,7 @@
        * @exception IOException if the underlying stream throws an IOException
        * during reading
        */
  -    public final int read() throws IOException {
  +    public int read() throws IOException {
           if (!getInitialized()) {
               initialize();
               setInitialized(true);
  @@ -128,7 +128,7 @@
        *
        * @param lines the number of lines to be returned in the filtered stream
        */
  -    public final void setLines(final long lines) {
  +    public void setLines(final long lines) {
           this.lines = lines;
       }
   
  @@ -137,7 +137,7 @@
        *
        * @return the number of lines to be returned in the filtered stream
        */
  -    private final long getLines() {
  +    private long getLines() {
           return lines;
       }
   
  @@ -146,7 +146,7 @@
        *
        * @param skip the number of lines to be skipped in the filtered stream
        */
  -    public final void setSkip(final long skip) {
  +    public void setSkip(final long skip) {
           this.skip = skip;
       }
   
  @@ -155,7 +155,7 @@
        *
        * @return the number of lines to be skipped in the filtered stream
        */
  -    private final long getSkip() {
  +    private long getSkip() {
           return skip;
       }
   
  @@ -169,7 +169,7 @@
        * @return a new filter based on this configuration, but filtering
        *         the specified reader
        */
  -    public final Reader chain(final Reader rdr) {
  +    public Reader chain(final Reader rdr) {
           TailFilter newFilter = new TailFilter(rdr);
           newFilter.setLines(getLines());
           newFilter.setSkip(getSkip());
  @@ -182,7 +182,7 @@
        * it to set the number of lines to be returned in the filtered stream.
        * also scan for "skip" parameter.
        */
  -    private final void initialize() {
  +    private void initialize() {
           Parameter[] params = getParameters();
           if (params != null) {
               for (int i = 0; i < params.length; i++) {
  
  
  
  1.27      +7 -7      ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java
  
  Index: ChainReaderHelper.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/filters/util/ChainReaderHelper.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- ChainReaderHelper.java	22 Nov 2004 09:23:26 -0000	1.26
  +++ ChainReaderHelper.java	25 Jan 2005 15:33:01 -0000	1.27
  @@ -64,7 +64,7 @@
        * Sets the primary reader
        * @param rdr the reader object
        */
  -    public final void setPrimaryReader(Reader rdr) {
  +    public void setPrimaryReader(Reader rdr) {
           primaryReader = rdr;
       }
   
  @@ -72,7 +72,7 @@
        * Set the project to work with
        * @param project the current project
        */
  -    public final void setProject(final Project project) {
  +    public void setProject(final Project project) {
           this.project = project;
       }
   
  @@ -81,7 +81,7 @@
        *
        * @return the current project
        */
  -    public final Project getProject() {
  +    public Project getProject() {
           return project;
       }
   
  @@ -90,7 +90,7 @@
        * if this method is not invoked.
        * @param size the buffer size to use
        */
  -    public final void setBufferSize(int size) {
  +    public void setBufferSize(int size) {
           bufferSize = size;
       }
   
  @@ -99,7 +99,7 @@
        *
        * @param fchain the filter chains collection
        */
  -    public final void setFilterChains(Vector fchain) {
  +    public void setFilterChains(Vector fchain) {
           filterChains = fchain;
       }
   
  @@ -108,7 +108,7 @@
        * @return the assembled reader
        * @exception BuildException if an error occurs
        */
  -    public final Reader getAssembledReader() throws BuildException {
  +    public Reader getAssembledReader() throws BuildException {
           if (primaryReader == null) {
               throw new BuildException("primaryReader must not be null.");
           }
  @@ -226,7 +226,7 @@
        * @return the contents of the file as a string
        * @exception IOException if an error occurs
        */
  -    public final String readFully(Reader rdr)
  +    public String readFully(Reader rdr)
           throws IOException {
           return FileUtils.readFully(rdr, bufferSize);
       }
  
  
  

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


Mime
View raw message