Projects >> android-arabic-reader >>17d467938201262f92a3d724a9c2ad50955e3caa

Chunk
Conflicting content 
import org.geometerplus.android.util.*;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/FBReader.java
public final class FBReader extends Activity implements ZLApplicationWindow {
	public static final String BOOK_PATH_KEY = "BookPath";
	static final int ACTION_BAR_COLOR = Color.DKGRAY;

	public static final int REQUEST_PREFERENCES = 1;
	public static final int REQUEST_CANCEL_MENU = 2;

=======
public final class FBReader extends FBReaderMainActivity implements ZLApplicationWindow {
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReader.java
	public static final int RESULT_DO_NOTHING = RESULT_FIRST_USER;
	public static final int RESULT_REPAINT = RESULT_FIRST_USER + 1;
Solution content 
import org.geometerplus.android.util.*;

public final class FBReader extends FBReaderMainActivity implements ZLApplicationWindow {
	public static final int RESULT_DO_NOTHING = RESULT_FIRST_USER;
	public static final int RESULT_REPAINT = RESULT_FIRST_USER + 1;
File
FBReader.java
Developer's decision
Version 2
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
		myFBReaderApp.addAction(ActionCode.OPEN_WEB_HELP, new OpenWebHelpAction(this, myFBReaderApp));
		myFBReaderApp.addAction(ActionCode.INSTALL_PLUGINS, new InstallPluginsAction(this, myFBReaderApp));

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/FBReader.java
		ZLLogUtil.packageName = getPackageName();
		ZLAdUtil ad = new ZLAdUtil(this, myRootView);
		ad.start();
=======
		myFBReaderApp.addAction(ActionCode.SWITCH_TO_DAY_PROFILE, new SwitchProfileAction(this, myFBReaderApp, ColorProfile.DAY));
		myFBReaderApp.addAction(ActionCode.SWITCH_TO_NIGHT_PROFILE, new SwitchProfileAction(this, myFBReaderApp, ColorProfile.NIGHT));

		myFBReaderApp.addAction(ActionCode.GOTO_PAGE_NUMBER, new GotoPageNumberAction(this, myFBReaderApp));
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/FBReader.java

		myFBReaderApp.addAction(ActionCode.YOTA_SWITCH_TO_BACK_SCREEN, new YotaSwitchScreenAction(this, myFBReaderApp, true));
		myFBReaderApp.addAction(ActionCode.YOTA_SWITCH_TO_FRONT_SCREEN, new YotaSwitchScreenAction(this, myFBReaderApp, false));
Solution content 
		myFBReaderApp.addAction(ActionCode.OPEN_WEB_HELP, new OpenWebHelpAction(this, myFBReaderApp));
		myFBReaderApp.addAction(ActionCode.INSTALL_PLUGINS, new InstallPluginsAction(this, myFBReaderApp));

		ZLLogUtil.packageName = getPackageName();
		ZLAdUtil ad = new ZLAdUtil(this, myRootView);
		ad.start();

		myFBReaderApp.addAction(ActionCode.SWITCH_TO_DAY_PROFILE, new SwitchProfileAction(this, myFBReaderApp, ColorProfile.DAY));
		myFBReaderApp.addAction(ActionCode.SWITCH_TO_NIGHT_PROFILE, new SwitchProfileAction(this, myFBReaderApp, ColorProfile.NIGHT));

		myFBReaderApp.addAction(ActionCode.GOTO_PAGE_NUMBER, new GotoPageNumberAction(this, myFBReaderApp));

