Projects >> tatami >>16bdbbbf83abdad867880ffd886e79583baeecac

Chunk
Conflicting content 

    void addTweetToTimeline(String login, Tweet tweet);

<<<<<<< HEAD
=======
    void addTweetToTagline(Tweet tweet);

    /**
     * a day's tweets
     */
    Collection getDayline(String date);
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
    /**
     * a user's and his followed users tweets
     */
Solution content 
    void addTweetToTimeline(String login, Tweet tweet);

    void addTweetToTagline(Tweet tweet);

    /**
     * a day's tweets
     */
    Collection getDayline(String date);

    /**
     * a user's and his followed users tweets
     */
File
TweetRepository.java
Developer's decision
Version 2
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
    Collection getTimeline(String login, int size);

    /**
<<<<<<< HEAD
     * a users own tweets
=======
     * a user's own tweets
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
     */
    Collection getUserline(String login, int size);
Solution content 
    Collection getTimeline(String login, int size);

    /**
     * a user's own tweets
     */
    Collection getUserline(String login, int size);
File
TweetRepository.java
Developer's decision
Version 2
Kind of conflict
Comment
Chunk
Conflicting content 
     */
    public Collection getTimeline(String login, int nbTweets) {
        if (login == null || login.isEmpty()) {
<<<<<<< HEAD
            User currentUser = userService.getCurrentUser();
=======
            User currentUser = authenticationService.getCurrentUser();
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
            login = currentUser.getLogin();
        }
        Collection tweetIds = tweetRepository.getTimeline(login, nbTweets);
Solution content 
     */
    public Collection getTimeline(String login, int nbTweets) {
        if (login == null || login.isEmpty()) {
            User currentUser = authenticationService.getCurrentUser();
            login = currentUser.getLogin();
        }
        Collection tweetIds = tweetRepository.getTimeline(login, nbTweets);
File
TimelineService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
     */
    public Collection getUserline(String login, int nbTweets) {
        if (login == null || login.isEmpty()) {
<<<<<<< HEAD
            User currentUser = userService.getCurrentUser();
=======
            User currentUser = authenticationService.getCurrentUser();
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
            login = currentUser.getLogin();
        }
        Collection tweetIds = tweetRepository.getUserline(login, nbTweets);
Solution content 
     */
    public Collection getUserline(String login, int nbTweets) {
        if (login == null || login.isEmpty()) {
            User currentUser = authenticationService.getCurrentUser();
            login = currentUser.getLogin();
        }
        Collection tweetIds = tweetRepository.getUserline(login, nbTweets);
File
TimelineService.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        }
        return tweets;
    }
<<<<<<< HEAD
=======

    public void setAuthenticationService(AuthenticationService authenticationService) {
        this.authenticationService = authenticationService;
    }
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
}
Solution content 
        }
        return tweets;
    }

    public void setAuthenticationService(AuthenticationService authenticationService) {
        this.authenticationService = authenticationService;
    }
}
File
TimelineService.java
Developer's decision
Version 2
Kind of conflict
Method declaration
Chunk
Conflicting content 
            users.put(tweet.getLogin(), userService.getUserProfileByLogin(tweet.getLogin()));
            if (users.size() == 3) break;    // suggestions list limit
        }
<<<<<<< HEAD
        return mock;
=======
        return users.values();
>>>>>>> 74d054033ff8b17029c48429290e0575f534f743
    }
}
Solution content 
            users.put(tweet.getLogin(), userService.getUserProfileByLogin(tweet.getLogin()));
            if (users.size() == 3) break;    // suggestions list limit
        }
        return users.values();
    }
}
File
UserController.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Return statement
Variable