Projects >> wro4j >>6b44e73c69a1ff8b12d8b642c435369f4830456d

Chunk
Conflicting content 
            final WildcardExpandedHandlerAware expandedHandler = (WildcardExpandedHandlerAware)wildcardStreamLocator;
            LOG.debug("Expanding resource: {}", resource.getUri());

<<<<<<< HEAD
            final String baseNameFolder = computeBaseNameFolder(resource, resourceLocatorFactory);
=======
            final String baseNameFolder = computeBaseNameFolder(resource, uriLocator, expandedHandler);
            LOG.debug("baseNameFolder: {}", baseNameFolder);
>>>>>>> a4ccfe4a4e516b5422015a286fa203c7d31e063e

            expandedHandler.setWildcardExpanderHandler(createExpanderHandler(group, resource, baseNameFolder));
            try {
Solution content 
            final WildcardExpandedHandlerAware expandedHandler = (WildcardExpandedHandlerAware)wildcardStreamLocator;
            LOG.debug("Expanding resource: {}", resource.getUri());

            final String baseNameFolder = computeBaseNameFolder(resource, resourceLocatorFactory);
            LOG.debug("baseNameFolder: {}", baseNameFolder);

            expandedHandler.setWildcardExpanderHandler(createExpanderHandler(group, resource, baseNameFolder));
            try {
File
WildcardExpanderModelTransformer.java
Developer's decision
Combination
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        throws Exception {
        LOG.debug("\texpanded Files: {}", input);
        for (final File file : input) {
<<<<<<< HEAD
          LOG.debug("expanded file: {}", file);
=======
          LOG.debug("\tsetting baseNameFolder: {}", file.getParent());
>>>>>>> a4ccfe4a4e516b5422015a286fa203c7d31e063e
          baseNameFolderHolder.set(file.getParent());
          // no need to continue
          break;
Solution content 
        throws Exception {
        LOG.debug("\texpanded Files: {}", input);
        for (final File file : input) {
          LOG.debug("\tsetting baseNameFolder: {}", file.getParent());
          baseNameFolderHolder.set(file.getParent());
          // no need to continue
          break;
File
WildcardExpanderModelTransformer.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
    });

    try {
<<<<<<< HEAD
      LOG.debug("locating baseName using resourcePath: {}", resourcePath);
      resourceLocator.getInputStream();
=======
      uriLocator.locate(resourcePath);
>>>>>>> a4ccfe4a4e516b5422015a286fa203c7d31e063e
    } catch (final Exception e) {
      LOG.debug("[FAIL] Exception caught during wildcard expanding for resource: {}\n with exception message {}", resourcePath,
          e.getMessage());
Solution content 
    });

    try {
      LOG.debug("locating baseName using resourcePath: {}", resourcePath);
      resourceLocator.getInputStream();
    } catch (final Exception e) {
      LOG.debug("[FAIL] Exception caught during wildcard expanding for resource: {}\n with exception message {}", resourcePath,
          e.getMessage());
File
WildcardExpanderModelTransformer.java
Developer's decision
Version 1
Kind of conflict
Method invocation