		myFBReaderApp.addAction(ActionCode.YOTA_SWITCH_TO_BACK_SCREEN, new YotaSwitchScreenAction(this, myFBReaderApp, true));
		myFBReaderApp.addAction(ActionCode.YOTA_SWITCH_TO_FRONT_SCREEN, new YotaSwitchScreenAction(this, myFBReaderApp, false));
File
FBReader.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
<<<<<<< HEAD:src/org/geometerplus/android/fbreader/PluginListActivity.java
import org.geometerplus.zlibrary.core.xml.ZLStringMap;
import org.geometerplus.zlibrary.core.xml.ZLXMLReaderAdapter;
import net.sourceforge.arabicReader.R;
=======
import org.geometerplus.zlibrary.core.util.XmlUtil;
import org.geometerplus.zlibrary.ui.android.R;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/PluginListActivity.java

import org.geometerplus.android.util.PackageUtil;
Solution content 
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.XmlUtil;
import net.sourceforge.arabicReader.R;

import org.geometerplus.android.util.PackageUtil;
File
PluginListActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
package org.geometerplus.android.fbreader.error;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.error.ErrorKeys;
import org.geometerplus.zlibrary.ui.android.error.ErrorUtil;

import android.app.Activity;
=======
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
Solution content 
package org.geometerplus.android.fbreader.error;

import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.ui.android.error.ErrorKeys;
import org.geometerplus.zlibrary.ui.android.error.ErrorUtil;

import android.content.Intent;
import android.os.Bundle;
import android.view.View;
File
BookReadingErrorActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import android.os.Bundle;
import android.view.View;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java
import net.sourceforge.arabicReader.R;
=======
import org.geometerplus.zlibrary.core.resources.ZLResource;

import org.geometerplus.zlibrary.ui.android.error.ErrorKeys;
import org.geometerplus.zlibrary.ui.android.error.ErrorUtil;
import org.geometerplus.android.fbreader.util.SimpleDialogActivity;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/error/BookReadingErrorActivity.java

public class BookReadingErrorActivity extends SimpleDialogActivity implements ErrorKeys {
	@Override
Solution content 
import android.os.Bundle;
import android.view.View;

import org.geometerplus.zlibrary.core.resources.ZLResource;

import org.geometerplus.zlibrary.ui.android.error.ErrorKeys;
import org.geometerplus.zlibrary.ui.android.error.ErrorUtil;
import org.geometerplus.android.fbreader.util.SimpleDialogActivity;

public class BookReadingErrorActivity extends SimpleDialogActivity implements ErrorKeys {
	@Override
File
BookReadingErrorActivity.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.util.MimeType;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java
import net.sourceforge.arabicReader.R;
=======
import org.geometerplus.zlibrary.ui.android.R;
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.opds.OPDSCustomNetworkLink;
Solution content 
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.util.MimeType;

import net.sourceforge.arabicReader.R;
import org.geometerplus.zlibrary.ui.android.network.SQLiteCookieDatabase;

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.opds.OPDSCustomNetworkLink;
File
AddCustomCatalogActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import android.widget.RemoteViews;
import android.widget.Toast;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
import net.sourceforge.arabicReader.R;

import org.geometerplus.zlibrary.core.resources.ZLResource;
=======
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java
import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.MimeType;
Solution content 
import android.widget.RemoteViews;
import android.widget.Toast;

import org.geometerplus.zlibrary.core.network.*;
import org.geometerplus.zlibrary.core.resources.ZLResource;
import org.geometerplus.zlibrary.core.util.MimeType;
File
BookDownloaderService.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.money.Money;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
import net.sourceforge.arabicReader.R;

=======
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BuyBooksActivity.java
import org.geometerplus.android.util.UIUtil;

import org.geometerplus.fbreader.network.*;
Solution content 
import org.geometerplus.zlibrary.core.network.ZLNetworkException;
import org.geometerplus.zlibrary.core.money.Money;

import org.geometerplus.android.util.UIUtil;

import org.geometerplus.fbreader.network.*;
File
BuyBooksActivity.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import com.mobeta.android.dslv.DragSortListView;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java
import net.sourceforge.arabicReader.R;
=======
import org.fbreader.util.android.ViewUtil;

import org.geometerplus.zlibrary.ui.android.R;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/CatalogManagerActivity.java
import org.geometerplus.fbreader.network.*;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.covers.CoverManager;
Solution content 
import org.fbreader.util.android.ViewUtil;

import com.mobeta.android.dslv.DragSortListView;

import net.sourceforge.arabicReader.R;
import org.geometerplus.fbreader.network.*;
import org.geometerplus.android.fbreader.FBReader;
import org.geometerplus.android.fbreader.covers.CoverManager;
File
CatalogManagerActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import org.geometerplus.fbreader.network.tree.ManageCatalogsItemTree;
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
import net.sourceforge.arabicReader.R;
import org.geometerplus.android.fbreader.OrientationUtil;
=======
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ManageCatalogsAction.java
import org.geometerplus.android.fbreader.network.CatalogManagerActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
Solution content 
import org.geometerplus.fbreader.network.tree.ManageCatalogsItemTree;
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
import net.sourceforge.arabicReader.R;
import org.geometerplus.android.fbreader.network.CatalogManagerActivity;
import org.geometerplus.android.fbreader.network.NetworkLibraryActivity;
import org.geometerplus.android.util.OrientationUtil;
File
ManageCatalogsAction.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
			final BookUrlInfo reference = book.reference(UrlInfo.Type.Book);
			if (reference != null
					&& connection != null && connection.isBeingDownloaded(reference.Url)) {
<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
				return R.drawable.ic_list_download;
			} else if (book.localCopyFileName() != null) {
=======
				return R.drawable.ic_list_downloading;
			} else if (book.localCopyFileName(collection) != null) {
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/NetworkBookActions.java
				return R.drawable.ic_list_flag;
			} else if (reference != null) {
				return R.drawable.ic_list_download;
Solution content 
			final BookUrlInfo reference = book.reference(UrlInfo.Type.Book);
			if (reference != null
					&& connection != null && connection.isBeingDownloaded(reference.Url)) {
				return R.drawable.ic_list_download;
			} else if (book.localCopyFileName(collection) != null) {
				return R.drawable.ic_list_flag;
			} else if (reference != null) {
				return R.drawable.ic_list_download;
File
NetworkBookActions.java
Developer's decision
Combination
Kind of conflict
If statement
Return statement
Chunk
Conflicting content 
package org.geometerplus.android.fbreader.network.action;

<<<<<<< HEAD:src/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java
import net.sourceforge.arabicReader.R;
=======
import org.geometerplus.zlibrary.core.network.ZLNetworkContext;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/action/ReloadCatalogAction.java

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkCatalogTree;
Solution content 
package org.geometerplus.android.fbreader.network.action;

import org.geometerplus.zlibrary.core.network.ZLNetworkContext;

import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkCatalogTree;
File
ReloadCatalogAction.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		setView(BookTextView);
	}

<<<<<<< HEAD:src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	public void openBook(final Book book, final Bookmark bookmark, final Runnable postAction) {
		if (book != null || Model == null) {
			final SynchronousExecutor executor = createExecutor("loadingBook");
			executor.execute(new Runnable() {
				public void run() {
					openBookInternal(book, bookmark, false);
					if (book != null) {
						book.addLabel(Book.READ_LABEL);
						Collection.saveBook(book);
					}
				}
			}, postAction);
					}
=======
	public Book getCurrentBook() {
		final BookModel m = Model;
		return m != null ? m.Book : ExternalBook;
	}

	public void openHelpBook() {
		openBook(Collection.getBookByFile(BookUtil.getHelpFile().getPath()), null, null, null);
	}

	public Book getCurrentServerBook(Notifier notifier) {
		final SyncData.ServerBookInfo info = mySyncData.getServerBookInfo();
		if (info == null) {
			return null;
		}

		for (String hash : info.Hashes) {
			final Book book = Collection.getBookByHash(hash);
			if (book != null) {
				return book;
			}
		}
		if (notifier != null) {
			notifier.showMissingBookNotification(info);
		}
		return null;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/fbreader/fbreader/FBReaderApp.java
	}

	public void openBook(Book book, final Bookmark bookmark, Runnable postAction, Notifier notifier) {
Solution content 
		setView(BookTextView);
	}

	public Book getCurrentBook() {
		final BookModel m = Model;
		return m != null ? m.Book : ExternalBook;
	}

	public void openHelpBook() {
		openBook(Collection.getBookByFile(BookUtil.getHelpFile().getPath()), null, null, null);
	}

	public Book getCurrentServerBook(Notifier notifier) {
		final SyncData.ServerBookInfo info = mySyncData.getServerBookInfo();
		if (info == null) {
			return null;
		}

		for (String hash : info.Hashes) {
			final Book book = Collection.getBookByHash(hash);
			if (book != null) {
				return book;
			}
		}
		if (notifier != null) {
			notifier.showMissingBookNotification(info);
		}
		return null;
	}

	public void openBook(Book book, final Bookmark bookmark, Runnable postAction, Notifier notifier) {
File
FBReaderApp.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
					}
					char[] textData = it.getTextData();
					int textOffset = it.getTextOffset();
					int textLength = it.getTextLength();
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java
					if(arabicSearch) {
						for (int pos = ZLSearchUtil.arabicFind(textData, textOffset, textLength, pattern, 0); pos != -1;
							pos = ZLSearchUtil.arabicFind(textData, textOffset, textLength, pattern, pos + 1)) {
							myMarks.add(new ZLTextMark(index, offset + pos, pattern.getLength()));
							++count;
						}
					} else {
						for (int pos = ZLSearchUtil.find(textData, textOffset, textLength, pattern, 0); pos != -1;
								pos = ZLSearchUtil.find(textData, textOffset, textLength, pattern, pos + 1)) {
							myMarks.add(new ZLTextMark(index, offset + pos, pattern.getLength()));
							++count;
						}
=======
					for (ZLSearchUtil.Result res = ZLSearchUtil.find(textData, textOffset, textLength, pattern); res != null;
						res = ZLSearchUtil.find(textData, textOffset, textLength, pattern, res.Start + 1)) {
						myMarks.add(new ZLTextMark(index, offset + res.Start, res.Length));
						++count;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/model/ZLTextPlainModel.java
					offset += textLength;
				}
Solution content 
					char[] textData = it.getTextData();
					int textOffset = it.getTextOffset();
					int textLength = it.getTextLength();
					if(arabicSearch) {
						for (int pos = ZLSearchUtil.arabicFind(textData, textOffset, textLength, pattern, 0); pos != -1;
							pos = ZLSearchUtil.arabicFind(textData, textOffset, textLength, pattern, pos + 1)) {
							myMarks.add(new ZLTextMark(index, offset + pos, pattern.getLength()));
							++count;
						}
					} else {
						for (ZLSearchUtil.Result res = ZLSearchUtil.find(textData, textOffset, textLength, pattern); res != null;
							res = ZLSearchUtil.find(textData, textOffset, textLength, pattern, res.Start + 1)) {
							myMarks.add(new ZLTextMark(index, offset + res.Start, res.Length));
							++count;
						}
					}
					offset += textLength;
				}
File
ZLTextPlainModel.java
Developer's decision
Combination
Kind of conflict
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
public final class ZLTextParagraphCursor {
	private static final class Processor {
		private final ZLTextParagraph myParagraph;
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
		private final String myLanguage;
		private final boolean myRTLMode;
=======
		private final ExtensionElementManager myExtManager;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
		private final LineBreaker myLineBreaker;
		private final ArrayList myElements;
		private int myOffset;
Solution content 
public final class ZLTextParagraphCursor {
	private static final class Processor {
		private final ZLTextParagraph myParagraph;
		private final String myLanguage;
		private final boolean myRTLMode;
		private final ExtensionElementManager myExtManager;
		private final LineBreaker myLineBreaker;
		private final ArrayList myElements;
		private int myOffset;
File
ZLTextParagraphCursor.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
		private int myLastMark;
		private final List myMarks;

<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
		private Processor(ZLTextParagraph paragraph, String language, List marks, int paragraphIndex, ArrayList elements) {
=======
		private Processor(ZLTextParagraph paragraph, ExtensionElementManager extManager, LineBreaker lineBreaker, List marks, int paragraphIndex, ArrayList elements) {
			myExtManager = extManager;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
			myParagraph = paragraph;
			myLanguage = language;
			myRTLMode = (!(new ZLBooleanOption("Options", "enableLTR", false).getValue()) || myLanguage.equals("ar"));
Solution content 
		private int myLastMark;
		private final List myMarks;

		private Processor(ZLTextParagraph paragraph, String language, ExtensionElementManager extManager, LineBreaker lineBreaker, List marks, int paragraphIndex, ArrayList elements) {
			myExtManager = extManager;
			myParagraph = paragraph;
			myLanguage = language;
			myRTLMode = (!(new ZLBooleanOption("Options", "enableLTR", false).getValue()) || myLanguage.equals("ar"));
File
ZLTextParagraphCursor.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Variable
Chunk
Conflicting content 
		ZLTextParagraph	paragraph = Model.getParagraph(Index);
		switch (paragraph.getKind()) {
			case ZLTextParagraph.Kind.TEXT_PARAGRAPH:
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
				new Processor(paragraph, Model.getLanguage(), Model.getMarks(), Index, myElements).fill();
=======
				new Processor(paragraph, CursorManager.ExtensionManager, new LineBreaker(Model.getLanguage()), Model.getMarks(), Index, myElements).fill();
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextParagraphCursor.java
				break;
			case ZLTextParagraph.Kind.EMPTY_LINE_PARAGRAPH:
				myElements.add(new ZLTextWord(SPACE_ARRAY, 0, 1, 0));
Solution content 
		ZLTextParagraph	paragraph = Model.getParagraph(Index);
		switch (paragraph.getKind()) {
			case ZLTextParagraph.Kind.TEXT_PARAGRAPH:
				new Processor(paragraph, Model.getLanguage(), CursorManager.ExtensionManager, new LineBreaker(Model.getLanguage()), Model.getMarks(), Index, myElements).fill();
				break;
			case ZLTextParagraph.Kind.EMPTY_LINE_PARAGRAPH:
				myElements.add(new ZLTextWord(SPACE_ARRAY, 0, 1, 0));
File
ZLTextParagraphCursor.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
=======
import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.geometerplus.zlibrary.core.library.ZLibrary;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
import org.geometerplus.zlibrary.core.util.RationalNumber;
import org.geometerplus.zlibrary.core.util.ZLColor;
import org.geometerplus.zlibrary.core.view.*;
Solution content 
import org.geometerplus.zlibrary.core.application.ZLApplication;
import org.geometerplus.zlibrary.core.filesystem.ZLFile;
import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.geometerplus.zlibrary.core.library.ZLibrary;
import org.geometerplus.zlibrary.core.options.ZLBooleanOption;
import org.geometerplus.zlibrary.core.util.RationalNumber;
import org.geometerplus.zlibrary.core.util.ZLColor;
import org.geometerplus.zlibrary.core.view.*;
File
ZLTextView.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
			labels[++index] = page.TextElementMap.size();
			if (index == page.Column0Height) {
				y = getTopMargin();
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java

				if (myRTLMode)
					x -= page.getTextWidth() + getSpaceBetweenColumns();
				else
					x += page.getTextWidth() + getSpaceBetweenColumns();
=======
				x += page.getTextWidth() + getSpaceBetweenColumns();
				columnIndex = 1;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
			}
			previousInfo = info;
		}
Solution content 
			labels[++index] = page.TextElementMap.size();
			if (index == page.Column0Height) {
				y = getTopMargin();

				if (myRTLMode)
					x -= page.getTextWidth() + getSpaceBetweenColumns();
				else
					x += page.getTextWidth() + getSpaceBetweenColumns();
				columnIndex = 1;
			}
			previousInfo = info;
		}
File
ZLTextView.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
			previousInfo = info;
		}

<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
		x = (myRTLMode
				? ((page.twoColumnView() ? page.getTextWidth() * 2 + getSpaceBetweenColumns() : page.getTextWidth()) + getLeftMargin())
				: getLeftMargin());
=======
		final List hilites = findHilites(page);

		x = getLeftMargin();
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
		y = getTopMargin();
		index = 0;
		for (ZLTextLineInfo info : lineInfos) {
Solution content 
			previousInfo = info;
		}

		final List hilites = findHilites(page);

		x = (myRTLMode
				? ((page.twoColumnView() ? page.getTextWidth() * 2 + getSpaceBetweenColumns() : page.getTextWidth()) + getLeftMargin())
				: getLeftMargin());
		y = getTopMargin();
		index = 0;
		for (ZLTextLineInfo info : lineInfos) {
File
ZLTextView.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
			}
		}

<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
		x = (myRTLMode
				? ((page.twoColumnView() ? page.getTextWidth() * 2 + getSpaceBetweenColumns() : page.getTextWidth()) + getLeftMargin())
				: getLeftMargin());
		y = getTopMargin();
		index = 0;
		for (ZLTextLineInfo info : lineInfos) {
			drawTextLine(page, info, labels[index], labels[index + 1]);
			y += info.Height + info.Descent + info.VSpaceAfter;
			++index;
			if (index == page.Column0Height) {
				y = getTopMargin();
				if (myRTLMode)
					x -= page.getTextWidth() + getSpaceBetweenColumns();
				else
					x += page.getTextWidth() + getSpaceBetweenColumns();
=======
		for (ZLTextHighlighting h : hilites) {
			int mode = Hull.DrawMode.None;

			final ZLColor bgColor = h.getBackgroundColor();
			if (bgColor != null) {
				context.setFillColor(bgColor, 128);
				mode |= Hull.DrawMode.Fill;
			}

			final ZLColor outlineColor = h.getOutlineColor();
			if (outlineColor != null) {
				context.setLineColor(outlineColor);
				mode |= Hull.DrawMode.Outline;
			}

			if (mode != Hull.DrawMode.None) {
				h.hull(page).draw(getContext(), mode);
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
			}
		}
Solution content 
			}
		}

		for (ZLTextHighlighting h : hilites) {
			int mode = Hull.DrawMode.None;

			final ZLColor bgColor = h.getBackgroundColor();
			if (bgColor != null) {
				context.setFillColor(bgColor, 128);
				mode |= Hull.DrawMode.Fill;
			}

			final ZLColor outlineColor = h.getOutlineColor();
			if (outlineColor != null) {
				context.setLineColor(outlineColor);
				mode |= Hull.DrawMode.Outline;
			}

			if (mode != Hull.DrawMode.None) {
				h.hull(page).draw(getContext(), mode);
			}
		}
File
ZLTextView.java
Developer's decision
Version 2
Kind of conflict
Attribute
For statement
If statement
Method invocation
Variable
Chunk
Conflicting content 
				}
			}
		}
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
		if (hilites.isEmpty()) {
			return;
		}

		final ZLTextElementArea fromArea = page.TextElementMap.get(from);
		final ZLTextElementArea toArea = page.TextElementMap.get(to - 1);
		for (ZLTextHighlighting h : hilites) {
			final ZLColor bgColor = h.getBackgroundColor();
			if (bgColor == null) {
				continue;
			}
			final ZLTextElementArea selectionStartArea = h.getStartArea(page);
			if (selectionStartArea == null || selectionStartArea.compareTo(toArea) > 0) {
				continue;
			}
			final ZLTextElementArea selectionEndArea = h.getEndArea(page);
			if (selectionEndArea == null || selectionEndArea.compareTo(fromArea) < 0) {
				continue;
			}

			final int top = y + 1;
			int left, right, bottom = y + info.Height + info.Descent;
			if (selectionStartArea.compareTo(fromArea) < 0) {
				left = x;
			} else {
				left = selectionStartArea.XStart;
			}
			if (selectionEndArea.compareTo(toArea) > 0) {
				if(myRTLMode)
					right = x - page.getTextWidth() + 1;
				else
					right = x + page.getTextWidth() - 1;
				bottom += info.VSpaceAfter;
			} else {
				right = selectionEndArea.XEnd;
			}
			getContext().setFillColor(bgColor);
			getContext().fillRectangle(left, top, right, bottom);
		}
=======
		return hilites;
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
	}

	protected abstract ZLPaintContext.ColorAdjustingMode getAdjustingModeForImages();
Solution content 
				}
			}
		}
		return hilites;
	}

