Projects information

Chunk

Conflicting content
import java.util.List; import com.fluxtream.ApiData; import com.fluxtream.connectors.ObjectType; <<<<<<< HEAD import com.fluxtream.connectors.updaters.UpdateInfo; ======= import com.fluxtream.connectors.location.LocationFacet; >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 import com.fluxtream.domain.AbstractFacet; import com.fluxtream.domain.Tag; import com.fluxtream.facets.extractors.AbstractFacetExtractor;

Conflicting content

import java.util.List;
import com.fluxtream.ApiData;
import com.fluxtream.connectors.ObjectType;
<<<<<<< HEAD
import com.fluxtream.connectors.updaters.UpdateInfo;
=======
import com.fluxtream.connectors.location.LocationFacet;
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
import com.fluxtream.domain.AbstractFacet;
import com.fluxtream.domain.Tag;
import com.fluxtream.facets.extractors.AbstractFacetExtractor;

Solution content
import java.util.List; import com.fluxtream.ApiData; import com.fluxtream.connectors.ObjectType; import com.fluxtream.connectors.updaters.UpdateInfo; import com.fluxtream.connectors.location.LocationFacet; import com.fluxtream.domain.AbstractFacet; import com.fluxtream.domain.Tag; import com.fluxtream.facets.extractors.AbstractFacetExtractor;

Solution content

import java.util.List;
import com.fluxtream.ApiData;
import com.fluxtream.connectors.ObjectType;
import com.fluxtream.connectors.updaters.UpdateInfo;
import com.fluxtream.connectors.location.LocationFacet;
import com.fluxtream.domain.AbstractFacet;
import com.fluxtream.domain.Tag;
import com.fluxtream.facets.extractors.AbstractFacetExtractor;

File
FlickrFacetExtractor.java

Developer's decision
Concatenation

Kind of conflict
Import

Chunk

