Projects >> wro4j >>02fccd46d19525c12b31dc7c88ffa9a951b9ff5b

Chunk
Conflicting content 
      final Element element = (Element) importsList.item(i);
      final String name = element.getTextContent();
      LOG.debug("processing import: {}", name);
<<<<<<< HEAD
=======
      Validate.notNull(uriLocatorFactory, "The Locator cannot be null!");
>>>>>>> c581a97152af73ed0bbb68a1148e2191c7e28298
      final XmlModelFactory importedModelFactory = new XmlModelFactory() {
        @Override
        protected ResourceLocator getModelResourceLocator() {
Solution content 
      final Element element = (Element) importsList.item(i);
      final String name = element.getTextContent();
      LOG.debug("processing import: {}", name);
      Validate.notNull(resourceLocatorFactory, "The Locator cannot be null!");
      final XmlModelFactory importedModelFactory = new XmlModelFactory() {
        @Override
        protected ResourceLocator getModelResourceLocator() {
File
XmlModelFactory.java
Developer's decision
Manual
Kind of conflict
Method invocation
Chunk
Conflicting content 
    assertEquals(new WroModel(), factory.create());
  }

<<<<<<< HEAD
  /**
   * When a wildcard uri is used to import wro.xml, the resulted xml to parse won't be valid, because it will contain
   * merged content.
   */
  @Test(expected=SAXParseException.class)
  public void testWildcardImports() throws Throwable {
=======
  @Test(expected = SAXParseException.class)
  public void testWildcardImports()
      throws Throwable {
>>>>>>> c581a97152af73ed0bbb68a1148e2191c7e28298
    try {
      factory = new XmlModelFactory() {
        @Override
Solution content 
    assertEquals(new WroModel(), factory.create());
  }

  /**
   * When a wildcard uri is used to import wro.xml, the resulted xml to parse won't be valid, because it will contain
   * merged content.
   */
  @Test(expected = SAXParseException.class)
  public void testWildcardImports() throws Throwable {
    try {
      factory = new XmlModelFactory() {
        @Override
File
TestXmlModelFactory.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method signature
Chunk
Conflicting content 
import ro.isdc.wro.model.factory.AbstractWroModelFactory;
import ro.isdc.wro.model.factory.WroModelFactory;
import ro.isdc.wro.model.factory.XmlModelFactory;
<<<<<<< HEAD
import ro.isdc.wro.model.resource.locator.ResourceLocator;
import ro.isdc.wro.model.resource.locator.support.AbstractResourceLocator;
=======
import ro.isdc.wro.model.group.Inject;
import ro.isdc.wro.model.group.processor.Injector;
>>>>>>> c581a97152af73ed0bbb68a1148e2191c7e28298


/**
Solution content 
import ro.isdc.wro.model.factory.AbstractWroModelFactory;
import ro.isdc.wro.model.factory.WroModelFactory;
import ro.isdc.wro.model.factory.XmlModelFactory;
import ro.isdc.wro.model.resource.locator.ResourceLocator;
import ro.isdc.wro.model.resource.locator.support.AbstractResourceLocator;


/**
File
SmartWroModelFactory.java
Developer's decision
Version 1
Kind of conflict
Import