Projects >> android-arabic-reader >>30f9bb8a1facbff899a4021b7a92ac197e9d8db9

Chunk
Conflicting content 
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.bookmodel.BookReadingException;

<<<<<<< HEAD:src/org/geometerplus/fbreader/book/BookUtil.java
public abstract class BookUtil {
=======
public abstract class LibraryUtil {
>>>>>>> 8b9530c36b3646bec23c3e56ead6bec09b433c00:src/org/geometerplus/fbreader/library/LibraryUtil.java
	public static ZLImage getCover(Book book) {
		return book != null ? book.getCover() : null;
	}
Solution content 
import org.geometerplus.fbreader.formats.FormatPlugin;
import org.geometerplus.fbreader.bookmodel.BookReadingException;

public abstract class BookUtil {
	public static ZLImage getCover(Book book) {
		return book != null ? book.getCover() : null;
	}
File
BookUtil.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.tree.FBTree;

<<<<<<< HEAD
public final class Library {
=======
public final class Library extends AbstractLibrary {
>>>>>>> 8b9530c36b3646bec23c3e56ead6bec09b433c00
	public static ZLResource resource() {
		return ZLResource.resource("library");
	}
Solution content 
import org.geometerplus.fbreader.book.*;
import org.geometerplus.fbreader.tree.FBTree;

public final class Library {
	public static ZLResource resource() {
		return ZLResource.resource("library");
	}
File
Library.java
Developer's decision
Version 1
Kind of conflict
Class signature
Chunk
Conflicting content 
	}
		return ZLResource.resource("library");
	}

<<<<<<< HEAD
	private final List myListeners = Collections.synchronizedList(new LinkedList());

	public interface ChangeListener {
		public enum Code {
			BookAdded,
			BookRemoved,
			StatusChanged,
			Found,
			NotFound
		}

		void onLibraryChanged(Code code);
	}

	public void addChangeListener(ChangeListener listener) {
		myListeners.add(listener);
	public void removeChangeListener(ChangeListener listener) {
		myListeners.remove(listener);
	}

	protected void fireModelChangedEvent(ChangeListener.Code code) {
		synchronized (myListeners) {
			for (ChangeListener l : myListeners) {
				l.onLibraryChanged(code);
			}
		}
	}

=======
>>>>>>> 8b9530c36b3646bec23c3e56ead6bec09b433c00
	public static final String ROOT_FOUND = "found";
	public static final String ROOT_FAVORITES = "favorites";
	public static final String ROOT_RECENT = "recent";
Solution content 
		return ZLResource.resource("library");
	}

	private final List myListeners = Collections.synchronizedList(new LinkedList());

	public interface ChangeListener {
		public enum Code {
			BookAdded,
			BookRemoved,
			StatusChanged,
			Found,
			NotFound
		}

		void onLibraryChanged(Code code);
	}

	public void addChangeListener(ChangeListener listener) {
		myListeners.add(listener);
	}

	public void removeChangeListener(ChangeListener listener) {
		myListeners.remove(listener);
	}

	protected void fireModelChangedEvent(ChangeListener.Code code) {
		synchronized (myListeners) {
			for (ChangeListener l : myListeners) {
				l.onLibraryChanged(code);
			}
		}
	}

	public static final String ROOT_FOUND = "found";
	public static final String ROOT_FAVORITES = "favorites";
	public static final String ROOT_RECENT = "recent";
File
Library.java
Developer's decision
Version 1
Kind of conflict
Attribute
Interface declaration
Method declaration
Method invocation