Revision: 6641 Author: j...@google.com Date: Wed Nov 4 07:51:58 2009 Log: Merge of /trunk c6640.
http://code.google.com/p/google-web-toolkit/source/detail?r=6641 Added: /releases/2.0/user/src/com/google/gwt/user/client/ui/ResizeComposite.java Deleted: /releases/2.0/user/src/com/google/gwt/user/client/ui/LayoutComposite.java Modified: /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.java /releases/2.0/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java ======================================= --- /dev/null +++ /releases/2.0/user/src/com/google/gwt/user/client/ui/ResizeComposite.java Wed Nov 4 07:51:58 2009 @@ -0,0 +1,36 @@ +/* + * Copyright 2009 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.google.gwt.user.client.ui; + +/** + * A {...@link Composite} implementation that implements {...@link RequiresResize} and + * automatically delegates that interface's methods to its wrapped widget, which + * must itself implement {...@link RequiresResize}. + */ +public abstract class ResizeComposite extends Composite implements + RequiresResize { + + @Override + protected void initWidget(Widget widget) { + assert widget instanceof RequiresResize : + "LayoutComposite requires that its wrapped widget implement HasLayout"; + super.initWidget(widget); + } + + public void onResize() { + ((RequiresResize) getWidget()).onResize(); + } +} ======================================= --- /releases/2.0/user/src/com/google/gwt/user/client/ui/LayoutComposite.java Mon Nov 2 12:44:54 2009 +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2009 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.google.gwt.user.client.ui; - -/** - * A {...@link Composite} implementation that implements {...@link RequiresResize} and - * automatically delegates that interface's methods to its wrapped widget, which - * must itself implement {...@link RequiresResize}. - */ -public abstract class LayoutComposite extends Composite implements RequiresResize { - - @Override - protected void initWidget(Widget widget) { - assert widget instanceof RequiresResize : - "LayoutComposite requires that its wrapped widget implement HasLayout"; - super.initWidget(widget); - } - - public void onResize() { - ((RequiresResize) getWidget()).onResize(); - } -} ======================================= --- /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java Tue Sep 22 14:34:43 2009 +++ /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java Wed Nov 4 07:51:58 2009 @@ -20,13 +20,13 @@ import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.HTML; -import com.google.gwt.user.client.ui.LayoutComposite; +import com.google.gwt.user.client.ui.ResizeComposite; import com.google.gwt.user.client.ui.Widget; /** * A composite for displaying the details of an email message. */ -public class MailDetail extends LayoutComposite { +public class MailDetail extends ResizeComposite { interface Binder extends UiBinder<Widget, MailDetail> { } private static final Binder binder = GWT.create(Binder.class); ======================================= --- /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java Wed Nov 4 07:24:16 2009 +++ /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/MailList.java Wed Nov 4 07:51:58 2009 @@ -22,14 +22,14 @@ import com.google.gwt.user.client.ui.FlexTable; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HorizontalPanel; -import com.google.gwt.user.client.ui.LayoutComposite; +import com.google.gwt.user.client.ui.ResizeComposite; import com.google.gwt.user.client.ui.ScrollPanel; import com.google.gwt.user.client.ui.HTMLTable.Cell; /** * A composite that displays a list of emails that can be selected. */ -public class MailList extends LayoutComposite implements ClickHandler { +public class MailList extends ResizeComposite implements ClickHandler { private static final int VISIBLE_EMAIL_COUNT = 20; ======================================= --- /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.java Wed Nov 4 07:24:16 2009 +++ /releases/2.0/samples/mail/src/com/google/gwt/sample/mail/client/Shortcuts.java Wed Nov 4 07:51:58 2009 @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.user.client.ui.LayoutComposite; +import com.google.gwt.user.client.ui.ResizeComposite; import com.google.gwt.user.client.ui.StackLayoutPanel; /** @@ -28,7 +28,7 @@ * {...@link com.google.gwt.user.client.ui.StackPanel}, * {...@link com.google.gwt.user.client.ui.Tree}, and other custom widgets. */ -public class Shortcuts extends LayoutComposite { +public class Shortcuts extends ResizeComposite { interface Binder extends UiBinder<StackLayoutPanel, Shortcuts> { } private static final Binder binder = GWT.create(Binder.class); ======================================= --- /releases/2.0/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java Wed Nov 4 07:24:16 2009 +++ /releases/2.0/user/src/com/google/gwt/user/client/ui/TabLayoutPanel.java Wed Nov 4 07:51:58 2009 @@ -58,7 +58,7 @@ * - Aria, RTL, DebugId * - Update style mechanism (gwt-Tab, etc. not really sufficient). */ -public class TabLayoutPanel extends LayoutComposite implements HasWidgets, +public class TabLayoutPanel extends ResizeComposite implements HasWidgets, ProvidesResize, IndexedPanel, HasBeforeSelectionHandlers<Integer>, HasSelectionHandlers<Integer> { --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---