Projects >> wro4j >>023f1cc2de320ceebab1c8c13c9b93236178ce42

Chunk
Conflicting content 
   * Computes the file name of the folder where the resource is located. The implementation uses a trick by invoking the
   * {@link WildcardExpanderHandlerAware} to get the baseName.
   */
<<<<<<< HEAD
  private String computeBaseNameFolder(final Resource resource, final ResourceLocatorFactory resourceLocatorFactory) {
=======
  private String computeBaseNameFolder(final Resource resource, final UriLocator uriLocator,
    final WildcardExpanderHandlerAware expandedHandler) {
>>>>>>> cf7905d972dbd3dc2809dac62edffbef55cf41f5
    // Find the baseName
    // add a recursive wildcard to trigger the wildcard detection. The simple wildcard ('*') is not enough because it
    // won't work for folders containing only directories with no files.
Solution content 
   * Computes the file name of the folder where the resource is located. The implementation uses a trick by invoking the
   * {@link WildcardExpanderHandlerAware} to get the baseName.
   */
  private String computeBaseNameFolder(final Resource resource, final UriLocator uriLocator,
    final WildcardExpanderHandlerAware expandedHandler) {
    // Find the baseName
    // add a recursive wildcard to trigger the wildcard detection. The simple wildcard ('*') is not enough because it
    // won't work for folders containing only directories with no files.
File
WildcardExpanderModelTransformer.java
Developer's decision
Version 2
Kind of conflict
Method signature
Chunk
Conflicting content 
        // use this to skip wildcard stream detection, we are only interested in the baseName
        throw new NoMoreAttemptsIOException("BaseNameFolder computed successfully, skip further wildcard processing..");
      }
<<<<<<< HEAD
    });

    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());
    }
    if (baseNameFolderHolder.get() == null) {
      LOG.debug("[FAIL] Cannot compute baseName folder for resource: {}", resource);
    }
    return baseNameFolderHolder.get();
=======
    };
>>>>>>> cf7905d972dbd3dc2809dac62edffbef55cf41f5
  }
Solution content 
        // use this to skip wildcard stream detection, we are only interested in the baseName
        throw new NoMoreAttemptsIOException("BaseNameFolder computed successfully, skip further wildcard processing..");
      }
    });

    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());
    }
    if (baseNameFolderHolder.get() == null) {
      LOG.debug("[FAIL] Cannot compute baseName folder for resource: {}", resource);
    }
    return baseNameFolderHolder.get();
  }
File
WildcardExpanderModelTransformer.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Return statement
Try statement
Chunk
Conflicting content 
 */
package ro.isdc.wro.util;

<<<<<<< HEAD
import java.io.InputStream;
=======
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
>>>>>>> cf7905d972dbd3dc2809dac62edffbef55cf41f5
import java.util.Enumeration;
import java.util.TimeZone;
import java.util.concurrent.ThreadFactory;
Solution content 
 */
package ro.isdc.wro.util;

import java.util.Enumeration;
import java.util.TimeZone;
import java.util.concurrent.ThreadFactory;
File
WroUtil.java
Developer's decision
None
Kind of conflict
Import