modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
| 7 +++-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
| 3 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 16 +++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
| 2 -
4 files changed, 16 insertions(+), 12 deletions(-)
New commits:
commit cf14573dee789270e5855f08f5de244ec8bc10ba
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 28 15:36:55 2011 -0400
- Start using Drift_16 icon
- also, update resource detail tabs to use subsystem icon paths under CoreGUI
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 d0ec4ee..858e0c2 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
@@ -163,7 +163,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(summaryTab);
inventoryTab = new
TwoLevelTab(getTabSet().extendLocatorId("Inventory"), new
ViewName("Inventory", MSG
- .view_tabs_common_inventory()),
"/images/icons/Inventory_grey_16.png");
+ .view_tabs_common_inventory()),
"subsystems/inventory/Inventory_grey_16.png");
inventoryChildren = new
SubTab(inventoryTab.extendLocatorId("Children"), new
ViewName("Children", MSG
.view_tabs_common_child_resources()), null);
inventoryChildHistory = new
SubTab(inventoryTab.extendLocatorId("ChildHist"), new
ViewName("ChildHistory", MSG
@@ -181,7 +181,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(inventoryTab);
alertsTab = new TwoLevelTab(getTabSet().extendLocatorId("Alerts"), new
ViewName("Alerts", MSG
- .view_tabs_common_alerts()), "/images/icons/Alert_grey_16.png");
+ .view_tabs_common_alerts()), "subsystems/alert/Alerts_16.png");
this.alertHistory = new SubTab(alertsTab.extendLocatorId("History"),
new ViewName("History", MSG
.view_tabs_common_history()), null);
this.alertDef = new SubTab(alertsTab.extendLocatorId("Definitions"),
new ViewName("Definitions", MSG
@@ -190,7 +190,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(alertsTab);
monitoringTab = new
TwoLevelTab(getTabSet().extendLocatorId("Monitoring"), new
ViewName("Monitoring", MSG
- .view_tabs_common_monitoring()),
"/images/icons/Monitor_grey_16.png");
+ .view_tabs_common_monitoring()),
"subsystems/monitor/Monitor_grey_16.png");
monitorGraphs = new SubTab(monitoringTab.extendLocatorId("Graphs"), new
ViewName("Graphs", MSG
.view_tabs_common_graphs()), null);
monitorTables = new SubTab(monitoringTab.extendLocatorId("Tables"), new
ViewName("Tables", MSG
@@ -208,14 +208,14 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(monitoringTab);
eventsTab = new TwoLevelTab(getTabSet().extendLocatorId("Events"), new
ViewName("Events", MSG
- .view_tabs_common_events()), "/images/icons/Events_grey_16.png");
+ .view_tabs_common_events()),
"subsystems/event/Events_grey_16.png");
this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History", MSG
.view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
operationsTab = new TwoLevelTab(getTabSet().extendLocatorId(Tab.OPERATIONS), new
ViewName(Tab.OPERATIONS, MSG
- .view_tabs_common_operations()),
"/images/icons/Operation_grey_16.png");
+ .view_tabs_common_operations()),
"subsystems/control/Operation_grey_16.png");
this.operationsSchedules = new
SubTab(operationsTab.extendLocatorId(OperationsSubTab.SCHEDULES), new ViewName(
OperationsSubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null);
this.operationsHistory = new
SubTab(operationsTab.extendLocatorId(OperationsSubTab.HISTORY), new ViewName(
@@ -224,7 +224,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(operationsTab);
configurationTab = new
TwoLevelTab(getTabSet().extendLocatorId(Tab.CONFIGURATION), new ViewName(
- Tab.CONFIGURATION, MSG.view_tabs_common_configuration()),
"/images/icons/Configure_grey_16.png");
+ Tab.CONFIGURATION, MSG.view_tabs_common_configuration()),
"subsystems/configure/Configure_grey_16.png");
this.configCurrent = new
SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.CURRENT), new ViewName(
ConfigurationSubTab.CURRENT, MSG.view_tabs_common_current()), null);
this.configHistory = new
SubTab(configurationTab.extendLocatorId(ConfigurationSubTab.HISTORY), new ViewName(
@@ -233,7 +233,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(configurationTab);
driftTab = new TwoLevelTab(getTabSet().extendLocatorId("Drift"), new
ViewName("Drift", MSG
- .view_tabs_common_drift()),
"/images/icons/Configure_grey_16.png");
+ .view_tabs_common_drift()), "subsystems/drift/Drift_16.png");
this.driftHistory = new SubTab(driftTab.extendLocatorId("History"), new
ViewName("History", MSG
.view_tabs_common_history()), null);
this.driftConfig = new SubTab(driftTab.extendLocatorId("Config"), new
ViewName("Config", MSG
@@ -242,7 +242,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
tabs.add(driftTab);
contentTab = new TwoLevelTab(getTabSet().extendLocatorId("Content"),
new ViewName("Content", MSG
- .view_tabs_common_content()),
"/images/icons/Content_grey_16.png");
+ .view_tabs_common_content()),
"subsystems/content/Content_grey_16.png");
this.contentDeployed = new
SubTab(contentTab.extendLocatorId("Deployed"), new
ViewName("Deployed", MSG
.view_tabs_common_deployed()), null);
this.contentNew = new SubTab(contentTab.extendLocatorId("New"),
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index 8bd4960..3823ebe 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -144,7 +144,7 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
});
NavigationItem recentDriftsItem = new
NavigationItem(DriftHistoryView.SUBSYSTEM_VIEW_ID,
- "subsystems/configure/Configure_16.png", new ViewFactory() {
+ "subsystems/drift/Drift_16.png", new ViewFactory() {
public Canvas createView() {
return new SubsystemResourceDriftView(
extendLocatorId(DriftHistoryView.SUBSYSTEM_VIEW_ID.getName()),
getGlobalPermissions().contains(
commit 8fccc25601a7cf529e2245b189792d612b17fefe
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 28 15:23:38 2011 -0400
Fix dev mode issue by ensuring a String value for a record property.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
index d5e0f1c..fe592a9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
@@ -124,6 +124,7 @@ public class DriftDataSource extends RPCDataSource<Drift,
DriftCriteria> {
pathField.setWidth("35%");
resourceNameField.setWidth("25%");
ancestryField.setWidth("40%");
+
} else {
ctimeField.setWidth(200);
pathField.setWidth("*");
@@ -270,7 +271,7 @@ public class DriftDataSource extends RPCDataSource<Drift,
DriftCriteria> {
ListGridRecord record = new ListGridRecord();
record.setAttribute("id", from.getId());
record.setAttribute("ctime", new Date(from.getCtime()));
- record.setAttribute("category", from.getCategory());
+ record.setAttribute("category", from.getCategory().name());
record.setAttribute("path", from.getPath());
DriftChangeSet changeSet = from.getChangeSet();
commit fd2978a0d3055264f6c417a65c7498cd9411cafe
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Tue Jun 28 15:22:31 2011 -0400
Add serialization to [Drift]Headers so it can be passed around as needed.
diff --git a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
index acfdaf1..39fe8d9 100644
--- a/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
+++ b/modules/common/drift/src/main/java/org/rhq/common/drift/Headers.java
@@ -1,9 +1,12 @@
package org.rhq.common.drift;
-import org.rhq.core.domain.drift.DriftChangeSet;
+import java.io.Serializable;
+
import org.rhq.core.domain.drift.DriftChangeSetCategory;
-public class Headers {
+public class Headers implements Serializable {
+
+ private static final long serialVersionUID = 1L;
private String driftConfigurationName;