Projects >> open2jam >>cebb4f14878681ee312c5a2a04e05de007e012ec

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 table_map = new HashMap();
    
<<<<<<< HEAD
    private class RenderThread extends Thread {
	Container c;
	private int lastKey;
	public int key;
	
	public RenderThread(Container c, int lastKey) {
	    this.c = c;
	    this.lastKey = lastKey;
	}

	@Override
	public void run() {
	    c.setEnabled(false);
	    try {
		key = read_keyboard_key(lastKey);
	    } catch (LWJGLException ex) {
		// FML
		key = lastKey;
		return;
	    }
	    c.setEnabled(true);
	}
    }
=======
    private String vlc_path;
    
    private static FileFilter vlc_filter = new FileFilter() {

	@Override
	public boolean accept(File file) {
	    if(file.isDirectory()) return true;
	    
	    String name = file.getName().toLowerCase();
	    if(name.startsWith("libvlc")) return true;
	    
	    return false;
	}

	@Override
	public String getDescription() {
	    return "libvlc file";
	}
    };
>>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef
    
    /** Creates new form Configuration */
    public Configuration() {
Solution content
    private HashMap table_map = new HashMap();
    
    private String vlc_path;
    
    private static FileFilter vlc_filter = new FileFilter() {

	@Override
	public boolean accept(File file) {
	    if(file.isDirectory()) return true;
	    
	    String name = file.getName().toLowerCase();
	    if(name.startsWith("libvlc")) return true;
	    
	    return false;
	}

	@Override
	public String getDescription() {
	    return "libvlc file";
	}
    };
    
    /** Creates new form Configuration */
    public Configuration() {
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 buffer)
    {
        while(buffer.hasNext())
        {
            Event e = buffer.next();
            switch(e.getChannel())
            {
            case NOTE_1: e.setChannel(Event.Channel.NOTE_7); break;
            case NOTE_2: e.setChannel(Event.Channel.NOTE_6); break;
            case NOTE_3: e.setChannel(Event.Channel.NOTE_5); break;
            case NOTE_5: e.setChannel(Event.Channel.NOTE_3); break;
            case NOTE_6: e.setChannel(Event.Channel.NOTE_2); break;
            case NOTE_7: e.setChannel(Event.Channel.NOTE_1); break;
            }
        }
    }

    /**
     * This function will shuffle the note lanes
     * TODO ADD P2 SUPPORT
     * @param buffer
     */
    void channelShuffle(Iterator buffer)
    {
        List channelSwap = new LinkedList();

        channelSwap.add(Event.Channel.NOTE_1);
        channelSwap.add(Event.Channel.NOTE_2);
        channelSwap.add(Event.Channel.NOTE_3);
        channelSwap.add(Event.Channel.NOTE_4);
        channelSwap.add(Event.Channel.NOTE_5);
        channelSwap.add(Event.Channel.NOTE_6);
        channelSwap.add(Event.Channel.NOTE_7);

        Collections.shuffle(channelSwap);

        while(buffer.hasNext())
        {
            Event e = buffer.next();
            switch(e.getChannel())
            {
            case NOTE_1: e.setChannel(channelSwap.get(0)); break;
            case NOTE_2: e.setChannel(channelSwap.get(1)); break;
            case NOTE_3: e.setChannel(channelSwap.get(2)); break;
            case NOTE_4: e.setChannel(channelSwap.get(3)); break;
            case NOTE_5: e.setChannel(channelSwap.get(4)); break;
            case NOTE_6: e.setChannel(channelSwap.get(5)); break;
            case NOTE_7: e.setChannel(channelSwap.get(6)); break;
            }
        }
    }

    /**
     * This function will randomize the notes
     * o2jam randomize the pattern each measure unless a longnote is in between measures
     * This implementation keeps the randomization of the previous measure if that happens
     * @param buffer
     */
    void channelRandom(Iterator buffer)
    {
        List channelSwap = new LinkedList();

        channelSwap.add(Event.Channel.NOTE_1);
        channelSwap.add(Event.Channel.NOTE_2);
        channelSwap.add(Event.Channel.NOTE_3);
        channelSwap.add(Event.Channel.NOTE_4);
        channelSwap.add(Event.Channel.NOTE_5);
        channelSwap.add(Event.Channel.NOTE_6);
        channelSwap.add(Event.Channel.NOTE_7);

        Collections.shuffle(channelSwap);

        EnumMap lnMap = new EnumMap(Event.Channel.class);

        int last_measure = -1;
        while(buffer.hasNext())
        {
            Event e = buffer.next();

                if(e.getMeasure() > last_measure)
                {
                    if(lnMap.isEmpty())
                        Collections.shuffle(channelSwap);
                    last_measure = e.getMeasure();
                }

            switch(e.getChannel())
            case NOTE_1:
                        setRandomChannel(e, lnMap, channelSwap.get(0));
                    break;
            case NOTE_2:
                        setRandomChannel(e, lnMap, channelSwap.get(1));
                    break;
            case NOTE_3:
                        setRandomChannel(e, lnMap, channelSwap.get(2));
                    break;
            case NOTE_4:
                        setRandomChannel(e, lnMap, channelSwap.get(3));
                    break;
            case NOTE_5:
                        setRandomChannel(e, lnMap, channelSwap.get(4));
                    break;
            case NOTE_6:
                        setRandomChannel(e, lnMap, channelSwap.get(5));
                    break;
            case NOTE_7:
                        setRandomChannel(e, lnMap, channelSwap.get(6));
                    break;
            }
        }
    }

    private void setRandomChannel(Event e, EnumMap lnMap, Event.Channel random)
    {
        Event.Channel c = random;

        if(e.getFlag() == Event.Flag.HOLD || e.getFlag() == Event.Flag.RELEASE)
        {
            if(!lnMap.containsKey(e.getChannel()))
                lnMap.put(e.getChannel(), c);
            else
                c = lnMap.remove(e.getChannel());
        }
        else if(e.getFlag() == Event.Flag.NONE)
            c = lnMap.containsValue(c) ? Event.Channel.NONE : c;

        if(c == null)
        {
            Logger.global.log(Level.WARNING, "FUCK THIS RANDOMNESS! I mean... channel null :/");
            c = random;
        }

        e.setChannel(c);
    }

=======
>>>>>>> 2b7c3ebadf1cc1b191bd147150f59ee1a9629cef
    private void visibility(GameOptions.VisibilityMod value)
    {
        // We will make a new entity with the masking rectangle for each note lane
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