diff options
Diffstat (limited to 'client/src')
3 files changed, 13 insertions, 13 deletions
diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java index 4112a29e6b..be1734a269 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java @@ -42,7 +42,7 @@ public class ColumnConnector extends AbstractExtensionConnector { extends Column<Object, JsonObject> { private final String connectorId; - private ContentMode contentMode; + private ContentMode tooltipContentMode; CustomColumn(String connectorId) { this.connectorId = connectorId; @@ -64,20 +64,20 @@ public class ColumnConnector extends AbstractExtensionConnector { * * @since 8.2 */ - public ContentMode getContentMode() { - return contentMode; + public ContentMode getTooltipContentMode() { + return tooltipContentMode; } /** * Sets the content mode for tooltips in this column. * - * @param contentMode + * @param tooltipContentMode * the content mode for tooltips * * @since 8.2 */ - public void setContentMode(ContentMode contentMode) { - this.contentMode = contentMode; + public void setTooltipContentMode(ContentMode tooltipContentMode) { + this.tooltipContentMode = tooltipContentMode; } } @@ -189,9 +189,9 @@ public class ColumnConnector extends AbstractExtensionConnector { column.setEditable(getState().editable); } - @OnStateChange("contentMode") - void updateContentMode() { - column.setContentMode(getState().contentMode); + @OnStateChange("tooltipContentMode") + void updateTooltipContentMode() { + column.setTooltipContentMode(getState().tooltipContentMode); } @Override diff --git a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java index 14d5b297eb..ff83763d7b 100644 --- a/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java +++ b/client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java @@ -634,7 +634,7 @@ public class GridConnector extends AbstractListingConnector if (cellDescriptions != null && cellDescriptions.hasKey(id)) { return new TooltipInfo(cellDescriptions.getString(id), - ((CustomColumn) column).getContentMode()); + ((CustomColumn) column).getTooltipContentMode()); } else if (row.hasKey(GridState.JSONKEY_ROWDESCRIPTION)) { return new TooltipInfo( row.getString(GridState.JSONKEY_ROWDESCRIPTION), diff --git a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java index a5b387871b..479fcd60f5 100644 --- a/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/AbstractConnector.java @@ -20,7 +20,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.List; -import java.util.Map; +import java.util.Set; import java.util.logging.Logger; import com.google.gwt.core.client.JsArrayString; @@ -490,8 +490,8 @@ public abstract class AbstractConnector */ @Override public boolean hasEventListener(String eventIdentifier) { - Map<String, Integer> reg = getState().registeredEventListeners; - return reg != null && reg.containsKey(eventIdentifier); + Set<String> reg = getState().registeredEventListeners; + return reg != null && reg.contains(eventIdentifier); } /** |