Projects >> android-arabic-reader >>1761ef83a84c5383c8e09a3d788e1b6a48d5e7c9

Chunk
Conflicting content 
	protected abstract void executeAsATransaction(Runnable actions);

	// returns map fileId -> book
<<<<<<< HEAD
	protected abstract Map loadBooks(FileInfoSet infos, boolean existing);
	protected abstract void setExistingFlag(Collection books, boolean flag);
	protected abstract Book loadBook(long bookId);
	protected abstract Book loadBookByFile(long fileId, ZLFile file);
=======
	public /*protected*/ abstract Map loadBooks(FileInfoSet infos, boolean existing);
	public /*protected*/ abstract void setExistingFlag(Collection books, boolean flag);
	public /*protected*/ abstract Book loadBook(long bookId);
	public /*protected*/ abstract void reloadBook(Book book);
	public /*protected*/ abstract Book loadBookByFile(long fileId, ZLFile file);
>>>>>>> aaf12c8f175219b08c662fa7e6ab5835b1e8eda9

	protected abstract List loadAuthors(long bookId);
	protected abstract List loadTags(long bookId);
Solution content 
	protected abstract void executeAsATransaction(Runnable actions);

	// returns map fileId -> book
	protected abstract Map loadBooks(FileInfoSet infos, boolean existing);
	protected abstract void setExistingFlag(Collection books, boolean flag);
	protected abstract Book loadBook(long bookId);
	protected abstract Book loadBookByFile(long fileId, ZLFile file);

	protected abstract List loadAuthors(long bookId);
	protected abstract List loadTags(long bookId);
File
BooksDatabase.java
Developer's decision
Version 1
Kind of conflict
Method interface
Chunk
Conflicting content 
	protected abstract List loadAuthors(long bookId);
	protected abstract List loadTags(long bookId);
	protected abstract SeriesInfo loadSeriesInfo(long bookId);
<<<<<<< HEAD
	protected abstract void updateBookInfo(long bookId, long fileId, String encoding, String language, String title);
	protected abstract long insertBookInfo(ZLFile file, String encoding, String language, String title);
=======
	public /*protected*/ abstract void updateBookInfo(long bookId, long fileId, String encoding, String language, String title);
	public /*protected*/ abstract long insertBookInfo(ZLFile file, String encoding, String language, String title);
>>>>>>> aaf12c8f175219b08c662fa7e6ab5835b1e8eda9
	protected abstract void deleteAllBookAuthors(long bookId);
	protected abstract void saveBookAuthorInfo(long bookId, long index, Author author);
	protected abstract void deleteAllBookTags(long bookId);
Solution content 
	protected abstract List loadAuthors(long bookId);
	protected abstract List loadTags(long bookId);
	protected abstract SeriesInfo loadSeriesInfo(long bookId);
	protected abstract void updateBookInfo(long bookId, long fileId, String encoding, String language, String title);
	protected abstract long insertBookInfo(ZLFile file, String encoding, String language, String title);
	protected abstract void deleteAllBookAuthors(long bookId);
	protected abstract void saveBookAuthorInfo(long bookId, long index, Author author);
	protected abstract void deleteAllBookTags(long bookId);
File
BooksDatabase.java
Developer's decision
Version 1
Kind of conflict
Method interface