diff --git a/core/src/main/java/hudson/util/CharSpool.java b/core/src/main/java/hudson/util/CharSpool.java deleted file mode 100644 index 07d05ee23b..0000000000 --- a/core/src/main/java/hudson/util/CharSpool.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.util; - -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.List; - -/** - * {@link Writer} that spools the output and writes to another {@link Writer} later. - * - * @author Kohsuke Kawaguchi - * @deprecated since 2008-05-28. moved to stapler - */ -@Deprecated -public final class CharSpool extends Writer { - private List buf; - - private char[] last = new char[1024]; - private int pos; - - @Override - public void write(char[] cbuf, int off, int len) { - while(len>0) { - int sz = Math.min(last.length-pos,len); - System.arraycopy(cbuf,off,last,pos,sz); - len -= sz; - off += sz; - pos += sz; - renew(); - } - } - - private void renew() { - if(pos(); - buf.add(last); - last = new char[1024]; - pos = 0; - } - - @Override - public void write(int c) { - renew(); - last[pos++] = (char)c; - } - - @Override - public void flush() { - // noop - } - - @Override - public void close() { - // noop - } - - public void writeTo(Writer w) throws IOException { - if(buf!=null) { - for (char[] cb : buf) { - w.write(cb); - } - } - w.write(last,0,pos); - } -} diff --git a/core/src/main/java/hudson/util/LineEndNormalizingWriter.java b/core/src/main/java/hudson/util/LineEndNormalizingWriter.java deleted file mode 100644 index ffa182e263..0000000000 --- a/core/src/main/java/hudson/util/LineEndNormalizingWriter.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package hudson.util; - -import java.io.FilterWriter; -import java.io.IOException; -import java.io.Writer; - -/** - * Finds the lone LF and converts that to CR+LF. - * - *

- * Internet Explorer's {@code XmlHttpRequest.responseText} seems to - * normalize the line end, and if we only send LF without CR, it will - * not recognize that as a new line. To work around this problem, - * we use this filter to always convert LF to CR+LF. - * - * @author Kohsuke Kawaguchi - * @deprecated since 2008-05-28. moved to stapler - */ -@Deprecated -public class LineEndNormalizingWriter extends FilterWriter { - - private boolean seenCR; - - public LineEndNormalizingWriter(Writer out) { - super(out); - } - - @Override - public void write(char[] cbuf) throws IOException { - write(cbuf, 0, cbuf.length); - } - - @Override - public void write(String str) throws IOException { - write(str,0,str.length()); - } - - @Override - public void write(int c) throws IOException { - if(!seenCR && c==LF) - super.write("\r\n"); - else - super.write(c); - seenCR = c == CR; - } - - @Override - public void write(char[] cbuf, int off, int len) throws IOException { - int end = off+len; - int writeBegin = off; - - for( int i=off; i