Projects >> robolectric >>4ea6e425e7ead4a762f3be06e94c2522d2fcf06b

Chunk
Conflicting content 
import android.view.animation.AnimationUtils;
import android.webkit.WebSettings;
import android.webkit.WebView;
<<<<<<< HEAD
import android.widget.*;
=======
import android.widget.AdapterView;
import android.widget.ExpandableListView;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.RemoteViews;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.ZoomButtonsController;
>>>>>>> e16b77583250fac8d1c67e8773f115d7d8119a8d
import com.xtremelabs.robolectric.bytecode.RobolectricInternals;
import com.xtremelabs.robolectric.bytecode.ShadowWrangler;
import com.xtremelabs.robolectric.shadows.*;
Solution content 
import android.view.animation.AnimationUtils;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.widget.*;
import com.xtremelabs.robolectric.bytecode.RobolectricInternals;
import com.xtremelabs.robolectric.bytecode.ShadowWrangler;
import com.xtremelabs.robolectric.shadows.*;
File
Robolectric.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
        return (ShadowPath) shadowOf_(instance);
    }

<<<<<<< HEAD
    public static ShadowPreference shadowOf(Preference instance) {
        return (ShadowPreference) shadowOf_(instance);
    }
    
    public static ShadowProgressBar shadowOf(ProgressBar instance) {
        return (ShadowProgressBar) shadowOf_(instance);
    }
    
=======
    public static ShadowProgressBar shadowOf(ProgressBar instance) {
        return (ShadowProgressBar) shadowOf_(instance);
    }

>>>>>>> e16b77583250fac8d1c67e8773f115d7d8119a8d
    public static ShadowListActivity shadowOf(ListActivity instance) {
        return (ShadowListActivity) shadowOf_(instance);
    }
Solution content 
        return (ShadowPath) shadowOf_(instance);
    }

    public static ShadowPreference shadowOf(Preference instance) {
        return (ShadowPreference) shadowOf_(instance);
    }
    
    public static ShadowProgressBar shadowOf(ProgressBar instance) {
        return (ShadowProgressBar) shadowOf_(instance);
    }
    
    public static ShadowListActivity shadowOf(ListActivity instance) {
        return (ShadowListActivity) shadowOf_(instance);
    }
File
Robolectric.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
import com.xtremelabs.robolectric.internal.RealObject;
<<<<<<< HEAD
import com.xtremelabs.robolectric.tester.android.view.TestWindow;

=======
import com.xtremelabs.robolectric.view.TestWindow;
>>>>>>> e16b77583250fac8d1c67e8773f115d7d8119a8d
import java.lang.reflect.Method;

import static com.xtremelabs.robolectric.Robolectric.shadowOf;
Solution content 
import com.xtremelabs.robolectric.internal.Implementation;
import com.xtremelabs.robolectric.internal.Implements;
import com.xtremelabs.robolectric.internal.RealObject;
import com.xtremelabs.robolectric.tester.android.view.TestWindow;

import java.lang.reflect.Method;

import static com.xtremelabs.robolectric.Robolectric.shadowOf;
File
ShadowDialog.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }

    @Implementation
<<<<<<< HEAD
    public boolean isConnected(){
    	return isConnected;
    }
    
    @Implementation
    public int getType(){
    	return connectionType;
    }
    
=======
    public NetworkInfo.State getState() {
      return isConnected ? NetworkInfo.State.CONNECTED :
          NetworkInfo.State.DISCONNECTED;
    }

    @Implementation
    public boolean isConnected() {
        return isConnected;
    }

>>>>>>> e16b77583250fac8d1c67e8773f115d7d8119a8d
    /**
     * Non-Android accessor
     * Sets up the return value of {@link #isConnectedOrConnecting()}.
Solution content 
    }

    @Implementation
    public NetworkInfo.State getState() {
      return isConnected ? NetworkInfo.State.CONNECTED :
          NetworkInfo.State.DISCONNECTED;
    }

    @Implementation
    public int getType(){
    	return connectionType;
    }
    
    @Implementation
    public boolean isConnected() {
        return isConnected;
    }

    /**
     * Non-Android accessor
     * Sets up the return value of {@link #isConnectedOrConnecting()}.
File
ShadowNetworkInfo.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
        return httpResponse;
    }

<<<<<<< HEAD:src/main/java/com/xtremelabs/robolectric/tester/org/apache/http/FakeHttpLayer.java
    public boolean hasPendingResponses() {
        return !pendingHttpResponses.isEmpty();
    }

    public boolean hasRequestInfos() {
        return !httpRequestInfos.isEmpty();
    }

    public boolean hasResponseRules() {
        return !httpResponseRules.isEmpty();
    }

    public HttpResponse getDefaultResponse() {
        return defaultResponse;
    }

    public HttpRequestInfo getSentHttpRequestInfo(int index) {
        return httpRequestInfos.get(index);
    }

    public static class RequestMatcherResponseRule implements HttpEntityStub.ResponseRule {
=======
    public void clearHttpResponseRules() {
        httpResponseRules.clear();
    }

    public static class RequestMatcherResponseRule implements ResponseRule {
>>>>>>> e16b77583250fac8d1c67e8773f115d7d8119a8d:src/main/java/com/xtremelabs/robolectric/shadows/FakeHttpLayer.java
        private RequestMatcher requestMatcher;
        private HttpResponse responseToGive;
        private IOException ioException;
Solution content 
        return httpResponse;
    }
    public boolean hasPendingResponses() {
        return !pendingHttpResponses.isEmpty();
    }

    public boolean hasRequestInfos() {
        return !httpRequestInfos.isEmpty();
    }

    public boolean hasResponseRules() {
        return !httpResponseRules.isEmpty();
    }

    public HttpResponse getDefaultResponse() {
        return defaultResponse;
    }

    public HttpRequestInfo getSentHttpRequestInfo(int index) {
        return httpRequestInfos.get(index);
    }
    public void clearHttpResponseRules() {
        httpResponseRules.clear();
    }

    public static class RequestMatcherResponseRule implements HttpEntityStub.ResponseRule {
        private RequestMatcher requestMatcher;
        private HttpResponse responseToGive;
        private IOException ioException;
File
FakeHttpLayer.java
Developer's decision
Combination
Kind of conflict
Class signature
Method declaration