Projects >> Fellesprosjektet >>0358715191f1dd2c3c4889b18f6e2891bd10069e

Chunk
Conflicting content 
	public static int addAppointment(String description, User leader, MeetTime time){

		String query = "INSERT INTO hendelse " +
<<<<<<< HEAD:database/DBAppointment.java
		"(brukerNavn, beskrivelse, startTime, sluttTime, startMinutt, sluttMinutt, dag, uke, m�ned, �r) VALUES ('"
		+ leader.getUserName() + "','" + description + "','" + time.getStart().getHour() + "','" + time.getEnd().getHour() + "','" + 
=======
		"(brukerNavn, beskrivelse, startTime, sluttTime, startMinutt, sluttMinutt, dag, uke, m�ned, �r) VALUES ('"
		+ leader.getUserName() + "','" + 
		description + "','" + time.getStart().getHour() + "','" + time.getEnd().getHour() + "','" + 
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b:Database/DBAppointment.java
		time.getStart().getMinute() + "','" + time.getEnd().getMinute() + "','" + time.getDay().getValue() + "','" + time.getWeek() + "','" + 
		time.getMonth() + "','" + time.getYear() + "')";
		Interact.executeUpdate(query);
Solution content 
	public static int addAppointment(String description, User leader, MeetTime time){

		String query = "INSERT INTO hendelse " +
<<<<<<< HEAD:database/DBAppointment.java
		"(brukerNavn, beskrivelse, startTime, sluttTime, startMinutt, sluttMinutt, dag, uke, m�ned, �r) VALUES ('"
		+ leader.getUserName() + "','" + description + "','" + time.getStart().getHour() + "','" + time.getEnd().getHour() + "','" + 
=======
		"(brukerNavn, beskrivelse, startTime, sluttTime, startMinutt, sluttMinutt, dag, uke, m�ned, �r) VALUES ('"
		+ leader.getUserName() + "','" + 
		description + "','" + time.getStart().getHour() + "','" + time.getEnd().getHour() + "','" + 
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b:Database/DBAppointment.java
		time.getStart().getMinute() + "','" + time.getEnd().getMinute() + "','" + time.getDay().getValue() + "','" + time.getWeek() + "','" + 
		time.getMonth() + "','" + time.getYear() + "')";
		Interact.executeUpdate(query);
File
DBAppointment.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
		User leader = new User("SuperLeader", "Wilhelm", "hemmelig");
		MeetTime meetingTime = new MeetTime(new Time(12, 15), new Time(16, 00), Day.Friday, 52, 2012);
		
<<<<<<< HEAD:database/DBTest.java
		
//		m�te.setId(DBAppointment.getNewestID(m�te));
		ArrayList m  = DBMessage.getInbox(test);
		for (Message message : m) {
			System.out.println(message.getContent());
		}
=======
		Meeting meeting = new Meeting(participants, room, description, leader, meetingTime);
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b:Database/DBTest.java
		

	}
Solution content 
		User leader = new User("SuperLeader", "Wilhelm", "hemmelig");
		MeetTime meetingTime = new MeetTime(new Time(12, 15), new Time(16, 00), Day.Friday, 52, 2012);
		
<<<<<<< HEAD:database/DBTest.java
		
//		m�te.setId(DBAppointment.getNewestID(m�te));
		ArrayList m  = DBMessage.getInbox(test);
		for (Message message : m) {
			System.out.println(message.getContent());
		}
=======
		Meeting meeting = new Meeting(participants, room, description, leader, meetingTime);
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b:Database/DBTest.java
		

	}
File
DBTest.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
Method invocation
Variable
Chunk
Conflicting content 
import javax.swing.JTextField;
import javax.swing.JTextPane;

<<<<<<< HEAD
import controller.AlterDate;
import model.Day;
import model.EventList;
import model.MeetTime;
import model.Meeting;
import model.Time;
import database.DBUser;


