if (visibleRowRange.isEmpty()
|| getState().dropMode == DropMode.ON_TOP) {
return tableWrapper;
- } else { // if dragged under the last row to empty space, drop target
- // needs to be below the last row
- return gridBody.getRowElement(visibleRowRange.getEnd() - 1);
}
+ // if dragged under the last row to empty space, drop target
+ // needs to be below the last row
+ return gridBody.getRowElement(visibleRowRange.getEnd() - 1);
}
@Override
int y = paddingTop;
for (int column = 0; column < cells.length; column++) {
- y = paddingTop + 1 - 1; // Ensure IE10 does not optimize this out by
- // adding something to evaluate on the RHS
- // #11303
+ // Ensure IE10 does not optimize this out by
+ // adding something to evaluate on the RHS
+ // #11303
+ y = paddingTop + 1 - 1;
for (int row = 0; row < cells[column].length; row++) {
Cell cell = cells[column][row];
|| "video".equalsIgnoreCase(old.getTagName())) {
if (!old.hasAttribute("controls")
&& "audio".equalsIgnoreCase(old.getTagName())) {
- return null; // nothing to animate, so we won't add this to
- // the clone
+ // nothing to animate, so we won't add this to
+ // the clone
+ return null;
}
Element newEl = DOM.createElement(old.getTagName());
if (old.hasAttribute("controls")) {
reordered.addAll(columns.subList(
draggedColumnIndex + colspan, columns.size()));
}
- reordered.remove(selectionColumn); // since
- // setColumnOrder
- // will
- // add
- // it
- // anyway!
+ // since setColumnOrder will add it anyway!
+ reordered.remove(selectionColumn);
// capture focused cell column before reorder
Cell focusedCell = cellFocusHandler.getFocusedCell();
.toArray(new Column[reordered.size()]);
setColumnOrder(true, array);
transferCellFocusOnDrop();
- } // else
- // no
- // reordering
+ } // else no reordering
}
private void transferCellFocusOnDrop() {
fieldSet.appendChild(legend);
legend.appendChild(caption);
- fieldSet.appendChild(desc); // Adding description for initial padding
- // measurements, removed later if no
- // description is set
+ // Adding description for initial padding
+ // measurements, removed later if no
+ // description is set
+ fieldSet.appendChild(desc);
fieldSet.appendChild(fieldContainer);
errorMessage.setVisible(false);
private static final int CHARCODE_SPACE = 32;
private int firstRowInViewPort = 0;
private int pageLength = 15;
- private int lastRequestedFirstvisible = 0; // to detect "serverside scroll"
- private int firstvisibleOnLastPage = -1; // To detect if the first visible
- // is on the last page
+ // to detect "serverside scroll"
+ private int lastRequestedFirstvisible = 0;
+ // To detect if the first visible
+ // is on the last page
+ private int firstvisibleOnLastPage = -1;
/** For internal use only. May be removed or replaced in the future. */
public boolean showRowHeaders = false;
colIndex = getColIndexByKey(cid);
DOM.setCapture(getElement());
headerX = tHead.getAbsoluteLeft();
- event.preventDefault(); // prevent selecting text &&
- // generated touch events
+ // prevent selecting text &&
+ // generated touch events
+ event.preventDefault();
}
break;
case Event.ONMOUSEUP:
rowRequestHandler
.setReqRows((int) (2 * pageLength * cacheRate
+ pageLength));
- rowRequestHandler.deferRowFetch(); // some validation +
- // defer 250ms
- rowRequestHandler.cancel(); // instead of waiting
- rowRequestHandler.run(); // run immediately
+ // some validation and defer 250ms
+ // instead of waiting
+ rowRequestHandler.deferRowFetch();
+ rowRequestHandler.cancel();
+ // run immediately
+ rowRequestHandler.run();
}
fireHeaderClickedEvent(event);
if (WidgetUtil.isTouchEvent(event)) {
VScrollTableRow toBeFocusedRow = scrollBody
.getRowByRowIndex(indexOfToBeFocused);
- if (toBeFocusedRow != null) { // if the next focused row
- // is rendered
+ if (toBeFocusedRow != null) {
+ // if the next focused row is rendered
+
setRowFocus(toBeFocusedRow);
selectFocusedRow(ctrl, shift);
// TODO needs scrollintoview ?
boolean display = true;
if (event.isTimeOnDifferentDays()) {
display = true;
- } else { // only in case of one-day event we are able not to display
- // event
- // which is placed in unpublished parts on calendar
+ } else {
+ // only in case of one-day event we are able not to display
+ // event which is placed in unpublished parts on calendar
Date eventStart = event.getStartTime();
Date eventEnd = event.getEndTime();
reordered.addAll(columns.subList(
draggedColumnIndex + colspan, columns.size()));
}
- reordered.remove(selectionColumn); // since setColumnOrder will
- // add it anyway!
+ // since setColumnOrder will add it anyway!
+ reordered.remove(selectionColumn);
// capture focused cell column before reorder
Cell focusedCell = cellFocusHandler.getFocusedCell();
rightBound = cellColumnRightIndex;
}
cellColumnIndex = cellColumnRightIndex - 1;
- } else { // can't drop inside a spanned cell, or this is the
- // dragged cell
+ } else {
+ // can't drop inside a spanned cell, or this is the
+ // dragged cell
while (colspan > 1) {
cellColumnIndex++;
colspan--;
protected Collection<String> getCustomAttributes() {
Collection<String> customAttributes = super.getCustomAttributes();
customAttributes.add("maxlength");
- customAttributes.add("max-length"); // to prevent this appearing in
- // output
+
+ // prevent this from appearing in output
+ customAttributes.add("max-length");
customAttributes.add("cursor-position");
return customAttributes;
}
}
} else if (newDate != oldDate
&& (newDate == null || !newDate.equals(oldDate))) {
- setValue(newDate, true); // Don't require a repaint, client
- // updates itself
+ // Don't require a repaint, client updates itself
+ setValue(newDate, true);
} else if (!uiHasValidDateString) { // oldDate ==
// newDate == null
// Empty value set, previously contained unparsable date string,
final int length) {
LinkedHashSet<Object> ids = new LinkedHashSet<Object>();
for (int i = 0; i < length; i++) {
- assert itemId != null; // should not be null unless client-server
- // are out of sync
+ // should not be null unless client-server are out of sync
+ assert itemId != null;
ids.add(itemId);
itemId = nextItemId(itemId);
}
*/
public NumberRenderer(String formatString, Locale locale)
throws IllegalArgumentException {
- this(formatString, locale, ""); // This will call #toString() during
- // formatting
+ // This will call #toString() during formatting
+ this(formatString, locale, "");
}
/**
// Item with incomplete property set
fieldGroup.setItemDataSource(
grid.getContainerDataSource().getItem(folder));
- grid.getColumn(PROPERTY_NAME).getEditorField(); // called in
- // grid.doEditItem
+
+ // called in grid.doEditItem
+ grid.getColumn(PROPERTY_NAME).getEditorField();
+
assertTrue("Properties in item should be bound",
fieldGroup.getBoundPropertyIds().contains(PROPERTY_NAME));
assertFalse("Properties not present in item should not be bound",
.indexOf(ServletPortletHelper.UPLOAD_URL_PREFIX)
+ ServletPortletHelper.UPLOAD_URL_PREFIX.length();
String uppUri = pathInfo.substring(startOfData);
- String[] parts = uppUri.split("/", 4); // 0= UIid, 1 = cid, 2= name, 3
- // = sec key
+ // 0= UIid, 1= cid, 2= name, 3= sec key
+ String[] parts = uppUri.split("/", 4);
String uiId = parts[0];
String connectorId = parts[1];
String variableName = parts[2];
value = getEmptyValue();
}
dateString = formatDate(value);
- RangeValidator<T> validator = getRangeValidator();// TODO move range
- // check to internal
- // validator?
+ // TODO move range check to internal validator?
+ RangeValidator<T> validator = getRangeValidator();
ValidationResult result = validator.apply(value,
new ValueContext(this, this));
import java.util.Collection;
import java.util.Objects;
-import com.vaadin.event.FieldEvents;
import org.jsoup.nodes.Attributes;
import org.jsoup.nodes.Element;
+import com.vaadin.event.FieldEvents;
import com.vaadin.event.FieldEvents.BlurEvent;
import com.vaadin.event.FieldEvents.BlurListener;
import com.vaadin.event.FieldEvents.FocusEvent;
protected Collection<String> getCustomAttributes() {
Collection<String> customAttributes = super.getCustomAttributes();
customAttributes.add("maxlength");
- customAttributes.add("max-length"); // to prevent this appearing in
- // output
+ // to prevent this appearing in output
+ customAttributes.add("max-length");
customAttributes.add("cursor-position");
return customAttributes;
}
return CODE_POINTS.get(codepoint);
}
- if (FontAwesome.FONT_FAMILY.equals(familyAndCode[0])) { // Left
- // for
- // compatibility
+ if (FontAwesome.FONT_FAMILY.equals(familyAndCode[0])) { // Left for compatibility
return FontAwesome.fromCodepoint(codepoint);
}
// all vaadin icons should have a codepoint
*/
public NumberRenderer(String formatString, Locale locale)
throws IllegalArgumentException {
- this(formatString, locale, ""); // This will call #toString() during
- // formatting
+ // This will call #toString() during formatting
+ this(formatString, locale, "");
}
/**
});
grid.getSelectionModel().select(Sex.UNKNOWN);
- model.setSelectedFromClient(Sex.MALE); // simulates client side
- // selection
+ // simulates client side selection
+ model.setSelectedFromClient(Sex.MALE);
grid.getSelectionModel().select(Sex.MALE); // NOOP
grid.getSelectionModel().deselect(Sex.UNKNOWN); // NOOP
- model.setSelectedFromClient(null); // simulates deselect from client
- // side
+ // simulates deselect from client side
+ model.setSelectedFromClient(null);
grid.getSelectionModel().select(Sex.FEMALE);
assertEquals(Arrays.asList(Sex.UNKNOWN, Sex.MALE, null, Sex.FEMALE),
session.valueUnbound(
EasyMock.createMock(HttpSessionBindingEvent.class));
- mockService.runPendingAccessTasks(session); // as soon as we changed
- // session.accessSynchronously
- // to session.access in
- // VaadinService.fireSessionDestroy,
- // we need to run the
- // pending task ourselves
+ // as soon as we changed session.accessSynchronously
+ // to session.access in VaadinService.fireSessionDestroy,
+ // we need to run the pending task ourselves
+ mockService.runPendingAccessTasks(session);
assertTrue(detachCalled.get());
}
CurrentInstance.clearAll();
session.close();
mockService.cleanupSession(session);
- mockService.runPendingAccessTasks(session); // as soon as we changed
- // session.accessSynchronously
- // to session.access in
- // VaadinService.fireSessionDestroy,
- // we need to run the
- // pending task ourselves
+ // as soon as we changed session.accessSynchronously
+ // to session.access in VaadinService.fireSessionDestroy,
+ // we need to run the pending task ourselves
+ mockService.runPendingAccessTasks(session);
assertTrue(detachCalled.get());
}
// since the selection model has been removed, it is no longer a data
// generator for the data communicator, would need to verify somehow
// that row is not marked as selected anymore ? (done in UI tests)
- assertTrue(customModel.generatedData.isEmpty()); // at least
- // removed
- // selection
- // model is not
- // triggered
+
+ // at least removed selection model is not triggered
+ assertTrue(customModel.generatedData.isEmpty());
}
@Test
obj.setSmallRandom(rand.nextInt(5));
obj.setDate(new Date(timestamp));
- timestamp += 91250000; // a bit over a day, just to get
- // variation
+ // a bit over a day, just to get variation
+ timestamp += 91250000;
data.add(obj);
}
top.setHeight("75px"); // Same as the background image height
playback.setStyleName("playback");
- playback.setMargin(new MarginInfo(false, true, false, false)); // Add
- // right-side
- // margin
+ // Add right-side margin
+ playback.setMargin(new MarginInfo(false, true, false, false));
play.setStyleName("play");
next.setStyleName("next");
prev.setStyleName("prev");
rightTable.setSelectable(true);
rightTable.setMultiSelect(true);
- rightTable.setImmediate(true); // react at once when something is
- // selected
+ // react at once when something is selected
+ rightTable.setImmediate(true);
rightTable.addContainerProperty("name", String.class, null);
// rightTable.setColumnWidth("name", 150);
@Override
protected void setup(VaadinRequest request) {
- setPollInterval(500); // Short polling like 100ms jams up the TestBench
- // waitForVaadin -functionality.
+ // Short polling like 100ms jams up the TestBench
+ // waitForVaadin -functionality.
+ setPollInterval(500);
final Label pollIndicator = new Label();
pollIndicator.setId("pollIndicator");
public class MovingComponentsWhileOldParentInvisible extends TestBase {
- private HasComponents cc = new AbsoluteLayout(); // initial dummy
- // contents
+ // initial dummy contents
+ private HasComponents cc = new AbsoluteLayout();
+
private Label lab;
@Override
d = datarow.get(col++);
d.value = new Date(timestamp);
- timestamp += 91250000; // a bit over a day, just to get
- // variation
+ // a bit over a day, just to get variation
+ timestamp += 91250000;
d = datarow.get(col++);
d.value = "<b>" + row + "</b>";
.setValue(Integer.valueOf(row));
item.getItemProperty(getColumnProperty(col++))
.setValue(new Date(timestamp));
- timestamp += 91250000; // a bit over a day, just to get
- // variation
+ // a bit over a day, just to get variation
+ timestamp += 91250000;
item.getItemProperty(getColumnProperty(col++))
.setValue("<b>" + row + "</b>");
waitUntilNextPageIsVisible();
dropDownComboBox.sendKeys(Keys.UP);
- assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1))); // item
- // 9
+ // item 9
+ assertThat(getSelectedItemText(), is("item " + (PAGESIZE - 1)));
}
private void waitUntilNextPageIsVisible() {
@Test
public void changeResolutionToDayThenMonth() throws Exception {
initialize();
- checkHeaderAndBody(DateTimeResolution.YEAR, true); // check the initial
- // state
+ // check the initial state
+ checkHeaderAndBody(DateTimeResolution.YEAR, true);
click(resolutionDay);
checkHeaderAndBody(DateTimeResolution.DAY, true);
click(resolutionMonth);
textField.getAttribute("value"));
dataFieldButton.click();
- dataFieldButton.click();// Requires two clicks because of error message.
- // TODO fix
+ // Requires two clicks because of error message.
+ // TODO fix
+ dataFieldButton.click();
assertFalse("Unexpected disabled element found",
isElementPresent(By.className("v-disabled")));
By.className("v-grid-sidebar-popup"));
WebElement visibilityToggle = findElementByText("Last Name",
sidebarPopup.findElements(By.className("gwt-MenuItem")));
- action.click(visibilityToggle).perform(); // Click on "Last Name"
- // menu item
+ // Click on "Last Name" menu item
+ action.click(visibilityToggle).perform();
// Check if column "Last Name" is visible
headerCells = grid.getHeaderCells(0);
getGridElement().getCell(5, 0).click();
- verifyAllSelected(false); // EXPECTED since multiselection model can't
- // verify that all have been selected
+ // EXPECTED since multiselection model can't
+ // verify that all have been selected
+ verifyAllSelected(false);
}
@Test
toggleFirstRowSelection();
- verifyAllSelected(false); // EXPECTED since multiselection model can't
- // verify that all have been selected
+ // EXPECTED since multiselection model can't
+ // verify that all have been selected
+ verifyAllSelected(false);
}
@Test
getGridElement().getCell(5, 0).click();
- verifyAllSelected(false); // EXPECTED since multiselection model can't
- // verify that all have been selected
+ // EXPECTED since multiselection model can't
+ // verify that all have been selected
+ verifyAllSelected(false);
}
@Test
toggleFirstRowSelection();
- verifyAllSelected(false); // EXPECTED since multiselection model can't
- // verify that all have been selected
+ // EXPECTED since multiselection model can't
+ // verify that all have been selected
+ verifyAllSelected(false);
}
@Test
rightSpaceSize > 0);
int diff = Math.abs(rightSpaceSize - leftSpaceSize);
- assertTrue("Element is not in the center, diff:" + diff, diff <= 2); // IE11
- // 2pixels
+ // IE11 2pixels
+ assertTrue("Element is not in the center, diff:" + diff, diff <= 2);
}
@Test
addItemsToSelection("Item 4");
assertEquals("4. Selected: [Item 2, Item 4]", getLogRow(0));
- addItemsToSelection("Item 10", "Item 0", "Item 9"); // will cause 3
- // events
+ // will cause 3 events
+ addItemsToSelection("Item 10", "Item 0", "Item 9");
assertEquals("7. Selected: [Item 2, Item 4, Item 10, Item 0, Item 9]",
getLogRow(0));
- removeItemsFromSelection("Item 0", "Item 2", "Item 9"); // will cause 3
- // events
+ // will cause 3 events
+ removeItemsFromSelection("Item 0", "Item 2", "Item 9");
assertEquals("10. Selected: [Item 4, Item 10]", getLogRow(0));
}
findElements(By.className("v-table-header-cell")).size(), 2);
checkHeaderAttributes(1);
- changeOrderButton.click(); // change column order, column #1 now becomes
- // column #0
+ // change column order, column #1 now becomes column #0
+ changeOrderButton.click();
checkHeaderAttributes(0);
-
}
/*
assertEquals("Current URI fragment:", getFragmentLabelValue());
navigateToTest();
assertFragment("test");
- navigateToNull(); // Setting to null when there is a fragment actually
- // sets it to #
+ // Setting to null when there is a fragment actually
+ // sets it to #
+ navigateToNull();
assertEquals("Current URI fragment:", getFragmentLabelValue());
// ensure IE works with new popstate based implementation, see
GridElement.GridRowElement nearToBottomRow = gridElement.getRow(993);
- nearToBottomRow.doubleClick(); // Open upper Row Details, lower Row
- // Details goes out of visible range
+ // Open upper Row Details, lower Row
+ // Details goes out of visible range
+ nearToBottomRow.doubleClick();
Thread.sleep(500);
- nearToBottomRow.doubleClick(); // Close upper Row Details, lower Row
- // Details goes back to visible range
+ // Close upper Row Details, lower Row
+ // Details goes back to visible range
+ nearToBottomRow.doubleClick();
deco = getSpacerDeco(0);
String clip = deco.getCssValue("clip");
projects / vaadin-framework.git / commitdiff