Projects >> violations-plugin >>a458a16a13b4d80ae954541342ea5d4f9aaf4ad5

Chunk
Conflicting content 
public class JsLintParser extends AbstractTypeParser {

    static final String TYPE_NAME = "jslint";
<<<<<<< HEAD

    private static final HashMapWithDefault SEVERITIES
        = new HashMapWithDefault(Severity.MEDIUM);
        
    static {
        SEVERITIES.put("E", Severity.HIGH);
        SEVERITIES.put("W", Severity.MEDIUM);
        SEVERITIES.put("I", Severity.LOW);
    }
=======
    
    private AbsoluteFileFinder absoluteFileFinder = new AbsoluteFileFinder();
>>>>>>> ac060663c3c5c4649f1ee88b30ed06e47dc42373

    /**
     * Parse the JSLint xml file.
Solution content 
        
    static {
        SEVERITIES.put("E", Severity.HIGH);
        SEVERITIES.put("W", Severity.MEDIUM);
public class JsLintParser extends AbstractTypeParser {

    static final String TYPE_NAME = "jslint";

    private static final HashMapWithDefault SEVERITIES
        = new HashMapWithDefault(Severity.MEDIUM);
        SEVERITIES.put("I", Severity.LOW);
    }
    
    private AbsoluteFileFinder absoluteFileFinder = new AbsoluteFileFinder();

    /**
     * Parse the JSLint xml file.
File
JsLintParser.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Static initializer
Chunk
Conflicting content 
        endElement();
        return violation;
    }
<<<<<<< HEAD

    private void setSeverity(Violation v, String severity) {
        v.setSeverity(SEVERITIES.get(severity));
        v.setSeverityLevel(Severity.getSeverityLevel(
                               v.getSeverity()));
    }
}
=======
}
>>>>>>> ac060663c3c5c4649f1ee88b30ed06e47dc42373
Solution content 
        endElement();
        return violation;
    }

    private void setSeverity(Violation v, String severity) {
        v.setSeverity(SEVERITIES.get(severity));
        v.setSeverityLevel(Severity.getSeverityLevel(
                               v.getSeverity()));
    }
}
File
JsLintParser.java
Developer's decision
Version 1
Kind of conflict
Method declaration