Projects >> cgeo >>a77e1b035b4b77be69d7858fa28b72b8bdaf57e1

Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    public static void storeWaypointStaticMap(cgCache cache, Activity activity, cgWaypoint waypoint, boolean waitForResult) {
        int edge = StaticMapsProvider.guessMinDisplaySide(activity);
        storeWaypointStaticMap(cache, edge, waypoint, waitForResult);
=======
    public static void storeWaypointStaticMap(cgCache cache, Activity activity, cgWaypoint waypoint) {
        final Display display = ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
        int edge = StaticMapsProvider.guessMinDisplaySide(display);
        storeWaypointStaticMap(cache, edge, waypoint);
>>>>>>> 355a04a3645858ac0bbe50a65e34481863237cc4
    }
    private static void storeWaypointStaticMap(cgCache cache, int edge, cgWaypoint waypoint, final boolean waitForResult) {
Solution content 
        }
    }

    public static void storeWaypointStaticMap(cgCache cache, Activity activity, cgWaypoint waypoint, boolean waitForResult) {
        int edge = StaticMapsProvider.guessMinDisplaySide(activity);
        storeWaypointStaticMap(cache, edge, waypoint, waitForResult);
    }

    private static void storeWaypointStaticMap(cgCache cache, int edge, cgWaypoint waypoint, final boolean waitForResult) {
File
StaticMapsProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
        downloadMaps(cache, wpMarkerUrl, "wp" + waypoint.getId() + "_", wpLatlonMap, edge, "", waitForResult);
    }

<<<<<<< HEAD
    public static void storeCacheStaticMap(cgCache cache, Activity activity, final boolean waitForResult) {
        int edge = guessMinDisplaySide(activity);
        storeCacheStaticMap(cache, edge, waitForResult);
=======
    public static void storeCacheStaticMap(cgCache cache, Activity activity) {
        final Display display = ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
        int edge = StaticMapsProvider.guessMinDisplaySide(display);
        storeCacheStaticMap(cache, edge);
>>>>>>> 355a04a3645858ac0bbe50a65e34481863237cc4
    }

    private static void storeCacheStaticMap(cgCache cache, int edge, final boolean waitForResult) {
Solution content 
        downloadMaps(cache, wpMarkerUrl, "wp" + waypoint.getId() + "_", wpLatlonMap, edge, "", waitForResult);
    }

    public static void storeCacheStaticMap(cgCache cache, Activity activity, final boolean waitForResult) {
        int edge = guessMinDisplaySide(activity);
        storeCacheStaticMap(cache, edge, waitForResult);
    }

    private static void storeCacheStaticMap(cgCache cache, int edge, final boolean waitForResult) {
File
StaticMapsProvider.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Variable
Chunk
Conflicting content 
    }

    private static void downloadMaps(final cgCache cache, final String markerUrl, final String prefix, final String latlonMap, final int edge,
<<<<<<< HEAD
            final String waypoints, boolean waitForResult) {
        if (waitForResult) {
            downloadDifferentZooms(cache, markerUrl, prefix, latlonMap, edge, waypoints);
        }
        else {
            Thread staticMapsThread = new Thread("getting static map") {
                @Override
                public void run() {
                    downloadDifferentZooms(cache, markerUrl, prefix, latlonMap, edge, waypoints);
                }
            };
            staticMapsThread.setPriority(Thread.MIN_PRIORITY);
            staticMapsThread.start();
=======
            final String waypoints) {

        Task currentTask = new Task("getting static map") {
            @Override
            public void run() {
                downloadMapsInThread(cache, markerUrl, prefix, latlonMap, edge, waypoints);
            }
        };
        try {
            pool.add(currentTask, 20, TimeUnit.SECONDS);
        } catch (InterruptedException e) {
            Log.e(Settings.tag, "StaticMapsProvider.downloadMaps error adding task: " + e.toString());
>>>>>>> 355a04a3645858ac0bbe50a65e34481863237cc4
        }
    }
Solution content 
    }

    private static int guessMinDisplaySide(Activity activity) {
        return guessMinDisplaySide(((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay());
    }

    private static void downloadMaps(final cgCache cache, final String markerUrl, final String prefix, final String latlonMap, final int edge,
            final String waypoints, boolean waitForResult) {
        if (waitForResult) {
            downloadDifferentZooms(cache, markerUrl, prefix, latlonMap, edge, waypoints);
        }
        else {
            Task currentTask = new Task("getting static map") {
                @Override
                public void run() {
                    downloadDifferentZooms(cache, markerUrl, prefix, latlonMap, edge, waypoints);
                }
            };
            try {
                pool.add(currentTask, 20, TimeUnit.SECONDS);
            } catch (InterruptedException e) {
                Log.e(Settings.tag, "StaticMapsProvider.downloadMaps error adding task: " + e.toString());
            }
        }
    }
File
StaticMapsProvider.java
Developer's decision
Manual
Kind of conflict
Catch clause
If statement
Method invocation
Try statement
Variable