Projects >> riot >>ccd9f769430d93081d627f4370dd431e7c2326e1

Chunk
Conflicting content 
	

import org.hibernate.Query;
import org.hibernate.Session;
<<<<<<< HEAD:common/src/org/riotfamily/common/hibernate/AbstractConditionalSetupBean.java
import org.hibernate.SessionFactory;

public abstract class AbstractConditionalSetupBean extends AbstractSetupBean {

	private String condition;
=======
import org.springframework.beans.factory.InitializingBean;
import org.springframework.orm.hibernate3.HibernateCallback;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
import org.springframework.transaction.PlatformTransactionManager;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallbackWithoutResult;
import org.springframework.transaction.support.TransactionTemplate;

	private PlatformTransactionManager tx;
public class SetupBean extends HibernateDaoSupport implements InitializingBean {

	private List objects;

	private String condition;
	
	public void setTransactionManager(PlatformTransactionManager tx) {
		this.tx = tx;
	}
		
	public void setObjects(List objects) {
		this.objects = objects;
	}
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f:riot-hibernate/src/org/riotfamily/riot/hibernate/support/SetupBean.java

	public AbstractConditionalSetupBean(SessionFactory sessionFactory) {
		super(sessionFactory);
Solution content 
import org.hibernate.Query;
import org.hibernate.Session;
import org.hibernate.SessionFactory;

public abstract class AbstractConditionalSetupBean extends AbstractSetupBean {

	private String condition;

	public AbstractConditionalSetupBean(SessionFactory sessionFactory) {
		super(sessionFactory);
File
AbstractConditionalSetupBean.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class signature
Import
Method declaration
Chunk
Conflicting content 
		this.condition = condition;
	}

<<<<<<< HEAD:common/src/org/riotfamily/common/hibernate/AbstractConditionalSetupBean.java
	@Override
	protected final void setup(Session session) throws Exception {
		if (isSetupRequired(session)) {
			doSetup(session);
		}
	}
	
	protected abstract void doSetup(Session session);

	private boolean isSetupRequired(Session session) {
=======
	protected void initDao() throws Exception {
		if (setupRequired()) {
			if (tx != null) {
				new TransactionTemplate(tx).execute(new TransactionCallbackWithoutResult() {
				
					@Override
					protected void doInTransactionWithoutResult(TransactionStatus status) {
						saveObjects();		
					}
				});
			}
			else {
				saveObjects();
			}
			
		}
	}
	
	protected void saveObjects() {
		for (Object object : objects) {
			getHibernateTemplate().save(object);
		}	
	}
	
	protected boolean setupRequired() {
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f:riot-hibernate/src/org/riotfamily/riot/hibernate/support/SetupBean.java
		if (condition == null) {
			return true;
		}
Solution content 
		this.condition = condition;
	}

	@Override
	protected final void setup(Session session) throws Exception {
		if (isSetupRequired(session)) {
			doSetup(session);
		}
	}
	
	protected abstract void doSetup(Session session);

	private boolean isSetupRequired(Session session) {
		if (condition == null) {
			return true;
		}
File
AbstractConditionalSetupBean.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Method interface
Method signature
Chunk
Conflicting content 
						for (Object entity : i.getUpdatedEntites()) {
							Object mergedEntity = session.merge(entity);
		final Interceptions i = interceptions.get();
		if (i != null) {
			try {
<<<<<<< HEAD:common/src/org/riotfamily/common/hibernate/EntityListenerInterceptor.java
				getHibernateTemplate().execute(new HibernateCallbackWithoutResult() {
					public void doWithoutResult(Session session) throws Exception {
						for (Object entity : i.getSavedEntites()) {
							Object mergedEntity = session.merge(entity);
							List> listeners = getListeners(mergedEntity);
							for (EntityListener listener : listeners) {
								listener.onSave(mergedEntity);
							}	
						}
							List> listeners = getListeners(mergedEntity);
							for (EntityListener listener : listeners) {
								listener.onUpdate(mergedEntity);
							}	
						}
					}
				});
=======
				Session session = createTemporarySession();
				for (Object entity : i.getSavedEntities()) {
					Object mergedEntity = session.merge(entity);
					List> listeners = getListeners(mergedEntity);
					for (EntityListener listener : listeners) {
						listener.onSave(mergedEntity);
					}	
				}
				for (Object entity : i.getUpdatedEntities()) {
					Object mergedEntity = session.merge(entity);
					List> listeners = getListeners(mergedEntity);
					for (EntityListener listener : listeners) {
						listener.onUpdate(mergedEntity);
					}	
				}
				session.flush();
				session.close();
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f:riot-hibernate/src/org/riotfamily/riot/hibernate/interceptor/EntityListenerInterceptor.java
			}
			catch (Exception e) {
				throw new CallbackException(e);
Solution content 
		final Interceptions i = interceptions.get();
		if (i != null) {
			try {
				getHibernateTemplate().execute(new HibernateCallbackWithoutResult() {
					public void doWithoutResult(Session session) throws Exception {
						for (Object entity : i.getSavedEntites()) {
							Object mergedEntity = session.merge(entity);
							List> listeners = getListeners(mergedEntity);
							for (EntityListener listener : listeners) {
								listener.onSave(mergedEntity);
							}	
						}
						for (Object entity : i.getUpdatedEntites()) {
							Object mergedEntity = session.merge(entity);
							List> listeners = getListeners(mergedEntity);
							for (EntityListener listener : listeners) {
								listener.onUpdate(mergedEntity);
							}	
						}
					}
				});
			}
			catch (Exception e) {
				throw new CallbackException(e);
File
EntityListenerInterceptor.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
 * ***** END LICENSE BLOCK ***** */
package org.riotfamily.core.screen.list.command.impl;

<<<<<<< HEAD:core/src/org/riotfamily/core/screen/list/command/impl/EditCommand.java
import org.riotfamily.core.screen.ScreenContext;
import org.riotfamily.core.screen.list.command.CommandContext;
import org.riotfamily.core.screen.list.command.CommandResult;
import org.riotfamily.core.screen.list.command.impl.support.AbstractSingleItemCommand;
import org.riotfamily.core.screen.list.command.result.GotoUrlResult;
=======
import org.riotfamily.riot.list.command.CommandContext;
import org.riotfamily.riot.list.command.CommandResult;
import org.riotfamily.riot.list.command.result.BatchResult;
import org.riotfamily.riot.list.command.result.ClearSelectionResult;
import org.riotfamily.riot.list.command.result.RefreshSiblingsResult;
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f:riot/src/org/riotfamily/riot/list/command/core/PasteCommand.java

public class EditCommand extends AbstractSingleItemCommand {
Solution content 
 * ***** END LICENSE BLOCK ***** */
package org.riotfamily.core.screen.list.command.impl;

import org.riotfamily.core.screen.ScreenContext;
import org.riotfamily.core.screen.list.command.CommandContext;
import org.riotfamily.core.screen.list.command.CommandResult;
import org.riotfamily.core.screen.list.command.impl.support.AbstractSingleItemCommand;
import org.riotfamily.core.screen.list.command.result.GotoUrlResult;

public class EditCommand extends AbstractSingleItemCommand {
File
EditCommand.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	}
	
	@Override
<<<<<<< HEAD:core/src/org/riotfamily/core/screen/list/command/impl/EditCommand.java
	protected CommandResult execute(CommandContext context, Object item) {
		ScreenContext childContext = context.createItemContext(item);
		return new GotoUrlResult(context.getRequest(), childContext.getUrl());
=======
	public boolean isEnabled(CommandContext context) {
		Clipboard cb = Clipboard.get(context);
		return cb.canPaste(context);
	}

	public CommandResult execute(CommandContext context) {
		Clipboard cb = Clipboard.get(context);
		cb.paste(context);
		return new BatchResult(
			new RefreshSiblingsResult(context),
			new ClearSelectionResult());
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f:riot/src/org/riotfamily/riot/list/command/core/PasteCommand.java
	}

}
Solution content 
	}
	
	@Override
	protected CommandResult execute(CommandContext context, Object item) {
		ScreenContext childContext = context.createItemContext(item);
		return new GotoUrlResult(context.getRequest(), childContext.getUrl());
	}

}
File
EditCommand.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
public class ImportMessageEntriesCommand extends DialogCommand {

<<<<<<< HEAD
=======
	public static final String ACTION_IMPORT = "import";

>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
	private static final RiotLog log = RiotLog.get(ImportMessageEntriesCommand.class);

	private DbMessageSourceDao dao;
Solution content 
public class ImportMessageEntriesCommand extends DialogCommand {

	private static final RiotLog log = RiotLog.get(ImportMessageEntriesCommand.class);

	private DbMessageSourceDao dao;
File
ImportMessageEntriesCommand.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
			return label;
		}
		if (getLabelKey() != null) {
<<<<<<< HEAD
			return MessageUtils.getMessage(this, getLabelKey(), null, getDefaultLabel());
=======
			return MessageUtils.getMessage(this, getLabelKey());
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
		}
		return "Submit";
	}
Solution content 
			return label;
		}
		if (getLabelKey() != null) {
			return MessageUtils.getMessage(this, getLabelKey(), null, getDefaultLabel());
		}
		return "Submit";
	}
File
Button.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement
Chunk
Conflicting content 
 * ***** END LICENSE BLOCK ***** */
package org.riotfamily.pages.dao;

<<<<<<< HEAD
=======
import java.util.ArrayList;
import java.util.Collection;

>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
import org.riotfamily.pages.model.Page;
import org.riotfamily.pages.model.SiteMapItem;
Solution content 
 * ***** END LICENSE BLOCK ***** */
package org.riotfamily.pages.dao;

import org.riotfamily.pages.model.Page;
import org.riotfamily.pages.model.SiteMapItem;
File
PageValidationUtils.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	public static boolean isValidChild(SiteMapItem parent, Page page) {

	private PageValidationUtils() { }

<<<<<<< HEAD

		for (Page child : parent.getChildPages()) {
			if (!child.equals(page) && child.getPathComponent().equals(page.getPathComponent())) {
				return false;
			}
		}
		return true;
=======
	public static boolean isValidChild(PageNode node, Page page) {
		Collection childs = getChildsWithoutPage(node, page);
		return !containsPathComponent(childs, page.getPathComponent());
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
	}

	/*
Solution content 
	private PageValidationUtils() { }


	public static boolean isValidChild(SiteMapItem parent, Page page) {
		for (Page child : parent.getChildPages()) {
			if (!child.equals(page) && child.getPathComponent().equals(page.getPathComponent())) {
				return false;
			}
		}
		return true;
	}

	/*
File
PageValidationUtils.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
		result.remove(item);
		return result;
	}
<<<<<<< HEAD
	*/
=======
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f

}
Solution content 
		result.remove(item);
		return result;
	}
	*/

}
File
PageValidationUtils.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
		}
	public Collection list(Object parent, ListParams params)
			throws DataAccessException {

<<<<<<< HEAD
		SiteMapItem parentItem = (SiteMapItem) parent;
		if (parentItem == null) {
			parentItem = Site.loadDefaultSite();
=======
		if (parent instanceof Page) {
			Page parentPage = (Page) parent;
			return parentPage.getChildPagesWithFallback();
		else {
			Site site;
			if (parent instanceof Site) {
				site = (Site) parent;
			}
			else {
				site = pageDao.getDefaultSite();
			}
			return pageDao.getRootNode().getChildPagesWithFallback(site);
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
		}
		return parentItem.getChildPagesWithFallback();
	}
Solution content 
	public Collection list(Object parent, ListParams params)
			throws DataAccessException {

		SiteMapItem parentItem = (SiteMapItem) parent;
		if (parentItem == null) {
			parentItem = Site.loadDefaultSite();
		}
		return parentItem.getChildPagesWithFallback();
	}
File
PageRiotDao.java
Developer's decision
Version 1
Kind of conflict
Cast expression
If statement
Method invocation
Return statement
Variable
Chunk
Conflicting content 
		for (Page child : page.getChildPages()) {
			updatePaths(child);
		}
<<<<<<< HEAD
=======
		pageDao.validate(parentNode, page);
		pageDao.moveNode(node, parentNode);
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
	}

	public void removeChild(Object entity, Object parent) {
Solution content 
		for (Page child : page.getChildPages()) {
			updatePaths(child);
		}
	}

	public void removeChild(Object entity, Object parent) {
File
PageRiotDao.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.riotfamily.core.screen.list.ListRenderContext;
import org.riotfamily.pages.model.Page;
import org.riotfamily.pages.model.Site;
<<<<<<< HEAD
=======
import org.riotfamily.riot.list.ui.ListSession;
import org.riotfamily.riot.ui.CssClassRenderer;
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f

/**
 * @author Felix Gnass [fgnass at neteye dot de]
Solution content 
import org.riotfamily.core.screen.list.ListRenderContext;
import org.riotfamily.pages.model.Page;
import org.riotfamily.pages.model.Site;

/**
 * @author Felix Gnass [fgnass at neteye dot de]
File
PublishStatusRenderer.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 */
public class PublishStatusRenderer extends CssClassRenderer {

<<<<<<< HEAD
	public void render(Object obj, RenderContext context, PrintWriter writer) {
		writer.print("
");
=======
	private static final String LABEL_MESSAGE_KEY = "publish-status.";
	
	@Override
	public String getLabelMessageKey() {
		return LABEL_MESSAGE_KEY;
	}
	
	@Override
	public boolean isAppendLabel() {
		return true;
	}
	
	@Override
	protected String convertToString(Object obj, RenderContext context) {
		return getStyleClass((Page) obj, (ListSession) context);
>>>>>>> 260fcfe098601f85ba966d6abaecb3c41c06553f
	}
	
	private String getStyleClass(Page page, ListRenderContext context) {
Solution content 
 */
public class PublishStatusRenderer implements ObjectRenderer {

	public void render(Object obj, RenderContext context, PrintWriter writer) {
		writer.print("
");
	}
	
	private String getStyleClass(Page page, ListRenderContext context) {
File
PublishStatusRenderer.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute
Method declaration
Method invocation
Method signature
Return statement