Switch from our own LazyTabChild to GWT 1.6's LazyPanel
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/src/main/java/com/google/gerrit/client/account/AccountSettings.java b/src/main/java/com/google/gerrit/client/account/AccountSettings.java
index 2ee412e..1b8a0e2 100644
--- a/src/main/java/com/google/gerrit/client/account/AccountSettings.java
+++ b/src/main/java/com/google/gerrit/client/account/AccountSettings.java
@@ -22,9 +22,9 @@
import com.google.gerrit.client.rpc.Common;
import com.google.gerrit.client.rpc.ScreenLoadCallback;
import com.google.gerrit.client.ui.AccountScreen;
-import com.google.gerrit.client.ui.LazyTabChild;
import com.google.gwt.i18n.client.LocaleInfo;
import com.google.gwt.user.client.ui.Grid;
+import com.google.gwt.user.client.ui.LazyPanel;
import com.google.gwt.user.client.ui.SourcesTabEvents;
import com.google.gwt.user.client.ui.TabListener;
import com.google.gwt.user.client.ui.TabPanel;
@@ -97,34 +97,34 @@
tabs.add(prefsPanel, Util.C.tabPreferences());
tabTokens.add(Link.SETTINGS);
- tabs.add(new LazyTabChild<ContactPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected ContactPanel create() {
+ protected ContactPanel createWidget() {
return new ContactPanel(AccountSettings.this);
}
}, Util.C.tabContactInformation());
tabTokens.add(Link.SETTINGS_CONTACT);
- tabs.add(new LazyTabChild<SshKeyPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected SshKeyPanel create() {
+ protected SshKeyPanel createWidget() {
return new SshKeyPanel();
}
}, Util.C.tabSshKeys());
tabTokens.add(Link.SETTINGS_SSHKEYS);
- tabs.add(new LazyTabChild<ExternalIdPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected ExternalIdPanel create() {
+ protected ExternalIdPanel createWidget() {
return new ExternalIdPanel();
}
}, Util.C.tabWebIdentities());
tabTokens.add(Link.SETTINGS_WEBIDENT);
if (Common.getGerritConfig().isUseContributorAgreements()) {
- tabs.add(new LazyTabChild<AgreementPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected AgreementPanel create() {
+ protected AgreementPanel createWidget() {
return new AgreementPanel();
}
}, Util.C.tabAgreements());
diff --git a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java b/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
index 6c2041a..644be9a 100644
--- a/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
+++ b/src/main/java/com/google/gerrit/client/admin/ProjectAdminScreen.java
@@ -20,7 +20,7 @@
import com.google.gerrit.client.reviewdb.ProjectRight;
import com.google.gerrit.client.rpc.ScreenLoadCallback;
import com.google.gerrit.client.ui.AccountScreen;
-import com.google.gerrit.client.ui.LazyTabChild;
+import com.google.gwt.user.client.ui.LazyPanel;
import com.google.gwt.user.client.ui.SourcesTabEvents;
import com.google.gwt.user.client.ui.TabListener;
import com.google.gwt.user.client.ui.TabPanel;
@@ -65,27 +65,27 @@
tabs.setWidth("98%");
add(tabs);
- tabs.add(new LazyTabChild<ProjectInfoPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected ProjectInfoPanel create() {
+ protected ProjectInfoPanel createWidget() {
return new ProjectInfoPanel(projectId);
}
}, Util.C.projectAdminTabGeneral());
tabTokens.add(Link.toProjectAdmin(projectId, INFO_TAB));
if (!ProjectRight.WILD_PROJECT.equals(projectId)) {
- tabs.add(new LazyTabChild<ProjectBranchesPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected ProjectBranchesPanel create() {
+ protected ProjectBranchesPanel createWidget() {
return new ProjectBranchesPanel(projectId);
}
}, Util.C.projectAdminTabBranches());
tabTokens.add(Link.toProjectAdmin(projectId, BRANCH_TAB));
}
- tabs.add(new LazyTabChild<ProjectRightsPanel>() {
+ tabs.add(new LazyPanel() {
@Override
- protected ProjectRightsPanel create() {
+ protected ProjectRightsPanel createWidget() {
return new ProjectRightsPanel(projectId);
}
}, Util.C.projectAdminTabAccess());
diff --git a/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java b/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java
deleted file mode 100644
index 903f8c5..0000000
--- a/src/main/java/com/google/gerrit/client/ui/LazyTabChild.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright (C) 2008 The Android Open Source Project
-//
-// 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.gerrit.client.ui;
-
-import com.google.gwt.user.client.ui.SimplePanel;
-import com.google.gwt.user.client.ui.Widget;
-
-/** Panel for use within a TabPanel to create the widget only on selection. */
-public abstract class LazyTabChild<T extends Widget> extends SimplePanel {
- /** @return the widget to display in this panel. */
- protected abstract T create();
-
- @Override
- public void setVisible(final boolean visible) {
- if (visible && getWidget() == null) {
- setWidget(create());
- }
- super.setVisible(visible);
- }
-}
