/*
 * Copyright 2013 Google Inc.
 *
 * 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 com.google.maps.android.utils.demo;

import android.os.Bundle;
import android.support.v4.app.FragmentActivity;
import com.google.android.gms.maps.GoogleMap;
import com.google.android.gms.maps.SupportMapFragment;

public abstract class BaseDemoActivity extends FragmentActivity {
    private GoogleMap mMap;

    protected int getLayoutId() {
        return R.layout.map;
    }

    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(getLayoutId());
        setUpMapIfNeeded();
    }

    @Override
    protected void onResume() {
        super.onResume();
        setUpMapIfNeeded();
    }

    private void setUpMapIfNeeded() {
        if (mMap != null) {
            return;
        }
        mMap = ((SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map)).getMap();
        if (mMap != null) {
            startDemo();
        }
    }

    /**
     * Run the demo-specific code.
     */
    protected abstract void startDemo();

    protected GoogleMap getMap() {
        setUpMapIfNeeded();
        return mMap;
    }
}

@@ -755,16 +755,71 @@
 gleMap;%0A
+import com.google.android.gms.maps.OnMapReadyCallback;%0A
 import c
@@ -930,16 +930,46 @@
 ctivity 
+implements OnMapReadyCallback 
 %7B%0A    pr
@@ -1224,32 +1224,24 @@
     setUpMap
-IfNeeded
 ();%0A    %7D%0A%0A 
@@ -1323,32 +1323,24 @@
     setUpMap
-IfNeeded
 ();%0A    %7D%0A%0A 
@@ -1346,38 +1346,58 @@
     
-private void setUpMapIfNeeded(
+@Override%0A    public void onMapReady(GoogleMap map
 ) %7B%0A
@@ -1468,16 +1468,87 @@
   mMap =
+ map;%0A        startDemo();%0A    %7D%0A%0A    private void setUpMap() %7B%0A       
  ((Suppo
@@ -1628,74 +1628,20 @@
 tMap
-();%0A        if (mMap != null) %7B%0A            startDemo();%0A        %7D
+Async(this);
 %0A   
@@ -1776,36 +1776,8 @@
 ) %7B%0A
-        setUpMapIfNeeded();%0A
     

Replace deprecated getMap with getMapAsync in demo.