Projects >> Galileo-Openbook-Cleaner >>a3ef3a87bf266df740d9c15eab16d577b69caa02

Chunk
Conflicting content
	public static void main(String[] args) throws Exception {
		long startTimeTotal = System.currentTimeMillis();
		processArgs(args);
<<<<<<< HEAD
		for (Book book : books) {
			long startTime = System.currentTimeMillis();
			new Downloader(downloadDir, book).download();
			SimpleLogger.echo("Processing " + book.unpackDirectory + "...");
			for (File htmlFile : new File(downloadDir, book.unpackDirectory).listFiles(HTML_FILES))
				cleanHTMLFile(htmlFile);
			SimpleLogger.time("Duration for " + book.unpackDirectory, System.currentTimeMillis() - startTime);
=======
		for (Book book : Options.VALUES.books) {
			System.out.println(book);
			long startTimeBook = System.currentTimeMillis();
			new Downloader(Options.VALUES.downloadDir, book).download();
			cleanBook(book);
			SimpleLogger.time("Duration for " + book.unpackDirectory, System.currentTimeMillis() - startTimeBook);
>>>>>>> 5ce34aa2f03bb706ebaacd0496248afed60454bd
		}
		SimpleLogger.time("\nTotal duration", System.currentTimeMillis() - startTimeTotal);
	}
Solution content
	public static void main(String[] args) throws Exception {
		long startTimeTotal = System.currentTimeMillis();
		processArgs(args);
		for (Book book : Options.VALUES.books) {
			System.out.println(book);
			long startTimeBook = System.currentTimeMillis();
			new Downloader(Options.VALUES.downloadDir, book).download();
			cleanBook(book);
			SimpleLogger.time("Duration for " + book.unpackDirectory, System.currentTimeMillis() - startTimeBook);
		}
		SimpleLogger.time("\nTotal duration", System.currentTimeMillis() - startTimeTotal);
	}
File
OpenbookCleaner.java
Developer's decision
Version 2
Kind of conflict
For statement
Method invocation
Variable