X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fcom%2Fstevesoft%2Fpat%2FRegexWriter.java;h=61bcdf618e7e1f3eb3852b83479106ead3f985e1;hb=a4780f236ded1ae07824254bca59b2aa0ea539ba;hp=a8c3e509c4669ed5ab69c2f500a887050640d10c;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git diff --git a/src/com/stevesoft/pat/RegexWriter.java b/src/com/stevesoft/pat/RegexWriter.java index a8c3e50..61bcdf6 100755 --- a/src/com/stevesoft/pat/RegexWriter.java +++ b/src/com/stevesoft/pat/RegexWriter.java @@ -7,9 +7,10 @@ // package com.stevesoft.pat; -import java.io.*; +import java.io.IOException; +import java.io.Writer; -import com.stevesoft.pat.wrap.*; +import com.stevesoft.pat.wrap.WriterWrap; /** * A basic extension of FilterWriter that uses Transformer to make replacements @@ -77,6 +78,7 @@ public class RegexWriter extends Writer * * @deprecated */ + @Deprecated public char getEOLchar() { return EOLchar; @@ -87,6 +89,7 @@ public class RegexWriter extends Writer * * @deprecated */ + @Deprecated public void setEOLchar(char c) { EOLchar = c; @@ -99,6 +102,7 @@ public class RegexWriter extends Writer * * @deprecated */ + @Deprecated public int getMaxLines() { return max_lines; @@ -109,6 +113,7 @@ public class RegexWriter extends Writer * * @deprecated */ + @Deprecated public void setMaxLines(int ml) { max_lines = ml; @@ -226,51 +231,4 @@ public class RegexWriter extends Writer { bufferSize = i; } - - static void test(String re, String inp, int n) throws Exception - { - StringWriter sw = new StringWriter(); - Regex rex = Regex.perlCode(re); - String res1 = rex.replaceAll(inp); - RegexWriter rw = new RegexWriter(rex, sw); - for (int i = 0; i < inp.length(); i++) - { - rw.write(inp.charAt(i)); - } - rw.close(); - String res2 = sw.toString(); - if (!res1.equals(res2)) - { - System.out.println("nmax=" + n); - System.out.println("re=" + re); - System.out.println("inp=" + inp); - System.out.println("res1=" + res1); - System.out.println("res2=" + res2); - System.exit(255); - } - } - - public static void main(String[] args) throws Exception - { - for (int n = 1; n <= 1; n++) - { - test("s/x/y/", "-----x123456789", n); - test("s/x/y/", "x123456789", n); - test("s/x/y/", "-----x", n); - test("s/x.*?x/y/", ".xx..x..x...x...x....x....x", n); - test("s/x.*x/[$&]/", "--x........x--xx", n); - test("s/x.*x/[$&]/", "--x........x------", n); - test("s/.$/a/m", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbbbbbbbbbbbb", n); - test("s/.$/a/", "123", n); - test("s/.$/a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb", n); - test("s/^./a/", "bb\nbbb\nbbbb\nbbbbb\nbbbbbb\nbb", n); - test("s/$/a/", "bbb", n); - test("s/^/a/", "bbb", n); - test("s/^/a/", "", n); - test("s{.*}{N}", "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", n); - test("s/.{0,7}/y/", "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", n); - test("s/x/$&/", "xxx", n); - } - System.out.println("Success!!!"); - } }