Projects information

Chunk

Conflicting content
import org.json.JSONArray; import org.json.JSONException; <<<<<<< HEAD ======= import android.util.Log; import com.teleca.jamendo.JamendoApplication; >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 import com.teleca.jamendo.api.Album; import com.teleca.jamendo.api.Artist; import com.teleca.jamendo.api.JamendoGet2Api;

Conflicting content

import org.json.JSONArray;
import org.json.JSONException;

<<<<<<< HEAD
=======
import android.util.Log;

import com.teleca.jamendo.JamendoApplication;
>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
import com.teleca.jamendo.api.Album;
import com.teleca.jamendo.api.Artist;
import com.teleca.jamendo.api.JamendoGet2Api;

Solution content
import org.json.JSONArray; import org.json.JSONException; import android.util.Log; import com.teleca.jamendo.JamendoApplication; import com.teleca.jamendo.api.Album; import com.teleca.jamendo.api.Artist; import com.teleca.jamendo.api.JamendoGet2Api;

Solution content

import org.json.JSONArray;
import org.json.JSONException;

import android.util.Log;

import com.teleca.jamendo.JamendoApplication;
import com.teleca.jamendo.api.Album;
import com.teleca.jamendo.api.Artist;
import com.teleca.jamendo.api.JamendoGet2Api;

File
JamendoGet2ApiImpl.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
@Override public Track[] getAlbumTracks(Album album, String encoding) throws JSONException, WSError { <<<<<<< HEAD try { String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding); JSONArray jsonArrayTracks = new JSONArray(jsonString); return TrackFunctions.getTracks(jsonArrayTracks, true); } catch (NullPointerException e) { e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } ======= String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding); JSONArray jsonArrayTracks = new JSONArray(jsonString); return getTracks(jsonArrayTracks, true); >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 } @Override

Conflicting content

	
	@Override
	public Track[] getAlbumTracks(Album album, String encoding) throws JSONException, WSError {
<<<<<<< HEAD
		try {
			String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding);
			JSONArray jsonArrayTracks = new JSONArray(jsonString); 
			return TrackFunctions.getTracks(jsonArrayTracks, true);
		} catch (NullPointerException e) {
			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
=======
		String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding);
		JSONArray jsonArrayTracks = new JSONArray(jsonString); 
		return getTracks(jsonArrayTracks, true);
>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
	}

	@Override

Solution content
@Override public Track[] getAlbumTracks(Album album, String encoding) throws JSONException, WSError { try { String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding); JSONArray jsonArrayTracks = new JSONArray(jsonString); return getTracks(jsonArrayTracks, true); } catch (NullPointerException e) { e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } } @Override

Solution content

	
	@Override
	public Track[] getAlbumTracks(Album album, String encoding) throws JSONException, WSError {
		try {
			String jsonString = doGet("numalbum+id+name+duration+rating+url+stream/track/json/?album_id="+album.getId()+"&streamencoding="+encoding);
			JSONArray jsonArrayTracks = new JSONArray(jsonString); 
			return getTracks(jsonArrayTracks, true);
		} catch (NullPointerException e) {
			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
	}

	@Override

File
JamendoGet2ApiImpl.java

Developer's decision
Combination

Kind of conflict
Method invocation
Return statement
Try statement
Variable

Chunk

Conflicting content
return null; String id_query = Caller.createStringFromIds(id); <<<<<<< HEAD try { String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query); JSONArray jsonArrayTracks = new JSONArray(jsonString); return TrackFunctions.getTracks(jsonArrayTracks, false); } catch (NullPointerException e) { e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } ======= String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query); JSONArray jsonArrayTracks = new JSONArray(jsonString); return getTracks(jsonArrayTracks, false); >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 } @Override

Conflicting content

			return null;
		
		String id_query = Caller.createStringFromIds(id);
<<<<<<< HEAD

		try {
			String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query);
			JSONArray jsonArrayTracks = new JSONArray(jsonString);
			return TrackFunctions.getTracks(jsonArrayTracks, false);
		} catch (NullPointerException e) {
			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
=======
		
		String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query);
		JSONArray jsonArrayTracks = new JSONArray(jsonString);
		return getTracks(jsonArrayTracks, false);
>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
	}

	@Override

Solution content
return null; String id_query = Caller.createStringFromIds(id); try { String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query); JSONArray jsonArrayTracks = new JSONArray(jsonString); return getTracks(jsonArrayTracks, false); } catch (NullPointerException e) { e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } } @Override

Solution content

			return null;
		
		String id_query = Caller.createStringFromIds(id);
		try {
			String jsonString = doGet("id+numalbum+name+duration+rating+url+stream/track/json/?streamencoding="+encoding+"&n="+id.length+"&id="+id_query);
			JSONArray jsonArrayTracks = new JSONArray(jsonString);
			return getTracks(jsonArrayTracks, false);
		} catch (NullPointerException e) {
			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
	}

	@Override

File
JamendoGet2ApiImpl.java

Developer's decision
Combination

Kind of conflict
Method invocation
Return statement
Try statement
Variable

Chunk

