Projects >> jcommune >>10f6bc6529027b9ddf2a858b966596bfe41c766a

Chunk
Conflicting content 
    /**
     * Fetches last read post information for particular user and topic.
     *
<<<<<<< HEAD
     * @param forWho user to find last read post for
     * @param topic topic we're interesting in
     * @return last read post for the particular topic or null if user had never opened this topic
=======
     * @param forWho
     * @param topics
     * @return
     */
    List getLastReadPosts(JCUser forWho, List topics);

    /**
     *
     * @param forWho
     * @return
>>>>>>> cc4851ffc044514e9b3731d10070e1f4674eaa0a
     */
    LastReadPost getLastReadPost(JCUser forWho, Topic topic);
Solution content 
    /**
     * Fetches last read post information for particular user and topic.
     *
     * @param forWho user to find last read post for
     * @param topic topic we're interesting in
     * @return last read post for the particular topic or null if user had never opened this topic
     */
    LastReadPost getLastReadPost(JCUser forWho, Topic topic);
File
PostDao.java
Developer's decision
Version 1
Kind of conflict
Comment
Method interface
Chunk
Conflicting content 
 */
package org.jtalks.jcommune.model.dao.hibernate;

<<<<<<< HEAD
=======
import java.util.List;

import org.hibernate.criterion.Property;
>>>>>>> cc4851ffc044514e9b3731d10070e1f4674eaa0a
import org.jtalks.common.model.dao.hibernate.AbstractHibernateChildRepository;
import org.jtalks.jcommune.model.dao.PostDao;
import org.jtalks.jcommune.model.entity.JCUser;
Solution content 
 */
package org.jtalks.jcommune.model.dao.hibernate;

import org.jtalks.common.model.dao.hibernate.AbstractHibernateChildRepository;
import org.jtalks.jcommune.model.dao.PostDao;
import org.jtalks.jcommune.model.entity.JCUser;
File
PostHibernateDao.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
import org.jtalks.jcommune.model.entity.Post;
import org.jtalks.jcommune.model.entity.Topic;

<<<<<<< HEAD
import java.util.List;

=======
>>>>>>> cc4851ffc044514e9b3731d10070e1f4674eaa0a
/**
 * The implementation of PostDao based on Hibernate.
 * The class is responsible for loading {@link Post} objects from database,
Solution content 
import org.jtalks.jcommune.model.entity.Post;
import org.jtalks.jcommune.model.entity.Topic;

import java.util.List;

/**
 * The implementation of PostDao based on Hibernate.
 * The class is responsible for loading {@link Post} objects from database,
File
PostHibernateDao.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
    }

    /**
<<<<<<< HEAD
     * @param index last read post index in this topic for current user
     * (0 means first post is the last read one)
     */
    public void setLastReadPostIndex(int index){
       hasUpdates = (index + 1 < posts.size());
    }

    /**
     * This method will return true if there are unread posts in that topic
     * for the current user. This state is NOT persisted and must be
     * explicitly set by calling  Topic.setLastReadPostIndex().
     *
     * If setter has not been called this method will always return no updates
     *
     * @return if current topic has posts still unread by the current user
     */
    public boolean isHasUpdates(){
       return hasUpdates;
    }
=======
     * {@inheritDoc}
     */
    @DocumentId
	@Override
	public long getId() {
		return super.getId();
	}
>>>>>>> cc4851ffc044514e9b3731d10070e1f4674eaa0a
}
Solution content 
    }

    /**
     * @param index last read post index in this topic for current user
     * (0 means first post is the last read one)
     */
    public void setLastReadPostIndex(int index){
       hasUpdates = (index + 1 < posts.size());
    }

    /**
     * This method will return true if there are unread posts in that topic
     * for the current user. This state is NOT persisted and must be
     * explicitly set by calling  Topic.setLastReadPostIndex().
     *
     * If setter has not been called this method will always return no updates
     *
     * @return if current topic has posts still unread by the current user
     */
    public boolean isHasUpdates(){
       return hasUpdates;
    }
    
	/**
     * {@inheritDoc}
     */
    @DocumentId
	@Override
	public long getId() {
		return super.getId();
	}
}
File
Topic.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Comment
Method declaration