Projects >> po-project >>fe81f6f120e8eacf6f318619a0060718ee3164f4

Chunk
Conflicting content 
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
<<<<<<< HEAD
import javax.swing.border.EmptyBorder;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.AbstractTableModel;
=======
import javax.swing.JTextField;
import javax.swing.SwingConstants;
import javax.swing.border.EmptyBorder;
import javax.swing.table.DefaultTableModel;

import java.awt.CardLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import javax.swing.JLabel;
>>>>>>> 411ee5229ea2cf39aa1ceaefd4d035f7c53d1010

public class Gabinet_GUI implements Serializable {
Solution content 
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.JTextField;
import javax.swing.border.EmptyBorder;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.AbstractTableModel;


public class Gabinet_GUI implements Serializable {
File
Gabinet_GUI.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
		final JMenu mnGabinet = new JMenu("Zarządzanie Gabinetem");
		menuBar.add(mnGabinet);
		
<<<<<<< HEAD
=======
		final JMenuItem mntmZapisz = new JMenuItem("Zapisz");
		mntmZapisz.addMouseListener(new MouseAdapter() {
			public void mouseClicked(MouseEvent e) {
				lblOczekiwanie.setText("Zapisano!");
			}
		});
		mnGabinet.add(mntmZapisz);
>>>>>>> 411ee5229ea2cf39aa1ceaefd4d035f7c53d1010
		
		JMenuItem mntmWyjdz = new JMenuItem("Wyjdź");
		mntmWyjdz.addActionListener(new ActionListener() {
Solution content 
		final JMenu mnGabinet = new JMenu("Zarządzanie Gabinetem");
		menuBar.add(mnGabinet);
				
		JMenuItem mntmWyjdz = new JMenuItem("Wyjdź");
		mntmWyjdz.addActionListener(new ActionListener() {
File
Gabinet_GUI.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		}
	}

<<<<<<< HEAD
	public void setTypGabinetu(String typGabinetu) {
		this.typGabinetu = typGabinetu;
	}

	public String getTypGabinetu() {
		return typGabinetu;
	}

	public String getTypOswietlenia() {
		return typOswietlenia;
	}
=======
public void setTypGabinetu(String typGabinetu) {
	this.typGabinetu = typGabinetu;
}
public String getTypGabinetu(){
	return typGabinetu;
}
public void saveNew() throws IOException{
	/*
	BufferedWriter plik = new BufferedWriter(new FileWriter("data/gabinety.txt"));
	String linia;
	String save = "";
	save += this.typGabinetu + sep + this.typOswietlenia + "\n";
	
	while((linia = plik.readline()) != null)
	{
		
	}
	plik.append(save);
	plik.close();
	*/
}
>>>>>>> 411ee5229ea2cf39aa1ceaefd4d035f7c53d1010

	public void setTypOswietlenia(String typOswietlenia) {
		this.typOswietlenia = typOswietlenia;
Solution content 
		}
	}


	public void setTypGabinetu(String typGabinetu) {
		this.typGabinetu = typGabinetu;
	}

	public String getTypGabinetu() {
		return typGabinetu;
	}

	public String getTypOswietlenia() {
		return typOswietlenia;
	}


	public void setTypOswietlenia(String typOswietlenia) {
		this.typOswietlenia = typOswietlenia;
File
Gabinet.java
Developer's decision
Version 1
Kind of conflict
Method declaration