| Chunk |
|---|
| Conflicting content |
|---|
import static haven.PUtils.*;
public class Tempers extends SIWidget {
<<<<<<< HEAD
static final Foundry tmprfnd = new RichText.Foundry(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, TextAttribute.FOREGROUND, new Color(32,32,64), TextAttribute.SIZE, 12);
public static final BufferedImage bg = Resource.loadimg("gfx/hud/tempers/bg");
=======
public static final BufferedImage[] bg = {
Resource.loadimg("gfx/hud/tempers/bg1"),
Resource.loadimg("gfx/hud/tempers/bg2"),
Resource.loadimg("gfx/hud/tempers/bg3"),
Resource.loadimg("gfx/hud/tempers/bg4"),
Resource.loadimg("gfx/hud/tempers/bg5"),
Resource.loadimg("gfx/hud/tempers/bg6"),
Resource.loadimg("gfx/hud/tempers/bg7"),
Resource.loadimg("gfx/hud/tempers/bg8"),
Resource.loadimg("gfx/hud/tempers/bg9"),
Resource.loadimg("gfx/hud/tempers/bg10"),
};
>>>>>>> 12a8c9f6ad4b749e88c3043ee9c5a93354aa340a
public static final BufferedImage[] bars, sbars, fbars;
public static final BufferedImage lcap = Resource.loadimg("gfx/hud/tempers/lcap");
public static final BufferedImage rcap = Resource.loadimg("gfx/hud/tempers/rcap"); |
| Solution content |
|---|
import static haven.PUtils.*;
public class Tempers extends SIWidget {
static final Foundry tmprfnd = new RichText.Foundry(TextAttribute.WEIGHT, TextAttribute.WEIGHT_BOLD, TextAttribute.FOREGROUND, new Color(32,32,64), TextAttribute.SIZE, 12);
public static final BufferedImage bg = Resource.loadimg("gfx/hud/tempers/bg");
public static final BufferedImage[] bg = {
Resource.loadimg("gfx/hud/tempers/bg1"),
Resource.loadimg("gfx/hud/tempers/bg2"),
Resource.loadimg("gfx/hud/tempers/bg3"),
Resource.loadimg("gfx/hud/tempers/bg4"),
Resource.loadimg("gfx/hud/tempers/bg5"),
Resource.loadimg("gfx/hud/tempers/bg6"),
Resource.loadimg("gfx/hud/tempers/bg7"),
Resource.loadimg("gfx/hud/tempers/bg8"),
Resource.loadimg("gfx/hud/tempers/bg9"),
Resource.loadimg("gfx/hud/tempers/bg10"),
};
public static final BufferedImage[] bars, sbars, fbars;
public static final BufferedImage lcap = Resource.loadimg("gfx/hud/tempers/lcap");
public static final BufferedImage rcap = Resource.loadimg("gfx/hud/tempers/rcap"); |
| File |
|---|
| Tempers.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Array initializer |
| Attribute |
| Method invocation |