Projects >> gwt-scheduler >>ca0c29ea91511157aa1d26038d77ef4e47924a18

Chunk
Conflicting content 
      presenter.addEventResizeStartHandler(handler);
    }
  }
<<<<<<< HEAD

  public void updateEvent(Event event) {
    // TODO: its not good idea to update only on active calendar.
    CalendarPresenter presenter = presenters.get(selectedPresenter);
    presenter.updateEvent(event);
=======
   public void addEventDeleteEventHandler(EventDeleteEventHandler handler) {
     for (CalendarPresenter calendar : presenters) {
      calendar.addEventDeleteEventHandler(handler);
    }
  }

  public void deleteEvent(Event event) {
    CalendarPresenter presenter = presenters.get(selectedPresenter);
    presenter.deleteEvent(event);
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }
}
Solution content 
      presenter.addEventResizeStartHandler(handler);
    }
  }
   public void addEventDeleteEventHandler(EventDeleteEventHandler handler) {
     for (CalendarPresenter calendar : presenters) {
      calendar.addEventDeleteEventHandler(handler);
    }
  }

  public void deleteEvent(Event event) {
    CalendarPresenter presenter = presenters.get(selectedPresenter);
    presenter.deleteEvent(event);
  }
  
  public void updateEvent(Event event) {
    // TODO: its not good idea to update only on active calendar.
    CalendarPresenter presenter = presenters.get(selectedPresenter);
    presenter.updateEvent(event);
  }
}
File
GwtScheduler.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method declaration
Method invocation
Method signature
Variable
Chunk
Conflicting content 
  HandlerRegistration addEventResizeStartHandler(CalendarEventResizeStartHandler handler);

<<<<<<< HEAD
  void updateEvent(Event event);
=======
  HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler);

  void deleteEvent(Event event);
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
}
Solution content 
  HandlerRegistration addEventResizeStartHandler(CalendarEventResizeStartHandler handler);

  HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler);

  void deleteEvent(Event event);
  
  void updateEvent(Event event);
}
File
CalendarPresenter.java
Developer's decision
Concatenation
Kind of conflict
Method interface
Chunk
Conflicting content 
    return eventsDashboard.getEventsDachboardWidgetResizeHandler();
  }

<<<<<<< HEAD
  public void updateEvent(Event event) {
    eventsDashboard.updateEvent(event);
=======
  public void deleteEvent(Event event) {
    eventsDashboard.deleteEvent(event);
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }
}
Solution content 
    return eventsDashboard.getEventsDachboardWidgetResizeHandler();
  }

  public void updateEvent(Event event) {
    eventsDashboard.updateEvent(event);
  }

  public void deleteEvent(Event event) {
    eventsDashboard.deleteEvent(event);
  }
}
File
CalendarContent.java
Developer's decision
Concatenation
Kind of conflict
Method invocation
Method signature
Chunk
Conflicting content 
      }
    });

<<<<<<< HEAD
    calendarContent.addContentChangeCallback(new ContentChange(){ // TODO: remove this callback. Make somehow with handler or catch from event bus. or fire event or something like that
=======

    eventBus.addHandler(CalendarEventDeleteEvent.TYPE,new CalendarEventDeleteEventHandler(){
      @Override
      public void onEventDelete(CalendarEventDeleteEvent e) {
           display.getHasEventDeleteEventHandlers().fireEvent(new EventDeleteEvent(e.getEvent()));
      }
    });

    calendarContent.addContentChangeCallback(new ContentChange(){
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2

      @Override
      public void onDrop(int[] newCell, Object droppedObject) {
Solution content 
      }
    });


    eventBus.addHandler(CalendarEventDeleteEvent.TYPE,new CalendarEventDeleteEventHandler(){
      @Override
      public void onEventDelete(CalendarEventDeleteEvent e) {
           display.getHasEventDeleteEventHandlers().fireEvent(new EventDeleteEvent(e.getEvent()));
      }
    });

    calendarContent.addContentChangeCallback(new ContentChange(){

      @Override
      public void onDrop(int[] newCell, Object droppedObject) {
File
ColumnsViewPresenter.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
  }

  @Override
<<<<<<< HEAD
  public void updateEvent(Event event) {
    calendarContent.updateEvent(event);
=======
  public HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler) {
    return display.getHasEventDeleteEventHandlers().addEventDeleteEventHandler(handler);
  }

  @Override
  public void deleteEvent(Event event) {
    calendarContent.deleteEvent(event);
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }

  @Override
Solution content 
  }

  @Override
  public HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler) {
    return display.getHasEventDeleteEventHandlers().addEventDeleteEventHandler(handler);
  }

  @Override
  public void deleteEvent(Event event) {
    calendarContent.deleteEvent(event);
  }
  
  @Override
  public void updateEvent(Event event) {
    calendarContent.updateEvent(event);
  }

  @Override
File
ColumnsViewPresenter.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Method declaration
Method invocation
Method signature
Chunk
Conflicting content 
      }
    });

