Projects >> gwt-bootstrap >>cfc662367e7b47f2062cd8b5302b352805569e52

Chunk
Conflicting content
    @Override
        paginationDiv.insert(w, beforeIndex);
    }

        initWidget(paginationDiv);
    }

<<<<<<< HEAD
=======
    @Override
    public void add(IsWidget w) {
        list.add(w);
    }

    @Override
    public boolean remove(IsWidget w) {
        return paginationDiv.remove(w);
    }

    @Override
    public void insert(IsWidget w, int beforeIndex) {
    public int getWidgetIndex(IsWidget child) {
        return paginationDiv.getWidgetIndex(child);
    }

    /**
     * Gets the child widget at the specified index.
     *
     * @param index the child widget's index
     * @return the child widget
     */
    @Override
    public Widget getWidget(int index) {
        return list.getWidget(index);
    }

    /**
     * Gets the number of child widgets in this panel.
     *
     * @return the number of children
     */
    @Override
    public int getWidgetCount() {
        return list.getWidgetCount();
    }

    /**
     * Gets the index of the specified child widget.
     *
     * @param child the widget to be found
     * @return the widget's index, or -1 if it is not a child of this
     *         panel
     */
    @Override
    public int getWidgetIndex(Widget child) {
        return list.getWidgetIndex(child);
    }

    /**
     * Removes the widget at the specified index.
     *
     * @param index the index of the widget to be removed
     * @return false if the widget is not present
     */
    @Override
    public boolean remove(int index) {
        return list.remove(index);
    }

>>>>>>> 74fb55a38ce398089820c6d3b1370f3a7c553e89
    public static enum PaginationSize implements Style {
        MINI,
        SMALL,
Solution content
        initWidget(paginationDiv);
    }

    public static enum PaginationSize implements Style {
        MINI,
        SMALL,
File
Pagination.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration
Chunk
Conflicting content
        return list.remove(w);
    }

<<<<<<< HEAD
    @Override
    public void add(IsWidget w) {
        list.add(w);
    }

    @Override
    public boolean remove(IsWidget w) {
        return paginationDiv.remove(w);
    }

    @Override
    public void insert(IsWidget w, int beforeIndex) {
        paginationDiv.insert(w, beforeIndex);
    }

    @Override
    public int getWidgetIndex(IsWidget child) {
        return paginationDiv.getWidgetIndex(child);

    /**
     * @return the child widget
     */
    @Override
    @Override
    public Widget getWidget(int index) {
        return list.getWidget(index);
    }
    }

    /**
     * Gets the child widget at the specified index.
     *
     * @param index the child widget's index
     * Gets the number of child widgets in this panel.
     *
     * @return the number of children
     */
    public int getWidgetCount() {
        return list.getWidgetCount();
    }

    /**
     * Gets the index of the specified child widget.
     *
     * @param child the widget to be found
     * @return the widget's index, or -1 if it is not a child of this
     *         panel
     */
    @Override
    public int getWidgetIndex(Widget child) {
        return list.getWidgetIndex(child);
    }

    /**
     * Removes the widget at the specified index.
     *
     * @param index the index of the widget to be removed
     * @return false if the widget is not present
     */
    @Override
    public boolean remove(int index) {
        return list.remove(index);
    }

=======
>>>>>>> 74fb55a38ce398089820c6d3b1370f3a7c553e89
    /**
     * Inserts another widget into this one.
     *
Solution content
        return list.remove(w);
    }

    @Override
    public void add(IsWidget w) {
        list.add(w);
    }

    @Override
    public boolean remove(IsWidget w) {
        return paginationDiv.remove(w);
    }

    @Override
    public void insert(IsWidget w, int beforeIndex) {
        paginationDiv.insert(w, beforeIndex);
    }

    @Override
    public int getWidgetIndex(IsWidget child) {
        return paginationDiv.getWidgetIndex(child);
    }

    public int getWidgetIndex(Widget child) {
        return list.getWidgetIndex(child);
    }
     * @param index the child widget's index

    /**
     * @return the child widget
     * Removes the widget at the specified index.
     */
    @Override
     * Gets the index of the specified child widget.
    /**
     *
     * @param child the widget to be found
     *
     * Gets the child widget at the specified index.
     * @return the widget's index, or -1 if it is not a child of this
     *
     *         panel
     */
    public Widget getWidget(int index) {
        return list.getWidget(index);
    }

    /**
     * Gets the number of child widgets in this panel.
     *
     * @return the number of children
     */
    @Override
    public int getWidgetCount() {
        return list.getWidgetCount();
    }

    /**
    @Override
     * @param index the index of the widget to be removed
     * @return false if the widget is not present
     */
    @Override
    public boolean remove(int index) {
        return list.remove(index);
    }

    /**
     * Inserts another widget into this one.
     *
File
Pagination.java
Developer's decision
Version 1
Kind of conflict
Annotation
Comment
Method declaration