Quellcode durchsuchen

Restructures Escalator method hierarchy (#13334)

Previously AbstractRowContainer.paintInsertRows was simply overridden by
BodyRowContainer, which was hard to follow. Now ARC.pIR is an abstract method
and the implementation has been put into another protected method.

Change-Id: Ia47a46216d2f9713b958785b5239d6850b1ede0d
tags/7.4.0.beta1
Henrik Paul vor 9 Jahren
Ursprung
Commit
c1de8966d4
1 geänderte Dateien mit 13 neuen und 8 gelöschten Zeilen
  1. 13
    8
      client/src/com/vaadin/client/ui/grid/Escalator.java

+ 13
- 8
client/src/com/vaadin/client/ui/grid/Escalator.java Datei anzeigen

package com.vaadin.client.ui.grid; package com.vaadin.client.ui.grid;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
* the number of rows to insert * the number of rows to insert
* @return a list of the added row elements * @return a list of the added row elements
*/ */
protected List<TableRowElement> paintInsertRows(final int visualIndex,
final int numberOfRows) {
protected abstract void paintInsertRows(final int visualIndex,
final int numberOfRows);

protected List<TableRowElement> paintInsertStaticRows(
final int visualIndex, final int numberOfRows) {
assert isAttached() : "Can't paint rows if Escalator is not attached"; assert isAttached() : "Can't paint rows if Escalator is not attached";


final List<TableRowElement> addedRows = new ArrayList<TableRowElement>(); final List<TableRowElement> addedRows = new ArrayList<TableRowElement>();


Profiler.leave("Escalator.AbstractStaticRowContainer.refreshRows"); Profiler.leave("Escalator.AbstractStaticRowContainer.refreshRows");
} }

@Override
protected void paintInsertRows(int visualIndex, int numberOfRows) {
paintInsertStaticRows(visualIndex, numberOfRows);
}
} }


private class HeaderRowContainer extends AbstractStaticRowContainer { private class HeaderRowContainer extends AbstractStaticRowContainer {
} }


@Override @Override
protected List<TableRowElement> paintInsertRows(final int index,
final int numberOfRows) {
protected void paintInsertRows(final int index, final int numberOfRows) {
if (numberOfRows == 0) { if (numberOfRows == 0) {
return Collections.emptyList();
return;
} }


/* /*
fireRowVisibilityChangeEvent(); fireRowVisibilityChangeEvent();
sortDomElements(); sortDomElements();
} }
return addedRows;
} }


/** /**


if (escalatorRowsNeeded > 0) { if (escalatorRowsNeeded > 0) {


final List<TableRowElement> addedRows = super.paintInsertRows(
final List<TableRowElement> addedRows = paintInsertStaticRows(
index, escalatorRowsNeeded); index, escalatorRowsNeeded);
visualRowOrder.addAll(index, addedRows); visualRowOrder.addAll(index, addedRows);



Laden…
Abbrechen
Speichern