diff --git a/radar.se/src/main/java/org/obrienscience/radar/DuplicationProcessor.java b/radar.se/src/main/java/org/obrienscience/radar/DuplicationProcessor.java index 82adc09..39a662d 100755 --- a/radar.se/src/main/java/org/obrienscience/radar/DuplicationProcessor.java +++ b/radar.se/src/main/java/org/obrienscience/radar/DuplicationProcessor.java @@ -41,9 +41,9 @@ private void copyFile(String src, String dest) { } } - public void merge(String _site, String _aDir, String _bDir){//, String _cDir) { - String aDir = _aDir + "/" + _site + "/"; - String bDir = _bDir + "/" + _site + "/"; + public void merge(String _site, String _destDir, String _srcDir){//, String _cDir) { + String aDir = _destDir + "/" + _site + "/"; + String bDir = _srcDir + "/" + _site + "/"; //String cDir = _cDir + "/" + _site + "/"; String filename; long filesize; @@ -236,18 +236,22 @@ public static void main(String[] args) { DuplicationProcessor processor = new DuplicationProcessor(); //site = "xwl"; -/* for(int i=0;i