Projects >> android-arabic-reader >>f92354903a2b6bf1d045acef897e3afa482e304d

Chunk
Conflicting content 
}
package org.geometerplus.zlibrary.text.view;

import org.geometerplus.zlibrary.core.image.ZLImageData;
<<<<<<< HEAD
import org.geometerplus.zlibrary.core.image.ZLImageManager;

import org.geometerplus.fbreader.network.NetworkImage;
import org.geometerplus.fbreader.network.opds.OPDSBookItem;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;

public final class BookElement extends ZLTextElement {
	private OPDSBookItem myItem;
	private NetworkImage myCover;

	void setData(OPDSBookItem item) {
		final String bookUrl = item.getUrl(UrlInfo.Type.Book);
		String coverUrl = item.getUrl(UrlInfo.Type.Image);
		if (coverUrl == null) {
			coverUrl = item.getUrl(UrlInfo.Type.Thumbnail);
		}
		if (bookUrl == null || coverUrl == null) {
			setFailed();
		} else {
			myItem = item;
			myCover = new NetworkImage(coverUrl);
			myCover.synchronize();
		}
	}

	void setFailed() {
		myItem = null;
		myCover = null;
	}

	public boolean isInitialized() {
		return myItem != null && myCover != null;
	}

	public OPDSBookItem getItem() {
		return myItem;
	}

	public ZLImageData getImageData() {
		if (myCover == null) {
			return null;
		}
		return ZLImageManager.Instance().getImageData(myCover);
=======

public final class BookElement extends ZLTextElement {
	public ZLImageData getImageData() {
		return null;
>>>>>>> 7ac8221a7b31409ee4c5b49aadd36416098f422f
	}
Solution content 
package org.geometerplus.zlibrary.text.view;

import org.geometerplus.zlibrary.core.image.ZLImageData;
import org.geometerplus.zlibrary.core.image.ZLImageManager;

import org.geometerplus.fbreader.network.NetworkImage;
import org.geometerplus.fbreader.network.opds.OPDSBookItem;
import org.geometerplus.fbreader.network.urlInfo.UrlInfo;

public final class BookElement extends ZLTextElement {
	private OPDSBookItem myItem;
	private NetworkImage myCover;

	void setData(OPDSBookItem item) {
		final String bookUrl = item.getUrl(UrlInfo.Type.Book);
		String coverUrl = item.getUrl(UrlInfo.Type.Image);
		if (coverUrl == null) {
			coverUrl = item.getUrl(UrlInfo.Type.Thumbnail);
		}
		if (bookUrl == null || coverUrl == null) {
			setFailed();
		} else {
			myItem = item;
			myCover = new NetworkImage(coverUrl);
			myCover.synchronize();
		}
	}

	void setFailed() {
		myItem = null;
		myCover = null;
	}

	public boolean isInitialized() {
		return myItem != null && myCover != null;
	}

	public OPDSBookItem getItem() {
		return myItem;
	}

	public ZLImageData getImageData() {
		if (myCover == null) {
			return null;
		}
		return ZLImageManager.Instance().getImageData(myCover);
	}
}
File
BookElement.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class signature
If statement
Import
Method declaration
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
					context.setFillColor(new ZLColor(196, 196, 196));
					context.fillPolygon(new int[] { l, l, r }, new int[] { t, b, c });
				} else if (element instanceof BookElement) {
<<<<<<< HEAD
					final int vSpace = ZLibrary.Instance().getDisplayDPI() / 15;
					final int hSpace = ZLibrary.Instance().getDisplayDPI() / 10;
					final ZLImageData imageData = ((BookElement)element).getImageData();
					if (imageData != null) {
						context.drawImage(
							area.XStart + hSpace, area.YEnd - vSpace,
							imageData,
							new ZLPaintContext.Size(
								area.XEnd - area.XStart - 2 * hSpace + 1,
								area.YEnd - area.YStart - 2 * vSpace + 1
							),
							ZLPaintContext.ScalingType.FitMaximum,
							ZLPaintContext.ColorAdjustingMode.NONE
						);
					} else {
						context.setLineColor(getTextColor(ZLTextHyperlink.NO_LINK));
						context.setFillColor(new ZLColor(127, 127, 127));
						final int xStart = area.XStart + hSpace;
						final int xEnd = area.XEnd - hSpace;
						final int yStart = area.YStart + vSpace;
						final int yEnd = area.YEnd - vSpace;
						context.fillRectangle(xStart, yStart, xEnd, yEnd);
						context.drawLine(xStart, yStart, xStart, yEnd);
						context.drawLine(xStart, yEnd, xEnd, yEnd);
						context.drawLine(xEnd, yEnd, xEnd, yStart);
						context.drawLine(xEnd, yStart, xStart, yStart);
=======
					final int vMargin = ZLibrary.Instance().getDisplayDPI() / 15;
					final int hMargin = ZLibrary.Instance().getDisplayDPI() / 10;
					final ZLImageData imageData = ((BookElement)element).getImageData();
					if (imageData != null) {
					} else {
>>>>>>> 7ac8221a7b31409ee4c5b49aadd36416098f422f
					}
				} else if (element == ZLTextElement.HSpace) {
					final int cw = context.getSpaceWidth();
Solution content 
					context.setFillColor(new ZLColor(196, 196, 196));
					context.fillPolygon(new int[] { l, l, r }, new int[] { t, b, c });
				} else if (element instanceof BookElement) {
					final int vMargin = ZLibrary.Instance().getDisplayDPI() / 15;
					final int hMargin = ZLibrary.Instance().getDisplayDPI() / 10;
					final ZLImageData imageData = ((BookElement)element).getImageData();
					if (imageData != null) {
						context.drawImage(
							area.XStart + hMargin, area.YEnd - vMargin,
							imageData,
							new ZLPaintContext.Size(
								area.XEnd - area.XStart - 2 * hMargin + 1,
								area.YEnd - area.YStart - 2 * vMargin + 1
							),
							ZLPaintContext.ScalingType.FitMaximum,
							ZLPaintContext.ColorAdjustingMode.NONE
						);
					} else {
						context.setLineColor(getTextColor(ZLTextHyperlink.NO_LINK));
						context.setFillColor(new ZLColor(127, 127, 127));
						final int xStart = area.XStart + hMargin;
						final int xEnd = area.XEnd - hMargin;
						final int yStart = area.YStart + vMargin;
						final int yEnd = area.YEnd - vMargin;
						context.fillRectangle(xStart, yStart, xEnd, yEnd);
						context.drawLine(xStart, yStart, xStart, yEnd);
						context.drawLine(xStart, yEnd, xEnd, yEnd);
						context.drawLine(xEnd, yEnd, xEnd, yStart);
						context.drawLine(xEnd, yStart, xStart, yStart);
					}
				} else if (element == ZLTextElement.HSpace) {
					final int cw = context.getSpaceWidth();
File
ZLTextView.java
Developer's decision
Manual
Kind of conflict
If statement
Method invocation
Variable