| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
/*
* JTalks for uniting people
* Copyright (C) 2011 JavaTalks Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
*
* This file creation date: Apr 12, 2011 / 8:05:19 PM
* The JTalks Project
* http://www.jtalks.org
*/
package org.jtalks.jcommune.model.dao;
import org.jtalks.jcommune.model.dao.hibernate.TopicHibernateDao;
import org.jtalks.jcommune.model.entity.Topic;
/**
* DAO for the {@link Topic} objects.
* Besides the basic CRUD methods it provides a method to load any Topics with associated Posts.
* @see TopicHibernateDao
* @author Pavel Vervenko
*/
public interface TopicDao extends Dao |
| Solution content |
|---|
/**
* Copyright (C) 2011 jtalks.org Team
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
* Creation date: Apr 12, 2011 / 8:05:19 PM
* The jtalks.org Project
*/
package org.jtalks.jcommune.model.dao;
import org.jtalks.jcommune.model.entity.Topic;
/**
* DAO for the {@link Topic} objects.
* Besides the basic CRUD methods it provides a method to load any Topics with associated Posts.
* @see TopicHibernateDao
* @author Pavel Vervenko
*/
public interface TopicDao extends Dao |
| File |
|---|
| TopicDao.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |
| Import |
| Interface declaration |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
/*
* JTalks for uniting people
* Copyright (C) 2011 JavaTalks Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
*
* This file creation date: Apr 12, 2011 / 8:05:19 PM
* The JTalks Project
* http://www.jtalks.org
*/
package org.jtalks.jcommune.model.dao.hibernate;
import org.jtalks.jcommune.model.dao.TopicDao;
import org.jtalks.jcommune.model.entity.Topic;
import java.util.List;
import org.hibernate.Query;
/**
* Hibernate DAO implementation from the {@link Topic}.
*
* @author Pavel Vervenko
*/
public class TopicHibernateDao extends AbstractHibernateDao |
| Solution content |
|---|
/**
* Copyright (C) 2011 jtalks.org Team
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
* Creation date: Apr 12, 2011 / 8:05:19 PM
* The jtalks.org Project
*/
package org.jtalks.jcommune.model.dao.hibernate;
import org.jtalks.jcommune.model.dao.TopicDao;
import org.jtalks.jcommune.model.entity.Topic;
import java.util.List;
import org.hibernate.Query;
/**
* Hibernate DAO implementation from the {@link Topic}.
*
* @author Pavel Vervenko
*/
public class TopicHibernateDao extends AbstractHibernateDao |
| File |
|---|
| TopicHibernateDao.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Import |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD /* * JTalks for uniting people * Copyright (C) 2011 JavaTalks Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Also add information on how to contact you by electronic and paper mail. * * This file creation date: Apr 12, 2011 / 8:05:19 PM * The JTalks Project * http://www.jtalks.org */ package org.jtalks.jcommune.model.dao.hibernate; import java.util.List; import org.hibernate.Query; import org.jtalks.jcommune.model.dao.UserDao; import org.jtalks.jcommune.model.entity.User; /** * Hibernate implementation of UserDao. * * @author Pavel Vervenko */ public class UserHibernateDao extends AbstractHibernateDao |
| Solution content |
|---|
/** * Copyright (C) 2011 jtalks.org Team * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Also add information on how to contact you by electronic and paper mail. * Creation date: Apr 12, 2011 / 8:05:19 PM * The jtalks.org Project */ package org.jtalks.jcommune.model.dao.hibernate; import java.util.List; import org.hibernate.Query; import org.jtalks.jcommune.model.dao.UserDao; import org.jtalks.jcommune.model.entity.User; /** * Hibernate implementation of UserDao. * * @author Pavel Vervenko */ public class UserHibernateDao extends AbstractHibernateDao |
| File |
|---|
| UserHibernateDao.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Import |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
/*
* JTalks for uniting people
* Copyright (C) 2011 JavaTalks Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
*
* This file creation date: Apr 12, 2011 / 8:05:19 PM
* The JTalks Project
* http://www.jtalks.org
*/
package org.jtalks.jcommune.model.entity;
/**
* Basic class for persistent objects.
*
* @author Pavel Vervenko
*/
public abstract class Persistent {
private long id;
/**
* Get the primary id of the persistent object.
* @return the id
*/
public long getId() {
return id;
}
/**
* Set the id for the persistent object.
* @param id id to set
*/
public void setId(long id) {
this.id = id;
}
/**
* {@inheritDoc }
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
Persistent other = (Persistent) obj;
return id == other.id;
}
/**
* {@inheritDoc }
*/
@Override
public int hashCode() {
int hash = 5;
hash = 53 * hash + (int) (this.id ^ (this.id >>> 32));
return hash;
}
}
=======
/**
* Copyright (C) 2011 jtalks.org Team
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
* Creation date: Apr 12, 2011 / 8:05:19 PM
* The jtalks.org Project
*/
package org.jtalks.jcommune.model.entity;
/**
* Basic class for persistent objects.
*
* @author Pavel Vervenko
*/
public abstract class Persistent {
private long id;
/**
* Get the primary id of the persistent object.
* @return the id
*/
public long getId() {
return id;
}
/**
* Set the id for the persistent object.
* @param id id to set
*/
public void setId(long id) {
this.id = id;
}
/**
* {@inheritDoc }
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
Persistent other = (Persistent) obj;
return id == other.id;
}
/**
* {@inheritDoc }
*/
@Override
public int hashCode() {
int hash = 5;
hash = 53 * hash + (int) (this.id ^ (this.id >>> 32));
return hash;
}
}
>>>>>>> 739fc5205d59b52d3615d0201a2d3c11087d9048 |
| Solution content |
|---|
/**
* Copyright (C) 2011 jtalks.org Team
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
* Creation date: Apr 12, 2011 / 8:05:19 PM
* The jtalks.org Project
*/
package org.jtalks.jcommune.model.entity;
/**
* Basic class for persistent objects.
*
* @author Pavel Vervenko
*/
public abstract class Persistent {
private long id;
/**
* Get the primary id of the persistent object.
* @return the id
*/
public long getId() {
return id;
}
/**
* Set the id for the persistent object.
* @param id id to set
*/
public void setId(long id) {
this.id = id;
}
/**
* {@inheritDoc }
*/
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
Persistent other = (Persistent) obj;
return id == other.id;
}
/**
* {@inheritDoc }
*/
@Override
public int hashCode() {
int hash = 5;
hash = 53 * hash + (int) (this.id ^ (this.id >>> 32));
return hash;
}
} |
| File |
|---|
| Persistent.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
/** <<<<<<< HEAD /* * JTalks for uniting people * Copyright (C) 2011 JavaTalks Team * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Also add information on how to contact you by electronic and paper mail. * * This file creation date: Apr 12, 2011 / 8:05:19 PM * The JTalks Project * http://www.jtalks.org */ package org.jtalks.jcommune.model.entity; import org.joda.time.DateTime; /** * Represents the simple version of post of the forum * with String content. |
| Solution content |
|---|
/** * Copyright (C) 2011 jtalks.org Team * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Also add information on how to contact you by electronic and paper mail. * Creation date: Apr 12, 2011 / 8:05:19 PM * The jtalks.org Project */ package org.jtalks.jcommune.model.entity; import org.joda.time.DateTime; /** * Represents the simple version of post of the forum * with String content. |
| File |
|---|
| Post.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Import |
| Package declaration |
| Chunk |
|---|
| Conflicting content |
|---|
/**
<<<<<<< HEAD
/*
* JTalks for uniting people
* Copyright (C) 2011 JavaTalks Team
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
*
* This file creation date: Apr 12, 2011 / 8:05:19 PM
* The JTalks Project
* http://www.jtalks.org
*/
package org.jtalks.jcommune.model.entity;
import java.util.ArrayList;
import java.util.List;
import org.joda.time.DateTime;
/**
* Represents the topic of the forum.
* Contains the list of related {@link Post}.
* All Posts will be cascade deleted with the associated Topic.
* The fields creationDate, topicStarter and Title are required and can't be |
| Solution content |
|---|
/**
* Copyright (C) 2011 jtalks.org Team
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* Also add information on how to contact you by electronic and paper mail.
* Creation date: Apr 12, 2011 / 8:05:19 PM
* The jtalks.org Project
*/
package org.jtalks.jcommune.model.entity;
import java.util.ArrayList;
import java.util.List;
import org.joda.time.DateTime;
/**
* Represents the topic of the forum.
* Contains the list of related {@link Post}.
* All Posts will be cascade deleted with the associated Topic.
* The fields creationDate, topicStarter and Title are required and can't be |
| File |
|---|
| Topic.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Class declaration |
| Comment |
| Import |
| Package declaration |