package com.itmill.toolkit.terminal.gwt.client.ui;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
-import com.itmill.toolkit.terminal.gwt.client.CaptionWrapper;
import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
+import com.itmill.toolkit.terminal.gwt.client.Caption;
import com.itmill.toolkit.terminal.gwt.client.Layout;
import com.itmill.toolkit.terminal.gwt.client.Paintable;
import com.itmill.toolkit.terminal.gwt.client.UIDL;
public class IVerticalLayout extends VerticalPanel implements Paintable, Layout {
- private HashMap componentToWrapper = new HashMap();
+ private HashMap componentToCaption = new HashMap();
+
+ private ApplicationConnection client;
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
+ this.client = client;
+
// Ensure correct implementation
if (client.updateComponent(this, uidl, false))
return;
- // TODO Should update instead of just redraw
- clear();
- componentToWrapper.clear();
-
- for (Iterator i = uidl.getChildIterator(); i.hasNext();) {
- UIDL uidlForChild = (UIDL) i.next();
+ ArrayList uidlWidgets = new ArrayList();
+ for (Iterator it = uidl.getChildIterator(); it.hasNext();) {
+ UIDL uidlForChild = (UIDL) it.next();
Widget child = client.getWidget(uidlForChild);
- add(child);
((Paintable)child).updateFromUIDL(uidlForChild, client);
+ uidlWidgets.add(child);
}
+
+ ArrayList oldWidgets = getPaintables();
+
+ Iterator oldIt = oldWidgets.iterator();
+ Iterator newIt = uidlWidgets.iterator();
+
+ Widget oldChild = null;
+ while(newIt.hasNext()) {
+ Widget child = (Widget) newIt.next();
+ if(oldChild == null && oldIt.hasNext()) {
+ // search for next old Paintable which still exists in layout
+ // and delete others
+ while(oldIt.hasNext()) {
+ oldChild = (Widget) oldIt.next();
+ // if faced a caption, bypass it
+ if (oldChild instanceof Caption) {
+ oldChild = (Widget) oldIt.next();
+ }
+ // now oldChild is an instance of Paintable
+ if(uidlWidgets.contains(oldChild))
+ break;
+ else {
+ client.unregisterPaintable((Paintable) oldChild);
+ remove(oldChild);
+ oldChild = null;
+ }
+ }
+ }
+ if(oldChild == null) {
+ // we are adding components to layout
+ add(child);
+ continue;
+ }
+ if(child == oldChild) {
+ // child already attached and updated
+ if(oldIt.hasNext())
+ oldChild = (Widget) oldIt.next();
+ continue;
+ }
+ if(hasChildComponent(child)) {
+ // some components have been moved or removed
+ // detach them temporarely
+ while(oldChild != child) {
+ remove(oldChild);
+ oldChild = (Widget) oldIt.next();
+ }
+ } else {
+ this.insert(child, this.getWidgetIndex(oldChild));
+ }
+ }
+ // remove possibly remaining old children which were not updated ~ removed
+ while(oldIt.hasNext())
+ remove((Widget) oldIt.next());
+ }
+
+ private ArrayList getPaintables() {
+ ArrayList al = new ArrayList();
+ Iterator it = iterator();
+ while (it.hasNext()) {
+ Widget w = (Widget) it.next();
+ if (w instanceof Paintable)
+ al.add(w);
+ }
+ return al;
+ }
+
+ public boolean remove(Widget w) {
+ if (w instanceof Paintable) {
+ Caption c = (Caption) componentToCaption.get(w);
+ if(c != null) {
+ componentToCaption.remove(c);
+ remove(c);
+ }
+ client.unregisterPaintable((Paintable) w);
+ }
+ return super.remove(w);
}
+ /* (non-Javadoc)
+ * @see com.itmill.toolkit.terminal.gwt.client.Layout#replaceChildComponent(com.google.gwt.user.client.ui.Widget, com.google.gwt.user.client.ui.Widget)
+ */
public void replaceChildComponent(Widget from, Widget to) {
- CaptionWrapper wrapper = (CaptionWrapper) componentToWrapper.get(from);
- if (wrapper != null) {
- componentToWrapper.remove(from);
- from = wrapper;
+ client.unregisterPaintable((Paintable) from);
+ Caption c = (Caption) componentToCaption.get(from);
+ if (c != null) {
+ remove(c);
+ componentToCaption.remove(c);
}
int index = getWidgetIndex(from);
if (index >= 0) {
}
public boolean hasChildComponent(Widget component) {
- return getWidgetIndex(component) >= 0 || componentToWrapper.get(component) != null;
+ return getWidgetIndex(component) >= 0;
}
public void updateCaption(Widget component, UIDL uidl) {
- CaptionWrapper wrapper = (CaptionWrapper) componentToWrapper.get(component);
- if (CaptionWrapper.isNeeded(uidl)) {
- if (wrapper == null) {
+ Caption c = (Caption) componentToCaption.get(component);
+
+ if (Caption.isNeeded(uidl)) {
+ if (c == null) {
int index = getWidgetIndex(component);
- remove(component);
- wrapper = new CaptionWrapper(component);
- insert(wrapper, index);
- componentToWrapper.put(component, wrapper);
+ c = new Caption();
+ insert(c, index);
+ componentToCaption.put(component, c);
}
- wrapper.updateCaption(uidl);
+ c.updateCaption(uidl);
} else {
- if (wrapper != null) {
- int index = getWidgetIndex(wrapper);
- remove(wrapper);
- insert(wrapper.getWidget(), index);
- componentToWrapper.remove(component);
+ if (c != null) {
+ remove(c);
+ componentToCaption.remove(component);
}
}
}
package com.itmill.toolkit.terminal.gwt.client.ui;
+import com.google.gwt.user.client.ui.SimplePanel;
+import com.google.gwt.user.client.ui.Widget;
import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
import com.itmill.toolkit.terminal.gwt.client.Paintable;
import com.itmill.toolkit.terminal.gwt.client.UIDL;
-public class IWindow extends IVerticalLayout implements Paintable {
+public class IWindow extends SimplePanel implements Paintable {
private String theme;
+ private Paintable layout;
+
public String getTheme() {
return theme;
}
public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
theme = uidl.getStringAttribute("theme");
- super.updateFromUIDL( uidl, client);
com.google.gwt.user.client.Window.setTitle(uidl.getStringAttribute("caption"));
+ UIDL childUidl = uidl.getChildUIDL(0);
+ Paintable lo = (Paintable) client.getWidget(childUidl);
+ if(layout != null) {
+ if(layout != lo) {
+ // remove old
+ client.unregisterPaintable(layout);
+ // add new
+ setWidget((Widget) lo);
+ layout = lo;
+ }
+ } else {
+ setWidget((Widget) lo);
+ }
+ lo.updateFromUIDL(childUidl, client);
}
}
projects / vaadin-framework.git / commitdiff