| Chunk |
|---|
| Conflicting content |
|---|
import java.util.EnumMap; import java.util.HashMap; import java.util.Map; <<<<<<< HEAD import javax.swing.JOptionPane; ======= import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; >>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef import javax.swing.table.DefaultTableModel; import org.lwjgl.LWJGLException; import org.lwjgl.input.Keyboard; |
| Solution content |
|---|
import java.util.EnumMap; import java.util.HashMap; import java.util.Map; import javax.swing.JFileChooser; import javax.swing.filechooser.FileFilter; import javax.swing.table.DefaultTableModel; import org.lwjgl.LWJGLException; import org.lwjgl.input.Keyboard; |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
private HashMap |
| Solution content |
|---|
private HashMap |
| File |
|---|
| Configuration.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Class declaration |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; <<<<<<< HEAD import java.text.DecimalFormat; import java.util.*; import java.util.logging.Level; import javax.swing.ImageIcon; import javax.swing.JFileChooser; import javax.swing.JOptionPane; import javax.swing.RowFilter; ======= import java.io.IOException; import java.text.DecimalFormat; import java.util.*; import java.util.logging.Level; import javax.swing.*; >>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; |
| Solution content |
|---|
import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.io.IOException; import java.text.DecimalFormat; import java.util.*; import java.util.logging.Level; import javax.swing.*; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.ListSelectionEvent; |
| File |
|---|
| MusicSelection.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.open2jam.gui.ChartListTableModel; import org.open2jam.gui.ChartModelLoader; import org.open2jam.gui.ChartTableModel; <<<<<<< HEAD import org.open2jam.parser.Chart; import org.open2jam.parser.ChartList; ======= import org.open2jam.parsers.BMSWriter; import org.open2jam.parsers.Chart; import org.open2jam.parsers.ChartList; >>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef import org.open2jam.render.DistanceRender; import org.open2jam.render.Render; import org.open2jam.render.TimeRender; |
| Solution content |
|---|
import org.open2jam.render.DistanceRender; import org.open2jam.render.Render; import org.open2jam.gui.ChartListTableModel; import org.open2jam.gui.ChartModelLoader; import org.open2jam.gui.ChartTableModel; import org.open2jam.parsers.BMSWriter; import org.open2jam.parsers.Chart; import org.open2jam.parsers.ChartList; import org.open2jam.render.TimeRender; |
| File |
|---|
| MusicSelection.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
.addComponent(btn_reload, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btn_delete))
<<<<<<< HEAD
.addComponent(table_scroll))
=======
.addComponent(table_scroll, javax.swing.GroupLayout.DEFAULT_SIZE, 472, Short.MAX_VALUE))
>>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef
.addContainerGap())
.addGroup(javax.swing.GroupLayout.Alignment.CENTER, panel_listLayout.createSequentialGroup()
.addGap(10, 10, 10) |
| Solution content |
|---|
.addComponent(btn_reload, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(btn_delete))
.addComponent(table_scroll, javax.swing.GroupLayout.DEFAULT_SIZE, 472, Short.MAX_VALUE))
.addContainerGap())
.addGroup(javax.swing.GroupLayout.Alignment.CENTER, panel_listLayout.createSequentialGroup()
.addGap(10, 10, 10) |
| File |
|---|
| MusicSelection.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Other |
| Chunk |
|---|
| Conflicting content |
|---|
import java.io.File; import java.io.IOException; import java.net.URL; <<<<<<< HEAD import java.util.*; import java.util.logging.Level; ======= import java.util.Map.Entry; import java.util.*; import java.util.logging.Level; import javax.imageio.ImageIO; >>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef import javax.swing.JOptionPane; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; |
| Solution content |
|---|
import java.io.File; import java.io.IOException; import java.net.URL; import java.util.Map.Entry; import java.util.*; import java.util.logging.Level; import javax.imageio.ImageIO; import javax.swing.JOptionPane; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; |
| File |
|---|
| Render.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import org.lwjgl.opengl.DisplayMode; import org.open2jam.Config; import org.open2jam.GameOptions; <<<<<<< HEAD import org.open2jam.parser.Chart; import org.open2jam.parser.Event; import org.open2jam.render.entities.*; import org.open2jam.render.lwjgl.SoundManager; import org.open2jam.render.lwjgl.TrueTypeFont; import org.open2jam.util.Interval; import org.open2jam.util.IntervalTree; import org.open2jam.util.Logger; import org.open2jam.util.SystemTimer; ======= import org.open2jam.parsers.Chart; import org.open2jam.parsers.Event; import org.open2jam.parsers.EventList; import org.open2jam.parsers.utils.SampleData; import org.open2jam.render.entities.*; import org.open2jam.render.lwjgl.SoundManager; import org.open2jam.render.lwjgl.TrueTypeFont; import org.open2jam.util.*; >>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef /** * |
| Solution content |
|---|
import org.lwjgl.opengl.DisplayMode; import org.open2jam.Config; import org.open2jam.GameOptions; import org.open2jam.parsers.Chart; import org.open2jam.parsers.Event; import org.open2jam.parsers.EventList; import org.open2jam.parsers.utils.SampleData; import org.open2jam.render.entities.*; import org.open2jam.render.lwjgl.SoundManager; import org.open2jam.render.lwjgl.TrueTypeFont; import org.open2jam.util.*; /** * |
| File |
|---|
| Render.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
{
return velocity_integral(t0, t1) * factor;
}
<<<<<<< HEAD
/**
* This function will mirrorize the notes
* TODO ADD P2 SUPPORT
* @param buffer
*/
void channelMirror(Iterator |
| Solution content |
|---|
return velocity_integral(t0, t1) * factor;
}
private void visibility(GameOptions.VisibilityMod value)
{
int height = 0;
int width = 0;
Sprite rec = null;
// We will make a new entity with the masking rectangle for each note lane |
| File |
|---|
| Render.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Comment |
| Method declaration |