Projects >> android-arabic-reader >>faa64fe9a1b604f40772dcad2b40b0ddfacca37f

Chunk
Conflicting content 
	public synchronized void reset(boolean force) {
		if (myInterface != null) {
			try {
<<<<<<< HEAD
				myInterface.reset(
					Util.splitDirectories(Paths.BooksDirectoryOption().getValue()), force
				);
=======
				myInterface.reset(Paths.BookPathOption().getValue(), force);
>>>>>>> 9b5718e104b39a65c83df889a38c2b67d0479782
			} catch (RemoteException e) {
			}
		}
Solution content 
	public synchronized void reset(boolean force) {
		if (myInterface != null) {
			try {
				myInterface.reset(Paths.BookPathOption().getValue(), force);
			} catch (RemoteException e) {
			}
		}
File
BookCollectionShadow.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
		LibraryImplementation() {
			myDatabase = SQLiteBooksDatabase.Instance(LibraryService.this);
<<<<<<< HEAD
			reset(Util.splitDirectories(Paths.BooksDirectoryOption().getValue()), true);
=======
			reset(Paths.BookPathOption().getValue(), true);
>>>>>>> 9b5718e104b39a65c83df889a38c2b67d0479782
		}

		public void reset(List bookDirectories, boolean force) {
Solution content 
		LibraryImplementation() {
			myDatabase = SQLiteBooksDatabase.Instance(LibraryService.this);
			reset(Paths.BookPathOption().getValue(), true);
		}

		public void reset(List bookDirectories, boolean force) {
File
LibraryService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
	}

	public static String mainBookDirectory() {
<<<<<<< HEAD
		return Util.splitDirectories(BooksDirectoryOption().getValue()).get(0);
=======
		final List bookPath = BookPathOption().getValue();
		return bookPath.isEmpty() ? defaultBookDirectory() : bookPath.get(0);
>>>>>>> 9b5718e104b39a65c83df889a38c2b67d0479782
	}

	public static String cacheDirectory() {
Solution content 
	}

	public static String mainBookDirectory() {
		final List bookPath = BookPathOption().getValue();
		return bookPath.isEmpty() ? defaultBookDirectory() : bookPath.get(0);
	}

	public static String cacheDirectory() {
File
Paths.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
public class FileFirstLevelTree extends FirstLevelTree {
	FileFirstLevelTree(RootTree root) {
		super(root, ROOT_FILE_TREE);
<<<<<<< HEAD
		List directories = Util.splitDirectories(Paths.BooksDirectoryOption().getValue());
		if (directories.size() == 1)
			addChild(directories.get(0), NODE_LIBRARY_DIRECTORY);
		else {
			FirstLevelTree libraryGroup = new FirstLevelTree(this, NODE_LIBRARY_DIRECTORY);
			for (String d : directories) {
				final ZLFile file = ZLFile.createFileByPath(d);
				if (file != null) {
					new FileTree(
						libraryGroup,
						file,
						file.getShortName(),
						file.getPath());
				}
			}
		}
		addChild("/", "fileTreeRoot");
		addChild(Paths.cardDirectory(), "fileTreeCard");
=======
		for (String dir : Paths.BookPathOption().getValue()) {
			addChild(dir, "fileTreeLibrary", dir);
		}
		addChild("/", "fileTreeRoot", null);
		addChild(Paths.cardDirectory(), "fileTreeCard", null);
>>>>>>> 9b5718e104b39a65c83df889a38c2b67d0479782
	}

	private void addChild(String path, String resourceKey, String summary) {
Solution content 
public class FileFirstLevelTree extends FirstLevelTree {
	FileFirstLevelTree(RootTree root) {
		super(root, ROOT_FILE_TREE);
		for (String dir : Paths.BookPathOption().getValue()) {
			addChild(dir, "fileTreeLibrary", dir);
		}
		addChild("/", "fileTreeRoot", null);
		addChild(Paths.cardDirectory(), "fileTreeCard", null);
	}

	private void addChild(String path, String resourceKey, String summary) {
File
FileFirstLevelTree.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation
Variable