Conflicting content
@Override public PlaylistRemote[] getUserPlaylist(String user) throws JSONException, WSError { <<<<<<< HEAD ======= >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 try { user = URLEncoder.encode(user, "UTF-8" ); String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user);

Conflicting content

	@Override
	public PlaylistRemote[] getUserPlaylist(String user) throws JSONException, WSError {
<<<<<<< HEAD
=======

>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
		try {
			user = URLEncoder.encode(user, "UTF-8" );
			String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user);

Solution content
@Override public PlaylistRemote[] getUserPlaylist(String user) throws JSONException, WSError { try { user = URLEncoder.encode(user, "UTF-8" ); String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user);

Solution content

	@Override
	public PlaylistRemote[] getUserPlaylist(String user) throws JSONException, WSError {
		try {
			user = URLEncoder.encode(user, "UTF-8" );
			String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user);

File
JamendoGet2ApiImpl.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } <<<<<<< HEAD ======= String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user); return PlaylistFunctions.getPlaylists(new JSONArray(jsonString)); >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 } @Override

Conflicting content

			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
<<<<<<< HEAD
=======

		String jsonString = doGet("id+name+url+duration/playlist/json/playlist_user/?order=starred_desc&user_idstr="+user);
		return PlaylistFunctions.getPlaylists(new JSONArray(jsonString));
>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
	}

	@Override

Solution content
e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } } @Override

File
JamendoGet2ApiImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Return statement
Variable

Chunk

Conflicting content
@Override public Playlist getPlaylist(PlaylistRemote playlistRemote) throws JSONException, WSError { <<<<<<< HEAD try { String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId()); return TrackFunctions.getPlaylist(new JSONArray(jsonString)); } catch (NullPointerException e) { e.printStackTrace(); throw new JSONException(e.getLocalizedMessage()); } ======= String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId()); JSONArray jsonArrayTracks = new JSONArray(jsonString); int n = jsonArrayTracks.length(); Track[] tracks = new Track[n]; int[] tracks_id = new int[n]; TrackBuilder trackBuilder = new TrackBuilder(); // building tracks and getting tracks_id for(int i=0; i < n; i++){ tracks[i] = trackBuilder.build(jsonArrayTracks.getJSONObject(i)); tracks_id[i] = tracks[i].getId(); } Album[] albums = new JamendoGet2ApiImpl().getAlbumsByTracksId(tracks_id); Log.i("jamendroid", ""+tracks.length+" tracks & "+albums.length+" albums"); return creatPlaylist(tracks, albums,tracks_id); >>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78 } @Override

Conflicting content


	@Override
	public Playlist getPlaylist(PlaylistRemote playlistRemote) throws JSONException, WSError {
<<<<<<< HEAD
		try {
			String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId());
			return TrackFunctions.getPlaylist(new JSONArray(jsonString));
		} catch (NullPointerException e) {
			e.printStackTrace();
			throw new JSONException(e.getLocalizedMessage());
		}
=======
		String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId());
		JSONArray jsonArrayTracks = new JSONArray(jsonString);

		int n = jsonArrayTracks.length();

		Track[] tracks = new Track[n];
		int[] tracks_id = new int[n];

		TrackBuilder trackBuilder = new TrackBuilder();
		// building tracks and getting tracks_id
		for(int i=0; i < n; i++){
			tracks[i] = trackBuilder.build(jsonArrayTracks.getJSONObject(i));
			tracks_id[i] = tracks[i].getId();
		}
		Album[] albums = new JamendoGet2ApiImpl().getAlbumsByTracksId(tracks_id);
		Log.i("jamendroid", ""+tracks.length+" tracks & "+albums.length+" albums");

		return creatPlaylist(tracks, albums,tracks_id);
>>>>>>> 5e4c2091dc2827219ba601937e8686bcb90bae78
	}

	@Override

Solution content
@Override public Playlist getPlaylist(PlaylistRemote playlistRemote) throws JSONException, WSError { String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId()); JSONArray jsonArrayTracks = new JSONArray(jsonString); int n = jsonArrayTracks.length(); Track[] tracks = new Track[n]; int[] tracks_id = new int[n]; TrackBuilder trackBuilder = new TrackBuilder(); // building tracks and getting tracks_id for(int i=0; i < n; i++){ tracks[i] = trackBuilder.build(jsonArrayTracks.getJSONObject(i)); tracks_id[i] = tracks[i].getId(); } Album[] albums = new JamendoGet2ApiImpl().getAlbumsByTracksId(tracks_id); Log.i("jamendroid", ""+tracks.length+" tracks & "+albums.length+" albums"); return createPlaylist(tracks, albums,tracks_id); } @Override

Solution content

	@Override
	public Playlist getPlaylist(PlaylistRemote playlistRemote) throws JSONException, WSError {
		String jsonString = doGet("stream+name+duration+url+id+rating/track/json/?playlist_id="+playlistRemote.getId());
		JSONArray jsonArrayTracks = new JSONArray(jsonString);

		int n = jsonArrayTracks.length();

		Track[] tracks = new Track[n];
		int[] tracks_id = new int[n];

		TrackBuilder trackBuilder = new TrackBuilder();
		// building tracks and getting tracks_id
		for(int i=0; i < n; i++){
			tracks[i] = trackBuilder.build(jsonArrayTracks.getJSONObject(i));
			tracks_id[i] = tracks[i].getId();
		}

		Album[] albums = new JamendoGet2ApiImpl().getAlbumsByTracksId(tracks_id);
		Log.i("jamendroid", ""+tracks.length+" tracks & "+albums.length+" albums");

		return createPlaylist(tracks, albums,tracks_id);
	}

	@Override

File
JamendoGet2ApiImpl.java

Developer's decision
Manual

Kind of conflict
Comment
For statement
Method invocation
Return statement
Try statement
Variable

Projects >> jamendo-android >>4c1b1ee70e9050a5366aacdcff51a0ff80f016a1