Projects >> wro4j >>8b67a6c5bbc999d1cc29197440b9353af938bf5a

Chunk
Conflicting content 
=======

import org.apache.commons.io.FilenameUtils;

<<<<<<< HEAD
import ro.isdc.wro.extensions.processor.support.JsTemplateCompiler;
>>>>>>> e649207150582ea34d7abc65794573439df7f124
import ro.isdc.wro.extensions.processor.support.dustjs.DustJs;
import ro.isdc.wro.extensions.processor.support.template.AbstractJsTemplateCompiler;
import ro.isdc.wro.model.resource.Resource;
Solution content 
import org.apache.commons.io.FilenameUtils;

import ro.isdc.wro.extensions.processor.support.dustjs.DustJs;
import ro.isdc.wro.extensions.processor.support.template.AbstractJsTemplateCompiler;
import ro.isdc.wro.model.resource.Resource;
File
DustJsProcessor.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import java.io.Writer;

import org.apache.commons.io.IOUtils;
<<<<<<< HEAD

import ro.isdc.wro.extensions.processor.support.JsTemplateCompiler;
=======
>>>>>>> e649207150582ea34d7abc65794573439df7f124
import ro.isdc.wro.extensions.processor.support.ObjectPoolHelper;
import ro.isdc.wro.extensions.processor.support.template.AbstractJsTemplateCompiler;
import ro.isdc.wro.model.resource.Resource;
Solution content 
import java.io.Writer;

import org.apache.commons.io.IOUtils;

import ro.isdc.wro.extensions.processor.support.ObjectPoolHelper;
import ro.isdc.wro.extensions.processor.support.template.AbstractJsTemplateCompiler;
import ro.isdc.wro.model.resource.Resource;
File
JsTemplateCompilerProcessor.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.util.ObjectFactory;

<<<<<<< HEAD
public abstract class JsTemplateCompilerProcessor implements ResourceProcessor {
  private final ObjectPoolHelper enginePool;
=======
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;

/**
 * A base class for template processors like: dustJS or hoganJS.
 *  
 * @author Eivind Barstad Waaler
 * @since 1.4.7
 * @created 11 May 2012
 */
public abstract class JsTemplateCompilerProcessor implements ResourcePreProcessor {
  private final ObjectPoolHelper enginePool;
>>>>>>> e649207150582ea34d7abc65794573439df7f124

  public JsTemplateCompilerProcessor() {
    enginePool = new ObjectPoolHelper(new ObjectFactory() {
Solution content 
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.util.ObjectFactory;

/**
 * A base class for template processors like: dustJS or hoganJS.
 *  
 * @author Eivind Barstad Waaler
 * @since 1.4.7
 * @created 11 May 2012
 */
public abstract class JsTemplateCompilerProcessor implements ResourceProcessor {
  private final ObjectPoolHelper enginePool;

  public JsTemplateCompilerProcessor() {
    enginePool = new ObjectPoolHelper(new ObjectFactory() {
File
JsTemplateCompilerProcessor.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Comment
Import
Chunk
Conflicting content 
import ro.isdc.wro.extensions.script.RhinoScriptBuilder;
import ro.isdc.wro.util.WroUtil;

<<<<<<< HEAD:wro4j-extensions/src/main/java/ro/isdc/wro/extensions/processor/support/JsTemplateCompiler.java
public abstract class JsTemplateCompiler {
  private ScriptableObject scope;
=======
import java.io.IOException;
import java.io.InputStream;

>>>>>>> e649207150582ea34d7abc65794573439df7f124:wro4j-extensions/src/main/java/ro/isdc/wro/extensions/processor/support/template/AbstractJsTemplateCompiler.java

/**
 * A base class for template processors like: dustJS or hoganJS.
Solution content 
import ro.isdc.wro.extensions.script.RhinoScriptBuilder;
import ro.isdc.wro.util.WroUtil;


/**
 * A base class for template processors like: dustJS or hoganJS.
File
AbstractJsTemplateCompiler.java
Developer's decision
None
Kind of conflict
Attribute
Class signature
Import