	protected abstract ZLPaintContext.ColorAdjustingMode getAdjustingModeForImages();
File
ZLTextView.java
Developer's decision
Version 2
Kind of conflict
For statement
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
		final int maxWidth = page.getTextWidth() - storedStyle.getRightIndent(metrics());
		info.LeftIndent = storedStyle.getLeftIndent(metrics());
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
		info.RightIndent = getTextStyle().getRightIndent(metrics());

		if (isFirstLine) {
=======
		if (isFirstLine && storedStyle.getAlignment() != ZLTextAlignmentType.ALIGN_CENTER) {
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
			info.LeftIndent += storedStyle.getFirstLineIndent(metrics());
		}
		if (info.LeftIndent > maxWidth - 20) {
Solution content 
		final int maxWidth = page.getTextWidth() - storedStyle.getRightIndent(metrics());
		info.LeftIndent = storedStyle.getLeftIndent(metrics());
		info.RightIndent = getTextStyle().getRightIndent(metrics());

		if (isFirstLine && storedStyle.getAlignment() != ZLTextAlignmentType.ALIGN_CENTER) {
			info.LeftIndent += storedStyle.getFirstLineIndent(metrics());
		}
		if (info.LeftIndent > maxWidth - 20) {
File
ZLTextView.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
							true, // is last in element
							false, // add hyphenation sign
							false, // changed style
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
							getTextStyle(), element, (myRTLMode ? x-spaceLength : x), (myRTLMode ? x : x + spaceLength), y, y
=======
							getTextStyle(), element, x, x + spaceLength, y, y, columnIndex
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
						);
					} else {
						spaceElement = null;
Solution content 
							true, // is last in element
							false, // add hyphenation sign
							false, // changed style
							getTextStyle(), element, (myRTLMode ? x-spaceLength : x), (myRTLMode ? x : x + spaceLength), y, y
						);
					} else {
						spaceElement = null;
File
ZLTextView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
					true, // is last in element
					false, // add hyphenation sign
					changeStyle, getTextStyle(), element,
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
					(myRTLMode ? x-width : x), (myRTLMode ? x : x + width) - 1, y - height + 1, y + descent
=======
					x, x + width - 1, y - height + 1, y + descent, columnIndex
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
				));
				changeStyle = false;
				wordOccurred = true;
Solution content 
					true, // is last in element
					false, // add hyphenation sign
					changeStyle, getTextStyle(), element,
					(myRTLMode ? x-width : x), (myRTLMode ? x : x + width) - 1, y - height + 1, y + descent
				));
				changeStyle = false;
				wordOccurred = true;
File
ZLTextView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Variable
Chunk
Conflicting content 
						false, // is last in element
						addHyphenationSign,
						changeStyle, getTextStyle(), word,
<<<<<<< HEAD:src/org/geometerplus/zlibrary/text/view/ZLTextView.java
						(myRTLMode ? x-width : x), (myRTLMode ? (x + 1) : (x + width - 1)), y - height + 1, y + descent
=======
						x, x + width - 1, y - height + 1, y + descent, columnIndex
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/ZLTextView.java
					)
				);
			}
