| Chunk |
|---|
| Conflicting content |
|---|
public class FolderOpener implements PlugIn {
private static String[] excludedTypes = {".txt", ".lut", ".roi", ".pty", ".hdr", ".java", ".ijm", ".py", ".js", ".bsh", ".xml"};
<<<<<<< HEAD
private static boolean convertToGrayscale, convertToRGB;
private static boolean sortFileNames = true;
private static boolean virtualStack;
=======
private static boolean staticSortFileNames = true;
private static boolean staticOpenAsVirtualStack;
private boolean convertToRGB;
private boolean sortFileNames = true;
private boolean openAsVirtualStack;
>>>>>>> 00fe9c4905a7d0581c8153d4e3726994b8d0e921
private double scale = 100.0;
private int n, start, increment;
private String filter; |
| Solution content |
|---|
public class FolderOpener implements PlugIn {
private static String[] excludedTypes = {".txt", ".lut", ".roi", ".pty", ".hdr", ".java", ".ijm", ".py", ".js", ".bsh", ".xml"};
private static boolean staticSortFileNames = true;
private static boolean staticOpenAsVirtualStack;
private boolean convertToGrayscale, convertToRGB;
private boolean sortFileNames = true;
private boolean openAsVirtualStack;
private double scale = 100.0;
private int n, start, increment;
private String filter; |
| File |
|---|
| FolderOpener.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
openAsVirtualStack = gd.getNextBoolean();
if (openAsVirtualStack)
scale = 100.0;
<<<<<<< HEAD
if (convertToGrayscale && convertToRGB) {
IJ.error("Cannot convert to grayscale and RGB at the same time.");
return false;
=======
if (!IJ.macroRunning()) {
staticSortFileNames = sortFileNames;
staticOpenAsVirtualStack = openAsVirtualStack;
>>>>>>> 00fe9c4905a7d0581c8153d4e3726994b8d0e921
}
return true;
} |
| Solution content |
|---|
openAsVirtualStack = gd.getNextBoolean();
if (openAsVirtualStack)
scale = 100.0;
if (convertToGrayscale && convertToRGB) {
IJ.error("Cannot convert to grayscale and RGB at the same time.");
return false;
}
if (!IJ.macroRunning()) {
staticSortFileNames = sortFileNames;
staticOpenAsVirtualStack = openAsVirtualStack;
}
return true;
} |
| File |
|---|
| FolderOpener.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Attribute |
| If statement |
| Method invocation |
| Return statement |