[SCM] UNNAMED PROJECT branch, master, updated. debian/1.6.2-19-g7f6060f

[Emmanuel Bourg]

The following commit has been merged in the master branch:
commit 7f6060fc4ff6170875b23eb6026446f48abba1f6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jun 11 17:38:17 2013 +0200

    Minor code changes

diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java
index 9e0c0cf..e2044d5 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DebianDependency.java
@@ -6,14 +6,12 @@ import static org.debian.maven.util.Preconditions.*;
 
 public class DebianDependency implements Comparable<DebianDependency> {
 
-    private static final Pattern VALID_DEBIAN_PACKAGE_NAME = Pattern
-            .compile("^[a-z0-9][a-z0-9+-.]+$");
+    private static final Pattern VALID_DEBIAN_PACKAGE_NAME = Pattern.compile("^[a-z0-9][a-z0-9+-.]+$");
 
     private final String packageName;
     private final String minimumVersion;
 
     public DebianDependency(String packageName, String minimumVersion) {
-        super();
         this.packageName = checkPackageName(packageName);
         this.minimumVersion = checkNotNull(minimumVersion);
     }
@@ -22,11 +20,8 @@ public class DebianDependency implements Comparable<DebianDependency> {
         this(packageName, "");
     }
 
-    @Override
     public String toString() {
-        if(minimumVersion.isEmpty())
-            return packageName;
-        return packageName + " (>= " + minimumVersion + ")";
+        return minimumVersion.isEmpty() ? packageName : packageName + " (>= " + minimumVersion + ")";
     }
 
     public String getPackageName() {
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
index 5ff4b29..cbca3d4 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
@@ -122,11 +122,9 @@ public class DependenciesMojo extends AbstractMojo {
      */
     protected boolean verbose;
 
-    public void execute()
-            throws MojoExecutionException {
-        File f = outputDirectory;
-        if (!f.exists()) {
-            f.mkdirs();
+    public void execute() throws MojoExecutionException {
+        if (!outputDirectory.exists()) {
+            outputDirectory.mkdirs();
         }
 
         DependenciesSolver solver = new DependenciesSolver(outputDirectory, new PackageScanner(offline), interactive);
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
index d8966d0..025e116 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
@@ -386,8 +386,7 @@ public class GenerateDebianFilesMojo extends AbstractMojo {
                     scanner.makeExecutable("debian/orig-tar.sh");
 
                 } else {
-                    System.err.println("Cannot locate the version in the download url (" +
-                            downloadUrl + ").");
+                    System.err.println("Cannot locate the version in the download url (" + downloadUrl + ").");
                     System.err.println("Please run again and provide the download location with an explicit version tag, e.g.");
                     System.err.println("-DdownloadUrl=scm:svn:http://svn.codehaus.org/modello/tags/modello-1.0-alpha-21/");
                 }
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 b582aa0..1e81bf5 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
@@ -53,14 +53,12 @@ public class IOUtil {
 
                     public void run() {
                         try {
-                            InputStreamReader isr = new InputStreamReader(process.getInputStream());
-                            BufferedReader br = new BufferedReader(isr);
-                            LineNumberReader aptIn = new LineNumberReader(br);
+                            LineNumberReader in = new LineNumberReader(new BufferedReader(new InputStreamReader(process.getInputStream())));
                             String line;
-                            while ((line = aptIn.readLine()) != null) {
+                            while ((line = in.readLine()) != null) {
                                 handler.newLine(line);
                             }
-                            aptIn.close();
+                            in.close();
                         } catch (IOException ex) {
                             ex.printStackTrace();
                         }
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 ee687d7..7b55552 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
@@ -355,15 +355,15 @@ public class DependenciesSolverTest extends TestCase {
     }
 
     protected File getFileInClasspath(String resource) {
-        if (! resource.startsWith("/")) {
+        if (!resource.startsWith("/")) {
             resource = "/" + resource;
         }
         URL url = this.getClass().getResource(resource);
         File f;
         try {
-          f = new File(url.toURI());
-        } catch(URISyntaxException e) {
-          f = new File(url.getPath());
+            f = new File(url.toURI());
+        } catch (URISyntaxException e) {
+            f = new File(url.getPath());
         }
         return f;
     }

-- 
UNNAMED PROJECT