modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
| 120 ----------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
| 10
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
| 28 ++
5 files changed, 38 insertions(+), 126 deletions(-)
New commits:
commit 30ed07c50505da3915d8fdcf17d4a498ca297038
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Thu Oct 28 14:26:36 2010 -0400
merge DemoCanvas (#Demo) into new TestTopView (#Test); use constants for view IDs in
MenuBarView
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
index a8bdeba..17b37cb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
@@ -195,8 +195,6 @@ public class CoreGUI implements EntryPoint,
ValueChangeHandler<String> {
if (breadcrumbName.equals(AdministrationView.VIEW_ID)) {
canvas = new AdministrationView();
- } else if (breadcrumbName.equals(DemoCanvas.VIEW_ID)) {
- canvas = new DemoCanvas();
} else if (breadcrumbName.equals(InventoryView.VIEW_ID)) {
canvas = new InventoryView();
} else if (breadcrumbName.equals(ResourceTopView.VIEW_ID)) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
deleted file mode 100644
index d252fb8..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/DemoCanvas.java
+++ /dev/null
@@ -1,120 +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;
-
-import com.smartgwt.client.types.Side;
-import com.smartgwt.client.types.TabBarControls;
-import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.menu.Menu;
-import com.smartgwt.client.widgets.menu.MenuButton;
-import com.smartgwt.client.widgets.menu.MenuItem;
-import com.smartgwt.client.widgets.menu.events.ItemClickEvent;
-import com.smartgwt.client.widgets.menu.events.ItemClickHandler;
-import com.smartgwt.client.widgets.tab.Tab;
-import com.smartgwt.client.widgets.tab.TabSet;
-
-import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import
org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector;
-import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeTreeView;
-import org.rhq.enterprise.gui.coregui.client.report.tag.TagCloudView;
-
-/**
- * @author Greg Hinkle
- */
-public class DemoCanvas extends Canvas {
- public static final String VIEW_ID = "Demo";
-
- @Override
- protected void onInit() {
-
- setWidth100();
- setHeight100();
-
- final TabSet topTabSet = new TabSet();
- topTabSet.setTabBarPosition(Side.TOP);
- topTabSet.setWidth100();//(1200);
- topTabSet.setHeight100(); //(900);
-
- // topTabSet.setTop(50);
-
- Tab tagTab = new Tab("Tag Cloud");
- Tab selectorTab = new Tab("Selector");
- Tab typeTree = new Tab("Type Tree");
- Tab treeTab = new Tab("Resource Tree");
- final Tab configTab = new Tab("Configuration Editor");
- //Tab alertHistoryTab = new Tab("Alert History");
-
- tagTab.setPane(new TagCloudView("TagTabTagCloud"));
-
- selectorTab.setPane(new ResourceSelector("Demo Resource Selector"));
-
- // Agent: resource (10005) type (10060)
- // Raw: 10003 / 10023
- // both: 10002 / 10022
-
- //configTab.setPane(new ConfigurationEditor(10005, 10060,
ConfigurationEditor.ConfigType.plugin));
- //treeTab.setPane(new ResourceTreeView(new Resource(10001)));
- typeTree.setPane(new ResourceTypeTreeView("DemoTypeTree"));
- //alertHistoryTab.setPane(new AbstractAlertsView());
-
- topTabSet.addTab(tagTab);
- topTabSet.addTab(selectorTab);
- topTabSet.addTab(typeTree);
- topTabSet.addTab(configTab);
- topTabSet.addTab(treeTab);
- //topTabSet.addTab(alertHistoryTab);
- //topTabSet.selectSubTabByTitle(alertHistoryTab);
-
- final Menu configSelectMenu = new Menu();
- configSelectMenu.addItem(new MenuItem("Agent"));
- configSelectMenu.addItem(new MenuItem("Raw Only"));
- configSelectMenu.addItem(new MenuItem("Structured and Raw"));
- configSelectMenu.addItem(new MenuItem("List Of Maps"));
- configSelectMenu.addItemClickHandler(new ItemClickHandler() {
- public void onItemClick(ItemClickEvent itemClickEvent) {
- int x = configSelectMenu.getItemNum(itemClickEvent.getItem());
- com.allen_sauer.gwt.log.client.Log.info("Loading: " + x);
- topTabSet.removeTab(configTab);
- switch (x) {
- case 0:
- configTab.setPane(new ConfigurationEditor("Case0", 10005,
10060));
- break;
- case 1:
- configTab.setPane(new ConfigurationEditor("Case1", 10003,
10023));
- break;
- case 2:
- configTab.setPane(new ConfigurationEditor("Case2", 10002,
10022));
- break;
- case 3:
- configTab.setPane(new ConfigurationEditor("Case3", 10149,
10134));
- break;
- }
- topTabSet.addTab(configTab, 0);
- topTabSet.selectTab(0);
- topTabSet.redraw();
-
- }
- });
-
- topTabSet.setTabBarControls(TabBarControls.TAB_SCROLLER,
TabBarControls.TAB_PICKER, new MenuButton(
- "Config Resource", configSelectMenu));
-
- addChild(topTabSet);
- }
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
index ca5a929..ddf9c4c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
@@ -19,6 +19,7 @@
package org.rhq.enterprise.gui.coregui.client.dashboard;
import java.util.HashSet;
+import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
@@ -53,7 +54,6 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Greg Hinkle
*/
public class DashboardView extends LocatableVLayout {
-
private DashboardsView dashboardsView;
private Dashboard storedDashboard;
@@ -63,7 +63,7 @@ public class DashboardView extends LocatableVLayout {
DynamicForm editForm;
IMenuButton addPortlet;
- HashSet<PortletWindow> portlets = new HashSet<PortletWindow>();
+ Set<PortletWindow> portlets = new HashSet<PortletWindow>();
public DashboardView(String locatorId, DashboardsView dashboardsView, Dashboard
storedDashboard) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
index 2aa22ce..453d231 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/menu/MenuBarView.java
@@ -31,7 +31,12 @@ import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
+import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
+import org.rhq.enterprise.gui.coregui.client.bundle.BundleTopView;
import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
+import org.rhq.enterprise.gui.coregui.client.dashboard.DashboardsView;
+import org.rhq.enterprise.gui.coregui.client.inventory.InventoryView;
+import org.rhq.enterprise.gui.coregui.client.report.ReportTopView;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableImg;
import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
@@ -42,9 +47,10 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
*/
public class MenuBarView extends LocatableVLayout {
- public static final String[] SECTIONS = { "Dashboard",
"Inventory", "Reports", "Bundles",
"Administration" };
+ public static final String[] SECTIONS = {DashboardsView.VIEW_ID,
InventoryView.VIEW_ID, ReportTopView.VIEW_ID,
+ BundleTopView.VIEW_ID, AdministrationView.VIEW_ID};
- private String currentlySelectedSection = "Dashboard";
+ private String currentlySelectedSection = DashboardsView.VIEW_ID;
public MenuBarView(String locatorId) {
super(locatorId);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
index fa345bf..3714034 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
@@ -28,6 +28,8 @@ import
org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLe
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceSelector;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeTreeView;
import org.rhq.enterprise.gui.coregui.client.test.configuration.TestConfigurationView;
import
org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigurationView;
@@ -40,6 +42,12 @@ import
org.rhq.enterprise.gui.coregui.client.test.configuration.TestGroupConfigu
public class TestTopView extends AbstractSectionedLeftNavigationView {
public static final String VIEW_ID = "Test";
+ // view IDs for Inventory section
+ private static final String INVENTORY_SECTION_VIEW_ID = "Inventory";
+
+ private static final String PAGE_RESOURCE_SELECTOR = "ResourceSelector";
+ private static final String PAGE_TYPE_TREE = "TypeTree";
+
// view IDs for Configuration section
private static final String CONFIGURATION_SECTION_VIEW_ID =
"Configuration";
@@ -63,12 +71,32 @@ public class TestTopView extends AbstractSectionedLeftNavigationView
{
protected List<NavigationSection> getNavigationSections() {
List<NavigationSection> sections = new
ArrayList<NavigationSection>();
+ NavigationSection inventorySection = buildInventorySection();
+ sections.add(inventorySection);
+
NavigationSection configurationSection = buildConfigurationSection();
sections.add(configurationSection);
return sections;
}
+ private NavigationSection buildInventorySection() {
+ NavigationItem resourceSelectorItem = new NavigationItem(PAGE_RESOURCE_SELECTOR,
null,
+ new ViewFactory() {
+ public Canvas createView() {
+ return new ResourceSelector(extendLocatorId(PAGE_RESOURCE_SELECTOR));
+ }
+ });
+
+ NavigationItem typeTreeItem = new NavigationItem(PAGE_TYPE_TREE, null,
+ new ViewFactory() {
+ public Canvas createView() {
+ return new ResourceTypeTreeView(extendLocatorId(PAGE_TYPE_TREE));
+ }
+ });
+
+ return new NavigationSection(INVENTORY_SECTION_VIEW_ID, resourceSelectorItem,
typeTreeItem);
+ }
private NavigationSection buildConfigurationSection() {
NavigationItem configEditorItem = new NavigationItem(PAGE_CONFIG_EDITOR, null,