Projects >> wro4j >>91fae4961c43c60ed5bd01c07e537702311c7d24

Chunk
Conflicting content 
   * Init processors with default values.
   */
  private void initProcessors() {
<<<<<<< HEAD
    preProcessors.putAll(createCommonProcessors());
    preProcessors.put(CssUrlRewritingProcessor.ALIAS, new CssUrlRewritingProcessor());
    preProcessors.put(CssImportPreProcessor.ALIAS, new CssImportPreProcessor());
    preProcessors.put(SemicolonAppenderPreProcessor.ALIAS, new SemicolonAppenderPreProcessor());
    preProcessors.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    preProcessors.put(DuplicatesAwareCssDataUriPreProcessor.ALIAS_DUPLICATE, new DuplicatesAwareCssDataUriPreProcessor());
    postProcessors.putAll(createCommonProcessors());
=======
    preProcessors.put(CssUrlRewritingProcessor.ALIAS, new CssUrlRewritingProcessor());
    preProcessors.put(BomStripperPreProcessor.ALIAS, new BomStripperPreProcessor());
    preProcessors.put(CssImportPreProcessor.ALIAS, new CssImportPreProcessor());
    preProcessors.put(CssVariablesProcessor.ALIAS, new CssVariablesProcessor());
    preProcessors.put(SemicolonAppenderPreProcessor.ALIAS, new SemicolonAppenderPreProcessor());
    preProcessors.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    preProcessors.put(DuplicatesAwareCssDataUriPreProcessor.ALIAS_DUPLICATE, new DuplicatesAwareCssDataUriPreProcessor());
    preProcessors.put(CssCompressorProcessor.ALIAS, new CssCompressorProcessor());
    preProcessors.put(JawrCssMinifierProcessor.ALIAS, new JawrCssMinifierProcessor());
    preProcessors.put(CssMinProcessor.ALIAS, new CssMinProcessor());
    preProcessors.put(JSMinProcessor.ALIAS, new JSMinProcessor());
    preProcessors.put(VariablizeColorsCssProcessor.ALIAS, new VariablizeColorsCssProcessor());
    preProcessors.put(ConformColorsCssProcessor.ALIAS, new ConformColorsCssProcessor());

    postProcessors.put(CssVariablesProcessor.ALIAS, new CssVariablesProcessor());
    postProcessors.put(CssCompressorProcessor.ALIAS, new CssCompressorProcessor());
    postProcessors.put(JawrCssMinifierProcessor.ALIAS, new JawrCssMinifierProcessor());
    postProcessors.put(JSMinProcessor.ALIAS, new JSMinProcessor());
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71

    contributePreProcessors(preProcessors);
    contributePostProcessors(postProcessors);
Solution content 
   * Init processors with default values.
   */
  private void initProcessors() {
    preProcessors.putAll(createCommonProcessors());
    preProcessors.put(CssUrlRewritingProcessor.ALIAS, new CssUrlRewritingProcessor());
    preProcessors.put(CssImportPreProcessor.ALIAS, new CssImportPreProcessor());
    preProcessors.put(SemicolonAppenderPreProcessor.ALIAS, new SemicolonAppenderPreProcessor());
    preProcessors.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    preProcessors.put(DuplicatesAwareCssDataUriPreProcessor.ALIAS_DUPLICATE, new DuplicatesAwareCssDataUriPreProcessor());
    postProcessors.putAll(createCommonProcessors());

    contributePreProcessors(preProcessors);
    contributePostProcessors(postProcessors);
File
ConfigurableWroManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
 * @created Created on Feb 20, 2010
 */
public final class BomStripperPreProcessor
<<<<<<< HEAD
    implements ResourceProcessor {
=======
    implements ResourcePreProcessor, ResourcePostProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "bomStripper";
  /**
   * A stream which removes BOM characters.
Solution content 
 * @created Created on Feb 20, 2010
 */
public final class BomStripperPreProcessor
    implements ResourceProcessor {
  public static final String ALIAS = "bomStripper";
  /**
   * A stream which removes BOM characters.
File
BomStripperPreProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
 */
@SupportedResourceType(ResourceType.CSS)
public class ConformColorsCssProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "conformColors";

  /**
Solution content 
 */
@SupportedResourceType(ResourceType.CSS)
public class ConformColorsCssProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "conformColors";

  /**
File
ConformColorsCssProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class CssCompressorProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "cssCompressor";

  /**
Solution content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class CssCompressorProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "cssCompressor";

  /**
File
CssCompressorProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class CssMinProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
  public static final String ALIAS = "cssMin";
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71

  /**
   * {@inheritDoc}
Solution content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class CssMinProcessor
  implements ResourceProcessor {

  public static final String ALIAS = "cssMin";

  /**
   * {@inheritDoc}
File
CssMinProcessor.java
Developer's decision
Combination
Kind of conflict
Attribute
Chunk
Conflicting content 
public class CssUrlRewritingProcessor
  extends AbstractCssUrlRewritingProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(CssUrlRewritingProcessor.class);
<<<<<<< HEAD
  public static final String ALIAS = "cssUrlRewriting";
  /**
   * Constant for WEB-INF folder.
   */
  private static final String PROTECTED_PREFIX = "/WEB-INF/";

  /**
=======
  public static final String ALIAS = "cssUrlRewriting";  /**
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
   * Resources mapping path. If request uri contains this, the filter will dispatch it to the original resource.
   */
  public static final String PATH_RESOURCES = "wroResources";
Solution content 
public class CssUrlRewritingProcessor
  extends AbstractCssUrlRewritingProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(CssUrlRewritingProcessor.class);
  public static final String ALIAS = "cssUrlRewriting";
  /**
   * Constant for WEB-INF folder.
   */
  private static final String PROTECTED_PREFIX = "/WEB-INF/";

  /**
   * Resources mapping path. If request uri contains this, the filter will dispatch it to the original resource.
   */
  public static final String PATH_RESOURCES = "wroResources";
File
CssUrlRewritingProcessor.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class JawrCssMinifierProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
  public static final String ALIAS = "cssMinJawr";

  /**
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
  public static final String ALIAS = "cssMinJawr";  /**
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
   * {@inheritDoc}
   */
  public void process(final Reader reader, final Writer writer)
Solution content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class JawrCssMinifierProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "cssMinJawr";

  /**
   * {@inheritDoc}
   */
  public void process(final Reader reader, final Writer writer)
File
JawrCssMinifierProcessor.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Chunk
Conflicting content 
 */
@SupportedResourceType(ResourceType.CSS)
public class VariablizeColorsCssProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "variablizeColors";

  /**
Solution content 
 */
@SupportedResourceType(ResourceType.CSS)
public class VariablizeColorsCssProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "variablizeColors";

  /**
File
VariablizeColorsCssProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
 */
@SupportedResourceType(ResourceType.JS)
public class SemicolonAppenderPreProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "semicolonAppender";
  /**
   * check if the last character is a semicolon and append only if one is missing.
Solution content 
 */
@SupportedResourceType(ResourceType.JS)
public class SemicolonAppenderPreProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "semicolonAppender";
  /**
   * check if the last character is a semicolon and append only if one is missing.
File
SemicolonAppenderPreProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import ro.isdc.wro.extensions.processor.js.UglifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.YUIJsCompressorProcessor;
import ro.isdc.wro.manager.factory.ConfigurableWroManagerFactory;
<<<<<<< HEAD
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssDataUriPreProcessor;
=======
import ro.isdc.wro.model.resource.processor.ResourcePostProcessor;
import ro.isdc.wro.model.resource.processor.ResourcePreProcessor;
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71

import com.google.javascript.jscomp.CompilationLevel;
Solution content 
import ro.isdc.wro.extensions.processor.js.UglifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.YUIJsCompressorProcessor;
import ro.isdc.wro.manager.factory.ConfigurableWroManagerFactory;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssDataUriPreProcessor;

import com.google.javascript.jscomp.CompilationLevel;
File
ExtensionsConfigurableWroManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected void contributePostProcessors(final Map map) {
    map.putAll(createCommonProcessors());
=======
  protected void contributePostProcessors(final Map map) {
    pupulateMap(map);
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  }

  /**
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected void contributePostProcessors(final Map map) {
    map.putAll(createCommonProcessors());
  }

  /**
File
ExtensionsConfigurableWroManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected void contributePreProcessors(final Map map) {
    map.putAll(createCommonProcessors());
    map.put("cssDataUri", new CssDataUriPreProcessor());
  }

  /**
   * @return a map of processors to be used as both: pre & post processor.
   */
  private Map createCommonProcessors() {
    final Map map = new HashMap();
    map.put(YUICssCompressorProcessor.ALIAS, new YUICssCompressorProcessor());
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, YUIJsCompressorProcessor.doMungeCompressor());
    map.put(DojoShrinksafeCompressorProcessor.ALIAS, new DojoShrinksafeCompressorProcessor());
    map.put(UglifyJsProcessor.ALIAS_UGLIFY, new UglifyJsProcessor());
    map.put(UglifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new LessCssProcessor());
    map.put(SassCssProcessor.ALIAS, new SassCssProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_SIMPLE, new GoogleClosureCompressorProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_ADVANCED, new GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS));
    map.put(CoffeeScriptProcessor.ALIAS, new CoffeeScriptProcessor());
    map.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    map.put(CJsonProcessor.ALIAS_PACK, CJsonProcessor.packProcessor());
    map.put(CJsonProcessor.ALIAS_UNPACK, CJsonProcessor.unpackProcessor());
    map.put(JsonHPackProcessor.ALIAS_PACK, JsonHPackProcessor.packProcessor());
    map.put(JsonHPackProcessor.ALIAS_UNPACK, JsonHPackProcessor.unpackProcessor());
    map.put(JsHintProcessor.ALIAS, new JsHintProcessor());
    map.put(CssLintProcessor.ALIAS, new CssLintProcessor());

    return map;
=======
  protected void contributePreProcessors(final Map map) {
    pupulateMap(map);
  }

  @SuppressWarnings("unchecked")
  private static  void pupulateMap(final Map map) {
    map.put(YUICssCompressorProcessor.ALIAS, (T) new YUICssCompressorProcessor());
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, (T) YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, (T) YUIJsCompressorProcessor.doMungeCompressor());
    map.put(DojoShrinksafeCompressorProcessor.ALIAS, (T) new DojoShrinksafeCompressorProcessor());
    map.put(UglifyJsProcessor.ALIAS_UGLIFY, (T) new UglifyJsProcessor());
    map.put(BeautifyJsProcessor.ALIAS_BEAUTIFY, (T) new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, (T) new PackerJsProcessor());
    map.put(LessCssProcessor.ALIAS, (T) new LessCssProcessor());
    map.put(SassCssProcessor.ALIAS, (T) new SassCssProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_SIMPLE, (T) new GoogleClosureCompressorProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_ADVANCED, (T) new GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS));
    map.put(CoffeeScriptProcessor.ALIAS, (T) new CoffeeScriptProcessor());
    map.put(CJsonProcessor.ALIAS_PACK, (T) CJsonProcessor.packProcessor());
    map.put(CJsonProcessor.ALIAS_UNPACK, (T) CJsonProcessor.unpackProcessor());
    map.put(JsonHPackProcessor.ALIAS_PACK, (T) JsonHPackProcessor.packProcessor());
    map.put(JsonHPackProcessor.ALIAS_UNPACK, (T) JsonHPackProcessor.unpackProcessor());
    map.put(JsHintProcessor.ALIAS, (T) new JsHintProcessor());
    map.put(CssLintProcessor.ALIAS, (T) new CssLintProcessor());
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  }
}
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected void contributePreProcessors(final Map map) {
    map.putAll(createCommonProcessors());
    map.put("cssDataUri", new CssDataUriPreProcessor());
  }

  /**
   * @return a map of processors to be used as both: pre & post processor.
   */
  private Map createCommonProcessors() {
    final Map map = new HashMap();
    map.put(YUICssCompressorProcessor.ALIAS, new YUICssCompressorProcessor());
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, YUIJsCompressorProcessor.doMungeCompressor());
    map.put(DojoShrinksafeCompressorProcessor.ALIAS, new DojoShrinksafeCompressorProcessor());
    map.put(UglifyJsProcessor.ALIAS_UGLIFY, new UglifyJsProcessor());
    map.put(UglifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new LessCssProcessor());
    map.put(SassCssProcessor.ALIAS, new SassCssProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_SIMPLE, new GoogleClosureCompressorProcessor());
    map.put(GoogleClosureCompressorProcessor.ALIAS_ADVANCED, new GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS));
    map.put(CoffeeScriptProcessor.ALIAS, new CoffeeScriptProcessor());
    map.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    map.put(CJsonProcessor.ALIAS_PACK, CJsonProcessor.packProcessor());
    map.put(CJsonProcessor.ALIAS_UNPACK, CJsonProcessor.unpackProcessor());
    map.put(JsonHPackProcessor.ALIAS_PACK, JsonHPackProcessor.packProcessor());
    map.put(JsonHPackProcessor.ALIAS_UNPACK, JsonHPackProcessor.unpackProcessor());
    map.put(JsHintProcessor.ALIAS, new JsHintProcessor());
    map.put(CssLintProcessor.ALIAS, new CssLintProcessor());

    return map;
  }
}
File
ExtensionsConfigurableWroManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class YUICssCompressorProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePostProcessor, ResourcePreProcessor {
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  public static final String ALIAS = "yuiCssMin";
  /**
   * An option of CssCompressor.
Solution content 
@Minimize
@SupportedResourceType(ResourceType.CSS)
public class YUICssCompressorProcessor
  implements ResourceProcessor {
  public static final String ALIAS = "yuiCssMin";
  /**
   * An option of CssCompressor.
File
YUICssCompressorProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
  implements ResourceProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(DojoShrinksafeCompressorProcessor.class);
  public static final String ALIAS = "dojoShrinksafe";
<<<<<<< HEAD
=======

  /**
   * {@inheritDoc}
   */
  public void process(final Reader reader, final Writer writer)
    throws IOException {
    process(null, reader, writer);
  }
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71

  /**
   * {@inheritDoc}
Solution content 
  implements ResourceProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(DojoShrinksafeCompressorProcessor.class);
  public static final String ALIAS = "dojoShrinksafe";

  /**
   * {@inheritDoc}
File
DojoShrinksafeCompressorProcessor.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
import org.slf4j.LoggerFactory;

import ro.isdc.wro.extensions.processor.css.CssLintProcessor;
<<<<<<< HEAD
=======
import ro.isdc.wro.extensions.processor.css.LessCssProcessor;
import ro.isdc.wro.extensions.processor.css.SassCssProcessor;
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
import ro.isdc.wro.extensions.processor.css.YUICssCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.BeautifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.CJsonProcessor;
Solution content 
import org.slf4j.LoggerFactory;

import ro.isdc.wro.extensions.processor.css.CssLintProcessor;
import ro.isdc.wro.extensions.processor.css.LessCssProcessor;
import ro.isdc.wro.extensions.processor.css.SassCssProcessor;
import ro.isdc.wro.extensions.processor.css.YUICssCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.BeautifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.CJsonProcessor;
File
CompressorOptionHandler.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
import ro.isdc.wro.extensions.processor.js.DojoShrinksafeCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.GoogleClosureCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.JsHintProcessor;
<<<<<<< HEAD
import ro.isdc.wro.extensions.processor.js.PackerJsProcessor;
import ro.isdc.wro.extensions.processor.js.UglifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.YUIJsCompressorProcessor;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
=======
import ro.isdc.wro.extensions.processor.js.JsonHPackProcessor;
import ro.isdc.wro.extensions.processor.js.PackerJsProcessor;
import ro.isdc.wro.extensions.processor.js.UglifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.YUIJsCompressorProcessor;
import ro.isdc.wro.model.resource.processor.ResourcePreProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.ConformColorsCssProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssCompressorProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssDataUriPreProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssMinProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssVariablesProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.JawrCssMinifierProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.VariablizeColorsCssProcessor;
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
import ro.isdc.wro.model.resource.processor.impl.js.JSMinProcessor;

import com.google.javascript.jscomp.CompilationLevel;
Solution content 
import ro.isdc.wro.extensions.processor.js.DojoShrinksafeCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.GoogleClosureCompressorProcessor;
import ro.isdc.wro.extensions.processor.js.JsHintProcessor;
import ro.isdc.wro.extensions.processor.js.JsonHPackProcessor;
import ro.isdc.wro.extensions.processor.js.PackerJsProcessor;
import ro.isdc.wro.extensions.processor.js.UglifyJsProcessor;
import ro.isdc.wro.extensions.processor.js.YUIJsCompressorProcessor;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.ConformColorsCssProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssCompressorProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssDataUriPreProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssMinProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.CssVariablesProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.JawrCssMinifierProcessor;
import ro.isdc.wro.model.resource.processor.impl.css.VariablizeColorsCssProcessor;
import ro.isdc.wro.model.resource.processor.impl.js.JSMinProcessor;

import com.google.javascript.jscomp.CompilationLevel;
File
CompressorOptionHandler.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    map.put(GoogleClosureCompressorProcessor.ALIAS_SIMPLE, new GoogleClosureCompressorProcessor(CompilationLevel.SIMPLE_OPTIMIZATIONS));
    map.put(GoogleClosureCompressorProcessor.ALIAS_ADVANCED, new GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS));
    map.put(JSMinProcessor.ALIAS, new JSMinProcessor());
<<<<<<< HEAD
    map.put(YUICssCompressorProcessor.ALIAS, new YUICssCompressorProcessor());
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, YUIJsCompressorProcessor.doMungeCompressor());
=======
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, YUIJsCompressorProcessor.doMungeCompressor());
    map.put(YUICssCompressorProcessor.ALIAS, new YUICssCompressorProcessor());
    map.put(JawrCssMinifierProcessor.ALIAS, new JawrCssMinifierProcessor());
    map.put(CssMinProcessor.ALIAS, new CssMinProcessor());
    map.put(CssCompressorProcessor.ALIAS, new CssCompressorProcessor());
>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
    map.put(UglifyJsProcessor.ALIAS_UGLIFY, new UglifyJsProcessor());
    map.put(BeautifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
Solution content 
    map.put(GoogleClosureCompressorProcessor.ALIAS_SIMPLE, new GoogleClosureCompressorProcessor(CompilationLevel.SIMPLE_OPTIMIZATIONS));
    map.put(GoogleClosureCompressorProcessor.ALIAS_ADVANCED, new GoogleClosureCompressorProcessor(CompilationLevel.ADVANCED_OPTIMIZATIONS));
    map.put(JSMinProcessor.ALIAS, new JSMinProcessor());
    map.put(YUIJsCompressorProcessor.ALIAS_NO_MUNGE, YUIJsCompressorProcessor.noMungeCompressor());
    map.put(YUIJsCompressorProcessor.ALIAS_MUNGE, YUIJsCompressorProcessor.doMungeCompressor());
    map.put(YUICssCompressorProcessor.ALIAS, new YUICssCompressorProcessor());
    map.put(JawrCssMinifierProcessor.ALIAS, new JawrCssMinifierProcessor());
    map.put(CssMinProcessor.ALIAS, new CssMinProcessor());
    map.put(CssCompressorProcessor.ALIAS, new CssCompressorProcessor());
    map.put(UglifyJsProcessor.ALIAS_UGLIFY, new UglifyJsProcessor());
    map.put(BeautifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
File
CompressorOptionHandler.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    map.put(BeautifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
    map.put(DojoShrinksafeCompressorProcessor.ALIAS, new DojoShrinksafeCompressorProcessor());
<<<<<<< HEAD
    map.put(CoffeeScriptProcessor.ALIAS, new CoffeeScriptProcessor());
    map.put(CssLintProcessor.ALIAS, new CssLintProcessor());
    map.put(JsHintProcessor.ALIAS, new JsHintProcessor());
=======
    map.put(CssLintProcessor.ALIAS, new CssLintProcessor());
    map.put(JsHintProcessor.ALIAS, new JsHintProcessor());
    map.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    map.put(CJsonProcessor.ALIAS_PACK, CJsonProcessor.packProcessor());
    map.put(CJsonProcessor.ALIAS_UNPACK, CJsonProcessor.unpackProcessor());
    map.put(JsonHPackProcessor.ALIAS_PACK, JsonHPackProcessor.packProcessor());
    map.put(JsonHPackProcessor.ALIAS_UNPACK, JsonHPackProcessor.unpackProcessor());
    map.put(LessCssProcessor.ALIAS, new LessCssProcessor());
    map.put(SassCssProcessor.ALIAS, new SassCssProcessor());
    map.put(CoffeeScriptProcessor.ALIAS, new CoffeeScriptProcessor());
    map.put(VariablizeColorsCssProcessor.ALIAS, new VariablizeColorsCssProcessor());
    map.put(ConformColorsCssProcessor.ALIAS, new ConformColorsCssProcessor());
    map.put(CssVariablesProcessor.ALIAS, new CssVariablesProcessor());

>>>>>>> 1502611b7499b3c3615c22b999bf1d3409a28f71
  }
Solution content 
    map.put(BeautifyJsProcessor.ALIAS_BEAUTIFY, new BeautifyJsProcessor());
    map.put(PackerJsProcessor.ALIAS, new PackerJsProcessor());
    map.put(DojoShrinksafeCompressorProcessor.ALIAS, new DojoShrinksafeCompressorProcessor());
    map.put(CssLintProcessor.ALIAS, new CssLintProcessor());
    map.put(JsHintProcessor.ALIAS, new JsHintProcessor());
    map.put(CssDataUriPreProcessor.ALIAS, new CssDataUriPreProcessor());
    map.put(CJsonProcessor.ALIAS_PACK, CJsonProcessor.packProcessor());
    map.put(CJsonProcessor.ALIAS_UNPACK, CJsonProcessor.unpackProcessor());
    map.put(JsonHPackProcessor.ALIAS_PACK, JsonHPackProcessor.packProcessor());
    map.put(JsonHPackProcessor.ALIAS_UNPACK, JsonHPackProcessor.unpackProcessor());
    map.put(LessCssProcessor.ALIAS, new LessCssProcessor());
    map.put(SassCssProcessor.ALIAS, new SassCssProcessor());
    map.put(CoffeeScriptProcessor.ALIAS, new CoffeeScriptProcessor());
    map.put(VariablizeColorsCssProcessor.ALIAS, new VariablizeColorsCssProcessor());
    map.put(ConformColorsCssProcessor.ALIAS, new ConformColorsCssProcessor());
    map.put(CssVariablesProcessor.ALIAS, new CssVariablesProcessor());
  }
File
CompressorOptionHandler.java
Developer's decision
Version 2
Kind of conflict
Method invocation