<<<<<<< HEAD
    display.addDragOverHandler(new DragOverHandler() {
      @Override
      public void onDragOver(DragOverEvent event) {
        proceedDragOver(event);
      }
    });
=======
  private void clearEvents() {
    display.asWidget().clear();
//    for (CalendarEvent event : events) {
//      event.removeFromParent(display.asWidget());
//    }
    events.clear();
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }

  private void proceedDragOver(DragOverEvent event) {
Solution content 
      }
    });
    
    display.addDragOverHandler(new DragOverHandler() {
      @Override
      public void onDragOver(DragOverEvent event) {
        proceedDragOver(event);
      }
    });
  }

  private void clearEvents() {
    display.asWidget().clear();
//    for (CalendarEvent event : events) {
//      event.removeFromParent(display.asWidget());
//    }
    events.clear();
  }

  private void proceedDragOver(DragOverEvent event) {
File
EventsDashboard.java
Developer's decision
Concatenation
Kind of conflict
Comment
Method invocation
Method signature
Chunk
Conflicting content 
    }
  }

<<<<<<< HEAD
  private void clearEvents() {
    for (CalendarEvent event : events) {
      event.removeFromParent(display.asWidget());
      events.remove(event);
    }
=======
  private CalendarEvent buildCalendarEvent(Event event, EventPosition eventPosition, int[] startCellPosition, int[] endCellPosition) {
    CalendarEvent calendarEvent = new CalendarEvent(event, eventPosition,startCellPosition,endCellPosition,eventBus);
    CalendarEvent.Display display = this.display.getCalendarEventDisplay();
    calendarEvent.bindDisplay(display);
    dragZone.add(calendarEvent);
    return calendarEvent;
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }

  private boolean checkForCollision(int[] cell, int cellCount, int rowsCount, CalendarColumn column) {
Solution content 
    }
  }

  private boolean checkForCollision(int[] cell, int cellCount, int rowsCount, CalendarColumn column) {
File
EventsDashboard.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Method signature
Return statement
Variable
Chunk
Conflicting content 
    return displayWidgetResizeHandler;
  }