Conflicting content
private static final DateTimeFormatter format = DateTimeFormat .forPattern("yyyy-MM-dd HH:mm:ss").withZone(DateTimeZone.UTC); <<<<<<< HEAD public List extractFacets(final UpdateInfo updateInfo, final ApiData apiData, ======= @Autowired MetadataService metadataService; public List extractFacets(ApiData apiData, >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 ObjectType objectType) { List facets = new ArrayList();

Conflicting content

	private static final DateTimeFormatter format = DateTimeFormat
			.forPattern("yyyy-MM-dd HH:mm:ss").withZone(DateTimeZone.UTC);

<<<<<<< HEAD
	public List extractFacets(final UpdateInfo updateInfo, final ApiData apiData,
=======
    @Autowired
    MetadataService metadataService;

	public List extractFacets(ApiData apiData,
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
			ObjectType objectType) {
		List facets = new ArrayList();

Solution content
private static final DateTimeFormatter format = DateTimeFormat .forPattern("yyyy-MM-dd HH:mm:ss").withZone(DateTimeZone.UTC); @Autowired MetadataService metadataService; public List extractFacets(final UpdateInfo updateInfo, final ApiData apiData, ObjectType objectType) { List facets = new ArrayList();

Solution content

	private static final DateTimeFormatter format = DateTimeFormat
			.forPattern("yyyy-MM-dd HH:mm:ss").withZone(DateTimeZone.UTC);

    @Autowired
    MetadataService metadataService;

	public List extractFacets(final UpdateInfo updateInfo, final ApiData apiData,

			ObjectType objectType) {
		List facets = new ArrayList();

File
FlickrFacetExtractor.java

Developer's decision
Combination

Kind of conflict
Annotation
Attribute
Method signature

Chunk

Conflicting content
List newFacets = new ArrayList(); AbstractFacetExtractor facetExtractor = apiData.updateInfo.apiKey .getConnector().extractor(objectTypes, beanFactory); <<<<<<< HEAD ======= if (facetExtractor==null) return newFacets; facetExtractor.setUpdateInfo(updateInfo); >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 List connectorTypes = ObjectType.getObjectTypes( apiData.updateInfo.apiKey.getConnector(), objectTypes); if (connectorTypes != null) {

Conflicting content

        List newFacets = new ArrayList();
		AbstractFacetExtractor facetExtractor = apiData.updateInfo.apiKey
				.getConnector().extractor(objectTypes, beanFactory);
<<<<<<< HEAD
=======
        if (facetExtractor==null)
            return newFacets;
		facetExtractor.setUpdateInfo(updateInfo);
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
		List connectorTypes = ObjectType.getObjectTypes(
				apiData.updateInfo.apiKey.getConnector(), objectTypes);
		if (connectorTypes != null) {

Solution content
List newFacets = new ArrayList(); AbstractFacetExtractor facetExtractor = apiData.updateInfo.apiKey .getConnector().extractor(objectTypes, beanFactory); if (facetExtractor==null) return newFacets; List connectorTypes = ObjectType.getObjectTypes( apiData.updateInfo.apiKey.getConnector(), objectTypes); if (connectorTypes != null) {

Solution content

        List newFacets = new ArrayList();
		AbstractFacetExtractor facetExtractor = apiData.updateInfo.apiKey
				.getConnector().extractor(objectTypes, beanFactory);
        if (facetExtractor==null)
            return newFacets;

		List connectorTypes = ObjectType.getObjectTypes(
				apiData.updateInfo.apiKey.getConnector(), objectTypes);
		if (connectorTypes != null) {

File
ApiDataServiceImpl.java

Developer's decision
Combination

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content
JPAUtils.execute(em, "notifications.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "settings.delete.all", guest.getId()); <<<<<<< HEAD em.flush(); JPAUtils.execute(em, "context.delete.all", guest.getId()); em.flush(); ======= JPAUtils.execute(em, "updateWorkerTasks.delete.all", guest.getId()); >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 JPAUtils.execute(em, "tags.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "notifications.delete.all", guest.getId());

Conflicting content

        JPAUtils.execute(em, "notifications.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "settings.delete.all", guest.getId());
<<<<<<< HEAD
        em.flush();
        JPAUtils.execute(em, "context.delete.all", guest.getId());
        em.flush();
=======
        JPAUtils.execute(em, "updateWorkerTasks.delete.all", guest.getId());
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
        JPAUtils.execute(em, "tags.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "notifications.delete.all", guest.getId());

Solution content
JPAUtils.execute(em, "notifications.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "settings.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "context.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "updateWorkerTasks.delete.all", guest.getId()); JPAUtils.execute(em, "tags.delete.all", guest.getId()); em.flush(); JPAUtils.execute(em, "notifications.delete.all", guest.getId());

Solution content

        JPAUtils.execute(em, "notifications.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "settings.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "context.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "updateWorkerTasks.delete.all", guest.getId());
        JPAUtils.execute(em, "tags.delete.all", guest.getId());
        em.flush();
        JPAUtils.execute(em, "notifications.delete.all", guest.getId());

File
GuestServiceImpl.java

Developer's decision
Concatenation

Kind of conflict
Method invocation

Chunk

Conflicting content
private void initializeConnectorList() throws Exception { ResourceBundle res = ResourceBundle.getBundle("messages/connectors"); int order = 0; <<<<<<< HEAD //final String moves = "Moves"; //String[] movesKeys = checkKeysExist(moves, Arrays.asList("moves.client.id", "moves.client.secret", "foursquare.client.id", "foursquare.client.secret")); //final ConnectorInfo movesConnectorInfo = new ConnectorInfo(moves, // "/images/connectors/connector-moves.jpg", // res.getString("moves"), // "/moves/oauth2/token", // Connector.getConnector("moves"), order++, movesKeys!=null, // false, true, movesKeys); //em.persist(movesConnectorInfo); final String latitude = "Google Latitude"; String[] latitudeKeys = checkKeysExist(latitude, Arrays.asList("google.client.id", "google.client.secret", "google_latitudeApiKey")); final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo(latitude, ======= final ConnectorInfo movesConnectorInfo = new ConnectorInfo("Moves", "/images/connectors/connector-moves.jpg", res.getString("moves"), "/moves/oauth2/token", Connector.getConnector("moves"), order++, true); em.persist(movesConnectorInfo); final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo("Google Latitude", >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 "/images/connectors/connector-google_latitude.jpg", res.getString("google_latitude"), "/google/oauth2/token?scope=https://www.googleapis.com/auth/latitude.all.best",

Conflicting content

    private void initializeConnectorList() throws Exception {
		ResourceBundle res = ResourceBundle.getBundle("messages/connectors");
        int order = 0;
<<<<<<< HEAD
        //final String moves = "Moves";
        //String[] movesKeys = checkKeysExist(moves, Arrays.asList("moves.client.id", "moves.client.secret", "foursquare.client.id", "foursquare.client.secret"));
        //final ConnectorInfo movesConnectorInfo = new ConnectorInfo(moves,
        //                                                           "/images/connectors/connector-moves.jpg",
        //                                                           res.getString("moves"),
        //                                                           "/moves/oauth2/token",
        //                                                           Connector.getConnector("moves"), order++, movesKeys!=null,
        //                                                           false, true, movesKeys);
        //em.persist(movesConnectorInfo);
        final String latitude = "Google Latitude";
        String[] latitudeKeys = checkKeysExist(latitude, Arrays.asList("google.client.id", "google.client.secret", "google_latitudeApiKey"));
        final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo(latitude,
=======
        final ConnectorInfo movesConnectorInfo = new ConnectorInfo("Moves",
                                                                   "/images/connectors/connector-moves.jpg",
                                                                   res.getString("moves"),
                                                                   "/moves/oauth2/token",
                                                                   Connector.getConnector("moves"), order++, true);
        em.persist(movesConnectorInfo);
        final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo("Google Latitude",
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
                                                                      "/images/connectors/connector-google_latitude.jpg",
                                                                      res.getString("google_latitude"),
                                                                      "/google/oauth2/token?scope=https://www.googleapis.com/auth/latitude.all.best",

Solution content
private void initializeConnectorList() throws Exception { ResourceBundle res = ResourceBundle.getBundle("messages/connectors"); int order = 0; final String moves = "Moves"; String[] movesKeys = checkKeysExist(moves, Arrays.asList("moves.client.id", "moves.client.secret", "foursquare.client.id", "foursquare.client.secret")); final ConnectorInfo movesConnectorInfo = new ConnectorInfo(moves, "/images/connectors/connector-moves.jpg", res.getString("moves"), "/moves/oauth2/token", Connector.getConnector("moves"), order++, movesKeys!=null, false, true, movesKeys); em.persist(movesConnectorInfo); final String latitude = "Google Latitude"; String[] latitudeKeys = checkKeysExist(latitude, Arrays.asList("google.client.id", "google.client.secret", "google_latitudeApiKey")); final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo(latitude, "/images/connectors/connector-google_latitude.jpg", res.getString("google_latitude"), "/google/oauth2/token?scope=https://www.googleapis.com/auth/latitude.all.best",

Solution content

    private void initializeConnectorList() throws Exception {
		ResourceBundle res = ResourceBundle.getBundle("messages/connectors");
        int order = 0;

        final String moves = "Moves";
        String[] movesKeys = checkKeysExist(moves, Arrays.asList("moves.client.id", "moves.client.secret", "foursquare.client.id", "foursquare.client.secret"));
        final ConnectorInfo movesConnectorInfo = new ConnectorInfo(moves,
                                                                   "/images/connectors/connector-moves.jpg",
                                                                   res.getString("moves"),
                                                                   "/moves/oauth2/token",
                                                                   Connector.getConnector("moves"), order++, movesKeys!=null,
                                                                   false, true, movesKeys);
        em.persist(movesConnectorInfo);
        final String latitude = "Google Latitude";
        String[] latitudeKeys = checkKeysExist(latitude, Arrays.asList("google.client.id", "google.client.secret", "google_latitudeApiKey"));
        final ConnectorInfo latitudeConnectorInfo = new ConnectorInfo(latitude,
                                                                      "/images/connectors/connector-google_latitude.jpg",
                                                                      res.getString("google_latitude"),
                                                                      "/google/oauth2/token?scope=https://www.googleapis.com/auth/latitude.all.best",

File
SystemServiceImpl.java

Developer's decision
Manual

Kind of conflict
Comment
Method invocation
Variable

Chunk

Conflicting content
"/images/connectors/connector-quantifiedmind.jpg", res.getString("quantifiedmind"), "ajax:/quantifiedmind/getTokenDialog", <<<<<<< HEAD Connector.getConnector("quantifiedmind"), order++, quantifiedMindKeys!=null, false, true, quantifiedMindKeys)); final String flickr = "Flickr"; String[] flickrKeys = checkKeysExist(flickr, Arrays.asList("flickrConsumerKey", "flickrConsumerSecret", "flickr.validRedirectURL")); em.persist(new ConnectorInfo(flickr, ======= Connector.getConnector("quantifiedmind"), order++, true)); em.persist(new ConnectorInfo("Flickr", >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 "/images/connectors/connector-flickr.jpg", res.getString("flickr"), "/flickr/token",

Conflicting content

                                     "/images/connectors/connector-quantifiedmind.jpg",
                                     res.getString("quantifiedmind"),
                                     "ajax:/quantifiedmind/getTokenDialog",
<<<<<<< HEAD
                                     Connector.getConnector("quantifiedmind"), order++, quantifiedMindKeys!=null,
                                     false, true, quantifiedMindKeys));
        final String flickr = "Flickr";
        String[] flickrKeys = checkKeysExist(flickr, Arrays.asList("flickrConsumerKey", "flickrConsumerSecret", "flickr.validRedirectURL"));
        em.persist(new ConnectorInfo(flickr,
=======
                                     Connector.getConnector("quantifiedmind"), order++, true));
        em.persist(new ConnectorInfo("Flickr",
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
                                     "/images/connectors/connector-flickr.jpg",
                                     res.getString("flickr"),
                                     "/flickr/token",

Solution content
"/images/connectors/connector-quantifiedmind.jpg", res.getString("quantifiedmind"), "ajax:/quantifiedmind/getTokenDialog", Connector.getConnector("quantifiedmind"), order++, quantifiedMindKeys!=null, false, true, quantifiedMindKeys)); final String flickr = "Flickr"; String[] flickrKeys = checkKeysExist(flickr, Arrays.asList("flickrConsumerKey", "flickrConsumerSecret", "flickr.validRedirectURL")); em.persist(new ConnectorInfo(flickr, "/images/connectors/connector-flickr.jpg", res.getString("flickr"), "/flickr/token",

Solution content

                                     "/images/connectors/connector-quantifiedmind.jpg",
                                     res.getString("quantifiedmind"),
                                     "ajax:/quantifiedmind/getTokenDialog",
                                     Connector.getConnector("quantifiedmind"), order++, quantifiedMindKeys!=null,
                                     false, true, quantifiedMindKeys));
        final String flickr = "Flickr";
        String[] flickrKeys = checkKeysExist(flickr, Arrays.asList("flickrConsumerKey", "flickrConsumerSecret", "flickr.validRedirectURL"));
        em.persist(new ConnectorInfo(flickr,
                                     "/images/connectors/connector-flickr.jpg",
                                     res.getString("flickr"),
                                     "/flickr/token",

File
SystemServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
"/images/connectors/connector-github.jpg", res.getString("github"), singlyAuthorizeUrl("github"), <<<<<<< HEAD Connector.getConnector("github"), order++, false, false, true, githubKeys)); final String fluxtreamCapture = "Fluxtream Capture"; String[] fluxtreamCaptureKeys = checkKeysExist(fluxtreamCapture, new ArrayList()); em.persist(new ConnectorInfo(fluxtreamCapture, ======= Connector.getConnector("github"), order++, false)); em.persist(new ConnectorInfo("Fluxtream Capture", >>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7 "/images/connectors/connector-fluxtream_capture.png", res.getString("fluxtream_capture"), "ajax:/fluxtream_capture/about",

Conflicting content

                                     "/images/connectors/connector-github.jpg",
                                     res.getString("github"),
                                     singlyAuthorizeUrl("github"),
<<<<<<< HEAD
                                     Connector.getConnector("github"), order++, false,
                                     false, true, githubKeys));
        final String fluxtreamCapture = "Fluxtream Capture";
        String[] fluxtreamCaptureKeys = checkKeysExist(fluxtreamCapture, new ArrayList());
        em.persist(new ConnectorInfo(fluxtreamCapture,
=======
                                     Connector.getConnector("github"), order++, false));
        em.persist(new ConnectorInfo("Fluxtream Capture",
>>>>>>> 377124bcad4647bd07b5be10697381f51fc43cd7
                                     "/images/connectors/connector-fluxtream_capture.png",
                                     res.getString("fluxtream_capture"),
                                     "ajax:/fluxtream_capture/about",

Solution content
"/images/connectors/connector-github.jpg", res.getString("github"), singlyAuthorizeUrl("github"), Connector.getConnector("github"), order++, false, false, true, githubKeys)); final String fluxtreamCapture = "Fluxtream Capture"; String[] fluxtreamCaptureKeys = checkKeysExist(fluxtreamCapture, new ArrayList()); em.persist(new ConnectorInfo(fluxtreamCapture, "/images/connectors/connector-fluxtream_capture.png", res.getString("fluxtream_capture"), "ajax:/fluxtream_capture/about",

Solution content

                                     "/images/connectors/connector-github.jpg",
                                     res.getString("github"),
                                     singlyAuthorizeUrl("github"),
                                     Connector.getConnector("github"), order++, false,
                                     false, true, githubKeys));
        final String fluxtreamCapture = "Fluxtream Capture";
        String[] fluxtreamCaptureKeys = checkKeysExist(fluxtreamCapture, new ArrayList());
        em.persist(new ConnectorInfo(fluxtreamCapture,
                                     "/images/connectors/connector-fluxtream_capture.png",
                                     res.getString("fluxtream_capture"),
                                     "ajax:/fluxtream_capture/about",

File
SystemServiceImpl.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Variable

Projects >> fluxtream-app >>5e73dc08f1ae2afcc096985e70648853db065df8