Projects >> wro4j >>8bee3712229341dece97f8711d3d602872308a32

Chunk
Conflicting content 
    map.put("coffeeScript", new CoffeeScriptProcessor());
    map.put("cssDataUri", new CssDataUriPreProcessor());
    map.put("jsonhpack", JsonHPackProcessor.packProcessor());
<<<<<<< HEAD
    return map;
=======
    map.put("jsHint", new JsHintProcessor());
    map.put("cssLint", new CssLintProcessor());
>>>>>>> 3c29a560b07fabe47cd3f3227d78c3367f85b3c6
  }
}
Solution content 
    map.put("coffeeScript", new CoffeeScriptProcessor());
    map.put("cssDataUri", new CssDataUriPreProcessor());
    map.put("jsonhpack", JsonHPackProcessor.packProcessor());
    map.put("cjson", CJsonProcessor.packProcessor());
    map.put("jsHint", new JsHintProcessor());
    map.put("cssLint", new CssLintProcessor());

    return map;
  }
}
File
ExtensionsConfigurableWroManagerFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Return statement
Variable
Chunk
Conflicting content 
import ro.isdc.wro.model.resource.Resource;
import ro.isdc.wro.model.resource.ResourceType;
import ro.isdc.wro.model.resource.SupportedResourceType;
<<<<<<< HEAD
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
=======
import ro.isdc.wro.model.resource.processor.ResourcePostProcessor;
import ro.isdc.wro.model.resource.processor.ResourcePreProcessor;
>>>>>>> 3c29a560b07fabe47cd3f3227d78c3367f85b3c6


/**
Solution content 
import ro.isdc.wro.model.resource.Resource;
import ro.isdc.wro.model.resource.ResourceType;
import ro.isdc.wro.model.resource.SupportedResourceType;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;


/**
File
JsHintProcessor.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
 */
@SupportedResourceType(ResourceType.JS)
public class JsHintProcessor
<<<<<<< HEAD
  implements ResourceProcessor {
=======
  implements ResourcePreProcessor, ResourcePostProcessor {
>>>>>>> 3c29a560b07fabe47cd3f3227d78c3367f85b3c6
  private static final Logger LOG = LoggerFactory.getLogger(JsHintProcessor.class);
  /**
   * Options to use to configure jsHint.
Solution content 
 */
@SupportedResourceType(ResourceType.JS)
public class JsHintProcessor
  implements ResourceProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(JsHintProcessor.class);
  /**
   * Options to use to configure jsHint.
File
JsHintProcessor.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import ro.isdc.wro.extensions.processor.algorithm.jshint.JsHintException;
import ro.isdc.wro.extensions.processor.js.JsHintProcessor;
import ro.isdc.wro.model.resource.Resource;
<<<<<<< HEAD
import ro.isdc.wro.model.resource.ResourceType;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;
import ro.isdc.wro.model.resource.processor.factory.ProcessorsFactory;
import ro.isdc.wro.model.resource.processor.factory.SimpleProcessorsFactory;
=======
import ro.isdc.wro.model.resource.processor.ResourcePreProcessor;
>>>>>>> 3c29a560b07fabe47cd3f3227d78c3367f85b3c6


/**
Solution content 
import ro.isdc.wro.extensions.processor.algorithm.jshint.JsHintException;
import ro.isdc.wro.extensions.processor.js.JsHintProcessor;
import ro.isdc.wro.model.resource.Resource;
import ro.isdc.wro.model.resource.processor.ResourceProcessor;


/**
File
JsHintMojo.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
          @Override
  protected ResourcePreProcessor createResourceProcessor() {
    final ResourcePreProcessor processor = new JsHintProcessor() {
      @Override
<<<<<<< HEAD
      protected ProcessorsFactory newProcessorsFactory() {
        final SimpleProcessorsFactory factory = new SimpleProcessorsFactory();
        final ResourceProcessor processor = new JsHintProcessor() {
          protected void onJsHintException(final JsHintException e, final Resource resource)
            throws Exception {
            getLog().error(
              e.getErrors().size() + " errors found while processing resource: " + resource.getUri() + " Errors are: "
                + e.getErrors());
            if (!failNever) {
              throw new MojoExecutionException("Errors found when validating resource: " + resource);
            }
          };
        }.setOptions(getOptions());

        factory.addPreProcessor(processor);
        return factory;
      }
    };
  }


  /**
   * @return an array of options.
   */
  private String[] getOptions() {
    return StringUtils.isEmpty(options) ? new String[] {} : options.split(",");
  }

  /**
   * @param options the options to set
   */
  public void setOptions(final String options) {
    this.options = options;
  }

  /**
   * @param failNever the failFast to set
   */
  public void setFailNever(final boolean failNever) {
    this.failNever = failNever;
=======
      protected void onJsHintException(final JsHintException e, final Resource resource)
        throws Exception {
        getLog().error(
          e.getErrors().size() + " errors found while processing resource: " + resource.getUri() + " Errors are: "
            + e.getErrors());
        if (!isFailNever()) {
          throw new MojoExecutionException("Errors found when validating resource: " + resource);
        }
      };
    }.setOptions(getOptions());
    return processor;
>>>>>>> 3c29a560b07fabe47cd3f3227d78c3367f85b3c6
  }
}
Solution content 
      @Override
      protected void onJsHintException(final JsHintException e, final Resource resource)
        throws Exception {
        getLog().error(
          e.getErrors().size() + " errors found while processing resource: " + resource.getUri() + " Errors are: "
            + e.getErrors());
        if (!isFailNever()) {
          throw new MojoExecutionException("Errors found when validating resource: " + resource);
        }
      };
    }.setOptions(getOptions());
    return processor;
  }
}
File
JsHintMojo.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature
Return statement
Variable