| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashMap; import boston.Bus.Map.main.AlertInfo; <<<<<<< HEAD ======= >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.transit.TransitSystem; import android.content.Context; |
| Solution content |
|---|
import java.util.HashMap; import boston.Bus.Map.main.AlertInfo; import boston.Bus.Map.transit.TransitSystem; import android.content.Context; |
| File |
|---|
| Alert.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |
| Chunk |
|---|
| Conflicting content |
|---|
import android.content.Context; import android.util.Log; import boston.Bus.Map.database.DatabaseHelper; <<<<<<< HEAD import boston.Bus.Map.parser.BusPredictionsFeedParser; import boston.Bus.Map.parser.RouteConfigFeedParser; import boston.Bus.Map.parser.VehicleLocationsFeedParser; import boston.Bus.Map.transit.NextBusTransitSource; ======= import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateAsyncTask; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.transit.TransitSource; import boston.Bus.Map.transit.TransitSystem; import boston.Bus.Map.ui.ProgressMessage; |
| Solution content |
|---|
import android.content.Context; import android.util.Log; import boston.Bus.Map.database.DatabaseHelper; import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateAsyncTask; import boston.Bus.Map.transit.TransitSource; import boston.Bus.Map.transit.TransitSystem; import boston.Bus.Map.ui.ProgressMessage; |
| File |
|---|
| Locations.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.HashSet; import java.util.LinkedList; <<<<<<< HEAD import java.util.List; import java.util.Queue; import com.schneeloch.latransit.R; import boston.Bus.Map.main.UpdateAsyncTask; ======= >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import android.util.Log; import boston.Bus.Map.database.DatabaseHelper; import boston.Bus.Map.transit.TransitSystem; |
| Solution content |
|---|
import java.util.HashSet; import java.util.LinkedList; import com.schneeloch.latransit.R; import android.util.Log; import boston.Bus.Map.database.DatabaseHelper; import boston.Bus.Map.main.UpdateAsyncTask; import boston.Bus.Map.transit.TransitSystem; |
| File |
|---|
| RoutePool.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.Collections; import boston.Bus.Map.math.Geometry; <<<<<<< HEAD import boston.Bus.Map.transit.NextBusTransitSource; ======= >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.transit.TransitSource; import boston.Bus.Map.transit.TransitSystem; import android.content.Context; |
| Solution content |
|---|
import java.util.Collections; import boston.Bus.Map.math.Geometry; import boston.Bus.Map.transit.TransitSource; import boston.Bus.Map.transit.TransitSystem; import android.content.Context; |
| File |
|---|
| StopLocation.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import java.util.Map; import java.util.SortedSet; <<<<<<< HEAD import com.schneeloch.latransit.R; ======= import boston.Bus.Map.R; import boston.Bus.Map.data.MyHashMap; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.data.Prediction; import boston.Bus.Map.ui.TextViewBinder; import boston.Bus.Map.util.StringUtil; |
| Solution content |
|---|
import java.util.Map; import java.util.SortedSet; import com.schneeloch.latransit.R; import boston.Bus.Map.data.MyHashMap; import boston.Bus.Map.data.Prediction; import boston.Bus.Map.ui.TextViewBinder; import boston.Bus.Map.util.StringUtil; |
| File |
|---|
| MoreInfo.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import boston.Bus.Map.data.RouteConfig; import boston.Bus.Map.data.RoutePool; import boston.Bus.Map.data.StopLocation; <<<<<<< HEAD ======= import boston.Bus.Map.data.SubwayStopLocation; import boston.Bus.Map.data.TransitDrawables; import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateAsyncTask; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.parser.BusPredictionsFeedParser; import boston.Bus.Map.parser.RouteConfigFeedParser; import boston.Bus.Map.parser.VehicleLocationsFeedParser; |
| Solution content |
|---|
import boston.Bus.Map.data.RouteConfig; import boston.Bus.Map.data.RoutePool; import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.data.SubwayStopLocation; import boston.Bus.Map.data.TransitDrawables; import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateAsyncTask; import boston.Bus.Map.parser.BusPredictionsFeedParser; import boston.Bus.Map.parser.RouteConfigFeedParser; import boston.Bus.Map.parser.VehicleLocationsFeedParser; |
| File |
|---|
| NextBusTransitSource.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import boston.Bus.Map.data.RouteConfig;
import boston.Bus.Map.data.RoutePool;
import boston.Bus.Map.data.StopLocation;
<<<<<<< HEAD
=======
import boston.Bus.Map.data.TransitDrawables;
import boston.Bus.Map.main.UpdateAsyncTask;
>>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316
public interface TransitSource {
|
| Solution content |
|---|
import boston.Bus.Map.data.RouteConfig;
import boston.Bus.Map.data.RoutePool;
import boston.Bus.Map.data.StopLocation;
import boston.Bus.Map.data.TransitDrawables;
import boston.Bus.Map.main.UpdateAsyncTask;
public interface TransitSource {
|
| File |
|---|
| TransitSource.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import boston.Bus.Map.data.RouteConfig; import boston.Bus.Map.data.RoutePool; import boston.Bus.Map.data.StopLocation; <<<<<<< HEAD ======= import boston.Bus.Map.data.TransitDrawables; import boston.Bus.Map.main.Main; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.util.Constants; /** * Any transit-system specific stuff should go here, if possible |
| Solution content |
|---|
import boston.Bus.Map.data.RouteConfig; import boston.Bus.Map.data.RoutePool; import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.data.TransitDrawables; import boston.Bus.Map.main.Main; import boston.Bus.Map.util.Constants; /** * Any transit-system specific stuff should go here, if possible |
| File |
|---|
| TransitSystem.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
{
if (defaultTransitSource == null)
{
<<<<<<< HEAD
defaultTransitSource = new LABusTransitSource(this, busStop, busStopUpdated, bus, arrow);
=======
defaultTransitSource = new BusTransitSource(this, busDrawables, alertsMapping);
SubwayTransitSource subwayTransitSource = new SubwayTransitSource(subwayDrawables, alertsMapping);
transitSourceMap.put(SubwayTransitSource.RedLine, subwayTransitSource);
transitSourceMap.put(SubwayTransitSource.OrangeLine, subwayTransitSource);
transitSourceMap.put(SubwayTransitSource.BlueLine, subwayTransitSource);
CommuterRailTransitSource commuterRailTransitSource = new CommuterRailTransitSource(commuterRailDrawables, alertsMapping);
for (String route : commuterRailTransitSource.getRoutes())
{
transitSourceMap.put(route, commuterRailTransitSource);
}
transitSources.add(commuterRailTransitSource);
transitSources.add(subwayTransitSource);
>>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316
transitSources.add(defaultTransitSource);
}
} |
| Solution content |
|---|
{
if (defaultTransitSource == null)
{
defaultTransitSource = new LABusTransitSource(this, busDrawables);
transitSources.add(defaultTransitSource);
}
} |
| File |
|---|
| TransitSystem.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| For statement |
| Method invocation |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.data.Location; <<<<<<< HEAD import boston.Bus.Map.database.DatabaseHelper; import boston.Bus.Map.math.Geometry; import boston.Bus.Map.util.Constants; ======= import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateHandler; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import com.google.android.maps.GeoPoint; import com.google.android.maps.ItemizedOverlay; import com.google.android.maps.MapView; |
| Solution content |
|---|
import com.google.android.maps.MapView; import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.data.Location; import boston.Bus.Map.main.Main; import boston.Bus.Map.main.UpdateHandler; import com.google.android.maps.GeoPoint; import com.google.android.maps.ItemizedOverlay; |
| File |
|---|
| BusOverlay.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
import boston.Bus.Map.data.MyHashMap; import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.database.DatabaseHelper; <<<<<<< HEAD import boston.Bus.Map.transit.NextBusTransitSource; ======= import boston.Bus.Map.main.Main; >>>>>>> 76a3fa4acbbd242acbb3c5d52a6d4d67a8493316 import boston.Bus.Map.transit.TransitSystem; public class SearchHelper |
| Solution content |
|---|
import boston.Bus.Map.data.MyHashMap; import boston.Bus.Map.data.StopLocation; import boston.Bus.Map.database.DatabaseHelper; import boston.Bus.Map.main.Main; import boston.Bus.Map.transit.TransitSystem; public class SearchHelper |
| File |
|---|
| SearchHelper.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Import |