From 91e246ad153388e680109605b6c46f500fa25c8f Mon Sep 17 00:00:00 2001
From: zapata <zapata>
Date: Sat, 11 Nov 2006 16:36:01 +0000
Subject: [PATCH] whoops

---
 source/mir/changetracker/ChangeTracker.java        |  3 +-
 .../producer/ChangeReportingProducerNode.java      | 33 ++++++++--------------
 .../reader/SupplementalProducerNodeBuilders.java   |  2 +-
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/source/mir/changetracker/ChangeTracker.java b/source/mir/changetracker/ChangeTracker.java
index 16ff7b42..3474b269 100644
--- 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();
-        if (change.getPath().startsWith(aBasePath))
+        if (change.getPath().startsWith(aBasePath)) {
           result.add(change);
+        }
       }
 
       return result;
diff --git a/source/mircoders/producer/ChangeReportingProducerNode.java b/source/mircoders/producer/ChangeReportingProducerNode.java
index 3ebb3a5f..e4635cc8 100644
--- a/source/mircoders/producer/ChangeReportingProducerNode.java
+++ b/source/mircoders/producer/ChangeReportingProducerNode.java
@@ -1,30 +1,21 @@
 package mircoders.producer;
 
-import mir.producer.AbstractProducerNode;
-import mir.producer.ProducerFailure;
+import mir.changetracker.ChangeTracker;
 import mir.log.LoggerWrapper;
+import mir.producer.AbstractProducerNode;
 import mir.util.ParameterExpander;
-import mir.util.ExceptionRoutines;
-import mir.changetracker.ChangeTracker;
+import mircoders.global.MirGlobal;
 
-import java.util.Map;
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Collection;
 import java.io.File;
-import java.io.OutputStream;
-import java.io.FileOutputStream;
-import java.io.Writer;
-import java.io.OutputStreamWriter;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
-
-import org.apache.xmlrpc.XmlRpcClient;
-import mircoders.global.MirGlobal;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
 
 public class ChangeReportingProducerNode extends AbstractProducerNode {
   private String format;
@@ -33,7 +24,7 @@ public class ChangeReportingProducerNode extends AbstractProducerNode {
   private String baseUrl;
   private String exclusionList;
 
-  public ChangeReportingProducerNode(String aFormat, String anOutputFile, String aBasePath, String aBaseUrl, String anExclusionList) {
+  public ChangeReportingProducerNode(String anOutputFile, String aFormat, String aBasePath, String aBaseUrl, String anExclusionList) {
     format = aFormat;
     outputFile = anOutputFile;
     basePath = aBasePath;
@@ -57,7 +48,7 @@ public class ChangeReportingProducerNode extends AbstractProducerNode {
       try {
         Writer writer = new OutputStreamWriter(stream);
         try {
-          String expandedBasePath = ParameterExpander.expandExpression(aValueMap, outputFile);
+          String expandedBasePath = ParameterExpander.expandExpression(aValueMap, basePath);
           Collection changes = MirGlobal.getChangeEngine().getTracker().flushChanges(expandedBasePath);
 
           Iterator i = changes.iterator();
diff --git a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
index 4f6f105d..2038f469 100755
--- a/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
+++ b/source/mircoders/producer/reader/SupplementalProducerNodeBuilders.java
@@ -276,7 +276,7 @@ public class SupplementalProducerNodeBuilders {
     }
 
     public ProducerNode constructNode() {
-      return new ChangeReportingProducerNode(format, file, basepath, null, null);
+      return new ChangeReportingProducerNode(file, format, basepath, null, null);
     }
   }
 }
-- 
2.11.0