Projects >> wro4j >>4c0b1ee7fff4f5d2cb1ef78efc3bd6736c4acf29

Chunk
Conflicting content 
  /**
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new CssDataUriPreProcessor());
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());

    factory.addPostProcessor(new CssVariablesProcessor());
    factory.addPostProcessor(new JSMinProcessor());
    factory.addPostProcessor(new JawrCssMinifierProcessor());
    return factory;
=======
  protected void configureGroupsProcessor(final GroupsProcessor groupsProcessor) {
    groupsProcessor.addPreProcessor(new CssDataUriPreProcessor());
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new SemicolonAppenderPreProcessor());
    groupsProcessor.addPreProcessor(new JSMinProcessor());
    groupsProcessor.addPreProcessor(new JawrCssMinifierProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  }
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new CssDataUriPreProcessor());
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPreProcessor(new JSMinProcessor());
    factory.addPreProcessor(new JawrCssMinifierProcessor());

    factory.addPostProcessor(new CssVariablesProcessor());

    return factory;
  }

  /**
File
ExperimentalWroManagerFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected UriLocatorFactory newUriLocatorFactory() {
    return new SimpleUriLocatorFactory().addUriLocator(
        new ServletContextUriLocator()).addUriLocator(new ClasspathUriLocator()).addUriLocator(new UrlUriLocator());
=======
  protected void configureGroupsProcessor(final GroupsProcessor groupsProcessor) {
    // this one must be before the CssUrlRewritingProcessor
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new SemicolonAppenderPreProcessor());
    groupsProcessor.addPreProcessor(new JSMinProcessor());
    groupsProcessor.addPreProcessor(new JawrCssMinifierProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  }

  /**
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected UriLocatorFactory newUriLocatorFactory() {
    return new SimpleUriLocatorFactory().addUriLocator(
        new ServletContextUriLocator()).addUriLocator(new ClasspathUriLocator()).addUriLocator(new UrlUriLocator());
  }

  /**
File
ServletContextAwareWroManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Method signature
Return statement
Chunk
Conflicting content 
    return factory;
  }

<<<<<<< HEAD
=======
  /**
   * Configure the pre and post processors. Override this to specify your own processors.
   *
   * @param groupsProcessor
   */
  protected void configureProcessors(final GroupsProcessor groupsProcessor) {
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new SemicolonAppenderPreProcessor());
    groupsProcessor.addPreProcessor(new JSMinProcessor());
    groupsProcessor.addPreProcessor(new JawrCssMinifierProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
  }


