Changeset 6249

Timestamp:

02/05/08 22:29:51 (5 years ago)

Author:

daisuke_m

Message:

mvnbeans: modify to ease using this as not only CLI application but also library. (cf. App2.java) / remove unused imports. / ignore root dot-files.
コマンドラインアプリとしてだけでなく、ライブラリとしても使いやすいよう修正。App2.java参照。その他、不要importの除去、ルートのドットファイルをignore。

Location:

lang/java/mvnbeans/trunk

Files:

• . (modified) (1 prop)
• src/main/java/jp/javelindev/mvnbeans/App.java (modified) (7 diffs)
• src/main/java/jp/javelindev/mvnbeans/App2.java (added)
• src/main/java/jp/javelindev/mvnbeans/Artifact.java (modified) (3 diffs)
• src/main/java/jp/javelindev/mvnbeans/RepositoryManager.java (modified) (3 diffs)

lang/java/mvnbeans/trunk

@@ -1 +1 @@
 target
+
+.*

@@ -1 +1 @@
 target
+
+.*

lang/java/mvnbeans/trunk/src/main/java/jp/javelindev/mvnbeans/App.java

@@ -7 +7 @@
 import java.io.InputStream;
 import java.nio.channels.Channels;
-import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -14 +13 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
@@ -26 +26 @@
  *
  */
-public class App 
+public class App
 {
     enum Command {
-        FETCH("fetch"), 
-        SEARCH("search"), 
-        INFO("info"), 
+        FETCH("fetch"),
+        SEARCH("search"),
+        INFO("info"),
         DEPS("showdeps");
         
@@ -43 +43 @@
             EnumSet<Command> enumSet = EnumSet.allOf(Command.class);
             for (App.Command command : enumSet) {
-                if(command.commandName.equals(cmdName)) return command;
+                if(command.commandName.equals(cmdName)) {
+                                        return command;
+                                }
             }
             return null;
@@ -130 +132 @@
     
     static String repeatString(final String original, final int count) {
-        if(original == null) return "";
-        if(count <= 0) return "";
+        if(original == null) {
+                        return "";
+                }
+        if(count <= 0) {
+                        return "";
+                }
         StringBuilder sb = new StringBuilder(original.length()*count);
         for(int i = 0; i < count; i++) {
@@ -164 +170 @@
                     System.out.println(repeatString("--", count) + "> processing " + fileName + "(" + artifact.getFileURL() + ")...");
                     
-                    //the artifact has some dependencies, so we can not download the artifact just now 
+                    //the artifact has some dependencies, so we can not download the artifact just now
                     //and need to wait until the end of downloading of all the dependencies.
                     //the artifact will be download after downloading the dependencies,
@@ -176 +182 @@
                 for (Artifact dependency : artifact.getDependencies()) {
                     fetchAllArtifact(dependency, count + 1, reserved);
-                }      
+                }
                 
                 InputStream input = null;

lang/java/mvnbeans/trunk/src/main/java/jp/javelindev/mvnbeans/Artifact.java

@@ -25 +25 @@
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.vfs.FileObject;
@@ -42 +41 @@
  */
 class Artifact {
-    enum ResourceType { 
+    enum ResourceType {
         POM(".pom"), JAR(".jar");
         
@@ -88 +87 @@
                     if(depScope == null || !depScope.equalsIgnoreCase("test")) {
                         Artifact dep = new Artifact(depGroupId, depArtifactId, depVersion, this.repositories);
-                        artifactList.add(dep); 
+                        artifactList.add(dep);
                     }
                 }

lang/java/mvnbeans/trunk/src/main/java/jp/javelindev/mvnbeans/RepositoryManager.java

@@ -26 +26 @@
 import java.util.List;
 import java.util.Properties;
+
 import org.apache.commons.io.IOUtils;
 
@@ -37 +38 @@
     
     void initialize(boolean useLocalRepository) throws FileNotFoundException, IOException, EnvVarNotFoundException {
-        String beansHome = System.getenv("MVNBEANS_HOME");
-        if(beansHome == null) {
-            throw new EnvVarNotFoundException("MVNBEANS_HOME");
-        }
-        
-        if(!beansHome.endsWith("/")) {
-            beansHome = beansHome + "/";
-        }
-        
-        File propFile = new File(beansHome + "repositories.properties");
-        if(!propFile.exists()) {
-            throw new FileNotFoundException("Can not find '" + beansHome + "repositories.properties'");
-        }
-        if(!propFile.canRead()) {
-            throw new IllegalStateException("the file " + beansHome + "repositories.properties is not readable.");
-        }
-        
-        Properties prop = new Properties();
-        FileInputStream fis = null;
-        try {
-            fis = new FileInputStream(propFile);
-            prop.load(fis);
-        } finally {
-            IOUtils.closeQuietly(fis);
-        }
-        
+            String beansHome = System.getenv("MVNBEANS_HOME");
+            if(beansHome == null) {
+                throw new EnvVarNotFoundException("MVNBEANS_HOME");
+            }
+            
+            if(!beansHome.endsWith("/")) {
+                beansHome = beansHome + "/";
+            }
+            
+            File propFile = new File(beansHome + "repositories.properties");
+            if(!propFile.exists()) {
+                throw new FileNotFoundException("Can not find '" + beansHome + "repositories.properties'");
+            }
+            if(!propFile.canRead()) {
+                throw new IllegalStateException("the file " + beansHome + "repositories.properties is not readable.");
+            }
+            
+            Properties prop = new Properties();
+            FileInputStream fis = null;
+            try {
+                fis = new FileInputStream(propFile);
+                prop.load(fis);
+            } finally {
+                IOUtils.closeQuietly(fis);
+            }
+            
+            initialize(useLocalRepository, prop);
+        }
+
+        void initialize(boolean useLocalRepository, Properties prop) {
         if(useLocalRepository) {
             String localRep = prop.getProperty("localrepository");
@@ -91 +96 @@
     }
     
+    public static RepositoryManager getInstance(boolean useLocalRepository, Properties prop) {
+        synchronized(RepositoryManager.class) {
+            if(INSTANCE == null) {
+                INSTANCE = new RepositoryManager();
+                INSTANCE.initialize(useLocalRepository, prop);
+            }
+            return INSTANCE;
+        }
+    }
+    
     public Iterator<Repository> iterator() {
         return new ArrayList<Repository>(this.repositories).iterator(); //diffensive copy

@@ -1 +1 @@
 target
+
+.*