Projects >> CityBikes >>c42d2fdc7a3e6050b11e0d3eec35100d1f491763

Chunk
Conflicting content 
import java.util.Calendar;
import java.util.List;

<<<<<<< HEAD:src/net/homelinux/penecoptero/android/openvelib/app/MainActivity.java
import net.homelinux.penecoptero.android.openvelib.utils.CircleHelper;
=======
import net.homelinux.penecoptero.android.citybikes.utils.CircleHelper;

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

import android.app.AlertDialog;
>>>>>>> ffdd010dba60916c5797244ca442be2fd2df8c40:src/net/homelinux/penecoptero/android/citybikes/app/MainActivity.java
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.SharedPreferences;
Solution content 
import java.util.Calendar;
import java.util.List;

import net.homelinux.penecoptero.android.openvelib.utils.CircleHelper;
import android.app.ProgressDialog;
import android.content.Intent;
import android.content.SharedPreferences;
File
MainActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
package net.homelinux.penecoptero.android.openvelib.app;

<<<<<<< HEAD:src/net/homelinux/penecoptero/android/openvelib/app/OpenVelib.java
public class OpenVelib {
	public static final String PREFERENCES_NAME = "openvelib";
=======
public class CityBikes {
	public static final String PREFERENCES_NAME = "citybikes";
	public static final int BOOKMARK_CHANGE = 42;
>>>>>>> ffdd010dba60916c5797244ca442be2fd2df8c40:src/net/homelinux/penecoptero/android/citybikes/app/CityBikes.java
}
Solution content 
package net.homelinux.penecoptero.android.openvelib.app;

public class OpenVelib {
	public static final String PREFERENCES_NAME = "openvelib";
	public static final int BOOKMARK_CHANGE = 42;
}
File
OpenVelib.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Chunk
Conflicting content 
<<<<<<< HEAD:src/net/homelinux/penecoptero/android/openvelib/app/StationSlidingDrawer.java
package net.homelinux.penecoptero.android.openvelib.app;
=======
/*
 * Copyright (C) 2010 Lluís Esquerda
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package net.homelinux.penecoptero.android.citybikes.app;
>>>>>>> ffdd010dba60916c5797244ca442be2fd2df8c40:src/net/homelinux/penecoptero/android/citybikes/app/StationSlidingDrawer.java

import java.util.LinkedList;
import java.util.List;
Solution content 
/*
 * Copyright (C) 2010 Lluís Esquerda
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package net.homelinux.penecoptero.android.openvelib.app;
import java.util.LinkedList;
import java.util.List;
File
StationSlidingDrawer.java
Developer's decision
Combination
Kind of conflict
Comment
Package declaration
Chunk
Conflicting content 
			case FETCH:
				try {
					SharedPreferences settings = this.mCtx.getSharedPreferences(PREF_NAME,0);
<<<<<<< HEAD:src/net/homelinux/penecoptero/android/openvelib/app/StationsDBAdapter.java
					String network_url = VELIB_URL;
=======
					String network_url = settings.getString("network_url","");
>>>>>>> ffdd010dba60916c5797244ca442be2fd2df8c40:src/net/homelinux/penecoptero/android/citybikes/app/StationsDBAdapter.java
					RAWstations = fetchStations(network_url);
					SimpleDateFormat sdf = new SimpleDateFormat(
							TIMESTAMP_FORMAT);
Solution content 
			case FETCH:
				try {
					SharedPreferences settings = this.mCtx.getSharedPreferences(PREF_NAME,0);
					String network_url = VELIB_URL;
					RAWstations = fetchStations(network_url);
					SimpleDateFormat sdf = new SimpleDateFormat(
							TIMESTAMP_FORMAT);
File
StationsDBAdapter.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable