Working on refactoring some stuff into archive-commons

This commit is contained in:
Noah Levitt
2012-12-18 14:46:52 -08:00
parent 5586d5452d
commit 3a65fa25d7
32 changed files with 99 additions and 6120 deletions
@@ -43,6 +43,7 @@ import org.archive.modules.net.ServerCache;
import org.archive.modules.seeds.SeedModule;
import org.archive.spring.ConfigPath;
import org.archive.util.ArchiveUtils;
import org.archive.util.ReportUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -615,7 +616,7 @@ implements Serializable,
}
public String getToeThreadReportShort() {
return (toePool == null) ? "" : ArchiveUtils.shortReportLine(toePool);
return (toePool == null) ? "" : ReportUtils.shortReportLine(toePool);
}
public Map<String,Object> getToeThreadReportShortData() {
@@ -624,7 +625,7 @@ implements Serializable,
}
public String getFrontierReportShort() {
return ArchiveUtils.shortReportLine(getFrontier());
return ReportUtils.shortReportLine(getFrontier());
}
/**
@@ -44,6 +44,7 @@ import org.archive.util.ArchiveUtils;
import org.archive.util.DevUtils;
import org.archive.util.ProgressStatisticsReporter;
import org.archive.util.Recorder;
import org.archive.util.ReportUtils;
import org.archive.util.Reporter;
import com.sleepycat.util.RuntimeExceptionWrapper;
@@ -573,7 +574,7 @@ implements Reporter, ProgressStatisticsReporter,
}
public String shortReportLine() {
return ArchiveUtils.shortReportLine(this);
return ReportUtils.shortReportLine(this);
}
public void progressStatisticsLine(PrintWriter writer) {
@@ -69,6 +69,7 @@ import org.archive.modules.seeds.SeedModule;
import org.archive.spring.HasKeyedProperties;
import org.archive.spring.KeyedProperties;
import org.archive.util.ArchiveUtils;
import org.archive.util.ReportUtils;
import org.archive.util.iterator.LineReadingIterator;
import org.archive.util.iterator.RegexLineIterator;
import org.json.JSONException;
@@ -1128,7 +1129,7 @@ public abstract class AbstractFrontier
// Reporter implementation
//
public String shortReportLine() {
return ArchiveUtils.shortReportLine(this);
return ReportUtils.shortReportLine(this);
}
@Override
@@ -39,6 +39,7 @@ import org.archive.modules.fetcher.FetchStats.Stage;
import org.archive.util.ArchiveUtils;
import org.archive.util.IdentityCacheable;
import org.archive.util.ObjectIdentityCache;
import org.archive.util.ReportUtils;
import org.archive.util.Reporter;
/**
@@ -541,7 +542,7 @@ public abstract class WorkQueue implements Frontier.FrontierGroup,
}
public String shortReportLine() {
return ArchiveUtils.shortReportLine(this);
return ReportUtils.shortReportLine(this);
}
/**
@@ -27,6 +27,7 @@ import org.archive.modules.CrawlURI;
import org.archive.modules.fetcher.FetchStats;
import org.archive.modules.fetcher.FetchStats.Stage;
import org.archive.util.ArchiveUtils;
import org.archive.util.ReportUtils;
import org.archive.util.Reporter;
/**
@@ -62,7 +63,7 @@ FetchStats.CollectsFetchStats, Serializable {
}
public String shortReportLine() {
return ArchiveUtils.shortReportLine(this);
return ReportUtils.shortReportLine(this);
}
@Override