Projects >> riot >>537460a44149ab60c664fd74d089ba4d587a909d

Chunk
Conflicting content 
			}
		}
	}
<<<<<<< HEAD

=======
		
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
	/**
	 * Sets whether caching should be prevented, i.e. the CacheItem should
	 * be discarded.
Solution content 
			}
		}
	}

	/**
	 * Sets whether caching should be prevented, i.e. the CacheItem should
	 * be discarded.
File
TaggingContext.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
     */
    private static String getListTag(ComponentListLocation location,
        boolean preview) {
<<<<<<< HEAD

        return location.toString() + (preview ? "-preview" : "-live");
    }
    
	public static void addListTag(HttpServletRequest request, 
=======
        
        return location.toString() + (preview ? "-preview" : "-live");
    }

    public static void addListTag(HttpServletRequest request, 
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
			ComponentList list, boolean preview) {
		
		TaggingContext.tag(request, getListTag(list, preview));
Solution content 
     */
    private static String getListTag(ComponentListLocation location,
        boolean preview) {

        return location.toString() + (preview ? "-preview" : "-live");
    }
    
	public static void addListTag(HttpServletRequest request, 
			ComponentList list, boolean preview) {
		
		TaggingContext.tag(request, getListTag(list, preview));
File
ComponentCacheUtils.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
	    ComponentCacheUtils.addListTag(request, location, isPreview());
	    super.onListNotFound(location, config, request, response);
	}
<<<<<<< HEAD
=======
	
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
		
	private class ListProcessor implements CacheableRequestProcessor {
Solution content 
	    ComponentCacheUtils.addListTag(request, location, isPreview());
	    super.onListNotFound(location, config, request, response);
	}
		
	private class ListProcessor implements CacheableRequestProcessor {
File
CachingRenderStrategy.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
		Page page = (Page) entity;
		pageDao.getRootNode().addChildNode(page.getNode());
	}
<<<<<<< HEAD

=======
	
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
}
Solution content 
		Page page = (Page) entity;
		pageDao.getRootNode().addChildNode(page.getNode());
	}

}
File
SiteRiotDao.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
				ServletUtils.getServerNameAndPort(request),
				request.getContextPath(), attributes);
	}
<<<<<<< HEAD
	
	public Page getMasterPage() {
		return page.getMasterPage();
	}
	
=======

	public Page getMasterPage() {
		return page.getMasterPage();
	}

>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
	public boolean isWildcard() {
		return page.isWildcard();
	}
Solution content 
				ServletUtils.getServerNameAndPort(request),
				request.getContextPath(), attributes);
	}
	
	public Page getMasterPage() {
		return page.getMasterPage();
	}
	
	public boolean isWildcard() {
		return page.isWildcard();
	}
File
PageFacade.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
		int pageSize = params.getPageSize();
		if (params.getOffset() >= itemsTotal) {
			params.setPage(params.getPage() - 1);
<<<<<<< HEAD
		}		
=======
		}
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
		Collection beans = listConfig.getDao().list(parent, params);
		if (itemsTotal < beans.size()) {
			itemsTotal = beans.size();
Solution content 
		int pageSize = params.getPageSize();
		if (params.getOffset() >= itemsTotal) {
			params.setPage(params.getPage() - 1);
		}		
		Collection beans = listConfig.getDao().list(parent, params);
		if (itemsTotal < beans.size()) {
			itemsTotal = beans.size();
File
ListSession.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Hibernate;
<<<<<<< HEAD
=======
import org.hibernate.Session;
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
import org.riotfamily.common.web.util.ServletUtils;
import org.riotfamily.pages.dao.PageDao;
import org.riotfamily.pages.model.Site;
Solution content 
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.Hibernate;
import org.riotfamily.common.web.util.ServletUtils;
import org.riotfamily.pages.dao.PageDao;
import org.riotfamily.pages.model.Site;
File
SiteIdentifier.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
				if (sites != null) {
				    Iterator i = sites.iterator();
				    while (i.hasNext()) {
<<<<<<< HEAD
				        Hibernate.initialize(((Site) i.next()).getAliases());
				    }
=======
                        Hibernate.initialize(((Site) i.next()).getAliases());
                    }
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
				}
			}
		});
Solution content 
				if (sites != null) {
				    Iterator i = sites.iterator();
				    while (i.hasNext()) {
				        Hibernate.initialize(((Site) i.next()).getAliases());
				    }
				}
			}
		});
File
SiteIdentifier.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
 */
public class SiteSearchController extends SearchController {

<<<<<<< HEAD
    protected Query createFilterQuery(HttpServletRequest request) {
        Query query = null;
        
        Page currentPage = PageResolver.getResolvedPage(request);
        if (currentPage != null) {
            String siteId = currentPage.getSite().getId().toString();
            
            query = new TermQuery(new Term("siteId", siteId));
        }
        
        return combineFilterQueries(query, super.createFilterQuery(request));
    }
    
    private Query combineFilterQueries(Query q, Query r) {
        if (q == null && r == null) return null;
        if (q == null) return r;
        if (r == null) return q;

        BooleanQuery query = new BooleanQuery();
        query.add(q, Occur.MUST);
        query.add(r, Occur.MUST);
        return query;
    }
=======
	protected Query createFilterQuery(HttpServletRequest request) {
	    Query query = null;
	    
		Page currentPage = PageResolver.getResolvedPage(request);
		if (currentPage != null) {
			String siteId = currentPage.getSite().getId().toString();
			
			query = new TermQuery(new Term("siteId", siteId));
		}
		
		return combineFilterQueries(query, super.createFilterQuery(request));
	}
	
	private Query combineFilterQueries(Query q, Query r) {
	    if (q == null && r == null) return null;
	    if (q == null) return r;
	    if (r == null) return q;

	    BooleanQuery query = new BooleanQuery();
        query.add(q, Occur.MUST);
        query.add(r, Occur.MUST);
        return query;
	}
>>>>>>> cf06cea654a10eaa876aaa0296c8bc82310fc5a9
}
Solution content 
 */
public class SiteSearchController extends SearchController {

    protected Query createFilterQuery(HttpServletRequest request) {
        Query query = null;
        
        Page currentPage = PageResolver.getResolvedPage(request);
        if (currentPage != null) {
            String siteId = currentPage.getSite().getId().toString();
            
            query = new TermQuery(new Term("siteId", siteId));
        }
        
        return combineFilterQueries(query, super.createFilterQuery(request));
    }
    
    private Query combineFilterQueries(Query q, Query r) {
        if (q == null && r == null) return null;
        if (q == null) return r;
        if (r == null) return q;

        BooleanQuery query = new BooleanQuery();
        query.add(q, Occur.MUST);
        query.add(r, Occur.MUST);
        return query;
    }
}
File
SiteSearchController.java
Developer's decision
Version 1
Kind of conflict
Method declaration