| Chunk |
|---|
| Conflicting content |
|---|
macro is running, it is aborted. Writes to the Java console
if the ImageJ window is not present.*/
public static void error(String msg) {
<<<<<<< HEAD
showMessage("ImageJA", msg);
Macro.abort();
=======
showMessage("ImageJ", msg);
if (Thread.currentThread().getName().endsWith("JavaScript"))
throw new RuntimeException(Macro.MACRO_CANCELED);
else
Macro.abort();
>>>>>>> 7ad169c2776736bfeea7998872a1ce6f99b22eeb
}
/** Displays a message in a dialog box with the specified title. |
| Solution content |
|---|
if the ImageJ window is not present.*/
macro is running, it is aborted. Writes to the Java console
public static void error(String msg) {
showMessage("ImageJA", msg);
showMessage("ImageJ", msg);
if (Thread.currentThread().getName().endsWith("JavaScript"))
throw new RuntimeException(Macro.MACRO_CANCELED);
else
Macro.abort();
}
/** Displays a message in a dialog box with the specified title. |
| File |
|---|
| IJ.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
@see ij.plugin.JpegWriter#getQuality
*/
public boolean saveAsJpeg(String path) {
<<<<<<< HEAD
JpegWriter.save(imp,path,JpegWriter.getQuality());
=======
Object jpegWriter = null;
IJ.runPlugIn(imp, "ij.plugin.JpegWriter", path); //ts
>>>>>>> 7ad169c2776736bfeea7998872a1ce6f99b22eeb
if (!(imp.getType()==ImagePlus.GRAY16 || imp.getType()==ImagePlus.GRAY32))
updateImp(fi, fi.GIF_OR_JPG);
return true; |
| Solution content |
|---|
@see ij.plugin.JpegWriter#getQuality
*/
public boolean saveAsJpeg(String path) {
Object jpegWriter = null;
IJ.runPlugIn(imp, "ij.plugin.JpegWriter", path); //ts
if (!(imp.getType()==ImagePlus.GRAY16 || imp.getType()==ImagePlus.GRAY32))
updateImp(fi, fi.GIF_OR_JPG);
return true; |
| File |
|---|
| FileSaver.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Variable |