This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-debian-helper.
commit d4717ce9077de3ab4fe64c119a2cacc62ad032d8 Author: Emmanuel Bourg <[email protected]> Date: Mon Sep 2 12:03:47 2013 +0200 Replaced LineNumberReader with BufferedReader --- .../main/java/org/debian/maven/packager/DependenciesSolver.java | 4 ++-- .../src/main/java/org/debian/maven/packager/util/IOUtil.java | 3 +-- .../java/org/debian/maven/packager/DependenciesSolverTest.java | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java index e6f7c12..832af5e 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java @@ -17,11 +17,11 @@ package org.debian.maven.packager; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.LineNumberReader; import java.util.*; import java.util.logging.Level; import java.util.logging.Logger; @@ -132,7 +132,7 @@ public class DependenciesSolver { StringBuilder sb = new StringBuilder(); try { InputStream is = DependenciesSolver.class.getResourceAsStream("/" + resource); - LineNumberReader r = new LineNumberReader(new InputStreamReader(is)); + BufferedReader r = new BufferedReader(new InputStreamReader(is)); String line; while ((line = r.readLine()) != null) { sb.append(line); diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IOUtil.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IOUtil.java index 1e81bf5..07b324d 100644 --- a/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IOUtil.java +++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/util/IOUtil.java @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; -import java.io.LineNumberReader; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadFactory; @@ -53,7 +52,7 @@ public class IOUtil { public void run() { try { - LineNumberReader in = new LineNumberReader(new BufferedReader(new InputStreamReader(process.getInputStream()))); + BufferedReader in = new BufferedReader(new BufferedReader(new InputStreamReader(process.getInputStream()))); String line; while ((line = in.readLine()) != null) { handler.newLine(line); diff --git a/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java b/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java index 7b55552..e7de184 100644 --- a/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java +++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java @@ -16,12 +16,12 @@ package org.debian.maven.packager; +import java.io.BufferedReader; import java.io.File; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStreamReader; -import java.io.LineNumberReader; import java.io.Reader; import java.net.URISyntaxException; import java.net.URL; @@ -306,8 +306,8 @@ public class DependenciesSolverTest extends TestCase { protected void assertFileEquals(String resource, String fileName) throws Exception { File file = new File(testDir, fileName); assertTrue(file.exists()); - LineNumberReader fileReader = new LineNumberReader(new FileReader(file)); - LineNumberReader refReader = new LineNumberReader(read(resource)); + BufferedReader fileReader = new BufferedReader(new FileReader(file)); + BufferedReader refReader = new BufferedReader(read(resource)); String ref, test = null; boolean skipReadTest = false; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
