whoops

diff --git a/source/mir/changetracker/ChangeTracker.java b/source/mir/changetracker/ChangeTracker.java
index 16ff7b4..3474b26 100644 (file)
--- a/source/mir/changetracker/ChangeTracker.java
+++ b/source/mir/changetracker/ChangeTracker.java
@@ -137,8 +137,9 @@ public class ChangeTracker {
       Iterator i = changes.iterator();
       while (i.hasNext()) {
         Change change = (Change) i.next();
       Iterator i = changes.iterator();
       while (i.hasNext()) {
         Change change = (Change) i.next();

-        if (change.getPath().startsWith(aBasePath))
+        if (change.getPath().startsWith(aBasePath)) {

           result.add(change);
           result.add(change);

+        }

       }
 
       return result;
       }
 
       return result;

diff --git a/source/mircoders/producer/ChangeReportingProducerNode.java b/source/mircoders/producer/ChangeReportingProducerNode.java
index 3ebb3a5..e4635cc 100644 (file)
--- a/source/mircoders/producer/ChangeReportingProducerNode.java
+++ b/source/mircoders/producer/ChangeReportingProducerNode.java
@@ -1,30 +1,21 @@
 package mircoders.producer;\r
 \r
 package mircoders.producer;\r
 \r

-import mir.producer.AbstractProducerNode;\r
-import mir.producer.ProducerFailure;\r
+import mir.changetracker.ChangeTracker;\r

 import mir.log.LoggerWrapper;\r
 import mir.log.LoggerWrapper;\r

+import mir.producer.AbstractProducerNode;\r

 import mir.util.ParameterExpander;\r
 import mir.util.ParameterExpander;\r

-import mir.util.ExceptionRoutines;\r
-import mir.changetracker.ChangeTracker;\r
+import mircoders.global.MirGlobal;\r

 \r
 \r

-import java.util.Map;\r
-import java.util.Vector;\r
-import java.util.Hashtable;\r
-import java.util.ArrayList;\r
-import java.util.Enumeration;\r
-import java.util.Collections;\r
-import java.util.Iterator;\r
-import java.util.Collection;\r

 import java.io.File;\r
 import java.io.File;\r

-import java.io.OutputStream;\r
-import java.io.FileOutputStream;\r
-import java.io.Writer;\r
-import java.io.OutputStreamWriter;\r

 import java.io.FileNotFoundException;\r
 import java.io.FileNotFoundException;\r

+import java.io.FileOutputStream;\r

 import java.io.IOException;\r
 import java.io.IOException;\r

-\r
-import org.apache.xmlrpc.XmlRpcClient;\r
-import mircoders.global.MirGlobal;\r
+import java.io.OutputStream;\r
+import java.io.OutputStreamWriter;\r
+import java.io.Writer;\r
+import java.util.Collection;\r
+import java.util.Iterator;\r
+import java.util.Map;\r

 \r
 public class ChangeReportingProducerNode extends AbstractProducerNode {\r
   private String format;\r
 \r
 public class ChangeReportingProducerNode extends AbstractProducerNode {\r
   private String format;\r


@@ -33,7 +24,7 @@ public class ChangeReportingProducerNode extends AbstractProducerNode {
   private String baseUrl;\r
   private String exclusionList;\r
 \r
   private String baseUrl;\r
   private String exclusionList;\r
 \r

-  public ChangeReportingProducerNode(String aFormat, String anOutputFile, String aBasePath, String aBaseUrl, String anExclusionList) {\r
+  public ChangeReportingProducerNode(String anOutputFile, String aFormat, String aBasePath, String aBaseUrl, String anExclusionList) {\r

     format = aFormat;\r
     outputFile = anOutputFile;\r
     basePath = aBasePath;\r
     format = aFormat;\r
     outputFile = anOutputFile;\r
     basePath = aBasePath;\r


@@ -57,7 +48,7 @@ public class ChangeReportingProducerNode extends AbstractProducerNode {
       try {\r
         Writer writer = new OutputStreamWriter(stream);\r
         try {\r
       try {\r
         Writer writer = new OutputStreamWriter(stream);\r
         try {\r

-          String expandedBasePath = ParameterExpander.expandExpression(aValueMap, outputFile);\r
+          String expandedBasePath = ParameterExpander.expandExpression(aValueMap, basePath);\r

           Collection changes = MirGlobal.getChangeEngine().getTracker().flushChanges(expandedBasePath);\r
 \r
           Iterator i = changes.iterator();\r
           Collection changes = MirGlobal.getChangeEngine().getTracker().flushChanges(expandedBasePath);\r
 \r
           Iterator i = changes.iterator();\r

diff --git a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
index 4f6f105..2038f46 100755 (executable)
--- a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
+++ b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
@@ -276,7 +276,7 @@ public class SupplementalProducerNodeBuilders {
     }
 
     public ProducerNode constructNode() {
     }
 
     public ProducerNode constructNode() {

-      return new ChangeReportingProducerNode(format, file, basepath, null, null);
+      return new ChangeReportingProducerNode(file, format, basepath, null, null);

     }
   }
 }
     }
   }
 }