Projects >> Accelerando >>1f93ef9aa408871d82e894449de4132ae7dfee3b

Chunk
Conflicting content 
     * Node, storing the root of the search tree.
     */
    private Node root;     // root of the BST
<<<<<<< HEAD
    // BST helper node data type
=======
    
    public RBBST()
    {
    }
    
    
    /**
     * BST helper node data type.
     * 
     *
     */
>>>>>>> 9c01154e5502b169e6fb411876f7ceaa51c16bce
    private class Node implements java.io.Serializable{
    	/**
    	 *Serial ID number that eclipse told us to use for serialization.  Don't really know what it does.
Solution content 
     * Node, storing the root of the search tree.
     */
    private Node root;     // root of the BST

    /**
     * BST helper node data type.
     * 
     *
     */
    private class Node implements java.io.Serializable{
    	/**
    	 *Serial ID number that eclipse told us to use for serialization.  Don't really know what it does.
File
RBBST.java
Developer's decision
Combination
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
import java.io.ObjectOutputStream;
import java.io.File;
import java.util.Date;
<<<<<<< HEAD:Implementations/src/TweetTable.java
public class TweetTable implements java.io.Serializable
=======


/**
 * Class for storing tweets as hash tables.
 */
public class TweetHashTable implements java.io.Serializable
>>>>>>> 9c01154e5502b169e6fb411876f7ceaa51c16bce:Implementations/src/TweetHashTable.java
{
	/**
	 *Serial ID number that eclipse told us to use for serialization.  Don't really know what it does.
Solution content 
import java.io.ObjectOutputStream;
import java.io.File;
import java.util.Date;
/**
 * Class for storing SuperTweets
 */
public class TweetTable implements java.io.Serializable

{
	/**
	 *Serial ID number that eclipse told us to use for serialization.  Don't really know what it does.
File
TweetTable.java
Developer's decision
Manual
Kind of conflict
Class signature
Comment
Chunk
Conflicting content 
	 *@see Java.io.Serializable
	 */
	private static final long serialVersionUID = 1L;
<<<<<<< HEAD:Implementations/src/TweetTable.java
	private int size;
	private TST> tweetTable;
	public TweetTable()
=======
	private RBBST[] hashTable;
	
	/**
	 * Integer holding the size of the hashtable.
	 */
	private int size;
	
	/**
	 * Constructor method.
	 * 
	 * 

	 * Every index of the hashtable is a RBBST of tweets with a given subject, organized by date created.
	 * 
	 * 
	 * @param size The size of the desired hash table.
	 */
	public TweetHashTable(int size)
>>>>>>> 9c01154e5502b169e6fb411876f7ceaa51c16bce:Implementations/src/TweetHashTable.java
	{
		tweetTable = new TST>();
	}
Solution content 
	 *@see Java.io.Serializable
	 */
	private static final long serialVersionUID = 1L;
	private int size;
	private TST> tweetTable;
	public TweetTable()
	{
		tweetTable = new TST>();
	}
File
TweetTable.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment
Method signature
Chunk
Conflicting content 
		return q;
	}
	
<<<<<<< HEAD:Implementations/src/TweetTable.java
	// Load a TweetHashTable from a given filename
	public static TweetTable load(String filename)
=======
	/**
	 * Method to load a hashtable from a file.
	 * 
	 * 

	 * Uses object serialization to read hashtables from files.
	 * 
	 * 
	 * @param filename The name of the file to read from.
	 * @return The hash table from the file.
	 */
	public static TweetHashTable load(String filename)
>>>>>>> 9c01154e5502b169e6fb411876f7ceaa51c16bce:Implementations/src/TweetHashTable.java
	{
		TweetTable tweetTable = null;
		FileInputStream superTweetInputStream = null;
Solution content 
		return q;
	}
	
	/**
	 * Method to load a hashtable from a file.
	 * 
	 * 

	 * Uses object serialization to read hashtables from files.
	 * 
	 * 
	 * @param filename The name of the file to read from.
	 * @return The hash table from the file.
	 */
	public static TweetTable load(String filename)
	{
		TweetTable tweetTable = null;
		FileInputStream superTweetInputStream = null;
File
TweetTable.java
Developer's decision
Combination
Kind of conflict
Comment
Method signature