>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  @Override
  protected ServletContextUriLocator newServletContextUriLocator() {
    return new ServletContextUriLocator() {
Solution content 
  @Override
    return factory;
  }

  protected ServletContextUriLocator newServletContextUriLocator() {
    return new ServletContextUriLocator() {
File
DefaultStandaloneContextAwareManagerFactory.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
import ro.isdc.wro.model.resource.util.CRC32HashBuilder;
import ro.isdc.wro.model.resource.util.MD5HashBuilder;
import ro.isdc.wro.util.WroTestUtils;
<<<<<<< HEAD
import ro.isdc.wro.util.WroUtil;
=======
import ro.isdc.wro.util.encoding.CharsetToolkit;
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
import ro.isdc.wro.util.io.UnclosableBufferedInputStream;
Solution content 
import ro.isdc.wro.model.resource.util.CRC32HashBuilder;
import ro.isdc.wro.model.resource.util.MD5HashBuilder;
import ro.isdc.wro.util.WroTestUtils;
import ro.isdc.wro.util.io.UnclosableBufferedInputStream;
File
TestWroManager.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
    genericProcessAndCompare("/wildcardRepeatedResources.js", "classpath:ro/isdc/wro/manager/wildcardRepeated-out.js");
  }

<<<<<<< HEAD
  // @Test
  // public void testChineseEncoding()
  // throws IOException {
  // genericProcessAndCompare("/chineseEncoding.js", "classpath:ro/isdc/wro/manager/wildcardRepeated-out.js");
  // }
=======
  @Test
  public void testMinimizeAttributeIsFalseOnResource()
      throws IOException {
    genericProcessAndCompare("/resourceMinimizeFalse.js", "classpath:ro/isdc/wro/manager/sample.js");
  }

  @Test
  public void testMinimizeAttributeIsTrueOnResource()
      throws IOException {
    genericProcessAndCompare("/resourceMinimizeTrue.js", "classpath:ro/isdc/wro/manager/sample.min.js");
  }

//  @Test
//  public void testChineseEncoding()
//      throws IOException {
//    genericProcessAndCompare("/chineseEncoding.js", "classpath:ro/isdc/wro/manager/wildcardRepeated-out.js");
//  }
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6

  @Test
  public void testWildcardGroupResources()
Solution content 
    genericProcessAndCompare("/wildcardRepeatedResources.js", "classpath:ro/isdc/wro/manager/wildcardRepeated-out.js");
  }

  @Test
  public void testMinimizeAttributeIsFalseOnResource()
      throws IOException {
    genericProcessAndCompare("/resourceMinimizeFalse.js", "classpath:ro/isdc/wro/manager/sample.js");
  }

  @Test
  public void testMinimizeAttributeIsTrueOnResource()
      throws IOException {
    genericProcessAndCompare("/resourceMinimizeTrue.js", "classpath:ro/isdc/wro/manager/sample.min.js");
  }

//  @Test
//  public void testChineseEncoding()
//      throws IOException {
//    genericProcessAndCompare("/chineseEncoding.js", "classpath:ro/isdc/wro/manager/wildcardRepeated-out.js");
//  }

  @Test
  public void testWildcardGroupResources()
File
TestWroManager.java
Developer's decision
Version 2
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPostProcessor(new CssVariablesProcessor());
    factory.addPostProcessor(new YUICssCompressorProcessor());
    factory.addPostProcessor(new YUIJsCompressorProcessor());
    return factory;
=======
  protected void configureGroupsProcessor(final GroupsProcessor groupsProcessor) {
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new YUICssCompressorProcessor());
    groupsProcessor.addPreProcessor(new YUIJsCompressorProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  }

}
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPreProcessor(new YUICssCompressorProcessor());
    factory.addPreProcessor(new YUIJsCompressorProcessor());

    factory.addPostProcessor(new CssVariablesProcessor());
    return factory;
  }

}
File
YUIServletContextAwareWroManagerFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPostProcessor(new CssVariablesProcessor());
    factory.addPostProcessor(new GoogleClosureCompressorProcessor(CompilationLevel.SIMPLE_OPTIMIZATIONS));
    factory.addPostProcessor(new JawrCssMinifierProcessor());
    return factory;
=======
  protected void configureProcessors(final GroupsProcessor groupsProcessor) {
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new SemicolonAppenderPreProcessor());
    groupsProcessor.addPreProcessor(new GoogleClosureCompressorProcessor(CompilationLevel.SIMPLE_OPTIMIZATIONS));
    groupsProcessor.addPreProcessor(new JawrCssMinifierProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  }
}
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPreProcessor(new GoogleClosureCompressorProcessor(CompilationLevel.SIMPLE_OPTIMIZATIONS));
    factory.addPreProcessor(new JawrCssMinifierProcessor());

    factory.addPostProcessor(new CssVariablesProcessor());
    return factory;
  }
}
File
GoogleStandaloneManagerFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
   * {@inheritDoc}
   */
  @Override
<<<<<<< HEAD
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPostProcessor(new CssVariablesProcessor());
    factory.addPostProcessor(new YUIJsCompressorProcessor());
    factory.addPostProcessor(new YUICssCompressorProcessor());
    return factory;
=======
  protected void configureProcessors(final GroupsProcessor groupsProcessor) {
    groupsProcessor.addPreProcessor(new BomStripperPreProcessor());
    groupsProcessor.addPreProcessor(new CssImportPreProcessor());
    groupsProcessor.addPreProcessor(new CssUrlRewritingProcessor());
    groupsProcessor.addPreProcessor(new SemicolonAppenderPreProcessor());
    groupsProcessor.addPreProcessor(new YUIJsCompressorProcessor());
    groupsProcessor.addPreProcessor(new YUICssCompressorProcessor());

    groupsProcessor.addPostProcessor(new CssVariablesProcessor());
>>>>>>> d389182ca4cae1825fd7edc097395cb26094d9a6
  }
}
Solution content 
   * {@inheritDoc}
   */
  @Override
  protected ProcessorsFactory newProcessorsFactory() {
    final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
    factory.addPreProcessor(new BomStripperPreProcessor());
    factory.addPreProcessor(new CssImportPreProcessor());
    factory.addPreProcessor(new CssUrlRewritingProcessor());
    factory.addPreProcessor(new SemicolonAppenderPreProcessor());
    factory.addPreProcessor(new YUIJsCompressorProcessor());
    factory.addPreProcessor(new YUICssCompressorProcessor());

    factory.addPostProcessor(new CssVariablesProcessor());
    return factory;
  }
}
File
YUIStandaloneManagerFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Method signature
Return statement
Variable