1 files changed, 29 insertions, 23 deletions

diff --git a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java
index 81dc6b1..6e84735 100644
--- a/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java
+++ b/src/main/java/org/apache/maven/artifact/resolver/JavadirWorkspaceReader.java
@@ -11,16 +11,12 @@ import org.sonatype.aether.repository.WorkspaceReader;
 import org.sonatype.aether.repository.WorkspaceRepository;
 import org.sonatype.aether.artifact.Artifact;
 
-
-public class JavadirWorkspaceReader
-    implements WorkspaceReader
-{
+public class JavadirWorkspaceReader implements WorkspaceReader {
     private WorkspaceRepository workspaceRepository;
 
     private static final char GROUP_SEPARATOR = '.';
     private static final char PATH_SEPARATOR = '/';
 
-
     public JavadirWorkspaceReader() {
         workspaceRepository = new WorkspaceRepository("javadir-workspace");
     }
@@ -29,8 +25,9 @@ public class JavadirWorkspaceReader
         return workspaceRepository;
     }
 
-    public File findArtifact( Artifact artifact ) {
-    	MavenJPackageDepmap.debug("=============JAVADIRREADER-FIND_ARTIFACT: " + artifact.getArtifactId());
+    public File findArtifact(Artifact artifact) {
+        MavenJPackageDepmap.debug("=============JAVADIRREADER-FIND_ARTIFACT: "
+                + artifact.getArtifactId());
         StringBuffer path = new StringBuffer();
 
         String artifactId = artifact.getArtifactId();
@@ -39,10 +36,11 @@ public class JavadirWorkspaceReader
 
         MavenJPackageDepmap.debug("Wanted GROUPID=" + groupId);
         MavenJPackageDepmap.debug("Wanted ARTIFACTID=" + artifactId);
-        
+
         if (!groupId.startsWith("JPP")) {
             MavenJPackageDepmap map = MavenJPackageDepmap.getInstance();
-            Hashtable<String,String> newInfo = map.getMappedInfo(groupId, artifactId, version);
+            Hashtable<String, String> newInfo = map.getMappedInfo(groupId,
+                    artifactId, version);
 
             groupId = (String) newInfo.get("group");
             artifactId = (String) newInfo.get("artifact");
@@ -53,29 +51,30 @@ public class JavadirWorkspaceReader
         if (artifact.getExtension().equals("pom")) {
             path = getPOMPath(groupId, artifactId);
         } else if (artifact.getExtension().equals("signature")) {
-        	path.append("/usr/share/maven/repository/");
-            path.append( groupId ).append( '/' );
-            path.append( artifactId ).append( ".signature" );
+            path.append("/usr/share/maven/repository/");
+            path.append(groupId).append('/');
+            path.append(artifactId).append(".signature");
         } else {
-        	path.append("/usr/share/maven/repository/");
-            path.append( groupId ).append( '/' );
-            path.append( artifactId ).append( ".jar" );
+            path.append("/usr/share/maven/repository/");
+            path.append(groupId).append('/');
+            path.append(artifactId).append(".jar");
         }
 
         MavenJPackageDepmap.debug("Returning " + path.toString());
         File ret = new File(path.toString());
         // if file doesn't exist return null to delegate to other
         // resolvers (reactor/local repo)
-        if ( ret.isFile() ) {
+        if (ret.isFile()) {
             MavenJPackageDepmap.debug("Returning " + path.toString());
             return ret;
         } else {
-            MavenJPackageDepmap.debug("Returning null for gid:aid" + groupId + ":" + artifactId);
+            MavenJPackageDepmap.debug("Returning null for gid:aid" + groupId
+                    + ":" + artifactId);
             return null;
         }
     }
 
-    public List<String> findVersions( Artifact artifact ) {
+    public List<String> findVersions(Artifact artifact) {
         List<String> ret = new LinkedList<String>();
         ret.add("latest");
         return ret;
@@ -84,19 +83,26 @@ public class JavadirWorkspaceReader
     private StringBuffer getPOMPath(String groupId, String artifactId) {
 
         StringBuffer path = new StringBuffer();
-        String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-" + artifactId + ".pom";
-        path.append(System.getProperty("maven.jpp.pom.path", "JPP/maven2/poms")).append("/").append(fName);
+        String fName = groupId.replace(PATH_SEPARATOR, GROUP_SEPARATOR) + "-"
+                + artifactId + ".pom";
+        path.append(System.getProperty("maven.jpp.pom.path", "JPP/maven2/poms"))
+                .append("/").append(fName);
         java.io.File f;
 
         // NOTE: We are returning default_poms/ as the path for this pom
         // even though it may not exist there. This may cause an error,
         // but that is fine because if the pom is not there, there is
         // a serious problem anyways..
-        f = new java.io.File(System.getProperty("maven.jpp.default.repo", "/usr/share/maven2/repository") + "/" + path.toString());
-        //System.err.println("Checking path " + f.getAbsolutePath() + " for the pom");
+        f = new java.io.File(System.getProperty("maven.jpp.default.repo",
+                "/usr/share/maven2/repository") + "/" + path.toString());
+        // System.err.println("Checking path " + f.getAbsolutePath() +
+        // " for the pom");
         if (!f.exists()) {
             path = new StringBuffer();
-            path.append(System.getProperty("maven.jpp.default.pom.path", "JPP/maven2/default_poms")).append("/").append(fName);
+            path.append(
+                    System.getProperty("maven.jpp.default.pom.path",
+                            "JPP/maven2/default_poms")).append("/")
+                    .append(fName);
         }
         path.insert(0, "/usr/share/maven2/repository/");
         return path;