summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorAleksi Hietanen <aleksi@vaadin.com>2017-11-21 14:25:42 +0200
committerGitHub <noreply@github.com>2017-11-21 14:25:42 +0200
commitf805482c6013cebdb401341da37614fd664f85c7 (patch)
treed5f04537f28513a4fbab86e2655eaa4e7a05b444 /client/src
parent0fbeb0a6261b5a9f6485928965f0932fea0e624f (diff)
downloadvaadin-framework-f805482c6013cebdb401341da37614fd664f85c7.tar.gz
vaadin-framework-f805482c6013cebdb401341da37614fd664f85c7.zip
Fix issues from API review for 8.2 (#10342)
* Rename HierarchicalDataCommunicator#getMapper to getHierarchyMapper * Make rpc field in Notification private * Change DropIndexCalculator.ALWAYS_DROP_TO_END to a generic static method * Move EditorImpl#editRow documentation to the interface level * Correct GridDragEndEvent, GridDragStartEvent constructor javadocs * Revert SharedState.registeredEventListeners to a Set * Rename GridDropTarget dropAllowedOnSortedGridRows * Rename ColumnState.contentMode to tooltipContentMode
Diffstat (limited to 'client/src')
-rw-r--r--client/src/main/java/com/vaadin/client/connectors/grid/ColumnConnector.java18
-rw-r--r--client/src/main/java/com/vaadin/client/connectors/grid/GridConnector.java2
-rw-r--r--client/src/main/java/com/vaadin/client/ui/AbstractConnector.java6
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);
}
/**