Projects >> jtalks-common >>7e93ec0f6929646a267b2535432fd5903c8cd569

Chunk
Conflicting content 
import org.jtalks.jcommune.model.dao.hibernate.AbstractHibernateDao;

/**
<<<<<<< HEAD
 *
 * @author Dmitry
 */
=======
 * @author Vitaliy Kravchwnko
 */

>>>>>>> 35e4163eb9e0b95c99decf29616e398224247cf7
public class ArticleHibernateDao extends AbstractHibernateDao
 implements ArticleDao {
    
}
Solution content 
import org.jtalks.jcommune.model.dao.hibernate.AbstractHibernateDao;

/**
 *
 * @author Vitaliy Kravchwnko
 * @author Dmitry Sokolov
 */
public class ArticleHibernateDao extends AbstractHibernateDao
 implements ArticleDao {
    
}
File
ArticleHibernateDao.java
Developer's decision
Manual
Kind of conflict
Comment
Chunk
Conflicting content 
package org.jtalks.antarcticle.model.entity;

import org.joda.time.DateTime;
<<<<<<< HEAD
import org.jtalks.jcommune.model.entity.User;
import org.jtalks.jcommune.model.entity.Persistent;

/**
 *
 * @author Dmitry
 */
=======
import org.jtalks.jcommune.model.entity.Persistent;

/**
 * @author Vitaliy Kravchwnko
 */

>>>>>>> 35e4163eb9e0b95c99decf29616e398224247cf7
public class Article extends Persistent {
    
    private DateTime creationDate;
Solution content 
package org.jtalks.antarcticle.model.entity;

import org.joda.time.DateTime;
import org.jtalks.jcommune.model.entity.User;
import org.jtalks.jcommune.model.entity.Persistent;

/**
 *
 * @author Vitaliy Kravchwnko
 * @author Dmitry Sokolov
 */

public class Article extends Persistent {
    
    private DateTime creationDate;
File
Article.java
Developer's decision
Manual
Kind of conflict
Comment
Import
Chunk
Conflicting content 
        this.articleContent = articleContent;
    }

<<<<<<< HEAD
    public String getArticleTopic() {
        return articleTopic;
    }

    public void setArticleTopic(String articleTopic) {
        this.articleTopic = articleTopic;
    }

=======
>>>>>>> 35e4163eb9e0b95c99decf29616e398224247cf7
    public DateTime getCreationDate() {
        return creationDate;
    }
Solution content 
        this.articleContent = articleContent;
    }

    public String getArticleTopic() {
        return articleTopic;
    }

    public void setArticleTopic(String articleTopic) {
        this.articleTopic = articleTopic;
    }

    public DateTime getCreationDate() {
        return creationDate;
    }
File
Article.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
        this.creationDate = creationDate;
    }

<<<<<<< HEAD
    public User getUserCreated() {
        return userCreated;
    }

    public void setUserCreated(User userCreated) {
        this.userCreated = userCreated;
=======
    public ArticleCollection getArticleCollection() {
        return articleCollection;
    }

    public void setArticleCollection(ArticleCollection articleCollection) {
        this.articleCollection = articleCollection;
>>>>>>> 35e4163eb9e0b95c99decf29616e398224247cf7
    }
}
Solution content 
        this.creationDate = creationDate;
    }


    public User getUserCreated() {
        return userCreated;
    }

    public void setUserCreated(User userCreated) {
        this.userCreated = userCreated;
	}
	
    public ArticleCollection getArticleCollection() {
        return articleCollection;
    }

    public void setArticleCollection(ArticleCollection articleCollection) {
        this.articleCollection = articleCollection;
    }
}
File
Article.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method declaration
Method signature