Projects >> thucydides >>ddcbc803b08926f2b8d13550355bcd5242b4b39e

Chunk
Conflicting content 
import java.io.File;
import java.io.IOException;
<<<<<<< HEAD
import java.io.InputStream;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
=======
import java.lang.reflect.InvocationTargetException;
>>>>>>> d8ccdf5daf869d46408163a9389872fa9779dd5e
import java.net.URL;

/**
Solution content 
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.net.URL;

/**
File
WebDriverFactory.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
public class WebDriverFactory {

    private static final String FIREBUGS_VERSION = "1.9.0b1";
<<<<<<< HEAD
    private static final String FIREBUGS_XPI_FILE = "/firefox/firebug-" + FIREBUGS_VERSION + ".xpi";
=======
    private static final String FIREBUGS_XPI_FILE = "firefox/firebug-" + FIREBUGS_VERSION + ".xpi";
>>>>>>> d8ccdf5daf869d46408163a9389872fa9779dd5e

    private final WebdriverInstanceFactory webdriverInstanceFactory;
Solution content 
public class WebDriverFactory {

    private static final String FIREBUGS_VERSION = "1.9.0b1";
    private static final String FIREBUGS_XPI_FILE = "/firefox/firebug-" + FIREBUGS_VERSION + ".xpi";

    private final WebdriverInstanceFactory webdriverInstanceFactory;
File
WebDriverFactory.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
    }

    private void addFirebugsTo(FirefoxProfile profile) {
<<<<<<< HEAD
        try {
            profile.addExtension(this.getClass(),FIREBUGS_XPI_FILE);
=======
        URL firebugsExtension = getClass().getClassLoader().getResource(FIREBUGS_XPI_FILE);
        try {
            profile.addExtension(new File(firebugsExtension.getFile()));
>>>>>>> d8ccdf5daf869d46408163a9389872fa9779dd5e
            profile.setPreference("extensions.firebug.currentVersion", FIREBUGS_VERSION); // Avoid startup screen

        } catch (IOException e) {
Solution content 
    }

    private void addFirebugsTo(FirefoxProfile profile) {
        <<<<<<>>>>>>d8ccdf5daf869d46408163a9389872fa9779dd5e
                profile.setPreference("extensions.firebug.currentVersion", FIREBUGS_VERSION); // Avoid startup screen

            } catch (IOException e) {
                LOGGER.warn("Failed to add Firebugs extension to Firefox");
            }
        }

        <<<<<<>>>>>>d8ccdf5daf869d46408163a9389872fa9779dd5e
        private FirefoxProfile getProfileFrom
        (
        final String profileName){
            FirefoxProfile profile = getAllProfiles().getProfile(profileName);
            if (profile == null) {
                profile = useExistingFirefoxProfile(new File(profileName));
            }
            return profile;
        }

    private boolean dontAssumeUntrustedCertificateIssuer() {
        return !(environmentVariables.getPropertyAsBoolean(ThucydidesSystemProperty.ASSUME_UNTRUSTED_CERTIFICATE_ISSUER.getPropertyName(), true));
    }

    /**
     * Initialize a page object's fields using the specified WebDriver instance.
     */
    public static void initElementsWithAjaxSupport(final Object pageObject, final WebDriver driver) {
        Configuration configuration = Injectors.getInjector().getInstance(Configuration.class);
        ElementLocatorFactory finder = new DisplayedElementLocatorFactory(driver, configuration.getElementTimeout());
        PageFactory.initElements(finder, pageObject);
    }

    public static void initElementsWithAjaxSupport(final Object pageObject, final WebDriver driver, int timeout) {
        ElementLocatorFactory finder = new DisplayedElementLocatorFactory(driver, timeout);
        PageFactory.initElements(finder, pageObject);
    }

}
File
WebDriverFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private URL getFirebugsExtensionFromClasspathOrJar() {
        URL firebugs = getClass().getClassLoader().getResource(FIREBUGS_XPI_FILE);
        if (firebugs == null) {
            firebugs = getClass().getClassLoader().getResource("/" + FIREBUGS_XPI_FILE);
        }
        return firebugs;
    }

=======
>>>>>>> d8ccdf5daf869d46408163a9389872fa9779dd5e
    private FirefoxProfile getProfileFrom(final String profileName) {
        FirefoxProfile profile = getAllProfiles().getProfile(profileName);
        if (profile == null) {
Solution content 
            if (profile == null) {
        }

        <<<<<<>>>>>>d8ccdf5daf869d46408163a9389872fa9779dd5e
        private FirefoxProfile getProfileFrom
        (
        final String profileName){
            FirefoxProfile profile = getAllProfiles().getProfile(profileName);
                profile = useExistingFirefoxProfile(new File(profileName));
            }
            return profile;
        }

    private boolean dontAssumeUntrustedCertificateIssuer() {
        return !(environmentVariables.getPropertyAsBoolean(ThucydidesSystemProperty.ASSUME_UNTRUSTED_CERTIFICATE_ISSUER.getPropertyName(), true));
    }

    /**
     * Initialize a page object's fields using the specified WebDriver instance.
     */
    public static void initElementsWithAjaxSupport(final Object pageObject, final WebDriver driver) {
        Configuration configuration = Injectors.getInjector().getInstance(Configuration.class);
        ElementLocatorFactory finder = new DisplayedElementLocatorFactory(driver, configuration.getElementTimeout());
        PageFactory.initElements(finder, pageObject);
    }

    public static void initElementsWithAjaxSupport(final Object pageObject, final WebDriver driver, int timeout) {
        ElementLocatorFactory finder = new DisplayedElementLocatorFactory(driver, timeout);
        PageFactory.initElements(finder, pageObject);
    }

}
File
WebDriverFactory.java
Developer's decision
Manual
Kind of conflict
Method declaration