Projects >> sveditor >>7e9f4141bad7b6662f3f4fc94063ae3360430759

Chunk
Conflicting content 
import net.sf.sveditor.core.db.index.ISVDBIndex;
import net.sf.sveditor.core.db.index.ISVDBItemIterator;
import net.sf.sveditor.core.db.index.SVDBArgFileIndexFactory;
<<<<<<< HEAD
import net.sf.sveditor.core.db.index.SVDBIndexCollection;
=======
>>>>>>> 7255cf28341145d15e015c93b9c39d164f35b5fb
import net.sf.sveditor.core.db.index.SVDBIndexRegistry;
import net.sf.sveditor.core.db.stmt.SVDBStmt;
import net.sf.sveditor.core.db.stmt.SVDBVarDeclItem;
Solution content 
import net.sf.sveditor.core.db.index.ISVDBIndex;
import net.sf.sveditor.core.db.index.ISVDBItemIterator;
import net.sf.sveditor.core.db.index.SVDBArgFileIndexFactory;
import net.sf.sveditor.core.db.index.SVDBIndexRegistry;
import net.sf.sveditor.core.db.stmt.SVDBStmt;
import net.sf.sveditor.core.db.stmt.SVDBVarDeclItem;
File
TestUvmBasics.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
		
		String test_name = "testBasicExamplePkg" ;
		
<<<<<<< HEAD
		SVDBIndexRegistry rgy = SVCorePlugin.getDefault().getSVDBIndexRegistry();
		rgy.init(TestIndexCacheFactory.instance(tmpdir));
	
		SVDBIndexCollection index_mgr = new SVDBIndexCollection("GLOBAL");
		index_mgr.addPluginLibrary(rgy.findCreateIndex(new NullProgressMonitor(),
				"GLOBAL", "org.uvmworld.uvm", SVDBPluginLibIndexFactory.TYPE, null));
=======
		File test_dir  = new File(fTmpDir,  test_name) ;
		File proj_dir  = new File(test_dir, "uvm/examples/simple/basic_examples/pkg") ;
		File uvm_dir   = new File(test_dir, "uvm") ;
		File uvm_pkg   = new File(test_dir, "uvm/src/uvm_pkg.sv") ;
>>>>>>> 7255cf28341145d15e015c93b9c39d164f35b5fb
		
		StringBuilder list_file_conent = new StringBuilder();
Solution content 
		
		String test_name = "testBasicExamplePkg" ;
		
		File test_dir  = new File(fTmpDir,  test_name) ;
		File proj_dir  = new File(test_dir, "uvm/examples/simple/basic_examples/pkg") ;
		File uvm_dir   = new File(test_dir, "uvm") ;
		File uvm_pkg   = new File(test_dir, "uvm/src/uvm_pkg.sv") ;
		
		StringBuilder list_file_conent = new StringBuilder();
File
TestUvmBasics.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Variable