Browse Source

CloneableReader -> ChainableReader

Reader clone(Reader) -> Reader chain(Reader)


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271585 13f79535-47bb-0310-9956-ffa450edef68
master
Magesh Umasankar 23 years ago
parent
commit
e91ef17bb5
12 changed files with 28 additions and 28 deletions
  1. +7
    -0
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ChainableReader.java
  2. +0
    -7
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/CloneableReader.java
  3. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java
  4. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java
  5. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java
  6. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java
  7. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java
  8. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java
  9. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java
  10. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java
  11. +2
    -2
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java
  12. +3
    -3
      proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java

+ 7
- 0
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ChainableReader.java View File

@@ -0,0 +1,7 @@
package org.apache.tools.ant.filters;

import java.io.Reader;

public interface ChainableReader {
public Reader chain(Reader rdr);
}

+ 0
- 7
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/CloneableReader.java View File

@@ -1,7 +0,0 @@
package org.apache.tools.ant.filters;

import java.io.Reader;

public interface CloneableReader {
public Reader clone(Reader rdr);
}

+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/HeadFilter.java View File

@@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class HeadFilter
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final String LINES_KEY = "lines";

@@ -192,7 +192,7 @@ public final class HeadFilter
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
HeadFilter newFilter = new HeadFilter(rdr);
newFilter.setLines(getLines());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/LineContains.java View File

@@ -34,7 +34,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class LineContains
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final String CONTAINS_KEY = "contains";

@@ -160,7 +160,7 @@ public final class LineContains
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
LineContains newFilter = new LineContains(rdr);
newFilter.setContains(getContains());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/PrefixLines.java View File

@@ -26,7 +26,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class PrefixLines
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
/**
* prefix key
@@ -145,7 +145,7 @@ public final class PrefixLines
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
PrefixLines newFilter = new PrefixLines(rdr);
newFilter.setPrefix(getPrefix());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/ReplaceTokens.java View File

@@ -84,7 +84,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class ReplaceTokens
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final char DEFAULT_BEGIN_TOKEN = '@';

@@ -237,7 +237,7 @@ public final class ReplaceTokens
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
ReplaceTokens newFilter = new ReplaceTokens(rdr);
newFilter.setBeginToken(getBeginToken());
newFilter.setEndToken(getEndToken());


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripJavaComments.java View File

@@ -67,7 +67,7 @@ import java.io.StringReader;
*/
public final class StripJavaComments
extends FilterReader
implements CloneableReader
implements ChainableReader
{
/**
* This constructor is a dummy constructor and is
@@ -167,7 +167,7 @@ public final class StripJavaComments
return n;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
StripJavaComments newFilter = new StripJavaComments(rdr);
return newFilter;
}


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineBreaks.java View File

@@ -75,7 +75,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class StripLineBreaks
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
/**
* Linebreaks. What do to on funny IBM mainframes with odd line endings?
@@ -177,7 +177,7 @@ public final class StripLineBreaks
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
StripLineBreaks newFilter = new StripLineBreaks(rdr);
newFilter.setLineBreaks(getLineBreaks());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/StripLineComments.java View File

@@ -37,7 +37,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class StripLineComments
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final String COMMENTS_KEY = "comment";

@@ -161,7 +161,7 @@ public final class StripLineComments
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
StripLineComments newFilter = new StripLineComments(rdr);
newFilter.setComments(getComments());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TabsToSpaces.java View File

@@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class TabsToSpaces
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final int DEFAULT_TAB_LENGTH = 8;

@@ -183,7 +183,7 @@ public final class TabsToSpaces
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
TabsToSpaces newFilter = new TabsToSpaces(rdr);
newFilter.setTablength(getTablength());
newFilter.setInitialized(true);


+ 2
- 2
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/filters/TailFilter.java View File

@@ -79,7 +79,7 @@ import org.apache.tools.ant.types.Parameterizable;
*/
public final class TailFilter
extends FilterReader
implements Parameterizable, CloneableReader
implements Parameterizable, ChainableReader
{
private static final String LINES_KEY = "lines";

@@ -237,7 +237,7 @@ public final class TailFilter
return initialized;
}

public final Reader clone(final Reader rdr) {
public final Reader chain(final Reader rdr) {
TailFilter newFilter = new TailFilter(rdr);
newFilter.setLines(getLines());
newFilter.setInitialized(true);


+ 3
- 3
proposal/sandbox/filterreaders/src/main/org/apache/tools/ant/util/ChainReaderHelper.java View File

@@ -56,7 +56,7 @@ package org.apache.tools.ant.util;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.filters.CloneableReader;
import org.apache.tools.ant.filters.ChainableReader;
import org.apache.tools.ant.types.AntFilterReader;
import org.apache.tools.ant.types.FilterReaderSet;
import org.apache.tools.ant.types.Path;
@@ -195,9 +195,9 @@ public final class ChainReaderHelper {
throw new BuildException(ite);
}
}
} else if (o instanceof CloneableReader &&
} else if (o instanceof ChainableReader &&
o instanceof Reader) {
instream = ((CloneableReader) o).clone(instream);
instream = ((ChainableReader) o).chain(instream);
}
}
}


Loading…
Cancel
Save