]> source.dussan.org Git - vaadin-framework.git/commitdiff
Merge remote branch 'origin/6.8'
authorLeif Åstrand <leif@vaadin.com>
Wed, 15 Feb 2012 07:31:53 +0000 (09:31 +0200)
committerLeif Åstrand <leif@vaadin.com>
Wed, 15 Feb 2012 07:31:53 +0000 (09:31 +0200)
1  2 
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java

index 86f2c7a2debfb160a06d6958f6ef1497c8f4c8b6,4454287ae994498e9df19ada47f742ccacecb5da..705bf13346ed0809edd588f098b6ce15c24a1dfe
@@@ -1233,13 -1385,27 +1233,17 @@@ public abstract class AbstractCommunica
                  }
                  try {
                      changeVariables(source, owner, m);
 -
 -                    // Special-case of closing browser-level windows:
 -                    // track browser-windows currently open in client
 -                    if (owner instanceof Window
 -                            && ((Window) owner).getParent() == null) {
 -                        final Boolean close = (Boolean) m.get("close");
 -                        if (close != null && close.booleanValue()) {
 -                            closingWindowName = ((Window) owner).getName();
 -                        }
 -                    }
                  } catch (Exception e) {
+                     Component errorComponent = null;
                      if (owner instanceof Component) {
-                         handleChangeVariablesError(app, (Component) owner, e, m);
-                     } else {
-                         // TODO DragDropService error handling
-                         throw new RuntimeException(e);
+                         errorComponent = (Component) owner;
+                     } else if (owner instanceof DragAndDropService) {
+                         if (m.get("dhowner") instanceof Component) {
+                             errorComponent = (Component) m.get("dhowner");
+                         }
                      }
+                     handleChangeVariablesError(app, errorComponent, e, m);
                  }
              } else {