From 8c598ccfada6a54a5733935544e41056198d6d7c Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 3 Apr 2012 11:20:11 +0300 Subject: [PATCH] Removed unnecessary updateFromUidl calls from containers --- .../gwt/client/ApplicationConnection.java | 7 ++--- .../terminal/gwt/client/ServerConnector.java | 10 ++----- .../gwt/client/ui/CustomLayoutConnector.java | 1 - .../terminal/gwt/client/ui/FormConnector.java | 2 -- .../terminal/gwt/client/ui/RootConnector.java | 2 -- .../terminal/gwt/client/ui/VAccordion.java | 1 - .../terminal/gwt/client/ui/VCssLayout.java | 3 --- .../terminal/gwt/client/ui/VFormLayout.java | 2 -- .../terminal/gwt/client/ui/VGridLayout.java | 1 - .../terminal/gwt/client/ui/VPopupView.java | 2 -- .../terminal/gwt/client/ui/VScrollTable.java | 26 ------------------- .../terminal/gwt/client/ui/VTabsheet.java | 2 -- .../gwt/client/ui/WindowConnector.java | 2 -- 13 files changed, 6 insertions(+), 55 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 854755743b..640e362e32 100644 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -1212,10 +1212,11 @@ public class ApplicationConnection { final UIDL uidl = change.getChildUIDL(0); String connectorId = uidl.getId(); - final ComponentConnector paintable = (ComponentConnector) connectorMap + final ComponentConnector legacyConnector = (ComponentConnector) connectorMap .getConnector(connectorId); - if (paintable != null) { - paintable.updateFromUIDL(uidl, + if (legacyConnector != null + && legacyConnector instanceof Paintable) { + ((Paintable) legacyConnector).updateFromUIDL(uidl, ApplicationConnection.this); } else { VConsole.error("Received update for " diff --git a/src/com/vaadin/terminal/gwt/client/ServerConnector.java b/src/com/vaadin/terminal/gwt/client/ServerConnector.java index 246a132c34..3aab3f8454 100644 --- a/src/com/vaadin/terminal/gwt/client/ServerConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ServerConnector.java @@ -20,14 +20,8 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChange * @version @VERSION@ * @since 7.0.0 */ -public interface ServerConnector extends Connector { - /** - * TODO - * - * @param uidl - * @param client - */ - public void updateFromUIDL(UIDL uidl, ApplicationConnection client); +// TODO Remove "implements Paintable" +public interface ServerConnector extends Connector, Paintable { /** * Sets a new state for the connector. diff --git a/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java index 089245b392..e9555989e3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java @@ -56,7 +56,6 @@ public class CustomLayoutConnector extends AbstractComponentContainerConnector Widget childWidget = childPaintable.getWidget(); try { getWidget().setWidget(childWidget, location); - childPaintable.updateFromUIDL(childUIDL, client); } catch (final IllegalArgumentException e) { // If no location is found, this component is not visible } diff --git a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java index bf2e31d057..20c19d4a23 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java @@ -106,7 +106,6 @@ public class FormConnector extends AbstractComponentContainerConnector getWidget().footerContainer); } getWidget().footer = newFooterWidget; - newFooter.updateFromUIDL(uidl.getChildUIDL(1), client); } else { if (getWidget().footer != null) { getWidget().remove(getWidget().footer); @@ -130,7 +129,6 @@ public class FormConnector extends AbstractComponentContainerConnector getWidget().lo = newLayoutWidget; getWidget().add(newLayoutWidget, getWidget().fieldContainer); } - newLayout.updateFromUIDL(layoutUidl, client); // also recalculates size of the footer if undefined size form - see // #3710 diff --git a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java index cfad231424..fc63eb4862 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java @@ -186,8 +186,6 @@ public class RootConnector extends AbstractComponentContainerConnector { } } - getWidget().layout.updateFromUIDL(childUidl, client); - // Save currently open subwindows to track which will need to be closed final HashSet removedSubWindows = new HashSet( getWidget().subWindows); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java index c496522094..9d71f4645d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VAccordion.java @@ -417,7 +417,6 @@ public class VAccordion extends VTabsheetBase { } else if (getChildWidget() != newWidget) { replaceWidget(newWidget); } - newPntbl.updateFromUIDL(contentUidl, client); if (contentUidl.getBooleanAttribute("cached")) { /* * The size of a cached, relative sized component must be diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java index 02d7ab9d5b..b32ea7b88d 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCssLayout.java @@ -112,9 +112,6 @@ public class VCssLayout extends SimplePanel { } } - if (!r.getBooleanAttribute("cached")) { - child.updateFromUIDL(r, client); - } } // loop oldWidgetWrappers that where not re-attached and unregister diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java index 1d7b053925..7188869af1 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VFormLayout.java @@ -140,8 +140,6 @@ public class VFormLayout extends SimplePanel { CLASSNAME + "-errorcell"); setWidget(i, COLUMN_ERRORFLAG, error); - childPaintable.updateFromUIDL(childUidl, client); - String rowstyles = CLASSNAME + "-row"; if (i == 0) { rowstyles += " " + CLASSNAME + "-firstrow"; diff --git a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java index 2451538511..7baf4c101a 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VGridLayout.java @@ -570,7 +570,6 @@ public class VGridLayout extends ComplexPanel { } } - childConnector.updateFromUIDL(childUidl, client); } } diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java index e5fb3d36c0..e6ca747b7c 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupView.java @@ -299,8 +299,6 @@ public class VPopupView extends HTML { popupComponentPaintable = newPopupComponent; } - popupComponentPaintable - .updateFromUIDL(uidl.getChildUIDL(0), client); } public void unregisterPaintables() { diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 3ef5e07f53..b372ad7e13 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -4364,7 +4364,6 @@ public class VScrollTable extends FlowPanel implements HasWidgets, protected ArrayList childWidgets = new ArrayList(); private boolean selected = false; protected final int rowKey; - private List pendingComponentPaints; private String[] actionKeys = null; private final TableRowElement rowElement; @@ -4491,7 +4490,6 @@ public class VScrollTable extends FlowPanel implements HasWidgets, addCell(uidl, cellContent.getWidget(), aligns[col++], style, sorted); - paintComponent(cellContent, (UIDL) cell); } } } @@ -4564,30 +4562,6 @@ public class VScrollTable extends FlowPanel implements HasWidgets, return index; } - protected void paintComponent(ComponentConnector p, UIDL uidl) { - if (isAttached()) { - p.updateFromUIDL(uidl, client); - } else { - if (pendingComponentPaints == null) { - pendingComponentPaints = new LinkedList(); - } - pendingComponentPaints.add(uidl); - } - } - - @Override - protected void onAttach() { - super.onAttach(); - if (pendingComponentPaints != null) { - for (UIDL uidl : pendingComponentPaints) { - ComponentConnector paintable = (ComponentConnector) ConnectorMap - .get(client).getConnector(uidl.getId()); - paintable.updateFromUIDL(uidl, client); - } - pendingComponentPaints.clear(); - } - } - @Override protected void onDetach() { super.onDetach(); diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java index ffef5825f4..027f7975d3 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java @@ -866,7 +866,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, if (tp.getWidgetIndex(tabContentWidget) < 0) { tp.insert(tabContentWidget, index); } - tabContentPaintable.updateFromUIDL(tabContentUIDL, client); } else if (tp.getWidgetCount() <= index) { tp.add(new PlaceHolder()); } @@ -909,7 +908,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, tp.showWidget(activeTabIndex); VTabsheet.this.iLayout(); - content.updateFromUIDL(contentUIDL, client); /* * The size of a cached, relative sized component must be updated to * report correct size to updateOpenTabSize(). diff --git a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java index 4b5394fa2a..6647d89c63 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java +++ b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java @@ -208,8 +208,6 @@ public class WindowConnector extends AbstractComponentContainerConnector getWidget().layout = lo; } - getWidget().layout.updateFromUIDL(childUidl, client); - // we may have actions and notifications if (uidl.getChildCount() > 1) { final int cnt = uidl.getChildCount(); -- 2.39.5