diff options
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java | 87 |
1 files changed, 32 insertions, 55 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java index c34c1fb681..13982b133c 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/util/io/ThrowingPrintWriter.java @@ -1,51 +1,16 @@ /* - * Copyright (C) 2012, Robin Rosenberg <robin.rosenberg@dewire.com> - * and other copyright owners as documented in the project's IP log. + * Copyright (C) 2012, Robin Rosenberg <robin.rosenberg@dewire.com> and others * - * This program and the accompanying materials are made available - * under the terms of the Eclipse Distribution License v1.0 which - * accompanies this distribution, is reproduced below, and is - * available at http://www.eclipse.org/org/documents/edl-v10.php + * This program and the accompanying materials are made available under the + * terms of the Eclipse Distribution License v. 1.0 which is available at + * https://www.eclipse.org/org/documents/edl-v10.php. * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following - * conditions are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * - Redistributions in binary form must reproduce the above - * copyright notice, this list of conditions and the following - * disclaimer in the documentation and/or other materials provided - * with the distribution. - * - * - Neither the name of the Eclipse Foundation, Inc. nor the - * names of its contributors may be used to endorse or promote - * products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND - * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, - * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ package org.eclipse.jgit.util.io; import java.io.IOException; import java.io.Writer; -import java.security.AccessController; -import java.security.PrivilegedAction; import org.eclipse.jgit.util.SystemReader; @@ -64,15 +29,11 @@ public class ThrowingPrintWriter extends Writer { * Construct a JGitPrintWriter * * @param out - * the underlying {@link Writer} + * the underlying {@link java.io.Writer} */ public ThrowingPrintWriter(Writer out) { this.out = out; - LF = AccessController.doPrivileged(new PrivilegedAction<String>() { - public String run() { - return SystemReader.getInstance().getProperty("line.separator"); //$NON-NLS-1$ - } - }); + LF = SystemReader.getInstance().getProperty("line.separator"); //$NON-NLS-1$ } @Override @@ -94,7 +55,9 @@ public class ThrowingPrintWriter extends Writer { * Print a string and terminate with a line feed. * * @param s - * @throws IOException + * a {@link java.lang.String} object. + * @throws java.io.IOException + * if an IO error occurred */ public void println(String s) throws IOException { print(s + LF); @@ -103,7 +66,8 @@ public class ThrowingPrintWriter extends Writer { /** * Print a platform dependent new line * - * @throws IOException + * @throws java.io.IOException + * if an IO error occurred */ public void println() throws IOException { print(LF); @@ -113,7 +77,9 @@ public class ThrowingPrintWriter extends Writer { * Print a char * * @param value - * @throws IOException + * a char. + * @throws java.io.IOException + * if an IO error occurred */ public void print(char value) throws IOException { print(String.valueOf(value)); @@ -123,7 +89,9 @@ public class ThrowingPrintWriter extends Writer { * Print an int as string * * @param value - * @throws IOException + * an int. + * @throws java.io.IOException + * if an IO error occurred */ public void print(int value) throws IOException { print(String.valueOf(value)); @@ -133,7 +101,9 @@ public class ThrowingPrintWriter extends Writer { * Print a long as string * * @param value - * @throws IOException + * a long. + * @throws java.io.IOException + * if an IO error occurred */ public void print(long value) throws IOException { print(String.valueOf(value)); @@ -143,7 +113,9 @@ public class ThrowingPrintWriter extends Writer { * Print a short as string * * @param value - * @throws IOException + * a short. + * @throws java.io.IOException + * if an IO error occurred */ public void print(short value) throws IOException { print(String.valueOf(value)); @@ -151,11 +123,14 @@ public class ThrowingPrintWriter extends Writer { /** * Print a formatted message according to - * {@link String#format(String, Object...)}. + * {@link java.lang.String#format(String, Object...)}. * * @param fmt + * a {@link java.lang.String} object. * @param args - * @throws IOException + * objects. + * @throws java.io.IOException + * if an IO error occurred */ public void format(String fmt, Object... args) throws IOException { print(String.format(fmt, args)); @@ -165,7 +140,9 @@ public class ThrowingPrintWriter extends Writer { * Print an object's toString representations * * @param any - * @throws IOException + * an object. + * @throws java.io.IOException + * if an IO error occurred */ public void print(Object any) throws IOException { out.write(String.valueOf(any)); |