Projects >> sisu-guice >>8884374672af8c13bcf63f6dab6bf50c6e63aee7

Chunk
Conflicting content 
 * Contains flags for Guice.
 */
public class InternalFlags {
<<<<<<< HEAD

  private static final IncludeStackTraceOption INCLUDE_STACK_TRACES;
  static {
    IncludeStackTraceOption includeStackTraces;
    try {
      includeStackTraces = IncludeStackTraceOption.valueOf(
          System.getProperty("guice_include_stack_traces"));
    } catch (Throwable e) {
      includeStackTraces = IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE;
    }
    INCLUDE_STACK_TRACES = includeStackTraces;
  }

=======
  private final static Logger logger = Logger.getLogger(InternalFlags.class.getName());
>>>>>>> 338213332308fc9932603b2f4c853a4a7d19cc13
  /**
   * The options for Guice stack trace collection.
   */
Solution content 
 * Contains flags for Guice.
 */
public class InternalFlags {
  private final static Logger logger = Logger.getLogger(InternalFlags.class.getName());

  private static final IncludeStackTraceOption INCLUDE_STACK_TRACES;
  static {
    IncludeStackTraceOption includeStackTraces;
    try {
      includeStackTraces = parseIncludeStackTraceOption();
    } catch (Throwable e) {
      includeStackTraces = IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE;
    }
    INCLUDE_STACK_TRACES = includeStackTraces;
  }

  /**
   * The options for Guice stack trace collection.
   */
File
InternalFlags.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Static initializer
Chunk
Conflicting content 

  public static IncludeStackTraceOption getIncludeStackTraceOption() {
<<<<<<< HEAD
    return INCLUDE_STACK_TRACES;
=======
    String flag = System.getProperty("guice_include_stack_traces");
    try {
      return (flag == null || flag.length() == 0)
          ? IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE
          : IncludeStackTraceOption.valueOf(flag);
    } catch (IllegalArgumentException e) {
      logger.warning(flag
          + " is not a valid flag value for guice_include_stack_traces. "
          + " Values must be one of " + Arrays.asList(IncludeStackTraceOption.values()));
      return IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE;
    }
>>>>>>> 338213332308fc9932603b2f4c853a4a7d19cc13
  }
}
Solution content 

  public static IncludeStackTraceOption getIncludeStackTraceOption() {
    return INCLUDE_STACK_TRACES;
  }

  private static IncludeStackTraceOption parseIncludeStackTraceOption() {
    String flag = System.getProperty("guice_include_stack_traces");
    try {
      return (flag == null || flag.length() == 0)
          ? IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE
          : IncludeStackTraceOption.valueOf(flag);
    } catch (IllegalArgumentException e) {
      logger.warning(flag
          + " is not a valid flag value for guice_include_stack_traces. "
          + " Values must be one of " + Arrays.asList(IncludeStackTraceOption.values()));
      return IncludeStackTraceOption.ONLY_FOR_DECLARING_SOURCE;
    }
  }
}
File
InternalFlags.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Return statement
Try statement
Variable