| Chunk |
|---|
| Conflicting content |
|---|
Book book = order.getBook();
FormatPlugin plugin = PluginCollection.Instance().getPlugin(book.File);
<<<<<<< HEAD
coverView.setImageResource(order.getIcon());
}
return view;
=======
Bitmap coverBitmap = null;
ZLImage cover = plugin.readCover(book);
if (cover != null) {
Log.v(FileManager.LOG, "cover != null");
ZLAndroidImageData data = null;
final ZLAndroidImageManager mgr = (ZLAndroidImageManager)ZLAndroidImageManager.Instance();
if (cover instanceof ZLLoadableImage) {
Log.v(FileManager.LOG, "cover != null");
final ZLLoadableImage img = (ZLLoadableImage)cover;
if (img.isSynchronized()) {
data = mgr.getImageData(img);
} else {
ZLAndroidImageLoader.Instance().startImageLoading(img, myInvalidateViewsRunnable);
}
} else {
data = mgr.getImageData(cover);
}
if (data != null) {
Log.v(FileManager.LOG, "data != null");
coverBitmap = data.getBitmap(2 * myCoverWidth, 2 * myCoverHeight);
}
}
if (coverBitmap != null) {
coverView.setImageBitmap(coverBitmap);
}else{
coverView.setImageResource(R.drawable.ic_list_library_book);
}
}
}
return view;
>>>>>>> 2a52f9d52d855ff294af85a51e4801ff20be057a
}
}
|
| Solution content |
|---|
} else {
Book book = order.getBook();
FormatPlugin plugin = PluginCollection.Instance().getPlugin(book.File);
Bitmap coverBitmap = null;
ZLImage cover = plugin.readCover(book);
if (cover != null) {
Log.v(FileManager.LOG, "cover != null");
ZLAndroidImageData data = null;
final ZLAndroidImageManager mgr = (ZLAndroidImageManager)ZLAndroidImageManager.Instance();
if (cover instanceof ZLLoadableImage) {
Log.v(FileManager.LOG, "cover != null");
final ZLLoadableImage img = (ZLLoadableImage)cover;
if (img.isSynchronized()) {
data = mgr.getImageData(img);
ZLAndroidImageLoader.Instance().startImageLoading(img, myInvalidateViewsRunnable);
}
} else {
data = mgr.getImageData(cover);
}
if (data != null) {
Log.v(FileManager.LOG, "data != null");
coverBitmap = data.getBitmap(2 * myCoverWidth, 2 * myCoverHeight);
}
}
if (coverBitmap != null) {
coverView.setImageBitmap(coverBitmap);
}else{
coverView.setImageResource(R.drawable.ic_list_library_book);
}
}
}
return view;
}
}
|
| File |
|---|
| FManagerAdapter.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
private String myName;
private String myPath;
private int myIcon;
<<<<<<< HEAD
=======
private Book myBook = null;
>>>>>>> 2a52f9d52d855ff294af85a51e4801ff20be057a
public FileOrder(String name, String path, int icon){
myName = name;
myPath = path; |
| Solution content |
|---|
private String myName;
private String myPath;
private int myIcon;
private Book myBook = null;
public FileOrder(String name, String path, int icon){
myName = name;
myPath = path; |
| File |
|---|
| FManagerAdapter.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
myIcon = R.drawable.ic_list_library_folder;
}
else if(PluginCollection.Instance().getPlugin(file) != null){
<<<<<<< HEAD
myIcon = R.drawable.ic_list_library_book;
Book book = Book.getByFile(file);
myName = book.getTitle();
FormatPlugin plugin = PluginCollection.Instance().getPlugin(file);
ZLImage image = plugin.readCover(book);
=======
myBook = Book.getByFile(file);
myName = myBook.getTitle();
myIcon = -1;
>>>>>>> 2a52f9d52d855ff294af85a51e4801ff20be057a
}
}
|
| Solution content |
|---|
myIcon = R.drawable.ic_list_library_folder;
}
else if(PluginCollection.Instance().getPlugin(file) != null){
myBook = Book.getByFile(file);
myName = myBook.getTitle();
myIcon = -1;
}
}
|
| File |
|---|
| FManagerAdapter.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Variable |