<<<<<<< HEAD
  public void setColumns(List columns) {
    this.columns = columns;
  }

  public void addContentChangeCallback(final ContentChange contentChange) {
    display.addDropHandler(new DropHandler() {
      @Override
      public void onDrop(DropEvent event) {
        if (collision) {
          throw new EventIntervalCollisionException(EVENT_IN_COLLISION);
        }
        int[] newCell = display.getCellPosition(event.getEndX(), event.getEndY());

        if(events.contains(event.getDroppedObject())){
          int[] oldCell = display.getCellPosition(event.getStartX(), event.getStartY());
          contentChange.onMove(oldCell, newCell, event.getDroppedObject());
        } else {
          contentChange.onDrop(newCell, event.getDroppedObject());
        }
      }
    });
  }

  public void addEvent(Event event) {
    CalendarEvent calendarEvent = buildCalendarEvent(event);
    events.add(calendarEvent);
    dragZone.add(calendarEvent);
    resizeHelper.attachResizeHelper(calendarEvent);
    calendarEvent.go(display.asWidget());
  }
                            // TODO: building on event can be completed by some object event builder!
  private CalendarEvent buildCalendarEvent(Event event) {
    int columnIndex = findColumnIndex(event);

    if(columnIndex < 0){
      GWT.log("Not acceptable column found!", new IllegalStateException());
      return null; // or throw an exception!
    }
    
    Instant startTime = event.getInterval().getStart().toInstant();
    Instant endTime = event.getInterval().getEnd().toInstant();

    int rowsCount = display.getRowCount();
    int startRow = dateGenerator.getRowForInstant(startTime, rowsCount);
    int endRow = dateGenerator.getRowForInstant(endTime, rowsCount);

    // checks if end row is at 00.00 on the next day
    if(endRow>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
  }
}
Solution content 
    return displayWidgetResizeHandler;
  }

  public void setColumns(List columns) {
    this.columns = columns;
  }

  public void addContentChangeCallback(final ContentChange contentChange) {
    display.addDropHandler(new DropHandler() {
      @Override
      public void onDrop(DropEvent event) {
        if (collision) {
          throw new EventIntervalCollisionException(EVENT_IN_COLLISION);
        }
        int[] newCell = display.getCellPosition(event.getEndX(), event.getEndY());

        if(events.contains(event.getDroppedObject())){
          int[] oldCell = display.getCellPosition(event.getStartX(), event.getStartY());
          contentChange.onMove(oldCell, newCell, event.getDroppedObject());
        } else {
          contentChange.onDrop(newCell, event.getDroppedObject());
        }
      }
    });
  }

  public void addEvent(Event event) {
    CalendarEvent calendarEvent = buildCalendarEvent(event);
    events.add(calendarEvent);
    dragZone.add(calendarEvent);
    resizeHelper.attachResizeHelper(calendarEvent);
    calendarEvent.go(display.asWidget());
  }
                            // TODO: building on event can be completed by some object event builder!
  private CalendarEvent buildCalendarEvent(Event event) {
    int columnIndex = findColumnIndex(event);

    if(columnIndex < 0){
      GWT.log("Not acceptable column found!", new IllegalStateException());
      return null; // or throw an exception!
    }
    
    Instant startTime = event.getInterval().getStart().toInstant();
    Instant endTime = event.getInterval().getEnd().toInstant();

    int rowsCount = display.getRowCount();
    int startRow = dateGenerator.getRowForInstant(startTime, rowsCount);
    int endRow = dateGenerator.getRowForInstant(endTime, rowsCount);

    // checks if end row is at 00.00 on the next day
    if(endRow
File
EventsDashboard.java
Developer's decision
Manual
Kind of conflict
Comment
For statement
Method declaration
Method signature
Return statement
Chunk
Conflicting content 
   */
  Object getColumnId();

<<<<<<< HEAD
  String getEventKey();
=======
  String getEventId();
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
}
Solution content 
   */
  Object getColumnId();

  String getEventId();
}
File
Event.java
Developer's decision
Version 2
Kind of conflict
Method interface
Chunk
Conflicting content 
  }
  }

  @Override
<<<<<<< HEAD
  public void updateEvent(Event event) {
=======
  public HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler) {
    return null;  //To change body of implemented methods use File | Settings | File Templates.
  }

  @Override
  public void deleteEvent(Event event) {
    //To change body of implemented methods use File | Settings | File Templates.
>>>>>>> d089bacecb0472f41a854d3330d7fd1322aafbe2
Solution content 
  }

  @Override
  public void updateEvent(Event event) {
  }
  
  @Override
  public HandlerRegistration addEventDeleteEventHandler(EventDeleteEventHandler handler) {
    return null;  //To change body of implemented methods use File | Settings | File Templates.
  }


  @Override
  public void deleteEvent(Event event) {
    //To change body of implemented methods use File | Settings | File Templates.
  }
File
DateTimeAwarePresenter.java
Developer's decision
Concatenation
Kind of conflict
Annotation
Comment
Method declaration
Method signature