Projects >> wro4j >>d5cbcc28ce615223de4dd93d738e5842bf38c777

Chunk
Conflicting content 
 * @since 1.3.8
 * @created 15 Jun 2011
 */
<<<<<<< HEAD:wro4j-core/src/main/java/ro/isdc/wro/model/resource/processor/impl/PlaceholderInterpolationProcessor.java
public class PlaceholderInterpolationProcessor
  implements ResourceProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(PlaceholderInterpolationProcessor.class);
=======
public class PlaceholderProcessor
  implements ResourcePreProcessor, ResourcePostProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(PlaceholderProcessor.class);
>>>>>>> 19f116513a6e19983607d611e8b7dd0442ab4e25:wro4j-core/src/main/java/ro/isdc/wro/model/resource/processor/impl/PlaceholderProcessor.java

  /** The url pattern */
  private static final Pattern PATTERN_PLACEHOLDER = Pattern.compile("(?ims)\\$\\{((.*?))}");
Solution content 
 * @since 1.3.8
 * @created 15 Jun 2011
 */
public class PlaceholderProcessor
  implements ResourceProcessor {
  private static final Logger LOG = LoggerFactory.getLogger(PlaceholderProcessor.class);

  /** The url pattern */
  private static final Pattern PATTERN_PLACEHOLDER = Pattern.compile("(?ims)\\$\\{((.*?))}");
File
PlaceholderProcessor.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Method invocation
Chunk
Conflicting content 
    properties.setProperty("prop2", "value2");
    properties.setProperty("prop3", "value3");
    properties.setProperty("prop4", "value4");
<<<<<<< HEAD:wro4j-core/src/test/java/ro/isdc/wro/model/resource/processor/TestPlaceholderInterpolationProcessor.java
    final ResourceProcessor processor = new PlaceholderInterpolationProcessor().setPropertiesFactory(WroUtil.simpleObjectFactory(properties));
    final URL url = getClass().getResource("placeholderInterpolation");
=======
    final ResourcePreProcessor processor = new PlaceholderProcessor().setPropertiesFactory(WroUtil.simpleObjectFactory(properties));
    final URL url = getClass().getResource("placeholder");
>>>>>>> 19f116513a6e19983607d611e8b7dd0442ab4e25:wro4j-core/src/test/java/ro/isdc/wro/model/resource/processor/TestPlaceholderProcessor.java

    final File testFolder = new File(url.getFile(), "test");
    final File expectedFolder = new File(url.getFile(), "expected");
Solution content 
    properties.setProperty("prop2", "value2");
    properties.setProperty("prop3", "value3");
    properties.setProperty("prop4", "value4");
    final ResourceProcessor processor = new PlaceholderInterpolationProcessor().setPropertiesFactory(WroUtil.simpleObjectFactory(properties));
    final URL url = getClass().getResource("placeholder");

    final File testFolder = new File(url.getFile(), "test");
    final File expectedFolder = new File(url.getFile(), "expected");
File
TestPlaceholderProcessor.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
=======
  @Test(expected=WroRuntimeException.class)
  public void noIgnoreForMissingVariables()
      throws Exception {
<<<<<<< HEAD:wro4j-core/src/test/java/ro/isdc/wro/model/resource/processor/TestPlaceholderInterpolationProcessor.java
    final ResourceProcessor processor = new PlaceholderInterpolationProcessor().setIgnoreMissingVariables(false);
    final URL url = getClass().getResource("placeholderInterpolation");
    final ResourcePreProcessor processor = new PlaceholderProcessor().setIgnoreMissingVariables(false);
    final URL url = getClass().getResource("placeholder");
>>>>>>> 19f116513a6e19983607d611e8b7dd0442ab4e25:wro4j-core/src/test/java/ro/isdc/wro/model/resource/processor/TestPlaceholderProcessor.java

    final File testFolder = new File(url.getFile(), "test");
    final File expectedFolder = new File(url.getFile(), "expected");
Solution content 
  @Test(expected=WroRuntimeException.class)
  public void noIgnoreForMissingVariables()
      throws Exception {
    final ResourceProcessor processor = new PlaceholderInterpolationProcessor().setIgnoreMissingVariables(false);
    final URL url = getClass().getResource("placeholder");

    final File testFolder = new File(url.getFile(), "test");
    final File expectedFolder = new File(url.getFile(), "expected");
File
TestPlaceholderProcessor.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable