Changeset 10853 for lang/java/mvnhack

Timestamp:

05/01/08 02:29:28 (5 years ago)

Author:

taichi

Message:

 

Location:

lang/java/mvnhack/trunk/src/mvnhack

Files:

• Main.java (modified) (2 diffs)
• repository/impl/DefaultConfiguration.java (modified) (1 diff)
• repository/impl/LocalRepository.java (modified) (2 diffs)

lang/java/mvnhack/trunk/src/mvnhack/Main.java

@@ -14 +14 @@
 import mvnhack.common.util.StreamUtil;
 import mvnhack.common.util.UrlUtil;
-import mvnhack.repository.ArtifactBuilder;
 import mvnhack.repository.impl.DefaultConfiguration;
 import mvnhack.repository.impl.DefaultContext;
 import mvnhack.repository.impl.FlatDestination;
 import mvnhack.repository.impl.LocalRepository;
-import mvnhack.repository.impl.StAXArtifactBuilder;
 
 public class Main {
@@ -43 +41 @@
 
                 Properties props = System.getProperties();
-                ArtifactBuilder builder = new StAXArtifactBuilder();
-                DefaultConfiguration config = new DefaultConfiguration(props, builder);
+                DefaultConfiguration config = new DefaultConfiguration(props);
                 if (cmd.isFlat) {
                         config.addDestination(new FlatDestination(cmd.destDir));
                 } else {
-                        LocalRepository lr = new LocalRepository(cmd.destDir, builder);
-                        config.addDestination(lr);
+                        config.addDestination(new LocalRepository(cmd.destDir));
                 }
                 DefaultContext ctx = new DefaultContext(config);

lang/java/mvnhack/trunk/src/mvnhack/repository/impl/DefaultConfiguration.java

@@ -23 +23 @@
         protected Set<Destination> destinations = new LinkedHashSet<Destination>();
 
-        protected ArtifactBuilder builder;
+        protected ArtifactBuilder builder = new StAXArtifactBuilder();
 
         public DefaultConfiguration() {
-                builder = new StAXArtifactBuilder();
         }
 
-        public DefaultConfiguration(Properties properties, ArtifactBuilder builder) {
-                this.builder = builder;
+        public DefaultConfiguration(Properties properties) {
                 load();
                 load(properties);

lang/java/mvnhack/trunk/src/mvnhack/repository/impl/LocalRepository.java

@@ -14 +14 @@
 import mvnhack.repository.Repository;
 
-
 public class LocalRepository implements Repository, Destination {
 
@@ -20 +19 @@
 
         protected ArtifactBuilder builder;
+
+        public LocalRepository(File root) {
+                this.root = root;
+        }
 
         public LocalRepository(File root, ArtifactBuilder builder) {