modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 11 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java | 57 ---------- 2 files changed, 1 insertion(+), 67 deletions(-)
New commits: commit 32f014cc679547fb39547165beb08d48196dc369 Author: John Mazzitelli mazz@redhat.com Date: Mon Dec 13 23:42:18 2010 -0500
remove resource overview page - its obsolete. "activity" subtab is now the one we are using
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index f2bd570..50e994f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -61,7 +61,6 @@ import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitorin import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits.TraitsView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.OperationHistoryView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.ActivityView; -import org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary.OverviewView; import org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository; import org.rhq.enterprise.gui.coregui.client.util.message.Message;
@@ -87,7 +86,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo private TwoLevelTab eventsTab; private TwoLevelTab contentTab;
- private SubTab summaryOverview; private SubTab summaryActivity; private SubTab summaryTimeline; private SubTab monitorGraphs; @@ -124,13 +122,11 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo
summaryTab = new TwoLevelTab(getTabSet().extendLocatorId("Summary"), new ViewName("Summary", MSG .view_tabs_common_summary()), ImageManager.getResourceIcon(ResourceCategory.SERVICE, Boolean.TRUE)); - summaryOverview = new SubTab(summaryTab.extendLocatorId("Overview"), new ViewName("Overview", MSG - .view_tabs_common_overview()), null); summaryActivity = new SubTab(summaryTab.extendLocatorId("Activity"), new ViewName("Activity", MSG .view_tabs_common_activity()), null); summaryTimeline = new SubTab(summaryTab.extendLocatorId("Timeline"), new ViewName("Timeline", MSG .view_tabs_common_timeline()), null); - summaryTab.registerSubTabs(summaryOverview, summaryActivity, summaryTimeline); + summaryTab.registerSubTabs(summaryActivity, summaryTimeline); tabs.add(summaryTab);
inventoryTab = new TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new ViewName("Inventory", MSG @@ -145,8 +141,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo "ConnectionSettingsHistory", MSG.view_tabs_common_connectionSettingsHistory()), null); inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"), new ViewName("Groups", MSG .view_tabs_common_groups()), null); - //inventoryGroupMembership = new SubTab(inventoryTab.extendLocatorId("GroupMembership"), new ViewName( - // "GroupMembership", MSG.view_tabs_common_group_membership()), null); inventoryAgent = new SubTab(inventoryTab.extendLocatorId("Agent"), new ViewName("Agent", MSG .view_tabs_common_agent()), null); inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory, this.inventoryConn, @@ -251,9 +245,6 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceCompo }
private void updateSummaryTabContent(Resource resource) { - updateSubTab(this.summaryTab, this.summaryOverview, new OverviewView(this.summaryTab - .extendLocatorId("OverviewView"), this.resourceComposite), true, true); - updateSubTab(this.summaryTab, this.summaryActivity, new ActivityView(this.summaryActivity .extendLocatorId("View"), this.resourceComposite), true, true);
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java deleted file mode 100644 index d7b787b..0000000 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/OverviewView.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * RHQ Management Platform - * Copyright (C) 2005-2010 Red Hat, Inc. - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.summary; - -import com.smartgwt.client.widgets.HTMLFlow; - -import org.rhq.core.domain.resource.composite.ResourceComposite; -import org.rhq.enterprise.gui.coregui.client.RefreshableView; -import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout; - -/** - * The Resource Summary>Overview tab. - * - * @author Lukas Krejci - * - * @deprecated This can be removed, since we now display the overview info in the collapsible pane above - * the Resource tabs (ips, 12/10/10). - */ -@Deprecated -public class OverviewView extends LocatableVLayout implements RefreshableView { - - private OverviewForm form; - - public OverviewView(String locatorId, ResourceComposite resourceComposite) { - super(locatorId); - this.form = new OverviewForm(extendLocatorId("form"), resourceComposite); - HTMLFlow separator = new HTMLFlow(); - separator.setContents("<hr>"); - - form.setHeight("200"); - setLeft("10%"); - - addMember(form); - } - - @Override - public void refresh() { - form.loadData(); - } - -}
rhq-commits@lists.fedorahosted.org