diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2013-07-25 15:05:18 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-03-31 05:53:21 +0000 |
| commit | ac14e9a5525b10b41449f17c366fb7e5de29e16b (patch) | |
| tree | 6b8f52e77af9784be0c14499392afd35fdf0be5e /server/src/com/vaadin/ui | |
| parent | 25f20bdd10b81ea5bc7996a040d93c92bff6ed0c (diff) | |
| download | vaadin-framework-ac14e9a5525b10b41449f17c366fb7e5de29e16b.tar.gz vaadin-framework-ac14e9a5525b10b41449f17c366fb7e5de29e16b.zip | |
Move DragAndDropService to VaadinSession (#11409)
* ConnectorTracker.getConnector() is now DnDService-aware
* Deprecated LCM.getDragAndDropService() is removed
* LCM.getConnector() simply delegates to ConnectorTracker.getConnector()
Change-Id: I9627d50f7386ead8d92ccbba27b4a558c03076c7
Diffstat (limited to 'server/src/com/vaadin/ui')
| -rw-r--r-- | server/src/com/vaadin/ui/ConnectorTracker.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java index d985ffd124..af03dade3a 100644 --- a/server/src/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/com/vaadin/ui/ConnectorTracker.java @@ -35,6 +35,7 @@ import org.json.JSONObject; import com.vaadin.server.AbstractClientConnector; import com.vaadin.server.ClientConnector; +import com.vaadin.server.DragAndDropService; import com.vaadin.server.GlobalResourceHandler; import com.vaadin.server.LegacyCommunicationManager; import com.vaadin.server.StreamVariable; @@ -271,8 +272,16 @@ public class ConnectorTracker implements Serializable { // Ignore connectors that have been unregistered but not yet cleaned up if (unregisteredConnectors.contains(connector)) { return null; + } else if (connector != null) { + return connector; + } else { + DragAndDropService service = uI.getSession() + .getDragAndDropService(); + if (connectorId.equals(service.getConnectorId())) { + return service; + } } - return connector; + return null; } /** |