Projects >> android-arabic-reader >>9e7ff53ae05914dfbcfa45010d0ab66a19a7bab9

Chunk
Conflicting content 
import org.geometerplus.zlibrary.ui.android.R;

import org.geometerplus.fbreader.book.*;
<<<<<<< HEAD
=======
import org.geometerplus.fbreader.library.Library;
>>>>>>> a9d948322cd8d957c55d87e818e3d1f3b0af680e

import org.geometerplus.android.fbreader.libraryService.*;
import org.geometerplus.android.util.UIUtil;
Solution content 
import org.geometerplus.zlibrary.ui.android.R;

import org.geometerplus.fbreader.book.*;

import org.geometerplus.android.fbreader.libraryService.*;
import org.geometerplus.android.util.UIUtil;
File
BookmarksActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	}

	private void gotoBookmark(Bookmark bookmark) {
<<<<<<< HEAD
		bookmark.markAsAccessed();
		myCollection.saveBookmark(bookmark);
		final Book book = myCollection.getBookById(bookmark.getBookId());
=======
		bookmark.onOpen();
		final Book book = Book.getById(bookmark.getBookId());
>>>>>>> a9d948322cd8d957c55d87e818e3d1f3b0af680e
		if (book != null) {
			FBReader.openBookActivity(this, book, bookmark);
		} else {
Solution content 
	}

	private void gotoBookmark(Bookmark bookmark) {
		bookmark.markAsAccessed();
		myCollection.saveBookmark(bookmark);
		final Book book = myCollection.getBookById(bookmark.getBookId());
		if (book != null) {
			FBReader.openBookActivity(this, book, bookmark);
		} else {
File
BookmarksActivity.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	public void reloadBook(Book book) {
		if (Model != null) {
			if (book != null) {
				Model.Book = book;
			}
=======
	public void reloadBook() {
		if (Model != null && Model.Book != null) {
			Model.Book.reloadInfoFromDatabase();
>>>>>>> a9d948322cd8d957c55d87e818e3d1f3b0af680e
			runWithMessage("loadingBook", new Runnable() {
				public void run() {
					openBookInternal(Model.Book, null, true);
Solution content 
		}
	}

	public void reloadBook(Book book) {
		if (Model != null) {
			if (book != null) {
				Model.Book = book;
			}
			runWithMessage("loadingBook", new Runnable() {
				public void run() {
					openBookInternal(Model.Book, null, true);
File
FBReaderApp.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Method signature
Chunk
Conflicting content 
		System.gc();
		try {
			Model = BookModel.createModel(book);
<<<<<<< HEAD
			Collection.saveBook(book, false);
			ZLTextHyphenator.Instance().load(book.getLanguage());
			BookTextView.setModel(Model.getTextModel());
			BookTextView.gotoPosition(Collection.getStoredPosition(book.getId()));
=======
			ZLTextHyphenator.Instance().load(book.getLanguage());
			BookTextView.setModel(Model.getTextModel());
			BookTextView.gotoPosition(book.getStoredPosition());
>>>>>>> a9d948322cd8d957c55d87e818e3d1f3b0af680e
			if (bookmark == null) {
				setView(BookTextView);
			} else {
Solution content 
		System.gc();
		try {
			Model = BookModel.createModel(book);
			Collection.saveBook(book, false);
			ZLTextHyphenator.Instance().load(book.getLanguage());
			BookTextView.setModel(Model.getTextModel());
			BookTextView.gotoPosition(Collection.getStoredPosition(book.getId()));
			if (bookmark == null) {
				setView(BookTextView);
			} else {
File
FBReaderApp.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
			} else {
				gotoBookmark(bookmark);
			}
<<<<<<< HEAD
			Collection.addBookToRecentList(book);
=======
			Library.Instance().addBookToRecentList(book);
>>>>>>> a9d948322cd8d957c55d87e818e3d1f3b0af680e
			final StringBuilder title = new StringBuilder(book.getTitle());
			if (!book.authors().isEmpty()) {
				boolean first = true;
Solution content 
			} else {
				gotoBookmark(bookmark);
			}
			Collection.addBookToRecentList(book);
			final StringBuilder title = new StringBuilder(book.getTitle());
			if (!book.authors().isEmpty()) {
				boolean first = true;
File
FBReaderApp.java
Developer's decision
Version 1
Kind of conflict
Method invocation