Projects >> tubaina >>31a52f3383a87e9ade9dcd5dce65497583b8b67a

Chunk
Conflicting content 
	}

	private static TubainaBuilder parseOptions(CommandLine cmd, Options options) {
<<<<<<< HEAD
		ParseTypes type = selectParseTypeFromCommandLine(cmd);

=======
		ParseType type = selectParseTypeFromCommandLine(cmd);
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		TubainaBuilder builder = new TubainaBuilder(type);

		if (cmd.hasOption("h")) {
Solution content 
	}

	private static TubainaBuilder parseOptions(CommandLine cmd, Options options) {
		ParseType type = selectParseTypeFromCommandLine(cmd);
		TubainaBuilder builder = new TubainaBuilder(type);

		if (cmd.hasOption("h")) {
File
Tubaina.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		return builder;
	}

<<<<<<< HEAD
	private static ParseTypes selectParseTypeFromCommandLine(CommandLine cmd) {
		for (ParseTypes type : ParseTypes.values()) {
=======
	private static ParseType selectParseTypeFromCommandLine(CommandLine cmd) {
		for (ParseType type : ParseType.values()) {
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
			if (cmd.hasOption(type.getType())) {
				return type;
			}
Solution content 
		return builder;
	}

	private static ParseType selectParseTypeFromCommandLine(CommandLine cmd) {
		for (ParseType type : ParseType.values()) {
			if (cmd.hasOption(type.getType())) {
				return type;
			}
File
Tubaina.java
Developer's decision
Version 2
Kind of conflict
For statement
Method signature
Chunk
Conflicting content 
=======
<<<<<<< HEAD
import br.com.caelum.tubaina.parser.html.FlatHtmlGenerator;
import br.com.caelum.tubaina.parser.html.Generator;
import br.com.caelum.tubaina.parser.html.HtmlGenerator;
import br.com.caelum.tubaina.parser.html.SingleHtmlGenerator;
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
import br.com.caelum.tubaina.parser.latex.LatexGenerator;
import br.com.caelum.tubaina.resources.ResourceLocator;
Solution content 
import br.com.caelum.tubaina.parser.html.FlatHtmlGenerator;
import br.com.caelum.tubaina.parser.html.Generator;
import br.com.caelum.tubaina.parser.html.HtmlGenerator;
import br.com.caelum.tubaina.parser.html.SingleHtmlGenerator;
import br.com.caelum.tubaina.parser.latex.LatexGenerator;
import br.com.caelum.tubaina.resources.ResourceLocator;
File
TubainaBuilder.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	private String outputFileName = "book.tex";

<<<<<<< HEAD
	public TubainaBuilder(ParseTypes type) {
=======
	public TubainaBuilder(ParseType type) {
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		this.parseType = type;
	}
Solution content 
	private String outputFileName = "book.tex";

	public TubainaBuilder(ParseType type) {
		this.parseType = type;
	}
File
TubainaBuilder.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
		Parser parser = parseType.getParser(conf, noAnswer, showNotes);
		
		Generator generator = null;
<<<<<<< HEAD
		if (parseType.equals(ParseTypes.LATEX)) {
			generator = new LatexGenerator(parser, templateDir, noAnswer, outputFileName);
		}

		if (parseType.equals(ParseTypes.HTML)) {
			generator = new HtmlGenerator(parser, strictXhtml, templateDir);
		}

		if (parseType.equals(ParseTypes.HTMLFLAT)) {
			generator = new FlatHtmlGenerator(parser, strictXhtml, templateDir);
=======
		if (parseType.equals(ParseType.LATEX)) {
			generator = new LatexGenerator(parser, templateDir, noAnswer, outputFileName);
		}

		if (parseType.equals(ParseType.HTML)) {
			generator = new HtmlGenerator(parser, strictXhtml, templateDir);
		}

		if (parseType.equals(ParseType.HTMLFLAT)) {
			generator = new FlatHtmlGenerator(parser, strictXhtml, templateDir);
		}
		if (parseType.equals(ParseType.SINGLEHTML)) {
			generator = new SingleHtmlGenerator(parser, templateDir);
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		}
		
		File file = new File(outputDir,parseType.getType());
Solution content 
		Parser parser = parseType.getParser(conf, noAnswer, showNotes);
		
		Generator generator = null;
		if (parseType.equals(ParseType.LATEX)) {
			generator = new LatexGenerator(parser, templateDir, noAnswer, outputFileName);
		}

		if (parseType.equals(ParseType.HTML)) {
			generator = new HtmlGenerator(parser, strictXhtml, templateDir);
		}

		if (parseType.equals(ParseType.HTMLFLAT)) {
			generator = new FlatHtmlGenerator(parser, strictXhtml, templateDir);
		}
		if (parseType.equals(ParseType.SINGLEHTML)) {
			generator = new SingleHtmlGenerator(parser, templateDir);
		}
		
		File file = new File(outputDir,parseType.getType());
File
TubainaBuilder.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
import br.com.caelum.tubaina.Chapter;
import br.com.caelum.tubaina.Section;
import br.com.caelum.tubaina.TubainaException;
<<<<<<< HEAD
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.resources.HtmlResourceManipulator;
import br.com.caelum.tubaina.resources.Resource;
import br.com.caelum.tubaina.resources.ResourceManipulator;
import br.com.caelum.tubaina.util.FileUtilities;
=======
import br.com.caelum.tubaina.io.TubainaDir;
import br.com.caelum.tubaina.io.TubainaHtmlIO;
import br.com.caelum.tubaina.parser.Parser;
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
import br.com.caelum.tubaina.util.Utilities;
import br.com.caelum.tubaina.util.XHTMLValidator;
import freemarker.ext.beans.BeansWrapper;
Solution content 
import br.com.caelum.tubaina.Chapter;
import br.com.caelum.tubaina.Section;
import br.com.caelum.tubaina.TubainaException;
import br.com.caelum.tubaina.io.TubainaDir;
import br.com.caelum.tubaina.io.TubainaHtmlIO;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.util.Utilities;
import br.com.caelum.tubaina.util.XHTMLValidator;
import freemarker.ext.beans.BeansWrapper;
File
FlatHtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	private final File templateDir;

<<<<<<< HEAD
=======
	private Configuration cfg;

>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
	public FlatHtmlGenerator(final Parser parser, final boolean shouldValidateXHTML, final File templateDir) {
		this.parser = parser;
		this.shouldValidateXHTML = shouldValidateXHTML;
Solution content 
	private final File templateDir;

	private Configuration cfg;

	public FlatHtmlGenerator(final Parser parser, final boolean shouldValidateXHTML, final File templateDir) {
		this.parser = parser;
		this.shouldValidateXHTML = shouldValidateXHTML;
File
FlatHtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		configureFreemarker();
	}

<<<<<<< HEAD
	public void generate(Book b, File directory) throws IOException {
		// FreeMarker configuration
		Configuration cfg = new Configuration();
		cfg.setDirectoryForTemplateLoading(templateDir);
		cfg.setObjectWrapper(new BeansWrapper());

		List dirTree = createDirTree(b, directory);

		StringBuffer sb = new BookToTOC().generateTOC(b, cfg, dirTree);
		File root = saveToFile(new File(directory, dirTree.get(0)), sb);

=======
	public void generate(Book book, File directory) throws IOException {
		TubainaDir bookRoot = new TubainaHtmlIO(templateDir).createTubainaDir(directory, book);
		
		List dirTree = createDirTree(book, directory);
		StringBuffer toc = new BookToTOC().generateTOC(book, cfg, dirTree);
		bookRoot.writeIndex(toc);
		
		int chapterIndex = 1;
		int currentDir = 1;
		for (Chapter chapter : book.getChapters()) {
Solution content 
		configureFreemarker();
	}

	public void generate(Book book, File directory) throws IOException {
		TubainaDir bookRoot = new TubainaHtmlIO(templateDir).createTubainaDir(directory, book);
		
		List dirTree = createDirTree(book, directory);
		StringBuffer toc = new BookToTOC().generateTOC(book, cfg, dirTree);
		bookRoot.writeIndex(toc);
		
		int chapterIndex = 1;
		int currentDir = 1;
		for (Chapter chapter : book.getChapters()) {
File
FlatHtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Variable
Chunk
Conflicting content 
import br.com.caelum.tubaina.Chapter;
import br.com.caelum.tubaina.Section;
import br.com.caelum.tubaina.TubainaException;
<<<<<<< HEAD
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.resources.HtmlResourceManipulator;
import br.com.caelum.tubaina.resources.Resource;
import br.com.caelum.tubaina.resources.ResourceManipulator;
import br.com.caelum.tubaina.util.FileUtilities;
=======
import br.com.caelum.tubaina.io.TubainaDir;
import br.com.caelum.tubaina.io.TubainaHtmlIO;
import br.com.caelum.tubaina.parser.Parser;
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
import br.com.caelum.tubaina.util.Utilities;
import br.com.caelum.tubaina.util.XHTMLValidator;
import freemarker.ext.beans.BeansWrapper;
Solution content 
import br.com.caelum.tubaina.Chapter;
import br.com.caelum.tubaina.Section;
import br.com.caelum.tubaina.TubainaException;
import br.com.caelum.tubaina.io.TubainaDir;
import br.com.caelum.tubaina.io.TubainaHtmlIO;
import br.com.caelum.tubaina.parser.Parser;
import br.com.caelum.tubaina.util.Utilities;
import br.com.caelum.tubaina.util.XHTMLValidator;
import freemarker.ext.beans.BeansWrapper;
File
HtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
	private final File templateDir;

<<<<<<< HEAD
	public HtmlGenerator(final Parser parser, final boolean shouldValidateXHTML, final File templateDir) {
=======
	private Configuration cfg;

	public HtmlGenerator(Parser parser, boolean shouldValidateXHTML, File templateDir) {
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		this.parser = parser;
		this.shouldValidateXHTML = shouldValidateXHTML;
		this.templateDir = new File(templateDir, "html/");
Solution content 
	private final File templateDir;

	private Configuration cfg;

	public HtmlGenerator(Parser parser, boolean shouldValidateXHTML, File templateDir) {
		this.parser = parser;
		this.shouldValidateXHTML = shouldValidateXHTML;
		this.templateDir = new File(templateDir, "html/");
File
HtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
		configureFreemarker();
	}

<<<<<<< HEAD
	public void generate(Book b, File directory) throws IOException {
		// FreeMarker configuration
		Configuration cfg = new Configuration();
		cfg.setDirectoryForTemplateLoading(templateDir);
		cfg.setObjectWrapper(new BeansWrapper());

		List dirTree = createDirTree(b, directory);

		StringBuffer sb = new BookToTOC().generateTOC(b, cfg, dirTree);
		File root = saveToFile(new File(directory, dirTree.get(0)), sb);

=======
	public void generate(Book book, File directory) throws IOException {
		TubainaDir bookRoot = new TubainaHtmlIO(templateDir).createTubainaDir(directory, book);
		
		List dirTree = createDirTree(book, directory);
		StringBuffer toc = new BookToTOC().generateTOC(book, cfg, dirTree);
		bookRoot.writeIndex(toc);
>>>>>>> 6edd701980834aa96fa7056f2da99c74e24a16af
		int chapterIndex = 1;
		int currentDir = 1;
		for (Chapter chapter : book.getChapters()) {
Solution content 
		configureFreemarker();
	}

	public void generate(Book book, File directory) throws IOException {
		TubainaDir bookRoot = new TubainaHtmlIO(templateDir).createTubainaDir(directory, book);
		
		List dirTree = createDirTree(book, directory);
		StringBuffer toc = new BookToTOC().generateTOC(book, cfg, dirTree);
		bookRoot.writeIndex(toc);
		int chapterIndex = 1;
		int currentDir = 1;
		for (Chapter chapter : book.getChapters()) {
File
HtmlGenerator.java
Developer's decision
Version 2
Kind of conflict
Comment
Method invocation
Method signature
Variable