=======
import model.Meeting;
import model.MeetingRoom;
import database.DBMeetingRoom;
import database.DBUser;
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
import model.User;

public class NewMeeting{
Solution content 
=======
import model.Meeting;
import javax.swing.JTextField;
import javax.swing.JTextPane;

<<<<<<< HEAD
import controller.AlterDate;

import model.Day;
import model.EventList;
import model.MeetTime;
import model.Meeting;
import model.Time;
import database.DBUser;


import model.MeetingRoom;
import database.DBMeetingRoom;
import database.DBUser;
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
import model.User;

public class NewMeeting{
File
NewMeeting.java
Developer's decision
Manual
Kind of conflict
Import
Chunk
Conflicting content 
	JLabel meetingLabel, messageLabel; 
	JComboBox numberDate, monthDate, fromHour, fromMinute;
	JComboBox toHour, toMinute, meetingRoom;
<<<<<<< HEAD

	EventList meetings;
	Meeting meeting;

	JFrame frame;
	ArrayList allUsers;

=======
	ArrayList meetings;
	Meeting meeting;
	JFrame frame;
	ArrayList allUsers;
	ArrayList rooms;
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
	
	JPanel pan1, pan2, underPanel;
Solution content 
	JLabel meetingLabel, messageLabel; 
	JComboBox numberDate, monthDate, fromHour, fromMinute;
	JComboBox toHour, toMinute, meetingRoom;
<<<<<<< HEAD

	EventList meetings;
	Meeting meeting;

	JFrame frame;
	ArrayList allUsers;

=======
	ArrayList meetings;
	Meeting meeting;
	JFrame frame;
	ArrayList allUsers;
	ArrayList rooms;
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
	
	JPanel pan1, pan2, underPanel;
File
NewMeeting.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
	JPanel pan1, pan2, underPanel;
	
	
<<<<<<< HEAD

=======
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
//	public static void main(String[]args){
//		
//		NewMeeting gogo = new NewMeeting();
Solution content 
	JPanel pan1, pan2, underPanel;
	
	
<<<<<<< HEAD

=======
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
//	public static void main(String[]args){
//		
//		NewMeeting gogo = new NewMeeting();
File
NewMeeting.java
Developer's decision
Manual
Kind of conflict
Blank
Chunk
Conflicting content 
//		NewMeeting gogo = new NewMeeting();
//	
//	}
<<<<<<< HEAD
//	public NewMeeting(ArrayList meetings){
//		JFrame frame = new JFrame();
//
//	public static void main(String[]args){
//		
//		NewMeeting gogo = new NewMeeting();
//	
//	}
	public NewMeeting(EventList meetings){
		frame = new JFrame();

=======
	public NewMeeting(ArrayList meetings){
		JFrame frame = new JFrame();
	}
	public static void main(String[]args){
		
		NewMeeting gogo = new NewMeeting();
	
	}
	public NewMeeting(){
		frame = new JFrame();
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
		
		pan1 = new JPanel();
		pan2 = new JPanel();
Solution content 
		pan2 = new JPanel();
//		NewMeeting gogo = new NewMeeting();
//	
//	}
<<<<<<< HEAD
//	public NewMeeting(ArrayList meetings){
//		JFrame frame = new JFrame();
//
//	public static void main(String[]args){
//		
//		NewMeeting gogo = new NewMeeting();
//	
//	}
	public NewMeeting(EventList meetings){
		frame = new JFrame();

=======
	public NewMeeting(ArrayList meetings){
		JFrame frame = new JFrame();
	}
	public static void main(String[]args){
		
		NewMeeting gogo = new NewMeeting();
	
	}
	public NewMeeting(){
		frame = new JFrame();
>>>>>>> dd83cb7e980065eb8ebe1a091fc3e9b99af7f22b
		
		pan1 = new JPanel();
File
NewMeeting.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method declaration
Method invocation
Method signature