Projects >> pmd >>fa950a82960993c7a7d70e276553b85174eec8b2

Chunk
Conflicting content 
import java.util.List;
import java.util.Map;

<<<<<<< HEAD
import net.sourceforge.pmd.lang.Language;
import net.sourceforge.pmd.lang.ast.AbstractNode;
import net.sourceforge.pmd.lang.ast.DummyNode;
import net.sourceforge.pmd.lang.ast.Node;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574
import net.sourceforge.pmd.lang.java.ast.DummyJavaNode;
import net.sourceforge.pmd.lang.java.symboltable.SourceFileScope;
import net.sourceforge.pmd.lang.rule.AbstractRule;
Solution content 
import java.util.List;
import java.util.Map;

import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.ast.DummyNode;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.DummyJavaNode;
import net.sourceforge.pmd.lang.java.symboltable.SourceFileScope;
import net.sourceforge.pmd.lang.rule.AbstractRule;
File
AbstractRuleTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Map;

import junit.framework.JUnit4TestAdapter;
<<<<<<< HEAD
import net.sourceforge.pmd.lang.Language;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.ast.DummyNode;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.ecmascript.ast.ASTFunctionNode;
import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
import net.sourceforge.pmd.lang.ecmascript.rule.EcmascriptRuleViolationFactory;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule;
import net.sourceforge.pmd.lang.ecmascript.ast.ASTFunctionNode;
import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
import net.sourceforge.pmd.lang.ecmascript.rule.EcmascriptRuleViolationFactory;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.DummyJavaNode;
import net.sourceforge.pmd.lang.java.ast.JavaNode;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
import net.sourceforge.pmd.lang.java.rule.JavaRuleViolation;
import net.sourceforge.pmd.lang.java.symboltable.SourceFileScope;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574
import net.sourceforge.pmd.lang.rule.MockRule;
import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
import net.sourceforge.pmd.renderers.Renderer;
Solution content 
import java.util.Map;

import junit.framework.JUnit4TestAdapter;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.ast.DummyNode;
import net.sourceforge.pmd.lang.ast.Node;
import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule;
import net.sourceforge.pmd.lang.ecmascript.ast.ASTFunctionNode;
import net.sourceforge.pmd.lang.ecmascript.rule.AbstractEcmascriptRule;
import net.sourceforge.pmd.lang.ecmascript.rule.EcmascriptRuleViolationFactory;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.rule.MockRule;
import net.sourceforge.pmd.lang.rule.ParametricRuleViolation;
import net.sourceforge.pmd.renderers.Renderer;
File
ReportTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import static org.junit.Assert.assertEquals;
import junit.framework.JUnit4TestAdapter;
<<<<<<< HEAD:pmd/src/test/java/net/sourceforge/pmd/lang/java/SuppressWarningsTest.java
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.lang.LanguageVersion;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574:pmd/src/test/java/net/sourceforge/pmd/SuppressWarningsTest.java
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
Solution content 
import static org.junit.Assert.assertEquals;
import junit.framework.JUnit4TestAdapter;
import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.Report;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
File
SuppressWarningsTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
package net.sourceforge.pmd.lang.java.ast;

import net.sourceforge.pmd.PMD;
<<<<<<< HEAD:pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTAnnotationTest.java
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.java.ParserTst;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.ASTAnnotation;
import net.sourceforge.pmd.lang.java.ast.ParseException;
import net.sourceforge.pmd.testframework.ParserTst;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574:pmd/src/test/java/net/sourceforge/pmd/ast/ASTAnnotationTest.java

import org.junit.Test;
Solution content 
package net.sourceforge.pmd.lang.java.ast;

import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ParserTst;

import org.junit.Test;
File
ASTAnnotationTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Set;

import net.sourceforge.pmd.PMD;
<<<<<<< HEAD:pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTFormalParameterTest.java
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.java.ParserTst;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.ASTFormalParameter;
import net.sourceforge.pmd.lang.java.ast.ASTVariableDeclaratorId;
import net.sourceforge.pmd.testframework.ParserTst;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574:pmd/src/test/java/net/sourceforge/pmd/ast/ASTFormalParameterTest.java

import org.junit.Test;
Solution content 
import java.util.Set;

import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ParserTst;

import org.junit.Test;
File
ASTFormalParameterTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import java.util.Set;

import net.sourceforge.pmd.PMD;
<<<<<<< HEAD:pmd/src/test/java/net/sourceforge/pmd/lang/java/ast/ASTImportDeclarationTest.java
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.java.ParserTst;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.ASTImportDeclaration;
import net.sourceforge.pmd.lang.java.ast.ParseException;
import net.sourceforge.pmd.testframework.ParserTst;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574:pmd/src/test/java/net/sourceforge/pmd/ast/ASTImportDeclarationTest.java

import org.junit.Test;
Solution content 
import java.util.Set;

import net.sourceforge.pmd.PMD;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ParserTst;

import org.junit.Test;
File
ASTImportDeclarationTest.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.dfa.DataFlowNode;
import net.sourceforge.pmd.lang.dfa.NodeType;
<<<<<<< HEAD:pmd/src/test/java/net/sourceforge/pmd/lang/java/dfa/StatementAndBraceFinderTest.java
import net.sourceforge.pmd.lang.java.ParserTst;
=======
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574:pmd/src/test/java/net/sourceforge/pmd/dfa/StatementAndBraceFinderTest.java
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTExpression;
Solution content 
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.dfa.DataFlowNode;
import net.sourceforge.pmd.lang.dfa.NodeType;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ParserTst;
import net.sourceforge.pmd.lang.java.ast.ASTCompilationUnit;
import net.sourceforge.pmd.lang.java.ast.ASTConstructorDeclaration;
import net.sourceforge.pmd.lang.java.ast.ASTExpression;
File
StatementAndBraceFinderTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RuleSet;
import net.sourceforge.pmd.RuleSets;
<<<<<<< HEAD
import net.sourceforge.pmd.lang.LanguageVersion;
=======
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.lang.java.ast.ASTClassOrInterfaceDeclaration;
import net.sourceforge.pmd.lang.java.rule.AbstractJavaRule;
>>>>>>> 079c72f7d6a0a09840985675dfaa80d2a8c2d574
import net.sourceforge.pmd.testframework.RuleTst;

import org.junit.Test;
Solution content 
import net.sourceforge.pmd.RuleContext;
import net.sourceforge.pmd.RuleSet;
import net.sourceforge.pmd.RuleSets;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.java.JavaLanguageModule;
import net.sourceforge.pmd.testframework.RuleTst;

import org.junit.Test;
File
XMLRendererTest.java
Developer's decision
Combination
Kind of conflict
Import