Projects >> gwt-scheduler >>ddfb993d74d973889d86b766508f38c38629802a

Chunk
Conflicting content 
import dragndrop.client.core.Zones;
import gwtscheduler.client.dialog.TestTaskDialog;
import gwtscheduler.client.dialog.TestTaskDialogWidget;
<<<<<<< HEAD
import gwtscheduler.client.widgets.view.common.resize.CalendarEventDurationChangeEvent;
import gwtscheduler.client.widgets.view.common.resize.CalendarEventDurationChangeStartHandler;
import gwtscheduler.common.event.colors.DefaultColors;
=======
import gwtscheduler.common.event.colors.DefaultEventColors;
>>>>>>> 95a0506afe8c504fd4e8e83c724ae063e0fe618c
import gwtscheduler.client.events.TeamTaskEvent;
import gwtscheduler.client.modules.EventBus;
import gwtscheduler.client.modules.config.AppConfiguration;
Solution content 
import dragndrop.client.core.Zones;
import gwtscheduler.client.dialog.TestTaskDialog;
import gwtscheduler.client.dialog.TestTaskDialogWidget;
import gwtscheduler.client.widgets.view.common.resize.CalendarEventDurationChangeEvent;
import gwtscheduler.client.widgets.view.common.resize.CalendarEventDurationChangeStartHandler;
import gwtscheduler.common.event.colors.DefaultEventColors;
import gwtscheduler.client.events.TeamTaskEvent;
import gwtscheduler.client.modules.EventBus;
import gwtscheduler.client.modules.config.AppConfiguration;
File
ViewportTests.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
    main.addEventDurationIntervalUpdateHandler(new CalendarEventDurationChangeHandler(){
      @Override
<<<<<<< HEAD
      public void onCalendarEventDurationChange(CalendarEventDurationChangeEvent event) {
//        GWT.log("Resized event" + event.getCalendarEvent().getEventTitle(), null);
//        GWT.log("Event from" + event.getStartTime(), null);
//        GWT.log("Event to" + event.getEndTime(), null);
=======
      public void onCalendarEventDurationIntervalUpdate(CalendarEventDurationIntervalUpdateEvent event) {

>>>>>>> 95a0506afe8c504fd4e8e83c724ae063e0fe618c
        Event calendarEvent = event.getEvent();
        calendarEvent.setDurationInterval(DurationInterval.getInterval(event.getStartTime(), event.getEndTime()));
        main.updateEvent(calendarEvent);
Solution content 
    main.addEventDurationIntervalUpdateHandler(new CalendarEventDurationChangeHandler(){
      @Override
      public void onCalendarEventDurationChange(CalendarEventDurationChangeEvent event) {
        Event calendarEvent = event.getEvent();
        calendarEvent.setDurationInterval(DurationInterval.getInterval(event.getStartTime(), event.getEndTime()));
        main.updateEvent(calendarEvent);
File
ViewportTests.java
Developer's decision
Combination
Kind of conflict
Comment
Method signature