接口的调整
接口的调整
Merge branch 'master' of https://github.com/luomuwen/map_agent

Conflicts:
	src/com/wk/agent/Agent.java
	src/com/wk/agent/Collector.java
	src/com/wk/agent/DelimiterResolve.java
	src/com/wk/agent/FileSource.java
	src/com/wk/agent/IFileReadMode.java
	src/com/wk/agent/IFileReader.java
	src/com/wk/agent/IResolve.java
	src/com/wk/agent/Test.java
	src/com/wk/agent/impl/DelimiterResolve.java
	src/com/wk/agent/impl/FixedSizeReadMode.java
	test.txt