Solution content 
						false, // is last in element
						addHyphenationSign,
						changeStyle, getTextStyle(), word,
						(myRTLMode ? x-width : x), (myRTLMode ? (x + 1) : (x + width - 1)), y - height + 1, y + descent
					)
				);
			}
File
ZLTextView.java
Developer's decision
Version 1
Kind of conflict
Attribute
Variable
Chunk
Conflicting content 
		reportTextView.append("FBReader " + versionName + " has been crached. You can send the report to developers.\n\n");
		reportTextView.append(reportText);

<<<<<<< HEAD:src/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java
		findViewById(R.id.send_report).setOnClickListener(
			new View.OnClickListener() {
				public void onClick(View view) {
					Intent sendIntent = new Intent(Intent.ACTION_SEND);
					sendIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { "ma7dev@gmail.com" });
					sendIntent.putExtra(Intent.EXTRA_TEXT, reportText.toString());
					sendIntent.putExtra(Intent.EXTRA_SUBJECT, "Arabic Reader " + versionName + " exception report");
					sendIntent.setType("message/rfc822");
					startActivity(sendIntent);
					finish();
				}
=======
		findViewById(R.id.send_report).setOnClickListener(new View.OnClickListener() {
			public void onClick(View view) {
				Intent sendIntent = new Intent(Intent.ACTION_SEND);
				sendIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { "exception@fbreader.org" });
				sendIntent.putExtra(Intent.EXTRA_TEXT, reportText.toString());
				sendIntent.putExtra(Intent.EXTRA_SUBJECT, "FBReader " + versionName + " exception report");
				sendIntent.setType("message/rfc822");
				startActivity(sendIntent);
				finish();
>>>>>>> ae01b56931dc470e9b841dcd812c70e86279773f:fbreader/app/src/main/java/org/geometerplus/zlibrary/ui/android/error/BugReportActivity.java
			}
		});
Solution content 
		reportTextView.append(reportText);

		findViewById(R.id.send_report).setOnClickListener(new View.OnClickListener() {
			public void onClick(View view) {
				Intent sendIntent = new Intent(Intent.ACTION_SEND);
				sendIntent.putExtra(Intent.EXTRA_EMAIL, new String[] { "ma7dev@gmail.com" });
				sendIntent.putExtra(Intent.EXTRA_TEXT, reportText.toString());
				sendIntent.putExtra(Intent.EXTRA_SUBJECT, "Arabic Reader " + versionName + " exception report");
				sendIntent.setType("message/rfc822");
				startActivity(sendIntent);
				finish();
			}
		});
File
BugReportActivity.java
Developer's decision
Combination
Kind of conflict
Method invocation