Projects >> android-arabic-reader >>e0f082801d53a04e8666af2d3be7c34ef7586b21

Chunk
Conflicting content 
import org.geometerplus.fbreader.fbreader.ActionCode;

<<<<<<< HEAD
import org.geometerplus.android.util.DeviceType;

=======
>>>>>>> 9b710109335e94b820256877c30cbf179f97f522
public abstract class MenuData {
	private static List ourNodes;
Solution content 
import org.geometerplus.fbreader.fbreader.ActionCode;

import org.geometerplus.android.util.DeviceType;

public abstract class MenuData {
	private static List ourNodes;
File
MenuData.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
		if (ourNodes == null) {
			ourNodes = new ArrayList();
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_LIBRARY, R.drawable.ic_menu_library));
<<<<<<< HEAD
			if (DeviceType.Instance() == DeviceType.YOTA_PHONE) {
				ourNodes.add(new MenuNode.Item(ActionCode.YOTA_SWITCH_TO_BACK_SCREEN, R.drawable.ic_menu_p2b));
				//ourNodes.add(new MenuNode.Item(ActionCode.YOTA_SWITCH_TO_FRONT_SCREEN, R.drawable.ic_menu_p2b));
			}
=======
>>>>>>> 9b710109335e94b820256877c30cbf179f97f522
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_NETWORK_LIBRARY, R.drawable.ic_menu_networklibrary));
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_TOC, R.drawable.ic_menu_toc));
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_BOOKMARKS, R.drawable.ic_menu_bookmarks));
Solution content 
		if (ourNodes == null) {
			ourNodes = new ArrayList();
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_LIBRARY, R.drawable.ic_menu_library));
			if (DeviceType.Instance() == DeviceType.YOTA_PHONE) {
				ourNodes.add(new MenuNode.Item(ActionCode.YOTA_SWITCH_TO_BACK_SCREEN, R.drawable.ic_menu_p2b));
				//ourNodes.add(new MenuNode.Item(ActionCode.YOTA_SWITCH_TO_FRONT_SCREEN, R.drawable.ic_menu_p2b));
			}
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_NETWORK_LIBRARY, R.drawable.ic_menu_networklibrary));
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_TOC, R.drawable.ic_menu_toc));
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_BOOKMARKS, R.drawable.ic_menu_bookmarks));
File
MenuData.java
Developer's decision
Version 1
Kind of conflict
If statement
Chunk
Conflicting content 
<<<<<<< HEAD
=======
			ourNodes.add(orientations);
			ourNodes.add(new MenuNode.Item(ActionCode.INCREASE_FONT));
			ourNodes.add(new MenuNode.Item(ActionCode.DECREASE_FONT));
			ourNodes.add(new MenuNode.Item(ActionCode.SHOW_NAVIGATION));
>>>>>>> 9b710109335e94b820256877c30cbf179f97f522
			ourNodes.add(new MenuNode.Item(ActionCode.INSTALL_PLUGINS));
			ourNodes.add(new MenuNode.Item(ActionCode.OPEN_WEB_HELP));
			ourNodes = Collections.unmodifiableList(ourNodes);
Solution content 
			ourNodes.add(orientations);
			ourNodes.add(new MenuNode.Item(ActionCode.INCREASE_FONT));
			ourNodes.add(new MenuNode.Item(ActionCode.DECREASE_FONT));
			ourNodes.add(new MenuNode.Item(ActionCode.INSTALL_PLUGINS));
			ourNodes.add(new MenuNode.Item(ActionCode.OPEN_WEB_HELP));
			ourNodes = Collections.unmodifiableList(ourNodes);
File
MenuData.java
Developer's decision
Version 1
Kind of conflict
Method invocation