Projects >> robolectric >>469b06b4bbfef2b774b2f5549ac55b5e93307c25

Chunk
Conflicting content 
	public static ShadowDisplay shadowOf(Display instance) {
		return ((ShadowDisplay) shadowOf_(instance));
	}
<<<<<<< HEAD
=======
	
	public static ShadowAudioManager shadowOf(AudioManager instance) {
		return ((ShadowAudioManager) shadowOf_(instance));
	}
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5

    @SuppressWarnings({"unchecked"})
    public static  P shadowOf_(R instance) {
Solution content 
	public static ShadowDisplay shadowOf(Display instance) {
		return ((ShadowDisplay) shadowOf_(instance));
	}
	
	public static ShadowAudioManager shadowOf(AudioManager instance) {
		return ((ShadowAudioManager) shadowOf_(instance));
	}

    @SuppressWarnings({"unchecked"})
    public static  P shadowOf_(R instance) {
File
Robolectric.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
import android.test.mock.MockContentResolver;
import android.view.LayoutInflater;
import android.view.WindowManager;
<<<<<<< HEAD
import com.xtremelabs.robolectric.res.ResourceLoader;
import com.xtremelabs.robolectric.util.Implementation;
import com.xtremelabs.robolectric.util.Implements;
import com.xtremelabs.robolectric.util.RealObject;
import com.xtremelabs.robolectric.view.TestWindowManager;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import static com.xtremelabs.robolectric.Robolectric.newInstanceOf;
import static com.xtremelabs.robolectric.Robolectric.shadowOf;
=======
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5

/**
 * Shadows the {@code android.app.Application} class.
Solution content 
import android.test.mock.MockContentResolver;
import android.view.LayoutInflater;
import android.view.WindowManager;
import com.xtremelabs.robolectric.res.ResourceLoader;
import com.xtremelabs.robolectric.util.Implementation;
import com.xtremelabs.robolectric.util.Implements;
import com.xtremelabs.robolectric.util.RealObject;
import com.xtremelabs.robolectric.view.TestWindowManager;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

import static com.xtremelabs.robolectric.Robolectric.newInstanceOf;
import static com.xtremelabs.robolectric.Robolectric.shadowOf;

/**
 * Shadows the {@code android.app.Application} class.
File
ShadowApplication.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    private LocationManager locationManager;
    private WifiManager wifiManager;
    private WindowManager windowManager;
<<<<<<< HEAD
=======
    private AudioManager audioManager;
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5
    private List startedActivities = new ArrayList();
    private List startedServices = new ArrayList();
    private List registeredReceivers = new ArrayList();
Solution content 
    private LocationManager locationManager;
    private WifiManager wifiManager;
    private WindowManager windowManager;
    private AudioManager audioManager;
    private List startedActivities = new ArrayList();
    private List startedServices = new ArrayList();
    private List registeredReceivers = new ArrayList();
File
ShadowApplication.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
        } else if (name.equals(Context.WIFI_SERVICE)) {
            return wifiManager == null ? wifiManager = newInstanceOf(WifiManager.class) : wifiManager;
        } else if (name.equals(Context.WINDOW_SERVICE)) {
<<<<<<< HEAD
            return windowManager == null ? windowManager = new TestWindowManager() : windowManager;
=======
        	return windowManager == null ? windowManager = new TestWindowManager() : windowManager;
        } else if (name.equals(Context.AUDIO_SERVICE)) {
        	return audioManager == null ? audioManager = newInstanceOf(AudioManager.class) : audioManager;
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5
        }
        return null;
    }
Solution content 
        } else if (name.equals(Context.WIFI_SERVICE)) {
            return wifiManager == null ? wifiManager = newInstanceOf(WifiManager.class) : wifiManager;
        } else if (name.equals(Context.WINDOW_SERVICE)) {
        	return windowManager == null ? windowManager = new TestWindowManager() : windowManager;
        } else if (name.equals(Context.AUDIO_SERVICE)) {
        	return audioManager == null ? audioManager = newInstanceOf(AudioManager.class) : audioManager;
        }
        return null;
    }
File
ShadowApplication.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation
Return statement
Chunk
Conflicting content 
    private ComponentName componentName;
    private Uri data;
    private int flags;
<<<<<<< HEAD
    private Class intentClass;
=======
    private Class cls;
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5

    public void __constructor__(Context packageContext, Class cls) {
        componentName = new ComponentName(packageContext, cls);
Solution content 
    private ComponentName componentName;
    private Uri data;
    private int flags;
    private Class intentClass;

    public void __constructor__(Context packageContext, Class cls) {
        componentName = new ComponentName(packageContext, cls);
File
ShadowIntent.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
		return cls;
	}

<<<<<<< HEAD
    public Class getIntentClass() {
        return intentClass;
    }

    private String ifWeHave(Object o, String name) {
=======
	private String ifWeHave(Object o, String name) {
>>>>>>> 121fbd81d2a372786df3840e35abf6b897c977e5
        if (o == null) return null;
        if (o instanceof Map && ((Map) o).isEmpty()) return null;
        return name + "=" + o;
Solution content 
    public Class getIntentClass() {
        return intentClass;
    }

    private String ifWeHave(Object o, String name) {
        if (o == null) return null;
        if (o instanceof Map && ((Map) o).isEmpty()) return null;
        return name + "=" + o;
File
ShadowIntent.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method signature