modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
| 59 +++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
| 37 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java
| 51 +++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewRenderer.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
| 12 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
| 31 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
| 30 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
| 14 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
| 29 ----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 25 ---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
| 40 ------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
| 66 ----------
12 files changed, 72 insertions(+), 325 deletions(-)
New commits:
commit 38af78cff487e16ec7b69d7197fbad3ed46137a2
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Mar 2 13:15:28 2010 -0500
fix so #Resource/xxxxx URLs work again; remove parentView param from
ViewRenderer.renderView() method; delete Presenter and Place classes
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 21a1f58..468dcea 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
@@ -48,7 +48,7 @@ public class CoreGUI implements EntryPoint {
private static ErrorHandler errorHandler = new ErrorHandler();
- private static BreadcrumbTrailPane breadCrumb;
+ private static BreadcrumbTrailPane breadCrumbTrailPane;
private static Canvas content;
@@ -145,9 +145,9 @@ public class CoreGUI implements EntryPoint {
rootCanvas.addMember(menuBarView);
- breadCrumb = new BreadcrumbTrailPane();
+ breadCrumbTrailPane = new BreadcrumbTrailPane();
- rootCanvas.addMember(breadCrumb);
+ rootCanvas.addMember(breadCrumbTrailPane);
DOM.setInnerHTML(RootPanel.get("Loading-Panel").getElement(),
"");
@@ -186,7 +186,7 @@ public class CoreGUI implements EntryPoint {
}
ViewId viewId = new ViewId(viewIdName, parentView.getId());
boolean lastNode = (i == (viewIdNamesSize - 1));
- parentView = viewRenderer.renderView(viewId, parentView,
lastNode);
+ parentView = viewRenderer.renderView(viewId, lastNode);
breadcrumbs.add(parentView.getBreadcrumb());
}
} catch (UnknownViewException e) {
@@ -194,35 +194,13 @@ public class CoreGUI implements EntryPoint {
// in the list. The breadcrumbs list will contain breadcrumbs for
only the names that were
// recognized.
System.err.println(e.getMessage());
+ // TODO: Should we add a new token to the History to point to the
valid location
+ // we ended up at?
}
System.out.println("Breadcrumbs: " + breadcrumbs);
- breadCrumb.setBreadcrumbs(breadcrumbs);
-
- /*breadCrumb.initialize(path);
- ArrayList<Place> trail = breadCrumb.getTrail();
-
- Place base = trail.get(0);
-
- if (content != null && content instanceof Presenter) {
- Presenter p = ((Presenter) content);
- if (!p.fireDisplay(base, trail.subList(1, trail.size()))) {
- Canvas c = createContent(base.getId());
- setContent(c);
-
- if (trail.size() >= 2 && c instanceof Presenter) {
- ((Presenter) c).fireDisplay(trail.get(0), trail.subList(1,
trail.size()));
- }
- }
- } else {
- Canvas c = createContent(base.getId());
- setContent(c);
- if (trail.size() >= 2 && c instanceof Presenter) {
- ((Presenter) c).fireDisplay(trail.get(0), trail.subList(1,
trail.size()));
- }
- }*/
-
- breadCrumb.refresh();
+ breadCrumbTrailPane.setBreadcrumbs(breadcrumbs);
+ breadCrumbTrailPane.refresh();
}
});
@@ -289,12 +267,12 @@ public class CoreGUI implements EntryPoint {
for (ViewId current = viewId.getParent(); current != null; current =
current.getParent()) {
index++;
}
- List<Breadcrumb> breadcrumbs = breadCrumb.getBreadcrumbs();
+ List<Breadcrumb> breadcrumbs = breadCrumbTrailPane.getBreadcrumbs();
if (index < breadcrumbs.size()) {
Breadcrumb breadcrumb = breadcrumbs.get(index);
if (breadcrumb.getName().equals(viewId.getName())) {
breadcrumbs.set(index, new Breadcrumb(breadcrumb.getName(),
displayName));
- breadCrumb.refresh();
+ breadCrumbTrailPane.refresh();
}
}
}
@@ -305,14 +283,16 @@ public class CoreGUI implements EntryPoint {
setHeight100(); // (900);
}
- public View renderView(ViewId viewId, View parentView, boolean lastNode) throws
UnknownViewException {
+ public View renderView(ViewId viewId, boolean lastNode) throws
UnknownViewException {
String path = viewId.getPath();
Canvas canvas = createContent(path);
if (canvas == null) {
throw new UnknownViewException();
}
setContent(canvas);
- return new View(viewId);
+ ViewRenderer descendantViewRender = (canvas instanceof ViewRenderer) ?
+ (ViewRenderer)canvas : null;
+ return new View(viewId, descendantViewRender);
}
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
deleted file mode 100644
index 84fa7e5..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/Presenter.java
+++ /dev/null
@@ -1,37 +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 org.rhq.enterprise.gui.coregui.client.places.Place;
-
-import java.util.List;
-
-/**
- * @deprecated replaced by {@link ViewRenderer}
- *
- * @author Greg Hinkle
- */
-@Deprecated
-public interface Presenter {
-
- boolean fireDisplay(Place baseLocation, List<Place> subLocations);
-
- Place getPlace();
-
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewRenderer.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewRenderer.java
index d3f237f..8a9279a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewRenderer.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/ViewRenderer.java
@@ -28,8 +28,7 @@ public interface ViewRenderer {
* TODO
*
* @param viewId
- *@param parentView @return
* @param lastNode @throws UnknownViewException
*/
- View renderView(ViewId viewId, View parentView, boolean lastNode) throws
UnknownViewException;
+ View renderView(ViewId viewId, boolean lastNode) throws UnknownViewException;
}
\ No newline at end of file
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 90611b0..1e4e517 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -146,7 +146,6 @@ public class AdministrationView extends HLayout implements
ViewRenderer {
return section;
}
-
private SectionStackSection buildManagementClusterSection() {
final SectionStackSection section = new SectionStackSection("Management
Cluster");
section.setExpanded(true);
@@ -346,8 +345,8 @@ public class AdministrationView extends HLayout implements
ViewRenderer {
}
- public View renderView(ViewId viewId, View parentView, boolean lastNode) throws
UnknownViewException {
- String parentPath = parentView.getId().getPath();
+ public View renderView(ViewId viewId, boolean lastNode) throws UnknownViewException
{
+ String parentPath = viewId.getParent().getPath();
if (parentPath.equals("Administration")) {
SectionStackSection stackSection =
this.sectionStack.getSection(viewId.getName());
if (stackSection != null) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index 8f71101..3f15169 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -18,18 +18,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.roles;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
-import org.rhq.enterprise.gui.coregui.client.admin.users.UsersDataSource;
-import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationEditor;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
-
-import com.smartgwt.client.docs.CheckboxField;
import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.types.ListGridFieldType;
import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.types.SelectionAppearance;
-import com.smartgwt.client.types.SelectionStyle;
-import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.IButton;
@@ -37,25 +28,18 @@ import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
-import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
-import com.smartgwt.client.widgets.form.fields.CheckboxItem;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
-import com.smartgwt.client.widgets.layout.SectionStack;
-import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
-import java.util.List;
-
/**
* @author Greg Hinkle
*/
-public class RolesView extends VLayout implements Presenter {
+public class RolesView extends VLayout {
@Override
@@ -185,17 +169,4 @@ public class RolesView extends VLayout implements Presenter {
editView.editNew();
}
-
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- if (!getPlace().equals(base)) {
- return false;
- }
-
-
- return true;
- }
-
- public Place getPlace() {
- return new Place("Roles", "Manage Roles");
- }
}
\ No newline at end of file
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index c2c0c6f..bf6d742 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -18,21 +18,10 @@
*/
package org.rhq.enterprise.gui.coregui.client.admin.users;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
-import org.rhq.enterprise.gui.coregui.client.admin.roles.RoleEditView;
-import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceDatasource;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
-
-import com.smartgwt.client.data.Criteria;
-import com.smartgwt.client.types.Alignment;
import com.smartgwt.client.types.Autofit;
import com.smartgwt.client.types.ListGridFieldType;
-import com.smartgwt.client.types.SelectionAppearance;
-import com.smartgwt.client.types.SelectionStyle;
-import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.util.BooleanCallback;
import com.smartgwt.client.util.SC;
-import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.Window;
@@ -43,17 +32,14 @@ import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.events.SelectionChangedHandler;
import com.smartgwt.client.widgets.grid.events.SelectionEvent;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
-import com.smartgwt.client.widgets.layout.SectionStack;
import com.smartgwt.client.widgets.layout.SectionStackSection;
import com.smartgwt.client.widgets.layout.VLayout;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
-import java.util.List;
-
/**
* @author Greg Hinkle
*/
-public class UsersView extends VLayout implements Presenter {
+public class UsersView extends VLayout {
public UsersView() {
super();
@@ -185,18 +171,4 @@ public class UsersView extends VLayout implements Presenter {
editView.editNew();
}
-
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- if (!base.equals(getPlace())) {
- return false;
- }
- if (subLocations.size() > 0) {
- int userId = Integer.parseInt(subLocations.get(0).getId());
- }
- return true;
- }
-
- public Place getPlace() {
- return new Place("users", "Users");
- }
}
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 ba07d21..7764657 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
@@ -18,11 +18,9 @@
*/
package org.rhq.enterprise.gui.coregui.client.dashboard;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.SmallGraphView;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
import com.google.gwt.user.client.Random;
import com.smartgwt.client.widgets.AnimationCallback;
@@ -33,12 +31,10 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.layout.VLayout;
-import java.util.List;
-
/**
* @author Greg Hinkle
*/
-public class DashboardView extends VLayout implements Presenter {
+public class DashboardView extends VLayout {
private static String[] colors = new String[]{
"FF6600", "808000", "008000",
"008080", "0000FF", "666699",
@@ -187,12 +183,4 @@ public class DashboardView extends VLayout implements Presenter {
addMember(portalLayout);
}
-
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- return base.equals(getPlace());
- }
-
- public Place getPlace() {
- return new Place("Dashboard", "Dashboard");
- }
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
index 38fa943..bb6c190 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourcesView.java
@@ -20,10 +20,8 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource;
import org.rhq.core.domain.resource.Resource;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView;
import
org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionListView;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
import com.smartgwt.client.types.ContentsType;
import com.smartgwt.client.types.VisibilityMode;
@@ -38,12 +36,10 @@ import com.smartgwt.client.widgets.tree.Tree;
import com.smartgwt.client.widgets.tree.TreeGrid;
import com.smartgwt.client.widgets.tree.TreeNode;
-import java.util.List;
-
/**
* @author Greg Hinkle
*/
-public class ResourcesView extends HLayout implements Presenter {
+public class ResourcesView extends HLayout {
public static final String VIEW_PATH = "Resources";
@@ -173,11 +169,9 @@ public class ResourcesView extends HLayout implements Presenter {
section.addItem(treeGrid);
-
return section;
}
-
public void setContent(Canvas newContent) {
if (contentCanvas.getChildren().length > 0)
contentCanvas.getChildren()[0].destroy();
@@ -186,25 +180,4 @@ public class ResourcesView extends HLayout implements Presenter {
contentCanvas.addChild(newContent);
contentCanvas.draw();
}
-
-
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- if (base.equals(getPlace())) {
- if (!subLocations.isEmpty()) {
- if (contentCanvas.getChildren().length > 0) {
- Canvas element = contentCanvas.getChildren()[0];
- if (element instanceof Presenter) {
- ((Presenter) element).fireDisplay(subLocations.get(0),
subLocations.subList(1, subLocations.size() - 1));
- }
- }
- }
- return true;
- }
- return false;
- }
-
-
- public Place getPlace() {
- return new Place("Resources", "Resources");
- }
}
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 f97a858..38f36a4 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
@@ -20,7 +20,6 @@ package
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail;
import org.rhq.core.domain.resource.Resource;
import org.rhq.core.domain.resource.ResourceType;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
import org.rhq.enterprise.gui.coregui.client.components.SimpleCollapsiblePanel;
import org.rhq.enterprise.gui.coregui.client.components.SubTabLayout;
@@ -28,7 +27,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.configuration.Configurat
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSelectListener;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.GraphListView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
import com.smartgwt.client.types.Side;
import com.smartgwt.client.widgets.HTMLFlow;
@@ -37,14 +35,13 @@ import com.smartgwt.client.widgets.tab.Tab;
import com.smartgwt.client.widgets.tab.TabSet;
import java.util.EnumSet;
-import java.util.List;
/**
* Right panel of the resource view.
*
* @author Greg Hinkle
*/
-public class ResourceDetailView extends VLayout implements Presenter,
ResourceSelectListener {
+public class ResourceDetailView extends VLayout implements ResourceSelectListener {
private Resource resource;
@@ -61,7 +58,6 @@ public class ResourceDetailView extends VLayout implements Presenter,
ResourceSe
private Tab contentTab;
private TabSet topTabSet;
-
HTMLFlow title = new HTMLFlow();
public void setResource(Resource resource) {
@@ -109,19 +105,6 @@ public class ResourceDetailView extends VLayout implements Presenter,
ResourceSe
// CoreGUI.addBreadCrumb(getPlace());
}
-
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- if (base.equals(getPlace())) {
-
- }
- return true;
-
- }
-
- public Place getPlace() {
- return new Place(String.valueOf(resource.getId()), resource.getName());
- }
-
public void onResourceSelected(Resource resource) {
this.resource = resource;
@@ -142,10 +125,6 @@ public class ResourceDetailView extends VLayout implements Presenter,
ResourceSe
topTabSet.updateTab(summaryTab, summarySet);
-
-
-
-
SubTabLayout monitoringSet = new SubTabLayout();
monitoringSet.registerSubTab("Graphs", new GraphListView(resource)); //
new FullHTMLPane("/rhq/common/monitor/graphs.xhtml?id=" + resource.getId()));
monitoringSet.registerSubTab("Tables", new
FullHTMLPane("/rhq/common/monitor/tables.xhtml?id=" + resource.getId()));
@@ -154,7 +133,6 @@ public class ResourceDetailView extends VLayout implements Presenter,
ResourceSe
monitoringSet.registerSubTab("Schedules", new
FullHTMLPane("/rhq/resource/monitor/schedules.xhtml?id=" + resource.getId()));
topTabSet.updateTab(monitoringTab, monitoringSet);
-
topTabSet.updateTab(configurationTab, new ConfigurationEditor(resource.getId(),
resource.getResourceType().getId()));
topTabSet.setSelectedTab(selectedTab);
@@ -203,7 +181,6 @@ public class ResourceDetailView extends VLayout implements Presenter,
ResourceSe
}
});
-
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
index 738fa17..61a7267 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
@@ -27,23 +27,19 @@ import org.rhq.enterprise.gui.coregui.client.View;
import org.rhq.enterprise.gui.coregui.client.ViewId;
import org.rhq.enterprise.gui.coregui.client.ViewRenderer;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.Presenter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourcesView;
-import org.rhq.enterprise.gui.coregui.client.places.Place;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.util.SC;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.HLayout;
-import java.util.List;
-
/**
* @author Greg Hinkle
*/
-public class ResourceView extends HLayout implements Presenter, ViewRenderer {
+public class ResourceView extends HLayout implements ViewRenderer {
private Canvas contentCanvas;
@@ -90,27 +86,6 @@ public class ResourceView extends HLayout implements Presenter,
ViewRenderer {
}
- public boolean fireDisplay(Place base, List<Place> subLocations) {
- try {
- if (base.equals(getPlace())) {
- if (subLocations.size() > 0) {
- Place resourcePlace = subLocations.get(0);
- int resourceId = Integer.parseInt(resourcePlace.getId());
-
- if (selectedResource == null || selectedResource.getId() !=
resourceId) {
- setSelectedResource(resourceId, null);
- }
- }
- return true;
- } else {
- return false;
- }
- } catch (Exception e) {
- return false;
- }
- }
-
-
public void setSelectedResource(final int resourceId, final ViewId viewId) {
Resource resource = this.treeView.getResource(resourceId);
if (resource != null) {
@@ -140,19 +115,12 @@ public class ResourceView extends HLayout implements Presenter,
ViewRenderer {
}
}
-
public void setSelectedResource(Resource resource) {
this.selectedResource = resource;
this.treeView.setSelectedResource(resource);
this.detailView.onResourceSelected(resource);
}
-
- public Place getPlace() {
-// return new Place("Resource[" + selectedResource.getId() +
"]", "Resource - " + selectedResource.getName());
- return new Place("Resource", "Resource");
- }
-
public void setContent(Canvas newContent) {
if (contentCanvas.getChildren().length > 0)
contentCanvas.getChildren()[0].destroy();
@@ -160,8 +128,8 @@ public class ResourceView extends HLayout implements Presenter,
ViewRenderer {
contentCanvas.draw();
}
- public View renderView(ViewId viewId, View parentView, boolean lastNode) throws
UnknownViewException {
- String parentPath = parentView.getId().getPath();
+ public View renderView(ViewId viewId, boolean lastNode) throws UnknownViewException
{
+ String parentPath = viewId.getParent().getPath();
if (!parentPath.equals("Resource")) {
throw new UnknownViewException();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
deleted file mode 100644
index cb63156..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/places/Place.java
+++ /dev/null
@@ -1,66 +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.places;
-
-/**
- * @deprecated replaced by {@link org.rhq.enterprise.gui.coregui.client.View} and
- * {@link org.rhq.enterprise.gui.coregui.client.Breadcrumb}
- *
- * @author Greg Hinkle
- */
-@Deprecated
-public class Place {
-
- private String id;
- private String name;
-
- public Place(String id, String name) {
- this.id = id;
- this.name = name;
- }
-
- public String getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- Place place = (Place) o;
-
- if (!id.equals(place.id)) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-}
commit d62a17440a0d3d45d446a0f598ab564cf74308f3
Merge: cdfa722... 5c46dee...
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Mar 2 12:02:59 2010 -0500
Merge branch 'gwt' of
ssh://git.fedorahosted.org/git/rhq/rhq into gwt
commit cdfa722fbe40368c3b47b9525df970c2d95714a7
Author: Ian P. Springer <ips(a)jetengine.(none)>
Date: Tue Mar 2 12:02:40 2010 -0500
replace getCanvas() method in View class with getDescendantViewRenderer() and refactor
callers; add javadoc to View class
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 67881a4..21a1f58 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
@@ -36,7 +36,6 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-
/**
* @author Greg Hinkle
*/
@@ -174,14 +173,16 @@ public class CoreGUI implements EntryPoint {
List<String> viewIdNames = path.equals("") ?
Collections.<String>emptyList() : Arrays.asList(path.split("\\/"));
View parentView = CoreGUI.this.rootView;
- ViewRenderer viewRenderer = (ViewRenderer)parentView.getCanvas();
+ ViewRenderer viewRenderer = parentView.getDescendantViewRenderer();
List<Breadcrumb> breadcrumbs = new
ArrayList<Breadcrumb>(viewIdNames.size());
try {
for (int i = 0, viewIdNamesSize = viewIdNames.size(); i <
viewIdNamesSize; i++) {
String viewIdName = viewIdNames.get(i);
- Canvas parentCanvas = parentView.getCanvas();
- if (parentCanvas != null && parentCanvas instanceof
ViewRenderer) {
- viewRenderer = (ViewRenderer) parentCanvas;
+ // See if the parent view provided a view renderer to use for its
descendants. If not,
+ // continue using the view renderer that renderer the parent
view.
+ ViewRenderer descendantViewRenderer =
parentView.getDescendantViewRenderer();
+ if (descendantViewRenderer != null) {
+ viewRenderer = descendantViewRenderer;
}
ViewId viewId = new ViewId(viewIdName, parentView.getId());
boolean lastNode = (i == (viewIdNamesSize - 1));
@@ -311,7 +312,7 @@ public class CoreGUI implements EntryPoint {
throw new UnknownViewException();
}
setContent(canvas);
- return new View(viewId, canvas);
+ return new View(viewId);
}
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java
index 6c37f97..ae1a10b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/View.java
@@ -18,31 +18,33 @@
*/
package org.rhq.enterprise.gui.coregui.client;
-import com.smartgwt.client.widgets.Canvas;
-
/**
- * TODO
+ * A view in the GUI which has a bookmarkable URL. The fragment portion of the URL is
what
+ * uniquely identifies the view. View id's are hierarchical and are therefore
represented as
+ * paths (e.g. "http://localhost:7080/coregui/CoreGUI.html#Resource/10001" is a
view URL,
+ * whose view id is "Resource/1001". The URL of its parent view is
+ * ""http://localhost:7080/coregui/CoreGUI.html#Resource", whose view id
is "Resource".
*
* @author Ian Springer
*/
public class View {
private ViewId id;
- private Canvas canvas;
+ private ViewRenderer descendantViewRender;
private Breadcrumb breadcrumb;
public View(ViewId id) {
this(id, null, null);
}
- public View(ViewId id, Canvas canvas) {
- this(id, canvas, null);
+ public View(ViewId id, ViewRenderer descendantViewRender) {
+ this(id, descendantViewRender, null);
}
public View(ViewId id, Breadcrumb breadcrumb) {
this(id, null, breadcrumb);
}
- public View(ViewId id, Canvas canvas, Breadcrumb breadcrumb) {
+ public View(ViewId id, ViewRenderer descendantViewRender, Breadcrumb breadcrumb) {
if (id == null) {
throw new IllegalArgumentException("Id is null.");
}
@@ -55,27 +57,48 @@ public class View {
} else {
this.breadcrumb = new Breadcrumb(id.getName());
}
- this.canvas = canvas;
+ this.descendantViewRender = descendantViewRender;
}
+ /**
+ * Returns this view's unique id.
+ *
+ * @return this view's unique id
+ */
public ViewId getId() {
- return id;
+ return this.id;
}
- public Canvas getCanvas() {
- return canvas;
+ /**
+ * Returns a view renderer that should be used to render descendant views, or null
if
+ * the view renderer that rendered this view should also be used to render
descendant
+ * views.
+ *
+ * @return a view renderer that should be used to render descendant views, or null
if
+ * the view renderer that rendered this view should also be used to render
+ * descendant views
+ */
+ public ViewRenderer getDescendantViewRenderer() {
+ return this.descendantViewRender;
}
+ /**
+ * Returns info that should be used when rendering a breadcrumb for this view in the
+ * breadcrumb trail, or null if a default breadcrumb should be used.
+ *
+ * @return info that should be used when rendering a breadcrumb for this view in the
+ * breadcrumb trail, or null if a default breadcrumb should be used
+ */
public Breadcrumb getBreadcrumb() {
- return breadcrumb;
+ return this.breadcrumb;
}
@Override
public String toString() {
return "View[" +
"id=" + id +
- ", canvas=" + canvas +
- ", breadcrumb=" + breadcrumb +
+ ", descendantViewRender=" + this.descendantViewRender +
+ ", breadcrumb=" + this.breadcrumb +
']';
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 18673f1..90611b0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -357,10 +357,9 @@ public class AdministrationView extends HLayout implements
ViewRenderer {
}
return new View(viewId, new Breadcrumb(viewId.getName(), false));
}
- } else if (parentPath.equals("Administration/Reports")) {
- FullHTMLPane pane = new FullHTMLPane(IFRAME_URL_INVENTORY_SUMMARY_REPORT);
- setContent(pane);
- return new View(viewId, pane);
+ } else if (parentPath.equals("Administration/Reports")) {
+ setContent(new FullHTMLPane(IFRAME_URL_INVENTORY_SUMMARY_REPORT));
+ return new View(viewId);
}
throw new UnknownViewException();
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
index 048db28..738fa17 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceView.java
@@ -178,6 +178,6 @@ public class ResourceView extends HLayout implements Presenter,
ViewRenderer {
// Use "..." as temporary display name for breadcrumb. If the Resource
is fetched successfully, the display name
// will be updated to be the Resource's name.
Breadcrumb breadcrumb = new Breadcrumb(viewId.getName(), "...");
- return new View(viewId, this.detailView, breadcrumb);
+ return new View(viewId, breadcrumb);
}
}