| Chunk |
|---|
| Conflicting content |
|---|
this.fileCacher = fileCacher;
}
<<<<<<< HEAD
public void setImage(View view, String fileUrl) {
=======
public void setImage(final String fileUrl, final View view) {
>>>>>>> fa16f605a989c62dfe14b02a65414aba7105693c
viewsToUrls.put(view, fileUrl);
exec.execute(fetchAndAttachRunnable);
} |
| Solution content |
|---|
this.fileCacher = fileCacher;
}
public void setImage(View view, String fileUrl) {
viewsToUrls.put(view, fileUrl);
exec.execute(fetchAndAttachRunnable);
} |
| File |
|---|
| ImageAttacher.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Method signature |
| Chunk |
|---|
| Conflicting content |
|---|
public void run() {
for (View view : viewsToUrls.keySet()) {
String fileUrl = viewsToUrls.get(view);
<<<<<<< HEAD
if (fileUrl != null) {
viewsToUrls.remove(view);
final Drawable image = getCachedOrFetchAndCache(fileUrl);
if (image != null) {
view.post(new AttachRunnable(view, image));
}
=======
viewsToUrls.remove(view);
final Drawable image = getCachedOrFetchAndCache(fileUrl);
if (image != null) {
view.post(new AttachRunnable(view, image));
>>>>>>> fa16f605a989c62dfe14b02a65414aba7105693c
}
}
} |
| Solution content |
|---|
public void run() {
for (View view : viewsToUrls.keySet()) {
String fileUrl = viewsToUrls.get(view);
if (fileUrl != null) {
viewsToUrls.remove(view);
final Drawable image = getCachedOrFetchAndCache(fileUrl);
if (image != null) {
view.post(new AttachRunnable(view, image));
}
}
}
} |
| File |
|---|
| ImageAttacher.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |