Projects >> cs304 >>7364abfb4c93fa950451715425bb78520e1ce2ed

Chunk
Conflicting content 
    private javax.swing.JTable SearchTable;
    private javax.swing.JTextField SearchTextField;
    private javax.swing.JPanel SearchTopPanel;
<<<<<<< HEAD
    private javax.swing.JTabbedPane TabbedPane;
=======
    private javax.swing.JTextField abAA;
    private javax.swing.JTextField abCN;
    private javax.swing.JTextField abISBN;
    private javax.swing.JTextField abMA;
    private javax.swing.JTextField abPub;
    private javax.swing.JSpinner abSpinner;
    private javax.swing.JTextField abSubs;
    private javax.swing.JTextField abTitle;
    private javax.swing.JTextField abYear;
>>>>>>> c16da9b0823f958b8d7afeb749c1539e5966dadb
    private javax.swing.JMenuItem addBookCopyMenuItem;
    private javax.swing.JMenuItem addBookMenuItem;
    private javax.swing.JPanel addBorrowerAddsPanel;
Solution content 
    private javax.swing.JTable SearchTable;
    private javax.swing.JTextField SearchTextField;
    private javax.swing.JPanel SearchTopPanel;

    private javax.swing.JTabbedPane TabbedPane;

    private javax.swing.JTextField abAA;
    private javax.swing.JTextField abCN;
    private javax.swing.JTextField abISBN;
    private javax.swing.JTextField abMA;
    private javax.swing.JTextField abPub;
    private javax.swing.JSpinner abSpinner;
    private javax.swing.JTextField abSubs;
    private javax.swing.JTextField abTitle;
    private javax.swing.JTextField abYear;

    private javax.swing.JMenuItem addBookCopyMenuItem;
    private javax.swing.JMenuItem addBookMenuItem;
    private javax.swing.JPanel addBorrowerAddsPanel;
File
ViewFrame.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    private javax.swing.JScrollPane checkOverdueListOverdueInfo;
    private javax.swing.JMenuItem checkOverdueMenuItem;
    private javax.swing.JPanel checkOverduePanel;
<<<<<<< HEAD
    private javax.swing.JTable checkedOutBooksTable;
=======
    private javax.swing.JScrollPane checkOverdueTextAreaBookCopyInfo;
    private javax.swing.JScrollPane checkOverdueTextAreaBorrInfo;
    private javax.swing.JCheckBox checkedOutReportFilterCheckBox;
    private javax.swing.JPanel checkedOutReportFilterPanel;
>>>>>>> c16da9b0823f958b8d7afeb749c1539e5966dadb
    private javax.swing.JMenuItem checkedOutReportMenuItem;
    private javax.swing.JPanel checkedOutReportPanel;
    private javax.swing.JTable checkedOutReportTable;
Solution content 
    private javax.swing.JScrollPane checkOverdueListOverdueInfo;
    private javax.swing.JMenuItem checkOverdueMenuItem;
    private javax.swing.JPanel checkOverduePanel;

    private javax.swing.JTable checkedOutBooksTable;

    private javax.swing.JScrollPane checkOverdueTextAreaBookCopyInfo;
    private javax.swing.JScrollPane checkOverdueTextAreaBorrInfo;
    private javax.swing.JCheckBox checkedOutReportFilterCheckBox;
    private javax.swing.JPanel checkedOutReportFilterPanel;

    private javax.swing.JMenuItem checkedOutReportMenuItem;
    private javax.swing.JPanel checkedOutReportPanel;
    private javax.swing.JTable checkedOutReportTable;
File
ViewFrame.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    private javax.swing.JLabel jLabel13;
    private javax.swing.JLabel jLabel14;
    private javax.swing.JLabel jLabel19;
<<<<<<< HEAD
    private javax.swing.JLabel jLabel20;
=======
    private javax.swing.JLabel jLabel2;
    private javax.swing.JLabel jLabel3;
>>>>>>> c16da9b0823f958b8d7afeb749c1539e5966dadb
    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel5;
    private javax.swing.JLabel jLabel6;
Solution content 
    private javax.swing.JLabel jLabel13;
    private javax.swing.JLabel jLabel14;
    private javax.swing.JLabel jLabel19;

    private javax.swing.JLabel jLabel20;

    private javax.swing.JLabel jLabel2;
    private javax.swing.JLabel jLabel3;

    private javax.swing.JLabel jLabel4;
    private javax.swing.JLabel jLabel5;
    private javax.swing.JLabel jLabel6;
File
ViewFrame.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
    private javax.swing.JPanel jPanel5;
    private javax.swing.JScrollPane jScrollPane1;
    private javax.swing.JScrollPane jScrollPane2;
<<<<<<< HEAD
    private javax.swing.JScrollPane jScrollPane3;
    private javax.swing.JScrollPane jScrollPane4;
=======
    private javax.swing.JTextArea jTextArea1;
    private javax.swing.JTextArea jTextArea2;
    private javax.swing.JTextArea jTextArea3;
    private javax.swing.JTextArea jTextArea4;
    private javax.swing.JTextField jTextField10;
>>>>>>> c16da9b0823f958b8d7afeb749c1539e5966dadb
    private javax.swing.JMenu librarianMenu;
    private javax.swing.JPanel mainPanel;
    private javax.swing.JMenuItem manualMenuItem;
Solution content 
    private javax.swing.JPanel jPanel5;
    private javax.swing.JScrollPane jScrollPane1;
    private javax.swing.JScrollPane jScrollPane2;

    private javax.swing.JScrollPane jScrollPane3;
    private javax.swing.JScrollPane jScrollPane4;

    private javax.swing.JTextArea jTextArea1;
    private javax.swing.JTextArea jTextArea2;
    private javax.swing.JTextArea jTextArea3;
    private javax.swing.JTextArea jTextArea4;
    private javax.swing.JTextField jTextField10;

    private javax.swing.JMenu librarianMenu;
    private javax.swing.JPanel mainPanel;
    private javax.swing.JMenuItem manualMenuItem;
File
ViewFrame.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Chunk
Conflicting content 
	Book b;
	static Connection c = Conn.getInstance().getConnection();

<<<<<<< HEAD
	
	@Test
	public void testSearchBySubject() throws SQLException{
		testBookInsert();
		Borrower bor = new Borrower();
		String[][] lob = bor.searchBookBySubject("astrobiology");
//		assertEquals(lob[0], "123456789");
	}
	@Test
	public void testBookInsert() throws SQLException {
=======
>>>>>>> c16da9b0823f958b8d7afeb749c1539e5966dadb

	public void createBookObject() throws SQLException {
		//create a book object
Solution content 
	Book b;
	static Connection c = Conn.getInstance().getConnection();

	@Test
	public void createBookObject() throws SQLException {
		//create a book object
File
tablesTest.java
Developer's decision
Combination
Kind of conflict
Annotation
Method declaration
Method signature