modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/CoreGUI.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
| 15 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
| 30 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 21 +
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/GroupAlertHistoryView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/ResourceAlertHistoryView.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
| 18 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
| 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
| 41 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
| 22 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
| 12
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/DashboardView.java
| 17 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
| 25 --
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDataSource.java
| 13 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
| 14 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
| 85 ++----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
| 14 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java
| 118 +++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
| 17 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java
| 70 -----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
| 114 ---------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java
| 125 ----------
77 files changed, 313 insertions(+), 704 deletions(-)
New commits:
commit 5329450d550f9e80ee9c5a81f34934de7e89670e
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Feb 22 14:30:16 2013 -0500
The witch is dead! No more Locatable* classes. Still a ways from getting home,
though...
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 7b8f111..be3e2f6 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
@@ -64,7 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.util.ErrorHandler;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.MessageCenter;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The GWT {@link EntryPoint entry point} to the RHQ GUI.
@@ -131,11 +130,6 @@ public class CoreGUI implements EntryPoint,
ValueChangeHandler<String>, Event.Na
return; // suppress loading this module if not using the new GWT app
}
- String enableLocators = Location.getParameter("enableLocators");
- if ((null != enableLocators) && Boolean.parseBoolean(enableLocators)) {
- SeleniumUtility.setUseDefaultIds(false);
- }
-
rpcTimeout = -1;
String rpcTimeoutParam = Location.getParameter("rpcTimeout");
if (rpcTimeoutParam != null) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index b3420f1..5513872 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -249,8 +249,7 @@ public class LinkManager {
}
return link;
}
-
-
+
public static String getSubsystemGroupOperationScheduleLink(int groupId, int
opScheduleId) {
return "#ResourceGroup/" + groupId + "/Operations/Schedules/"
+ opScheduleId;
}
@@ -565,4 +564,16 @@ public class LinkManager {
return "#Help";
}
+ /**
+ * Return an href element for links
+ *
+ * @param url the target url
+ * @param value the display value for the link
+ * @return
+ */
+ static public String getHref(String url, String value) {
+ String result = "<a href=\"" + url + "\">" +
value + "</a>";
+ return result;
+ }
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
index 77feb73..fd348ba 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RoleEditView.java
@@ -32,6 +32,7 @@ import com.smartgwt.client.widgets.form.fields.FormItem;
import com.smartgwt.client.widgets.form.fields.TextItem;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
import org.rhq.core.domain.auth.Subject;
import org.rhq.core.domain.authz.Permission;
@@ -51,8 +52,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsCh
import
org.rhq.enterprise.gui.coregui.client.components.selector.AssignedItemsChangedHandler;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.selection.ResourceGroupSelector;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**
@@ -64,16 +63,16 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
private static final String HEADER_ICON = "global/Role_24.png";
- private LocatableTab permissionsTab;
+ private Tab permissionsTab;
private PermissionsEditor permissionsEditor;
- private LocatableTab resourceGroupsTab;
+ private Tab resourceGroupsTab;
private ResourceGroupSelector resourceGroupSelector;
- private LocatableTab subjectsTab;
+ private Tab subjectsTab;
private RoleSubjectSelector subjectSelector;
- private LocatableTab ldapGroupsTab;
+ private Tab ldapGroupsTab;
private RoleLdapGroupSelector ldapGroupSelector;
private boolean hasManageSecurityPermission;
@@ -150,7 +149,7 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
contentPane.addMember(topPane);
- LocatableTabSet tabSet = new LocatableTabSet();
+ TabSet tabSet = new TabSet();
tabSet.setWidth100();
tabSet.setHeight100();
@@ -176,30 +175,29 @@ public class RoleEditView extends
AbstractRecordEditor<RolesDataSource> implemen
return contentPane;
}
- private LocatableTab buildPermissionsTab(LocatableTabSet tabSet) {
- LocatableTab tab = new LocatableTab(MSG.common_title_permissions(),
"global/Locked_16.png");
+ private Tab buildPermissionsTab(TabSet tabSet) {
+ Tab tab = new Tab(MSG.common_title_permissions(),
"global/Locked_16.png");
// NOTE: We will set the tab content to the permissions editor later once the
Role has been fetched.
return tab;
}
- private LocatableTab buildResourceGroupsTab(LocatableTabSet tabSet) {
- LocatableTab tab = new LocatableTab(MSG.common_title_resourceGroups(),
- ImageManager.getGroupIcon(GroupCategory.MIXED));
+ private Tab buildResourceGroupsTab(TabSet tabSet) {
+ Tab tab = new Tab(MSG.common_title_resourceGroups(),
ImageManager.getGroupIcon(GroupCategory.MIXED));
// NOTE: We will set the tab content to the resource group selector later once
the Role has been fetched.
return tab;
}
- private LocatableTab buildSubjectsTab(LocatableTabSet tabSet) {
- LocatableTab tab = new LocatableTab(MSG.common_title_users(),
"global/User_16.png");
+ private Tab buildSubjectsTab(TabSet tabSet) {
+ Tab tab = new Tab(MSG.common_title_users(), "global/User_16.png");
// NOTE: We will set the tab content to the subject selector later once the Role
has been fetched.
return tab;
}
- private LocatableTab buildLdapGroupsTab(LocatableTabSet tabSet) {
- LocatableTab tab = new LocatableTab(MSG.common_title_ldapGroups(),
"global/Role_16.png");
+ private Tab buildLdapGroupsTab(TabSet tabSet) {
+ Tab tab = new Tab(MSG.common_title_ldapGroups(),
"global/Role_16.png");
// NOTE: We will set the tab content to the LDAP group selector later once the
Role has been fetched.
return tab;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
index 927afb3..0fc2d7b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentDetailView.java
@@ -43,11 +43,11 @@ import org.rhq.core.domain.criteria.AgentCriteria;
import org.rhq.core.domain.resource.Agent;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows details of an agent.
@@ -197,7 +197,7 @@ public class AgentDetailView extends EnhancedVLayout {
if (ag != null && ag.getName() != null &&
!ag.getName().isEmpty()) {
String detailsUrl = "#" + AffinityGroupTableView.VIEW_PATH +
"/" + ag.getId();
String formattedValue = StringUtility.escapeHtml(ag.getName());
- affinityGroupItemText = SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ affinityGroupItemText = LinkManager.getHref(detailsUrl, formattedValue);
}
affinityGroupItem.setValue(affinityGroupItemText);
@@ -208,7 +208,7 @@ public class AgentDetailView extends EnhancedVLayout {
} else {
String detailsUrl = "#" + ServerTableView.VIEW_PATH + "/"
+ agent.getServer().getId();
String formattedValue =
StringUtility.escapeHtml(agent.getServer().getName());
- serverValue = SeleniumUtility.getLocatableHref(detailsUrl, formattedValue,
null);
+ serverValue = LinkManager.getHref(detailsUrl, formattedValue);
}
currentServerItem.setValue(serverValue);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
index 8534a9a..8376594 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/AgentTableView.java
@@ -34,6 +34,7 @@ import com.smartgwt.client.widgets.grid.ListGridRecord;
import org.rhq.core.domain.authz.Permission;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.AuthorizedTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
@@ -41,7 +42,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows the table of all agents.
@@ -86,7 +86,7 @@ public class AgentTableView extends TableSection<AgentDatasource>
implements Has
}
String detailsUrl = "#" + VIEW_PATH + "/" +
getId(record);
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
@@ -101,7 +101,7 @@ public class AgentTableView extends
TableSection<AgentDatasource> implements Has
String detailsUrl = "#" + ServerTableView.VIEW_PATH +
"/"
+
record.getAttributeAsString(FIELD_SERVER_ID.propertyName());
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
} else if (field.getName() == FIELD_AFFINITY_GROUP.propertyName()) {
@@ -115,7 +115,7 @@ public class AgentTableView extends
TableSection<AgentDatasource> implements Has
String detailsUrl = "#" +
AffinityGroupTableView.VIEW_PATH + "/"
+
record.getAttributeAsString(FIELD_AFFINITY_GROUP_ID.propertyName());
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
index ef6d96c..98c4435 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/PartitionEventTableView.java
@@ -40,6 +40,7 @@ import org.rhq.core.domain.cloud.PartitionEventType;
import org.rhq.core.domain.criteria.PartitionEventCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.table.AuthorizedTableAction;
@@ -50,7 +51,6 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows the table of all partition events.
@@ -127,7 +127,7 @@ public class PartitionEventTableView extends
TableSection<PartitionEventDatasour
}
String detailsUrl = "#" + VIEW_PATH + "/" +
getId(record);
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
index a27943a..7847215 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerDetailView.java
@@ -50,6 +50,7 @@ import org.rhq.core.domain.criteria.ServerCriteria;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
@@ -58,7 +59,6 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedToolStrip;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows details of a server.
@@ -205,7 +205,7 @@ public class ServerDetailView extends EnhancedVLayout implements
BookmarkableVie
if (ag != null && ag.getName() != null &&
!ag.getName().isEmpty()) {
String detailsUrl = "#" + AffinityGroupTableView.VIEW_PATH +
"/" + ag.getId();
String formattedValue = StringUtility.escapeHtml(ag.getName());
- affinityGroupItemText = SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ affinityGroupItemText = LinkManager.getHref(detailsUrl, formattedValue);
}
affinityGroupItem.setValue(affinityGroupItemText);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
index 09738a6..cdce529 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/topology/ServerTableView.java
@@ -42,6 +42,7 @@ import org.rhq.core.domain.cloud.Server.OperationMode;
import org.rhq.core.domain.criteria.BaseCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.IconEnum;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.components.table.AuthorizedTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
@@ -51,7 +52,6 @@ import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows the table of all servers.
@@ -121,7 +121,7 @@ public class ServerTableView extends
}
String detailsUrl = "#" + VIEW_PATH + "/" +
getId(record);
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
@@ -136,7 +136,7 @@ public class ServerTableView extends
String detailsUrl = "#" +
AffinityGroupTableView.VIEW_PATH + "/"
+
record.getAttributeAsString(FIELD_AFFINITY_GROUP_ID.propertyName());
String formattedValue =
StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(detailsUrl,
formattedValue, null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 6141345..dddeb3e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -18,6 +18,13 @@
*/
package org.rhq.enterprise.gui.coregui.client.alert;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.core.DataClass;
@@ -35,7 +42,12 @@ import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import org.rhq.core.domain.alert.*;
+
+import org.rhq.core.domain.alert.Alert;
+import org.rhq.core.domain.alert.AlertCondition;
+import org.rhq.core.domain.alert.AlertConditionLog;
+import org.rhq.core.domain.alert.AlertDefinition;
+import org.rhq.core.domain.alert.AlertPriority;
import org.rhq.core.domain.alert.notification.AlertNotificationLog;
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.AlertCriteria;
@@ -55,9 +67,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-
-import java.util.*;
/**
* @author Ian Springer
@@ -121,7 +130,7 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
Integer resourceId =
listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
Integer defId =
listGridRecord.getAttributeAsInt("definitionId");
String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId,
defId);
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
fields.add(nameField);
@@ -190,7 +199,7 @@ public class AlertDataSource extends RPCDataSource<Alert,
AlertCriteria> {
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, value.toString(),
null);
+ return LinkManager.getHref(url, value.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/GroupAlertHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/GroupAlertHistoryView.java
index 350eaee..0cd69ba 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/GroupAlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/GroupAlertHistoryView.java
@@ -26,14 +26,14 @@ import
org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
* @author Joseph Marques
*/
public class GroupAlertHistoryView extends AlertHistoryView {
- public static GroupAlertHistoryView get(String locatorId, ResourceGroupComposite
composite) {
+ public static GroupAlertHistoryView get(ResourceGroupComposite composite) {
String tableTitle = MSG.view_alerts_table_title_group();
EntityContext context =
EntityContext.forGroup(composite.getResourceGroup().getId());
boolean hasWriteAccess = composite.getResourcePermission().isAlert();
- return new GroupAlertHistoryView(locatorId, tableTitle, context,
hasWriteAccess);
+ return new GroupAlertHistoryView(tableTitle, context, hasWriteAccess);
}
- private GroupAlertHistoryView(String locatorId, String tableTitle, EntityContext
context, boolean hasWriteAccess) {
+ private GroupAlertHistoryView(String tableTitle, EntityContext context, boolean
hasWriteAccess) {
super(tableTitle, context, hasWriteAccess);
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/ResourceAlertHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/ResourceAlertHistoryView.java
index 2a8ad59..f52b4de 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/ResourceAlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/ResourceAlertHistoryView.java
@@ -26,14 +26,15 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
* @author Jay Shaughnessy
*/
public class ResourceAlertHistoryView extends AlertHistoryView {
- public static ResourceAlertHistoryView get(String locatorId, ResourceComposite
composite) {
+ public static ResourceAlertHistoryView get(ResourceComposite composite) {
+
String tableTitle = MSG.view_alerts_table_title_resource();
EntityContext context =
EntityContext.forResource(composite.getResource().getId());
boolean hasWriteAccess = composite.getResourcePermission().isAlert();
- return new ResourceAlertHistoryView(locatorId, tableTitle, context,
hasWriteAccess);
+ return new ResourceAlertHistoryView(tableTitle, context, hasWriteAccess);
}
- private ResourceAlertHistoryView(String locatorId, String tableTitle, EntityContext
context, boolean hasWriteAccess) {
+ private ResourceAlertHistoryView(String tableTitle, EntityContext context, boolean
hasWriteAccess) {
super(tableTitle, context, hasWriteAccess);
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
index 5bff96a..824059c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/SingleAlertDefinitionView.java
@@ -29,12 +29,11 @@ import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.layout.HLayout;
import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
import com.smartgwt.client.widgets.tab.events.TabDeselectedEvent;
import com.smartgwt.client.widgets.tab.events.TabDeselectedHandler;
import org.rhq.core.domain.alert.AlertDefinition;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**
@@ -66,11 +65,10 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
this.alertDefinition = alertDefinition;
this.isAuthorizedToModifyAlertDefinitions =
alertDefView.isAuthorizedToModifyAlertDefinitions();
- final LocatableTabSet tabSet = new LocatableTabSet();
+ final TabSet tabSet = new TabSet();
tabSet.setHeight100();
- final Tab generalPropertiesTab = new
LocatableTab(tabSet.extendLocatorId("General"),
- MSG.view_alert_common_tab_general());
+ final Tab generalPropertiesTab = new Tab(MSG.view_alert_common_tab_general());
generalProperties = new GeneralPropertiesAlertDefinitionForm(alertDefinition);
generalPropertiesTab.setPane(generalProperties);
generalPropertiesTab.addTabDeselectedHandler(new TabDeselectedHandler() {
@@ -83,21 +81,19 @@ public class SingleAlertDefinitionView extends EnhancedVLayout {
}
});
- Tab conditionsTab = new
LocatableTab(tabSet.extendLocatorId("Conditions"),
- MSG.view_alert_common_tab_conditions());
+ Tab conditionsTab = new Tab(MSG.view_alert_common_tab_conditions());
conditions = new ConditionsAlertDefinitionForm(alertDefView.getResourceType(),
alertDefinition);
conditionsTab.setPane(conditions);
- Tab notificationsTab = new
LocatableTab(tabSet.extendLocatorId("Notifications"),
- MSG.view_alert_common_tab_notifications());
+ Tab notificationsTab = new Tab(MSG.view_alert_common_tab_notifications());
notifications = new NotificationsAlertDefinitionForm(alertDefinition);
notificationsTab.setPane(notifications);
- Tab recoveryTab = new LocatableTab(tabSet.extendLocatorId("Recovery"),
MSG.view_alert_common_tab_recovery());
+ Tab recoveryTab = new Tab(MSG.view_alert_common_tab_recovery());
recovery = new
RecoveryAlertDefinitionForm(alertDefView.getAlertDefinitionDataSource(),
alertDefinition);
recoveryTab.setPane(recovery);
- Tab dampeningTab = new
LocatableTab(tabSet.extendLocatorId("Dampening"),
MSG.view_alert_common_tab_dampening());
+ Tab dampeningTab = new Tab(MSG.view_alert_common_tab_dampening());
dampening = new DampeningAlertDefinitionForm(alertDefinition);
dampeningTab.setPane(dampening);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
index f0d0d92..5752f3e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java
@@ -64,8 +64,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
public class BundleView extends EnhancedVLayout implements BookmarkableView {
@@ -99,7 +97,7 @@ public class BundleView extends EnhancedVLayout implements
BookmarkableView {
BackButton backButton = new BackButton(MSG.view_bundle_list_backToAll(),
BundleTopView.VIEW_ID.getTitle());
headerLabel = new HeaderLabel(IconEnum.BUNDLE.getIcon24x24Path(),
StringUtility.escapeHtml(bundle.getName()));
- tabs = new LocatableTabSet();
+ tabs = new TabSet();
versionsTab = createVersionsTab();
destinationsTab = createDestinationsTab();
tabs.addTab(versionsTab);
@@ -147,7 +145,7 @@ public class BundleView extends EnhancedVLayout implements
BookmarkableView {
}
private Tab createDestinationsTab() {
- LocatableTab destinationsTab = new LocatableTab(MSG.view_bundle_destinations());
+ Tab destinationsTab = new Tab(MSG.view_bundle_destinations());
Criteria criteria = new Criteria();
criteria.addCriteria("bundleId", bundle.getId());
destinationsTab.setPane(new BundleDestinationListView(criteria));
@@ -155,7 +153,7 @@ public class BundleView extends EnhancedVLayout implements
BookmarkableView {
}
private Tab createVersionsTab() {
- LocatableTab versionsTab = new LocatableTab(MSG.view_bundle_versions());
+ Tab versionsTab = new Tab(MSG.view_bundle_versions());
Criteria criteria = new Criteria();
criteria.addCriteria("bundleId", bundleBeingViewed);
bundleVersionsTable = new BundleVersionListView(criteria);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
index 59ba0f3..e927c81 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/BundleVersionView.java
@@ -60,8 +60,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.BundleGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedIButton;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**
@@ -100,7 +98,7 @@ public class BundleVersionView extends EnhancedVLayout implements
BookmarkableVi
addMember(createSummaryForm());
- TabSet tabs = new LocatableTabSet();
+ TabSet tabs = new TabSet();
tabs.addTab(createRecipeTab());
tabs.addTab(createLiveDeploymentsTab());
tabs.addTab(createFilesTab());
@@ -220,7 +218,7 @@ public class BundleVersionView extends EnhancedVLayout implements
BookmarkableVi
}
private Tab createRecipeTab() {
- LocatableTab tab = new LocatableTab(MSG.view_bundle_recipe());
+ Tab tab = new Tab(MSG.view_bundle_recipe());
DynamicForm form = new DynamicForm();
TextAreaItem recipeCanvas = new TextAreaItem("recipe",
MSG.view_bundle_recipe());
@@ -245,7 +243,7 @@ public class BundleVersionView extends EnhancedVLayout implements
BookmarkableVi
}
private Tab createLiveDeploymentsTab() {
- LocatableTab tab = new LocatableTab(MSG.view_bundle_deployments());
+ Tab tab = new Tab(MSG.view_bundle_deployments());
Criteria criteria = new Criteria();
criteria.setAttribute("bundleVersionId", version.getId());
tab.setPane(new BundleDeploymentListView(criteria, this.canManageBundles));
@@ -253,8 +251,8 @@ public class BundleVersionView extends EnhancedVLayout implements
BookmarkableVi
}
private Tab createFilesTab() {
- LocatableTab tab = new LocatableTab(MSG.view_bundle_files());
- FileListView filesView = new FileListView(tab.getLocatorId(), version.getId());
+ Tab tab = new Tab(MSG.view_bundle_files());
+ FileListView filesView = new FileListView(version.getId());
tab.setPane(filesView);
return tab;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
index ea46c19..d374684 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/version/file/FileListView.java
@@ -55,7 +55,7 @@ public class FileListView extends EnhancedVLayout {
private int bundleVersionId;
- public FileListView(String locatorId, int bundleVersionId) {
+ public FileListView(int bundleVersionId) {
super();
this.bundleVersionId = bundleVersionId;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
index d54048e..56fa8f7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTab.java
@@ -1,17 +1,16 @@
package org.rhq.enterprise.gui.coregui.client.components.tab;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.tab.Tab;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
/**
- * A Wrapper for org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab
allowing for a Tab that separates
- * internal naming and external title.
+ * A Wrapper for {@link Tab} allowing for a Tab that separates internal naming and
external title.
*
* @author Jay Shaughnessy
*/
-public class NamedTab extends LocatableTab {
+public class NamedTab extends Tab {
private ViewName viewName;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
index c828ca9..173345a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/NamedTabSet.java
@@ -1,15 +1,14 @@
package org.rhq.enterprise.gui.coregui.client.components.tab;
import com.smartgwt.client.widgets.tab.Tab;
-
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
+import com.smartgwt.client.widgets.tab.TabSet;
/**
- * A Wrapper for org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet
allowing for a Set of NamedTabs.
+ * A Wrapper for {@link TabSet} allowing for a Set of NamedTabs.
*
* @author Jay Shaughnessy
*/
-public class NamedTabSet extends LocatableTabSet {
+public class NamedTabSet extends TabSet {
public NamedTabSet() {
super();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
index e28b80d..4736f90 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTab.java
@@ -27,37 +27,33 @@ import
org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.util.selenium.Enhanced;
/**
- * A Locatable SubTab associating a Button with a Canvas.
+ * A SubTab associating a Button with a Canvas. SubTabs for the same parent Tab must
have different viewNames.
*
* @author Jay Shaughnessy
*/
public class SubTab implements Enhanced {
- private String locatorId;
+ private NamedTab parent;
private ViewName viewName;
private Canvas canvas;
private ViewFactory viewFactory;
private Button button;
+ private String id;
private SubTab actualNext;
private SubTab visibleNext;
- public SubTab(String locatorId, ViewName viewName, Canvas canvas) {
- this.locatorId = locatorId;
- this.viewName = viewName;
- this.canvas = canvas;
- this.button = null;
+ public SubTab(NamedTab parent, ViewName viewName, Canvas canvas) {
+ this(parent, viewName, canvas, null);
}
- public SubTab(String locatorId, ViewName viewName, Canvas initialCanvas, ViewFactory
viewFactory) {
- this.locatorId = locatorId;
+ public SubTab(NamedTab parent, ViewName viewName, Canvas canvas, ViewFactory
viewFactory) {
+ this.parent = parent;
this.viewName = viewName;
- this.canvas = initialCanvas;
+ this.canvas = canvas;
this.viewFactory = viewFactory;
this.button = null;
- }
- public String getLocatorId() {
- return locatorId;
+ this.id = parent.getViewName().getName() + "_:_" + viewName.getName();
}
public Canvas getCanvas() {
@@ -87,6 +83,10 @@ public class SubTab implements Enhanced {
this.button = button;
}
+ public NamedTab getParent() {
+ return parent;
+ }
+
public ViewName getViewName() {
return viewName;
}
@@ -100,6 +100,13 @@ public class SubTab implements Enhanced {
}
/**
+ * @return a unique identifier for the SubTab that combines the parent Tab viewName
and the SubTab viewName.
+ */
+ public String getId() {
+ return id;
+ }
+
+ /**
* This is the successor or tab immediately to the right of this tab when all tabs
* are visible. The tab to which actualNext refers does not change whereas the tab
to
* which {@link #getVisibleNext visibleNext} refers can change.
@@ -162,13 +169,9 @@ public class SubTab implements Enhanced {
destroyButton();
}
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
@Override
public String toString() {
- return "SubTab[title=" + this.viewName.getTitle() + ", name="
+ this.viewName.getName() + ", locatorId="
- + this.locatorId + "]";
+ return "SubTab[parent=" + parent.getName() + ", title=" +
this.viewName.getTitle() + ", name=" + this.viewName
+ + "]";
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
index 95f786b..98a9503 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/SubTabLayout.java
@@ -43,9 +43,9 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
*/
public class SubTabLayout extends EnhancedVLayout {
- /** maps subTab locator IDs to SubTabs. Unlike names, locatorIDs are qualified by the
Tab and therefore unique. */
+ /** maps subTab IDs to SubTabs. Unlike names, IDs are qualified by the Tab and
therefore unique. */
private Map<String, SubTab> subTabs = new LinkedHashMap<String,
SubTab>();
- /** locator IDs of subTabs that are disabled. Unlike names, locator IDs are qualified
by the Tab and therefore unique. */
+ /** IDs of subTabs that are disabled. Unlike names, IDs are qualified by the Tab and
therefore unique. */
private Set<String> disabledSubTabs = new HashSet<String>();
private SubTab currentlyDisplayed;
@@ -86,7 +86,7 @@ public class SubTabLayout extends EnhancedVLayout {
if (null == currentlySelected) {
SubTab initial = getDefaultSubTab();
if (null != initial) {
- currentlySelected = initial.getLocatorId();
+ currentlySelected = initial.getId();
}
}
if (null != currentlySelected) {
@@ -176,7 +176,7 @@ public class SubTabLayout extends EnhancedVLayout {
button.addClickHandler(new ClickHandler() {
public void onClick(ClickEvent clickEvent) {
- SubTabLayout.this.currentlySelected = subTab.getLocatorId();
+ SubTabLayout.this.currentlySelected = subTab.getId();
fireSubTabSelection();
markForRedraw();
}
@@ -190,7 +190,7 @@ public class SubTabLayout extends EnhancedVLayout {
*/
public void enableSubTab(SubTab subTab) {
if (isSubTabVisible(subTab)) {
- disabledSubTabs.remove(subTab.getLocatorId());
+ disabledSubTabs.remove(subTab.getId());
subTab.getButton().enable();
subTab.getButton().show();
}
@@ -201,7 +201,7 @@ public class SubTabLayout extends EnhancedVLayout {
*/
public void disableSubTab(SubTab subTab) {
if (isSubTabVisible(subTab)) {
- disabledSubTabs.add(subTab.getLocatorId());
+ disabledSubTabs.add(subTab.getId());
subTab.getButton().disable();
subTab.getButton().show();
}
@@ -216,7 +216,7 @@ public class SubTabLayout extends EnhancedVLayout {
public void registerSubTabs(SubTab... tabs) {
for (SubTab subTab : tabs) {
- String locatorId = subTab.getLocatorId();
+ String locatorId = subTab.getId();
subTabs.put(locatorId, subTab);
}
buildSubTabList(tabs);
@@ -313,7 +313,7 @@ public class SubTabLayout extends EnhancedVLayout {
if (subTab == null) {
throw new IllegalArgumentException("subTab is null.");
}
- return selectSubTabByLocatorId(subTab.getLocatorId(), showCanvas);
+ return selectSubTabByLocatorId(subTab.getId(), showCanvas);
}
/**
@@ -375,12 +375,12 @@ public class SubTabLayout extends EnhancedVLayout {
if (subTab == null) {
return false;
} else {
- if (this.disabledSubTabs.contains(subTab.getLocatorId())) {
+ if (this.disabledSubTabs.contains(subTab.getId())) {
// Nice try - user tried to select a disabled tab, probably by going
directly to a bookmark URL.
CoreGUI.getErrorHandler().handleError(MSG.view_subTab_error_disabled(subTab.getTitle()));
return false;
}
- this.currentlySelected = subTab.getLocatorId();
+ this.currentlySelected = subTab.getId();
setCurrentlySelected(showCanvas);
return true;
}
@@ -390,7 +390,7 @@ public class SubTabLayout extends EnhancedVLayout {
if (null == currentlySelected) {
SubTab current = getDefaultSubTab();
if (null != current) {
- currentlySelected = current.getLocatorId();
+ currentlySelected = current.getId();
}
return current;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
index 813d638..3d4342b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTab.java
@@ -35,7 +35,7 @@ public class TwoLevelTab extends NamedTab {
/**
* Use the more type safe version instead.<br/>
- * <code>TwoLevelTab(String locatorId, ViewName viewName, String
icon)</code>
+ * <code>TwoLevelTab(ViewName viewName, String icon)</code>
* @param viewName
* @param icon String representation of Icon not as typesafe as IconEnum.
*/
@@ -76,10 +76,6 @@ public class TwoLevelTab extends NamedTab {
return this.layout.getSubTabByName(name);
}
- public SubTab getSubTabByLocatorId(String locatorId) {
- return this.layout.getSubTabByLocatorId(locatorId);
- }
-
public SubTab getDefaultSubTab() {
return this.layout.getDefaultSubTab();
}
@@ -137,6 +133,6 @@ public class TwoLevelTab extends NamedTab {
@Override
public String toString() {
- return "TwoLevelTab[title=" + getTitle() + ", locatorId=" +
getLocatorId() + "]";
+ return "TwoLevelTab[title=" + getTitle() + ", viewName=" +
getViewName() + "]";
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
index 9cd0ca7..40a553c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/tab/TwoLevelTabSet.java
@@ -101,7 +101,7 @@ public class TwoLevelTabSet extends NamedTabSet implements
TabSelectedHandler, T
// the Tab structure in place while removing it from the TabSet
public void setTabHidden(TwoLevelTab tab, boolean hidden) {
if (hidden) {
- if (hiddenTabs.containsKey(tab.getLocatorId())) {
+ if (hiddenTabs.containsKey(tab.getName())) {
return;
}
@@ -127,13 +127,13 @@ public class TwoLevelTabSet extends NamedTabSet implements
TabSelectedHandler, T
// Note that removing the tab does *not* destroy its content pane
// since we set the destroyPanes property to false in the
removeTab(tab);
- hiddenTabs.put(tab.getLocatorId(), tab);
+ hiddenTabs.put(tab.getName(), tab);
} else {
- if (!hiddenTabs.containsKey(tab.getLocatorId())) {
+ if (!hiddenTabs.containsKey(tab.getName())) {
return;
}
- hiddenTabs.remove(tab.getLocatorId());
+ hiddenTabs.remove(tab.getName());
TwoLevelTab successor = findClosestVisibleSuccessor(tab);
if (successor == null) {
// if successor is null then that means we are updating the tail
@@ -261,10 +261,6 @@ public class TwoLevelTabSet extends NamedTabSet implements
TabSelectedHandler, T
return (TwoLevelTab) super.getTabByTitle(title);
}
- public TwoLevelTab getTabByLocatorId(String locatorId) {
- return (TwoLevelTab) super.getTabByLocatorId(locatorId);
- }
-
public void setTabEnabled(TwoLevelTab tab, boolean enabled) {
if (enabled) {
enableTab(tab);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
index 4a49067..f3244e7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/AbstractTableSection.java
@@ -40,6 +40,7 @@ import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.DetailsView;
import org.rhq.enterprise.gui.coregui.client.InitializableView;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.ViewPath;
import org.rhq.enterprise.gui.coregui.client.components.buttons.BackButton;
import org.rhq.enterprise.gui.coregui.client.util.Log;
@@ -203,7 +204,7 @@ public abstract class AbstractTableSection<DS extends
RPCDataSource, ID> extends
String detailsUrl = "#" + getBasePath() + "/" +
convertIDToCurrentViewPath(recordId);
String formattedValue = (escapeHtmlInDetailsLinkColumn) ?
StringUtility.escapeHtml(value.toString())
: value.toString();
- return SeleniumUtility.getLocatableHref(detailsUrl, formattedValue,
null);
+ return LinkManager.getHref(detailsUrl, formattedValue);
}
};
}
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 e96a08a..e7c811b 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
@@ -77,7 +77,6 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.resource.Resourc
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Jay Shaughnessy
@@ -603,21 +602,7 @@ public class DashboardView extends EnhancedVLayout {
storedDashboard.removePortlet(portletWindow.getStoredPortlet());
this.portletWindows.remove(portletWindow);
- // portlet remove means the portlet locations may have changed. The selenium
testing locators include
- // positioning info. So, in this case we have to take the hit and completely
refresh the dash.
- AsyncCallback<Dashboard> callback = SeleniumUtility.getUseDefaultIds() ?
null : new AsyncCallback<Dashboard>() {
-
- @Override
- public void onFailure(Throwable caught) {
- rebuild();
- }
-
- @Override
- public void onSuccess(Dashboard result) {
- rebuild();
- }
- };
- save(callback);
+ save();
}
public void save(Dashboard dashboard) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
index 6b7abb6..a471f45 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortalLayout.java
@@ -38,7 +38,6 @@ import org.rhq.core.domain.dashboard.Dashboard;
import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -110,29 +109,7 @@ public class PortalLayout extends EnhancedHLayout {
colNum++;
}
- // drop means the portlet location has changed. The selenium testing
locators include positioning
- // info. So, in this case we have to take the hit and completely
rebuild the dash.
- AsyncCallback<Dashboard> callback =
SeleniumUtility.getUseDefaultIds() ? null
- : new AsyncCallback<Dashboard>() {
-
- @Override
- public void onFailure(Throwable caught) {
- rebuild();
- }
-
- @Override
- public void onSuccess(Dashboard result) {
- // for some reason the drag drop operation is leaving the
target widget (the
- // portlet window) in the DOM, detached from its original
parent (the PortalLayout),
- // and therefore not destroyed in the redraw(). So, kill
it off manually to
- // avoid ID conflicts if the portlet is again dragged
back its original position.
- target.removeFromParent();
- target.destroy();
-
- rebuild();
- }
- };
- save(callback);
+ save();
Log.info("Rearranged column indexes");
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
index 44f7e79..b5a7383 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java
@@ -46,7 +46,6 @@ import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigura
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A base class for deriving recent alerts portlets for different entity contexts. In
this way the
@@ -90,7 +89,7 @@ public abstract class AbstractRecentAlertsPortlet extends
AlertHistoryView imple
public String format(Object value, ListGridRecord record, int i, int i1) {
String url = getAlertDetailLink(record);
String formattedValue = TimestampCellFormatter.format(value);
- return SeleniumUtility.getLocatableHref(url, formattedValue, null);
+ return LinkManager.getHref(url, formattedValue);
}
};
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
index 1890b5a..6df76c6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/operations/OperationSchedulePortlet.java
@@ -56,7 +56,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.operation.ScheduledOperationsDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A view that displays a live table of completed Operations and scheduled operations.
@@ -131,7 +130,7 @@ public class OperationSchedulePortlet extends EnhancedVLayout
implements CustomS
} else {
url = LinkManager.getSubsystemResourceOperationScheduleLink(id,
opScheduleId);
}
- return SeleniumUtility.getLocatableHref(url, timestamp, null);
+ return LinkManager.getHref(url, timestamp);
} else {
return "<i>" + MSG.common_label_none() +
"</i>";
}
@@ -157,7 +156,7 @@ public class OperationSchedulePortlet extends EnhancedVLayout
implements CustomS
} else {
url = LinkManager.getResourceLink(id);
}
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNext.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
index bcf2370..4738366 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/problems/ProblemResourcesPortlet.java
@@ -62,7 +62,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.resource.ProblemResourcesDataSource;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedHLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A view that displays a paginated table of Resources with alerts,
@@ -126,7 +125,7 @@ public class ProblemResourcesPortlet extends
Table<ProblemResourcesDataSource> i
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt("id"));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
index dfb4a0b..4bad15f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
@@ -40,6 +40,7 @@ import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.dashboard.Portlet;
import org.rhq.enterprise.gui.coregui.client.dashboard.PortletViewFactory;
import
org.rhq.enterprise.gui.coregui.client.dashboard.portlets.PortletConfigurationEditorComponent.Constant;
@@ -50,7 +51,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configura
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ResourceConfigurationHistoryListView;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**This portlet allows the end user to customize the Package History display
*
@@ -166,7 +166,7 @@ public class ResourceConfigurationUpdatesPortlet extends
GroupConfigurationUpdat
public String format(Object value, ListGridRecord record, int i, int i1)
{
Integer recordId = getId(record);
String detailsUrl = "#" + getBasePath() + "/" +
recordId;
- return SeleniumUtility.getLocatableHref(detailsUrl, value.toString(),
null);
+ return LinkManager.getHref(detailsUrl, value.toString());
}
};
}
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 b603ec5..e2d9742 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
@@ -18,6 +18,13 @@
*/
package org.rhq.enterprise.gui.coregui.client.drift;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.DSRequest;
import com.smartgwt.client.data.DSResponse;
@@ -29,6 +36,7 @@ import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.HoverCustomizer;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
+
import org.rhq.core.domain.common.EntityContext;
import org.rhq.core.domain.criteria.GenericDriftCriteria;
import org.rhq.core.domain.drift.Drift;
@@ -49,9 +57,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
-
-import java.util.*;
/**
* @author Jay Shaughnessy
@@ -143,7 +148,7 @@ public class DriftDataSource extends RPCDataSource<DriftComposite,
GenericDriftC
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url = LinkManager
.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
index 6ba4f78..a82850c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionDataSource.java
@@ -59,7 +59,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.DriftGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Jay Shaughnessy
@@ -207,7 +206,7 @@ public class DriftDefinitionDataSource extends
RPCDataSource<DriftDefinitionComp
int typeId = def.getResource().getResourceType().getId();
int templateId = def.getTemplate().getId();
String link = LinkManager.getDriftTemplateLink(typeId, templateId);
- return SeleniumUtility.getLocatableHref(link, o.toString(), null);
+ return LinkManager.getHref(link, o.toString());
} else {
return o.toString();
@@ -250,7 +249,7 @@ public class DriftDefinitionDataSource extends
RPCDataSource<DriftDefinitionComp
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
Integer resourceId =
listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
String url = LinkManager.getResourceLink(resourceId);
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
index 460371d..7c77f5c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftDefinitionTemplatesView.java
@@ -63,7 +63,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A list view that displays a paginated table of {@link
org.rhq.core.domain.drift.DriftDefinitionTemplate}s. It
@@ -340,7 +339,7 @@ public class DriftDefinitionTemplatesView extends
TableSection<DriftDefinitionTe
Integer resourceId =
listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
Integer driftDefId =
listGridRecord.getAttributeAsInt("id");
String url =
LinkManager.getDriftDefinitionCarouselLink(resourceId, driftDefId);
- return SeleniumUtility.getLocatableHref(url, o.toString(),
null);
+ return LinkManager.getHref(url, o.toString());
}
});
fields.add(nameField);
@@ -387,7 +386,7 @@ public class DriftDefinitionTemplatesView extends
TableSection<DriftDefinitionTe
public String format(Object o, ListGridRecord listGridRecord, int i,
int i1) {
Integer resourceId =
listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID);
String url = LinkManager.getResourceLink(resourceId);
- return SeleniumUtility.getLocatableHref(url, o.toString(),
null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
index 798caf6..19c9316 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/drift/DriftHistoryView.java
@@ -43,7 +43,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.StringIDTableSecti
import org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellFormatter;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A view that displays a paginated table of {@link org.rhq.core.domain.drift.JPADrift}s,
along with the
@@ -174,7 +173,7 @@ public class DriftHistoryView extends
StringIDTableSection<DriftDataSource> {
String driftId = getId(record);
String url = LinkManager.getDriftCarouselDriftLink(resourceId,
driftDefId, driftId);
String formattedValue = TimestampCellFormatter.format(value);
- return SeleniumUtility.getLocatableHref(url, formattedValue, null);
+ return LinkManager.getHref(url, formattedValue);
}
};
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
index 5db648e..dfba2cb 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
@@ -57,7 +57,6 @@ import
org.rhq.enterprise.gui.coregui.client.operation.OperationHistoryDataSourc
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Option;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -301,7 +300,7 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
index 01ae8ca..2aea953 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
@@ -32,8 +32,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
*/
public abstract class AbstractOperationScheduleListView extends
TableSection<AbstractOperationScheduleDataSource> {
- public AbstractOperationScheduleListView(String locatorId,
AbstractOperationScheduleDataSource dataSource,
- String title) {
+ public AbstractOperationScheduleListView(AbstractOperationScheduleDataSource
dataSource, String title) {
super(title);
setDataSource(dataSource);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
index 9be8b30..fc64667 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeDatasource.java
@@ -59,7 +59,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Joseph Marques
@@ -167,7 +166,7 @@ public class EventCompositeDatasource extends
RPCDataSource<EventComposite, Even
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index ac7a6b9..1990805 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -43,6 +43,7 @@ import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.resource.group.composite.ResourceGroupComposite;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.components.form.DateTimeFilterItem;
import org.rhq.enterprise.gui.coregui.client.components.form.EnumSelectItem;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
@@ -52,7 +53,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.TimestampCellForma
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Joseph Marques
@@ -78,21 +78,21 @@ public class EventCompositeHistoryView extends
TableSection<EventCompositeDataso
INITIAL_CRITERIA.addCriteria(EventCompositeDatasource.FILTER_SEVERITIES,
severityNames);
}
- public static EventCompositeHistoryView get(String locatorId, ResourceGroupComposite
composite) {
+ public static EventCompositeHistoryView get(ResourceGroupComposite composite) {
String tableTitle = MSG.view_inventory_eventHistory_groupEventHistory();
EntityContext context =
EntityContext.forGroup(composite.getResourceGroup().getId());
boolean hasWriteAccess = composite.getResourcePermission().isEvent();
- return new EventCompositeHistoryView(locatorId, tableTitle, context,
hasWriteAccess);
+ return new EventCompositeHistoryView(tableTitle, context, hasWriteAccess);
}
- public static EventCompositeHistoryView get(String locatorId, ResourceComposite
composite) {
+ public static EventCompositeHistoryView get(ResourceComposite composite) {
String tableTitle = MSG.view_inventory_eventHistory_resourceEventHistory();
EntityContext context =
EntityContext.forResource(composite.getResource().getId());
boolean hasWriteAccess = composite.getResourcePermission().isEvent();
- return new EventCompositeHistoryView(locatorId, tableTitle, context,
hasWriteAccess);
+ return new EventCompositeHistoryView(tableTitle, context, hasWriteAccess);
}
- private EventCompositeHistoryView(String locatorId, String tableTitle, EntityContext
context, boolean hasWriteAccess) {
+ private EventCompositeHistoryView(String tableTitle, EntityContext context, boolean
hasWriteAccess) {
super(tableTitle, INITIAL_CRITERIA, new SortSpecifier[] { DEFAULT_SORT_SPECIFIER
});
this.context = context;
this.hasWriteAccess = hasWriteAccess;
@@ -156,7 +156,7 @@ public class EventCompositeHistoryView extends
TableSection<EventCompositeDataso
public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
Integer recordId = getId(record);
String detailsUrl = "#" + getBasePath() + "/" +
recordId;
- return SeleniumUtility.getLocatableHref(detailsUrl,
TimestampCellFormatter.format(value), null);
+ return LinkManager.getHref(detailsUrl,
TimestampCellFormatter.format(value));
}
};
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
index 36b8094..846f8e9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/ResourceGroupListView.java
@@ -59,7 +59,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.groups.wizard.GroupCreate
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.inventory.ResourceResourceGroupsView;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -150,7 +149,7 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
public String format(Object value, ListGridRecord record, int i, int i1) {
String groupId = record.getAttribute("id");
String groupUrl =
LinkManager.getResourceGroupLink(Integer.valueOf(groupId));
- return SeleniumUtility.getLocatableHref(groupUrl, value.toString(),
null);
+ return LinkManager.getHref(groupUrl, value.toString());
}
});
@@ -271,8 +270,7 @@ public class ResourceGroupListView extends
Table<ResourceGroupCompositeDataSourc
// -------- Static Utility loaders ------------
- public static ResourceGroupListView getGroupsOf(String locatorId, int
explicitResourceId,
- boolean canModifyMembership) {
+ public static ResourceGroupListView getGroupsOf(int explicitResourceId, boolean
canModifyMembership) {
ResourceGroupListView view = new ResourceGroupListView(new
Criteria("explicitResourceId",
String.valueOf(explicitResourceId)), MSG.common_title_resourceGroups());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
index 6ccbc9d..468b8e9 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/ResourceGroupDetailView.java
@@ -166,77 +166,64 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
summaryTab = new TwoLevelTab(new ViewName("Summary",
MSG.common_title_summary()), ImageManager.getResourceIcon(
ResourceCategory.SERVICE, AvailabilityType.UP));
- 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);
+ summaryActivity = new SubTab(summaryTab, new ViewName("Activity",
MSG.view_tabs_common_activity()), null);
+ summaryTimeline = new SubTab(summaryTab, new ViewName("Timeline",
MSG.view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryActivity, summaryTimeline);
tabs.add(summaryTab);
inventoryTab = new TwoLevelTab(new ViewName("Inventory",
MSG.view_tabs_common_inventory()),
IconEnum.INVENTORY_SUMMARY);
- inventoryMembers = new SubTab(inventoryTab.extendLocatorId("Members"),
new ViewName("Members",
- MSG.view_tabs_common_members()), null);
- inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
- "ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
- inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettingsHistory"), new ViewName(
- "ConnectionSettingsHistory",
MSG.view_tabs_common_connectionSettingsHistory()), null);
+ inventoryMembers = new SubTab(inventoryTab, new ViewName("Members",
MSG.view_tabs_common_members()), null);
+ inventoryConn = new SubTab(inventoryTab, new
ViewName("ConnectionSettings",
+ MSG.view_tabs_common_connectionSettings()), null);
+ inventoryConnHistory = new SubTab(inventoryTab, new
ViewName("ConnectionSettingsHistory",
+ MSG.view_tabs_common_connectionSettingsHistory()), null);
inventoryTab.registerSubTabs(this.inventoryMembers, this.inventoryConn,
this.inventoryConnHistory);
tabs.add(inventoryTab);
alertsTab = new TwoLevelTab(new ViewName("Alerts",
MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS);
- 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.common_title_definitions()), null);
+ this.alertHistory = new SubTab(alertsTab, new ViewName("History",
MSG.view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab, new ViewName("Definitions",
MSG.common_title_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
monitoringTab = new TwoLevelTab(new ViewName("Monitoring",
MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
- 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.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
-
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
+ monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab, new ViewName("Tables",
MSG.view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab, new ViewName("Traits",
MSG.view_tabs_common_traits()), null);
+
+ monitorSched = new SubTab(monitoringTab, new ViewName("Schedules",
MSG.view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime",
MSG.view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorGraphs, monitorTables, monitorTraits,
monitorSched, monitorCallTime);
tabs.add(monitoringTab);
eventsTab = new TwoLevelTab(new ViewName("Events",
MSG.view_tabs_common_events()), IconEnum.EVENTS);
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.eventHistory = new SubTab(eventsTab, new ViewName("History",
MSG.view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
operationsTab = new TwoLevelTab(new ViewName("Operations",
MSG.common_title_operations()),
IconEnum.RECENT_OPERATIONS);
- this.operationsSchedules = new
SubTab(operationsTab.extendLocatorId("Schedules"), new
ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- this.operationsHistory = new
SubTab(operationsTab.extendLocatorId("History"), new
ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.operationsSchedules = new SubTab(operationsTab,
+ new ViewName("Schedules", MSG.view_tabs_common_schedules()),
null);
+ this.operationsHistory = new SubTab(operationsTab, new
ViewName("History", MSG.view_tabs_common_history()),
+ null);
operationsTab.registerSubTabs(this.operationsSchedules, this.operationsHistory);
tabs.add(operationsTab);
configurationTab = new TwoLevelTab(new ViewName("Configuration",
MSG.common_title_configuration()),
IconEnum.CONFIGURATION_HISTORY);
- this.configCurrent = new
SubTab(configurationTab.extendLocatorId("Current"), new
ViewName("Current",
- MSG.view_tabs_common_current()), null);
- this.configHistory = new
SubTab(configurationTab.extendLocatorId("History"), new
ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.configCurrent = new SubTab(configurationTab, new
ViewName("Current", MSG.view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab, new
ViewName("History", MSG.view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
- // driftTab = new TwoLevelTab(getTabSet().extendLocatorId(Tab.DRIFT), new
ViewName(Tab.DRIFT, MSG
+ // driftTab = new TwoLevelTab(getTabSet(), new ViewName(Tab.DRIFT, MSG
// .view_tabs_common_drift()),
"subsystems/drift/Drift_16.png");
- // this.driftHistory = new
SubTab(driftTab.extendLocatorId(DriftSubTab.HISTORY), new ViewName(DriftSubTab.HISTORY,
+ // this.driftHistory = new SubTab(driftTab, new
ViewName(DriftSubTab.HISTORY,
// MSG.view_tabs_common_history()), null);
- // this.driftDefinition = new
SubTab(driftTab.extendLocatorId(DriftSubTab.DEFINITIONS), new ViewName(
+ // this.driftDefinition = new SubTab(driftTab, new ViewName(
// DriftSubTab.DEFINITIONS, MSG.common_title_definitions()), null);
// driftTab.registerSubTabs(driftHistory, driftDefinition);
// tabs.add(driftTab);
@@ -278,8 +265,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.summaryTab, this.summaryActivity, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return new
ActivityView(summaryActivity.extendLocatorId("View"), groupComposite,
isAutoCluster(),
- isAutoGroup());
+ return new ActivityView(groupComposite, isAutoCluster(), isAutoGroup());
}
});
// TODO (ips): Add Timeline subtab?
@@ -316,7 +302,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
// return new
FullHTMLPane(monitorTables.extendLocatorId("View"),
//
"/rhq/group/monitor/tables-plain.xhtml?groupId=" + groupId);
//gwt version of group table view.
- return new
GroupMonitoringTablesView(monitorTables.extendLocatorId("monitorTable"),
groupComposite);
+ return new GroupMonitoringTablesView(groupComposite);
}
};
updateSubTab(this.monitoringTab, this.monitorTables, visible, true,
viewFactory);
@@ -366,15 +352,14 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
true, new ViewFactory() {
@Override
public Canvas createView() {
- return new
GroupPluginConfigurationEditView(inventoryConn.extendLocatorId("View"),
groupComposite);
+ return new GroupPluginConfigurationEditView(groupComposite);
}
});
updateSubTab(this.inventoryTab, this.inventoryConnHistory,
facets.contains(ResourceTypeFacet.PLUGIN_CONFIGURATION), true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
HistoryGroupPluginConfigurationView(inventoryConnHistory.extendLocatorId("View"),
- groupComposite);
+ return new HistoryGroupPluginConfigurationView(groupComposite);
}
});
}
@@ -385,8 +370,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.operationsTab, this.operationsSchedules, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
GroupOperationScheduleListView(operationsSchedules.extendLocatorId("View"),
- groupComposite);
+ return new GroupOperationScheduleListView(groupComposite);
}
});
updateSubTab(this.operationsTab, this.operationsHistory, true, true, new
ViewFactory() {
@@ -405,7 +389,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.alertsTab, this.alertHistory, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return
GroupAlertHistoryView.get(alertHistory.extendLocatorId("View"),
groupComposite);
+ return GroupAlertHistoryView.get(groupComposite);
}
});
// but alert definitions can only be created on compatible groups
@@ -428,14 +412,13 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.configurationTab, this.configCurrent, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
GroupResourceConfigurationEditView(configCurrent.extendLocatorId("View"),
groupComposite);
+ return new GroupResourceConfigurationEditView(groupComposite);
}
});
updateSubTab(this.configurationTab, this.configHistory, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
HistoryGroupResourceConfigurationView(configHistory.extendLocatorId("View"),
- groupComposite);
+ return new HistoryGroupResourceConfigurationView(groupComposite);
}
});
}
@@ -449,7 +432,7 @@ public class ResourceGroupDetailView extends
AbstractTwoLevelTabSetView<Resource
updateSubTab(this.eventsTab, this.eventHistory, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return
EventCompositeHistoryView.get(eventHistory.extendLocatorId("View"),
groupComposite);
+ return EventCompositeHistoryView.get(groupComposite);
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
index 43fe7e7..2223621 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
@@ -78,7 +78,7 @@ public class GroupResourceConfigurationEditView extends EnhancedVLayout
implemen
private boolean refreshing = false;
- public GroupResourceConfigurationEditView(String locatorId, ResourceGroupComposite
groupComposite) {
+ public GroupResourceConfigurationEditView(ResourceGroupComposite groupComposite) {
super();
this.group = groupComposite.getResourceGroup();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
index 5ccda50..151b9ed 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationMembers.java
@@ -61,7 +61,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows a table of individual resource members that belonged to the group when the group
configuration was updated.
@@ -108,7 +107,7 @@ public class HistoryGroupResourceConfigurationMembers extends
EnhancedVLayout {
fieldResource.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
fieldResource.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
index 84fa545..28a720e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/HistoryGroupResourceConfigurationView.java
@@ -35,7 +35,7 @@ public class HistoryGroupResourceConfigurationView extends
EnhancedVLayout imple
private HistoryGroupResourceConfigurationTable groupHistoryTable;
private Canvas detailsCanvas = null;
- public HistoryGroupResourceConfigurationView(String locatorId, ResourceGroupComposite
groupComposite) {
+ public HistoryGroupResourceConfigurationView(ResourceGroupComposite groupComposite)
{
super();
this.groupComposite = groupComposite;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
index b62ce64..c50ccd8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/GroupPluginConfigurationEditView.java
@@ -76,7 +76,7 @@ public class GroupPluginConfigurationEditView extends EnhancedVLayout
implements
private boolean refreshing = false;
- public GroupPluginConfigurationEditView(String locatorId, ResourceGroupComposite
groupComposite) {
+ public GroupPluginConfigurationEditView(ResourceGroupComposite groupComposite) {
super();
this.group = groupComposite.getResourceGroup();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
index 2a7033d..b28a013 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationMembers.java
@@ -61,7 +61,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Shows a table of individual resource members that belonged to the group when the group
configuration was updated.
@@ -108,7 +107,7 @@ public class HistoryGroupPluginConfigurationMembers extends
EnhancedVLayout {
fieldResource.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
fieldResource.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
index a250498..da3c042 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationView.java
@@ -35,7 +35,7 @@ public class HistoryGroupPluginConfigurationView extends EnhancedVLayout
impleme
private HistoryGroupPluginConfigurationTable groupHistoryTable;
private Canvas detailsCanvas = null;
- public HistoryGroupPluginConfigurationView(String locatorId, ResourceGroupComposite
groupComposite) {
+ public HistoryGroupPluginConfigurationView(ResourceGroupComposite groupComposite) {
super();
this.groupComposite = groupComposite;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
index 76be8c7..6bb346a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/ResourceGroupMetricGraphView.java
@@ -37,7 +37,6 @@ import
org.rhq.enterprise.gui.coregui.client.gwt.ResourceGroupGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricGraphView;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -85,7 +84,7 @@ public class ResourceGroupMetricGraphView extends
AbstractMetricGraphView {
final ResourceGroup group = result.get(0);
String url = LinkManager.getResourceGroupLink(group);
- resourceGroupTitle = new
HTMLFlow(SeleniumUtility.getLocatableHref(url, group.getName(), null));
+ resourceGroupTitle = new HTMLFlow(LinkManager.getHref(url,
group.getName()));
ResourceTypeRepository.Cache.getInstance().getResourceTypes(group.getResourceType().getId(),
EnumSet.of(ResourceTypeRepository.MetadataType.measurements),
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
index 97308cf..ed2060b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/table/GroupMonitoringTablesView.java
@@ -32,13 +32,13 @@ public class GroupMonitoringTablesView extends EnhancedVLayout
implements Refres
private GroupMeasurementTableView metrics;
private GroupMembersHealthView memberHealth;
-
+
/**
* @param locatorId
*/
- public GroupMonitoringTablesView(String locatorId, ResourceGroupComposite
groupComposite) {
+ public GroupMonitoringTablesView(ResourceGroupComposite groupComposite) {
super();
-
+
metrics = new GroupMeasurementTableView(groupComposite,
groupComposite.getResourceGroup().getId());
memberHealth = new
GroupMembersHealthView(groupComposite.getResourceGroup().getId(), false);
addMember(metrics);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java
index 64b857b..bd6b0e5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDataSource.java
@@ -43,7 +43,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasuremen
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A DataSource for reading traits for the current group.
@@ -82,7 +81,7 @@ public class TraitsDataSource extends
AbstractMeasurementDataTraitDataSource {
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, value.toString(), null);
+ return LinkManager.getHref(url, value.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
index 4a5a906..3fa9705 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsDetailView.java
@@ -29,7 +29,6 @@ import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListDetailView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The detail view for the group Monitoring>Traits subtab.
@@ -51,7 +50,7 @@ public class TraitsDetailView extends
AbstractMeasurementDataTraitListDetailView
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
index 306bf30..5ed2a79 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
@@ -47,7 +47,6 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The group Monitoring>Traits subtab.
@@ -76,7 +75,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
@@ -178,7 +177,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView
{
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
index 68de917..bedfdaf 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/history/GroupMemberResourceOperationHistoryListView.java
@@ -18,7 +18,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.h
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDataSource;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.operation.history.ResourceOperationHistoryDetailsView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Ian Springer
@@ -49,7 +48,7 @@ public class GroupMemberResourceOperationHistoryListView extends
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
index 1d634d7..985d5fd 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/operation/schedule/GroupOperationScheduleListView.java
@@ -35,8 +35,8 @@ public class GroupOperationScheduleListView extends
AbstractOperationScheduleLis
private ResourceGroupComposite groupComposite;
- public GroupOperationScheduleListView(String locatorId, ResourceGroupComposite
groupComposite) {
- super(locatorId, new GroupOperationScheduleDataSource(groupComposite), TITLE);
+ public GroupOperationScheduleListView(ResourceGroupComposite groupComposite) {
+ super(new GroupOperationScheduleDataSource(groupComposite), TITLE);
this.groupComposite = groupComposite;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
index 8b47fbf..a6e0f0b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/summary/ActivityView.java
@@ -91,8 +91,7 @@ public class ActivityView extends EnhancedVLayout implements
DashboardContainer,
private int rowRight = 0;
private boolean displayLeft = false;
- public ActivityView(String locatorId, ResourceGroupComposite groupComposite, boolean
isAutoCluster,
- boolean isAutoGroup) {
+ public ActivityView(ResourceGroupComposite groupComposite, boolean isAutoCluster,
boolean isAutoGroup) {
super();
this.groupComposite = groupComposite;
this.isAutoCluster = isAutoCluster;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
index 15e7bc3..fb8b854 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/AncestryUtil.java
@@ -35,7 +35,6 @@ import org.rhq.core.domain.resource.ResourceType;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A utility class for working with Resource ancestry values.
@@ -159,8 +158,7 @@ public abstract class AncestryUtil {
sbResources.append((i > 0) ? " < " : "");
//sbResources.append(" < ");
String url = LinkManager.getResourceLink(ancestorResourceId);
- String suffix = resourceId + "_" + entryTokens[1];
- String href = SeleniumUtility.getLocatableHref(url, ancestorName, suffix);
+ String href = LinkManager.getHref(url, ancestorName);
sbResources.append(href);
if (null != sbTypes) {
@@ -218,8 +216,7 @@ public abstract class AncestryUtil {
sbResources.append((i > 0) ? " < " : "");
if (generateLinks) {
String url = LinkManager.getResourceLink(ancestorResourceId);
- String suffix = resourceId + "_" + entryTokens[1];
- String href = SeleniumUtility.getLocatableHref(url, ancestorName,
suffix);
+ String href = LinkManager.getHref(url, ancestorName);
sbResources.append(href);
} else {
sbResources.append(ancestorName);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
index c09a703..aa9feb0 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceCompositeSearchView.java
@@ -71,17 +71,17 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
private boolean hasImportableTypes;
private boolean canCreate;
- public ResourceCompositeSearchView(String locatorId, ResourceComposite
parentResourceComposite, Criteria criteria,
- String title, SortSpecifier[] sortSpecifier, String[] excludeFields, String...
headerIcons) {
+ public ResourceCompositeSearchView(ResourceComposite parentResourceComposite,
Criteria criteria, String title,
+ SortSpecifier[] sortSpecifier, String[] excludeFields, String... headerIcons) {
super(criteria, title, sortSpecifier, excludeFields, headerIcons);
this.parentResourceComposite = parentResourceComposite;
this.canCreate =
this.parentResourceComposite.getResourcePermission().isCreateChildResources();
setInitialCriteriaFixed(true);
}
- public ResourceCompositeSearchView(String locatorId, ResourceComposite
parentResourceComposite, Criteria criteria,
- String title, String... headerIcons) {
- this(locatorId, parentResourceComposite, criteria, title, null, null,
headerIcons);
+ public ResourceCompositeSearchView(ResourceComposite parentResourceComposite,
Criteria criteria, String title,
+ String... headerIcons) {
+ this(parentResourceComposite, criteria, title, null, null, headerIcons);
}
@Override
@@ -379,8 +379,8 @@ public class ResourceCompositeSearchView extends ResourceSearchView {
// -------- Static Utility loaders ------------
- public static ResourceCompositeSearchView getChildrenOf(String locatorId,
ResourceComposite parentResourceComposite) {
- return new ResourceCompositeSearchView(locatorId, parentResourceComposite, new
Criteria("parentId",
+ public static ResourceCompositeSearchView getChildrenOf(ResourceComposite
parentResourceComposite) {
+ return new ResourceCompositeSearchView(parentResourceComposite, new
Criteria("parentId",
String.valueOf(parentResourceComposite.getResource().getId())),
MSG.view_tabs_common_child_resources());
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
index f30a49c..06a3469 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java
@@ -76,7 +76,6 @@ import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.TableUtility;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The list view for {@link Resource}s. If not specified a default title is assigned. If
not specified the list will
@@ -408,7 +407,7 @@ public class ResourceSearchView extends Table {
public String format(Object value, ListGridRecord record, int rowNum, int
colNum) {
String url =
LinkManager.getResourceLink(record.getAttributeAsInt("id"));
String name = StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(url, name, null);
+ return LinkManager.getHref(url, name);
}
});
nameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
index 745f7af..a580b35 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ChildHistoryView.java
@@ -72,8 +72,8 @@ public class ChildHistoryView extends
Table<ChildHistoryView.DataSource> {
private final ResourceComposite resourceComposite;
private FormItem dateRangeItem;
- public ChildHistoryView(String locatorId, ResourceComposite resourceComposite) {
- super(locatorId, VIEW_ID.getTitle());
+ public ChildHistoryView(ResourceComposite resourceComposite) {
+ super(VIEW_ID.getTitle());
this.resourceComposite = resourceComposite;
setDataSource(new DataSource());
}
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 301583e..6acd5d0 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
@@ -168,101 +168,85 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
summaryTab = new TwoLevelTab(new ViewName("Summary",
MSG.common_title_summary()), ImageManager.getResourceIcon(
ResourceCategory.SERVICE, AvailabilityType.UP));
- 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);
+ summaryActivity = new SubTab(summaryTab, new ViewName("Activity",
MSG.view_tabs_common_activity()), null);
+ summaryTimeline = new SubTab(summaryTab, new ViewName("Timeline",
MSG.view_tabs_common_timeline()), null);
summaryTab.registerSubTabs(summaryActivity, summaryTimeline);
tabs.add(summaryTab);
inventoryTab = new TwoLevelTab(new ViewName("Inventory",
MSG.view_tabs_common_inventory()),
IconEnum.INVENTORY_SUMMARY);
- 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",
+ inventoryChildren = new SubTab(inventoryTab, new ViewName("Children",
MSG.view_tabs_common_child_resources()),
+ null);
+ inventoryChildHistory = new SubTab(inventoryTab, new
ViewName("ChildHistory",
MSG.view_tabs_common_child_history()), null);
- inventoryConn = new
SubTab(inventoryTab.extendLocatorId("ConnectionSettings"), new ViewName(
- "ConnectionSettings", MSG.view_tabs_common_connectionSettings()),
null);
- inventoryConnHistory = new
SubTab(inventoryTab.extendLocatorId("ConnSetHist"),
- PluginConfigurationHistoryListView.VIEW_ID, null);
- inventoryGroups = new SubTab(inventoryTab.extendLocatorId("Groups"),
new ViewName("Groups",
- MSG.view_tabs_common_groups()), null);
- inventoryAgent = new SubTab(inventoryTab.extendLocatorId("Agent"), new
ViewName("Agent",
- MSG.view_tabs_common_agent()), null);
+ inventoryConn = new SubTab(inventoryTab, new
ViewName("ConnectionSettings",
+ MSG.view_tabs_common_connectionSettings()), null);
+ inventoryConnHistory = new SubTab(inventoryTab,
PluginConfigurationHistoryListView.VIEW_ID, null);
+ inventoryGroups = new SubTab(inventoryTab, new ViewName("Groups",
MSG.view_tabs_common_groups()), null);
+ inventoryAgent = new SubTab(inventoryTab, new ViewName("Agent",
MSG.view_tabs_common_agent()), null);
inventoryTab.registerSubTabs(this.inventoryChildren, this.inventoryChildHistory,
this.inventoryConn,
this.inventoryConnHistory, this.inventoryGroups, this.inventoryAgent);
tabs.add(inventoryTab);
alertsTab = new TwoLevelTab(new ViewName("Alerts",
MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS);
- 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.common_title_definitions()), null);
+ this.alertHistory = new SubTab(alertsTab, new ViewName("History",
MSG.view_tabs_common_history()), null);
+ this.alertDef = new SubTab(alertsTab, new ViewName("Definitions",
MSG.common_title_definitions()), null);
alertsTab.registerSubTabs(alertHistory, alertDef);
tabs.add(alertsTab);
monitoringTab = new TwoLevelTab(new ViewName("Monitoring",
MSG.view_tabs_common_monitoring()),
IconEnum.SUSPECT_METRICS);
- 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.view_tabs_common_tables()), null);
- monitorTraits = new SubTab(monitoringTab.extendLocatorId("Traits"), new
ViewName("Traits",
- MSG.view_tabs_common_traits()), null);
- monitorAvail = new
SubTab(monitoringTab.extendLocatorId("Availability"), new
ViewName("Availability",
- MSG.view_tabs_common_availability()), null);
- monitorSched = new SubTab(monitoringTab.extendLocatorId("Schedules"),
new ViewName("Schedules",
- MSG.view_tabs_common_schedules()), null);
- monitorCallTime = new SubTab(monitoringTab.extendLocatorId("CallTime"),
new ViewName("CallTime",
- MSG.view_tabs_common_calltime()), null);
+ monitorGraphs = new SubTab(monitoringTab, new ViewName("Graphs",
MSG.view_tabs_common_graphs()), null);
+ monitorTables = new SubTab(monitoringTab, new ViewName("Tables",
MSG.view_tabs_common_tables()), null);
+ monitorTraits = new SubTab(monitoringTab, new ViewName("Traits",
MSG.view_tabs_common_traits()), null);
+ monitorAvail = new SubTab(monitoringTab, new ViewName("Availability",
MSG.view_tabs_common_availability()),
+ null);
+ monitorSched = new SubTab(monitoringTab, new ViewName("Schedules",
MSG.view_tabs_common_schedules()), null);
+ monitorCallTime = new SubTab(monitoringTab, new ViewName("CallTime",
MSG.view_tabs_common_calltime()), null);
monitoringTab.registerSubTabs(monitorTables, monitorGraphs, monitorTraits,
monitorAvail, monitorSched,
monitorCallTime);
tabs.add(monitoringTab);
eventsTab = new TwoLevelTab(new ViewName("Events",
MSG.view_tabs_common_events()), IconEnum.EVENTS);
- this.eventHistory = new SubTab(eventsTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.eventHistory = new SubTab(eventsTab, new ViewName("History",
MSG.view_tabs_common_history()), null);
eventsTab.registerSubTabs(eventHistory);
tabs.add(eventsTab);
operationsTab = new TwoLevelTab(new ViewName(Tab.OPERATIONS,
MSG.common_title_operations()),
IconEnum.RECENT_OPERATIONS);
- 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(
- OperationsSubTab.HISTORY, MSG.view_tabs_common_history()), null);
+ this.operationsSchedules = new SubTab(operationsTab, new
ViewName(OperationsSubTab.SCHEDULES,
+ MSG.view_tabs_common_schedules()), null);
+ this.operationsHistory = new SubTab(operationsTab, new
ViewName(OperationsSubTab.HISTORY,
+ MSG.view_tabs_common_history()), null);
operationsTab.registerSubTabs(this.operationsSchedules, this.operationsHistory);
tabs.add(operationsTab);
configurationTab = new TwoLevelTab(new ViewName(Tab.CONFIGURATION,
MSG.common_title_configuration()),
IconEnum.CONFIGURATION_HISTORY);
- 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(
- ConfigurationSubTab.HISTORY, MSG.view_tabs_common_history()), null);
+ this.configCurrent = new SubTab(configurationTab, new
ViewName(ConfigurationSubTab.CURRENT,
+ MSG.view_tabs_common_current()), null);
+ this.configHistory = new SubTab(configurationTab, new
ViewName(ConfigurationSubTab.HISTORY,
+ MSG.view_tabs_common_history()), null);
configurationTab.registerSubTabs(this.configCurrent, this.configHistory);
tabs.add(configurationTab);
driftTab = new TwoLevelTab(new ViewName(Tab.DRIFT, MSG.view_tabs_common_drift()),
IconEnum.DRIFT_COMPLIANCE);
// TODO: Experimenting with not shoing a drift history tab and having all
resource level drift viewing
// go through the comprehensive drift carousel view. Leave it in, but commented,
in case we want it back.
- //this.driftHistory = new SubTab(driftTab.extendLocatorId(DriftSubTab.HISTORY),
new ViewName(DriftSubTab.HISTORY,
+ //this.driftHistory = new SubTab(driftTab, new ViewName(DriftSubTab.HISTORY,
// MSG.view_tabs_common_history()), null);
- this.driftDefinitions = new
SubTab(driftTab.extendLocatorId(DriftSubTab.DEFINITIONS), new ViewName(
- DriftSubTab.DEFINITIONS, MSG.common_title_definitions()), null);
+ this.driftDefinitions = new SubTab(driftTab, new
ViewName(DriftSubTab.DEFINITIONS,
+ MSG.common_title_definitions()), null);
//driftTab.registerSubTabs(driftHistory, driftDefinitions);
driftTab.registerSubTabs(driftDefinitions);
tabs.add(driftTab);
contentTab = new TwoLevelTab(new ViewName("Content",
MSG.view_tabs_common_content()), IconEnum.CONTENT);
- this.contentDeployed = new
SubTab(contentTab.extendLocatorId("Deployed"), new
ViewName("Deployed",
- MSG.view_tabs_common_deployed()), null);
- this.contentNew = new SubTab(contentTab.extendLocatorId("New"), new
ViewName("New", MSG.common_button_new()),
- null);
- this.contentSubscrip = new
SubTab(contentTab.extendLocatorId("Subscriptions"), new
ViewName("Subscriptions",
+ this.contentDeployed = new SubTab(contentTab, new ViewName("Deployed",
MSG.view_tabs_common_deployed()), null);
+ this.contentNew = new SubTab(contentTab, new ViewName("New",
MSG.common_button_new()), null);
+ this.contentSubscrip = new SubTab(contentTab, new
ViewName("Subscriptions",
MSG.view_tabs_common_subscriptions()), null);
- this.contentHistory = new SubTab(contentTab.extendLocatorId("History"),
new ViewName("History",
- MSG.view_tabs_common_history()), null);
+ this.contentHistory = new SubTab(contentTab, new ViewName("History",
MSG.view_tabs_common_history()), null);
contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip,
contentHistory);
tabs.add(contentTab);
@@ -311,14 +295,14 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.summaryTab, this.summaryActivity, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return new
ActivityView(summaryActivity.extendLocatorId("View"), resourceComposite);
+ return new ActivityView(resourceComposite);
}
});
updateSubTab(this.summaryTab, this.summaryTimeline, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return new
TimelineView(summaryTimeline.extendLocatorId("View"), resourceComposite);
+ return new TimelineView(resourceComposite);
}
});
}
@@ -332,8 +316,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
ViewFactory viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return
ResourceCompositeSearchView.getChildrenOf(inventoryTab.extendLocatorId("ChildrenView"),
- resourceComposite);
+ return ResourceCompositeSearchView.getChildrenOf(resourceComposite);
}
};
updateSubTab(this.inventoryTab, this.inventoryChildren, visible, true,
viewFactory);
@@ -342,7 +325,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new
ChildHistoryView(inventoryTab.extendLocatorId("ChildHistory"),
resourceComposite);
+ return new ChildHistoryView(resourceComposite);
}
};
updateSubTab(this.inventoryTab, this.inventoryChildHistory, visible, true,
viewFactory);
@@ -351,8 +334,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new
PluginConfigurationEditView(inventoryTab.extendLocatorId("PluginConfigView"),
- resourceComposite);
+ return new PluginConfigurationEditView(resourceComposite);
}
};
updateSubTab(this.inventoryTab, this.inventoryConn, visible, true, viewFactory);
@@ -371,8 +353,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.inventoryTab, this.inventoryGroups, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return
ResourceGroupListView.getGroupsOf(inventoryTab.extendLocatorId("GroupsView"),
resource.getId(),
- canModifyMembership);
+ return ResourceGroupListView.getGroupsOf(resource.getId(),
canModifyMembership);
}
});
@@ -380,7 +361,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!enabled) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new
ResourceAgentView(inventoryTab.extendLocatorId("AgentView"), resourceId);
+ return new ResourceAgentView(resourceId);
}
};
updateSubTab(this.inventoryTab, this.inventoryAgent, true, enabled,
viewFactory);
@@ -390,7 +371,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.alertsTab, this.alertHistory, true, true, new ViewFactory() {
@Override
public Canvas createView() {
- return
ResourceAlertHistoryView.get(alertHistory.extendLocatorId("View"),
resourceComposite);
+ return ResourceAlertHistoryView.get(resourceComposite);
}
});
@@ -417,7 +398,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
viewFactory = (!visible) ? null : new ViewFactory() {
@Override
public Canvas createView() {
- return new
MeasurementTableView(monitorTables.extendLocatorId("View"), resource.getId());
+ return new MeasurementTableView(resource.getId());
}
};
updateSubTab(this.monitoringTab, this.monitorTables, visible, true,
viewFactory);
@@ -434,7 +415,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.monitoringTab, this.monitorAvail, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return new
ResourceAvailabilityView(monitoringTab.extendLocatorId("AvailView"),
resourceComposite);
+ return new ResourceAvailabilityView(resourceComposite);
}
});
@@ -462,8 +443,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.eventsTab, this.eventHistory, true, true, new ViewFactory()
{
@Override
public Canvas createView() {
- return
EventCompositeHistoryView.get(eventsTab.extendLocatorId("CompositeHistoryView"),
- resourceComposite);
+ return EventCompositeHistoryView.get(resourceComposite);
}
});
}
@@ -481,8 +461,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.operationsTab, this.operationsSchedules, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
ResourceOperationScheduleListView(operationsTab.extendLocatorId("SchedulesView"),
- resourceComposite);
+ return new ResourceOperationScheduleListView(resourceComposite);
}
});
@@ -503,8 +482,7 @@ public class ResourceDetailView extends
AbstractTwoLevelTabSetView<ResourceCompo
updateSubTab(this.configurationTab, this.configCurrent, true, true, new
ViewFactory() {
@Override
public Canvas createView() {
- return new
ResourceConfigurationEditView(configurationTab.extendLocatorId("ResourceConfigView"),
- resourceComposite);
+ return new ResourceConfigurationEditView(resourceComposite);
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
index ac628cf..045e39a 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryDataSource.java
@@ -50,7 +50,6 @@ import
org.rhq.enterprise.gui.coregui.client.gwt.ConfigurationGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A superclass data source that loads information about all the plugin/resource
configuration changes that happened
@@ -227,7 +226,7 @@ public abstract class AbstractConfigurationHistoryDataSource<T
extends AbstractR
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url = LinkManager
.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
index 40c2c0b..3d27035 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/AbstractConfigurationHistoryListView.java
@@ -35,13 +35,13 @@ import
org.rhq.core.domain.configuration.AbstractResourceConfigurationUpdate;
import org.rhq.core.domain.criteria.AbstractResourceConfigurationUpdateCriteria;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import
org.rhq.enterprise.gui.coregui.client.components.configuration.ConfigurationComparisonView;
import org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableAction;
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.util.message.Message;
import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The superclass to the main plugin/resource views that lists all configuration history
items.
@@ -183,7 +183,7 @@ public abstract class AbstractConfigurationHistoryListView<T
extends AbstractCon
public String format(Object value, ListGridRecord record, int i, int i1) {
Integer recordId = getId(record);
String detailsUrl = "#" + getBasePath() + "/" +
recordId;
- String cellHtml = SeleniumUtility.getLocatableHref(detailsUrl,
value.toString(), null);
+ String cellHtml = LinkManager.getHref(detailsUrl, value.toString());
String isCurrentConfig = record
.getAttribute(AbstractConfigurationHistoryDataSource.Field.CURRENT_CONFIG);
if (Boolean.parseBoolean(isCurrentConfig)) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index 7ea1368..58322c6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -68,7 +68,7 @@ public class ResourceConfigurationEditView extends EnhancedVLayout
implements Pr
private IButton saveButton;
private boolean refreshing = false;
- public ResourceConfigurationEditView(String locatorId, ResourceComposite
resourceComposite) {
+ public ResourceConfigurationEditView(ResourceComposite resourceComposite) {
super();
this.resource = resourceComposite.getResource();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
index feb2914..67a300e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
@@ -62,7 +62,7 @@ public class PluginConfigurationEditView extends EnhancedVLayout
implements Prop
private boolean refreshingConfig = false;
private boolean refreshingConfigDef = false;
- public PluginConfigurationEditView(String locatorId, ResourceComposite
resourceComposite) {
+ public PluginConfigurationEditView(ResourceComposite resourceComposite) {
super();
this.resource = resourceComposite.getResource();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
index 259bcff..fe8ab29 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/ResourceAgentView.java
@@ -34,12 +34,12 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import org.rhq.core.domain.resource.Agent;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
+import org.rhq.enterprise.gui.coregui.client.LinkManager;
import org.rhq.enterprise.gui.coregui.client.RefreshableView;
import org.rhq.enterprise.gui.coregui.client.admin.topology.AgentTableView;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* The content pane for the Resource Inventory>Agent subtab.
@@ -61,7 +61,7 @@ public class ResourceAgentView extends EnhancedVLayout implements
RefreshableVie
private boolean loading = false; // will be true if loadData is currently waiting for
responses
- public ResourceAgentView(String locatorId, int resourceId) {
+ public ResourceAgentView(int resourceId) {
super();
this.resourceId = resourceId;
@@ -206,7 +206,7 @@ public class ResourceAgentView extends EnhancedVLayout implements
RefreshableVie
// make clickable link for agent topology view
String detailsUrl = "#" + AgentTableView.VIEW_PATH +
"/" + agent.getId();
String formattedValue =
StringUtility.escapeHtml(MSG.common_label_link());
- String topologyViewItemText =
SeleniumUtility.getLocatableHref(detailsUrl, formattedValue, null);
+ String topologyViewItemText = LinkManager.getHref(detailsUrl,
formattedValue);
topologyViewItem.setValue(topologyViewItemText);
form.markForRedraw();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
index 781caf6..5857251 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/ResourceMetricGraphView.java
@@ -39,7 +39,6 @@ import
org.rhq.enterprise.gui.coregui.client.gwt.ResourceGWTServiceAsync;
import org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMetricGraphView;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
import org.rhq.enterprise.server.measurement.util.MeasurementUtils;
/**
@@ -100,8 +99,7 @@ public class ResourceMetricGraphView extends AbstractMetricGraphView {
public void onTypesLoaded(Map<Integer, ResourceType>
types) {
String url =
LinkManager.getResourceLink(resource.getId());
- resourceTitle = new
HTMLFlow(SeleniumUtility.getLocatableHref(url, resource.getName(),
- null));
+ resourceTitle = new HTMLFlow(LinkManager.getHref(url,
resource.getName()));
resourceTitle.setTooltip(AncestryUtil.getAncestryHoverHTMLForResource(resource, types,
0));
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
index 912159c..cf42e46 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/avail/ResourceAvailabilityView.java
@@ -80,7 +80,7 @@ public class ResourceAvailabilityView extends EnhancedVLayout {
private StaticTextItem unknownField;
private StaticTextItem currentTimeField;
- public ResourceAvailabilityView(String locatorId, ResourceComposite
resourceComposite) {
+ public ResourceAvailabilityView(ResourceComposite resourceComposite) {
super();
this.resourceComposite = resourceComposite;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
index 8a415ac..43af070 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MeasurementTableView.java
@@ -55,7 +55,7 @@ public class MeasurementTableView extends
Table<MeasurementTableDataSource> {
private final int resourceId;
- public MeasurementTableView(String locatorId, int resourceId) {
+ public MeasurementTableView(int resourceId) {
super();
this.resourceId = resourceId;
setDataSource(new MeasurementTableDataSource(resourceId));
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
index 48694c0..a94a4c4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/history/ResourceOperationHistoryDetailsView.java
@@ -42,7 +42,6 @@ import
org.rhq.enterprise.gui.coregui.client.components.configuration.Configurat
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.detail.operation.history.AbstractOperationHistoryDetailsView;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Ian Springer
@@ -117,8 +116,7 @@ public class ResourceOperationHistoryDetailsView extends
AbstractOperationHistor
if (showResourceField) {
Resource resource = resourceOperationHistory.getResource();
String url = LinkManager.getResourceLink(resource.getId());
- disambiguatedResourceName = SeleniumUtility.getLocatableHref(url,
resource.getName(),
- String.valueOf(resource.getId()));
+ disambiguatedResourceName = LinkManager.getHref(url,
resource.getName());
}
displayDetails(resourceOperationHistory);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
index 55be11a..bc68bc2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/operation/schedule/ResourceOperationScheduleListView.java
@@ -35,8 +35,8 @@ public class ResourceOperationScheduleListView extends
AbstractOperationSchedule
private ResourceComposite resourceComposite;
- public ResourceOperationScheduleListView(String locatorId, ResourceComposite
resourceComposite) {
- super(locatorId, new ResourceOperationScheduleDataSource(resourceComposite),
TITLE);
+ public ResourceOperationScheduleListView(ResourceComposite resourceComposite) {
+ super(new ResourceOperationScheduleDataSource(resourceComposite), TITLE);
this.resourceComposite = resourceComposite;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
index b489db5..db9f3f4 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/ActivityView.java
@@ -65,7 +65,7 @@ public class ActivityView extends EnhancedVLayout implements
DashboardContainer,
private boolean isInitialized = false;
- public ActivityView(String locatorId, ResourceComposite resourceComposite) {
+ public ActivityView(ResourceComposite resourceComposite) {
super();
this.resourceComposite = resourceComposite;
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
index 26a658e..99f9d4d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/summary/TimelineView.java
@@ -33,7 +33,7 @@ public class TimelineView extends EnhancedVLayout {
private final ResourceComposite resourceComposite;
- public TimelineView(String locatorId, ResourceComposite resourceComposite) {
+ public TimelineView(ResourceComposite resourceComposite) {
super();
this.resourceComposite = resourceComposite;
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
index 4d5fcbd..df1e09e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/operation/OperationHistoryDataSource.java
@@ -64,7 +64,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.Log;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Jay Shaughnessy
@@ -128,7 +127,7 @@ public class OperationHistoryDataSource extends
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int
i1) {
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
@@ -171,7 +170,7 @@ public class OperationHistoryDataSource extends
Integer opHistoryId = record.getAttributeAsInt("id");
String url = LinkManager.getEntityTabLink(entityContext,
"Operations", "History") + "/"
+ opHistoryId;
- return SeleniumUtility.getLocatableHref(url, timestamp, null);
+ return LinkManager.getHref(url, timestamp);
} else {
return "<i>" +
MSG.view_operationHistoryList_notYetStarted() + "</i>";
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
index 6b5f110..a812334 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/AlertDefinitionReportView.java
@@ -66,7 +66,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.AncestryUtil;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* A tabular report that shows alert definitions on all resources in inventory.
@@ -261,7 +260,7 @@ public class AlertDefinitionReportView extends
Table<AlertDefinitionReportView.D
resourceField.setCellFormatter(new CellFormatter() {
public String format(Object value, ListGridRecord listGridRecord, int i,
int i1) {
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url,
StringUtility.escapeHtml(value.toString()), null);
+ return LinkManager.getHref(url,
StringUtility.escapeHtml(value.toString()));
}
});
resourceField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
index 5a6aa68..0fdc582 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/DriftComplianceReportResourceSearchView.java
@@ -54,7 +54,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.ResourceD
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
import org.rhq.enterprise.gui.coregui.client.util.StringUtility;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* Extends the ResourceSearchView with drift compliance information.
@@ -99,7 +98,7 @@ public class DriftComplianceReportResourceSearchView extends
ResourceSearchView
String url =
LinkManager.getResourceTabLink(record.getAttributeAsInt("id"),
ResourceDetailView.Tab.DRIFT, null);
String name = StringUtility.escapeHtml(value.toString());
- return SeleniumUtility.getLocatableHref(url, name, null);
+ return LinkManager.getHref(url, name);
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
index d47b4f0..1b768ea 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/measurement/MeasurementOOBDataSource.java
@@ -53,7 +53,6 @@ import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTyp
import
org.rhq.enterprise.gui.coregui.client.inventory.resource.type.ResourceTypeRepository.TypesLoadedCallback;
import org.rhq.enterprise.gui.coregui.client.util.MeasurementConverterClient;
import org.rhq.enterprise.gui.coregui.client.util.RPCDataSource;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
* @author Greg Hinkle
@@ -80,7 +79,7 @@ public class MeasurementOOBDataSource extends
RPCDataSource<MeasurementOOBCompos
resourceNameField.setCellFormatter(new CellFormatter() {
public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
String url =
LinkManager.getResourceLink(listGridRecord.getAttributeAsInt(AncestryUtil.RESOURCE_ID));
- return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ return LinkManager.getHref(url, o.toString());
}
});
resourceNameField.setShowHover(true);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
index fd17a80..04c948b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java
@@ -27,6 +27,7 @@ import java.util.Set;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.widgets.tab.Tab;
+import com.smartgwt.client.widgets.tab.TabSet;
import com.smartgwt.client.widgets.tab.events.TabSelectedEvent;
import com.smartgwt.client.widgets.tab.events.TabSelectedHandler;
@@ -47,8 +48,6 @@ import org.rhq.enterprise.gui.coregui.client.components.table.Table;
import org.rhq.enterprise.gui.coregui.client.components.view.HasViewName;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.inventory.resource.ResourceSearchView;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTab;
-import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableTabSet;
import org.rhq.enterprise.gui.coregui.client.util.selenium.EnhancedVLayout;
/**
@@ -63,7 +62,7 @@ public class TaggedView extends EnhancedVLayout implements
BookmarkableView, Has
public static final ViewName VIEW_ID = new ViewName("Tags",
MSG.view_tags_tags(), IconEnum.TAGS);
private TagCloudView tagCloudView;
- private LocatableTabSet container;
+ private TabSet container;
private ArrayList<Table> viewsWithTags = new ArrayList<Table>();
private int selectedTabNum = 0;
private Set<Permission> globalPermissions;
@@ -106,7 +105,7 @@ public class TaggedView extends EnhancedVLayout implements
BookmarkableView, Has
criteria.addCriteria("tagSemantic", tag.getSemantic());
criteria.addCriteria("tagName", tag.getName());
- container = new LocatableTabSet();
+ container = new TabSet();
container.setWidth100();
container.setHeight100();
container.setTabBarControls(tagCloudView.getDeleteButton());
@@ -121,14 +120,14 @@ public class TaggedView extends EnhancedVLayout implements
BookmarkableView, Has
BundlesListView bundlesView = new BundlesListView(criteria, null);
viewsWithTags.add(bundlesView);
- tab = new LocatableTab(MSG.view_bundle_bundles());
+ tab = new Tab(MSG.view_bundle_bundles());
tab.setIcon(ImageManager.getBundleIcon());
tab.setPane(bundlesView);
container.addTab(tab);
BundleVersionListView bundleVersionListView = new
BundleVersionListView(criteria);
viewsWithTags.add(bundleVersionListView);
- tab = new LocatableTab(MSG.view_bundle_bundleVersions());
+ tab = new Tab(MSG.view_bundle_bundleVersions());
tab.setIcon("subsystems/bundle/BundleVersion_16.png");
tab.setPane(bundleVersionListView);
container.addTab(tab);
@@ -136,21 +135,21 @@ public class TaggedView extends EnhancedVLayout implements
BookmarkableView, Has
BundleDeploymentListView bundleDeploymentListView = new
BundleDeploymentListView(criteria,
this.globalPermissions.contains(Permission.MANAGE_BUNDLE));
viewsWithTags.add(bundleDeploymentListView);
- tab = new LocatableTab(MSG.view_bundle_bundleDeployments());
+ tab = new Tab(MSG.view_bundle_bundleDeployments());
tab.setIcon("subsystems/bundle/BundleDeployment_16.png");
tab.setPane(bundleDeploymentListView);
container.addTab(tab);
BundleDestinationListView bundleDestinationListView = new
BundleDestinationListView(criteria);
viewsWithTags.add(bundleDestinationListView);
- tab = new LocatableTab(MSG.view_bundle_bundleDestinations());
+ tab = new Tab(MSG.view_bundle_bundleDestinations());
tab.setIcon("subsystems/bundle/BundleDestination_16.png");
tab.setPane(bundleDestinationListView);
container.addTab(tab);
ResourceSearchView resourceView = new ResourceSearchView(criteria,
MSG.view_taggedResources_title());
viewsWithTags.add(resourceView);
- tab = new LocatableTab(MSG.view_taggedResources_title());
+ tab = new Tab(MSG.view_taggedResources_title());
tab.setIcon(ImageManager.getResourceIcon(ResourceCategory.SERVICE));
tab.setPane(resourceView);
container.addTab(tab);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java
deleted file mode 100644
index 7777b6a..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTab.java
+++ /dev/null
@@ -1,70 +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.util.selenium;
-
-import com.smartgwt.client.widgets.tab.Tab;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.tab.Tab that sets the ID for use with selenium
scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableTab extends Tab implements Enhanced {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableTab(String title) {
- super(title);
- init("TODO!!!!");
- }
-
- /**
- * <pre>
- * ID Format: "Tab-locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableTab(String title, String icon) {
- super(title, icon);
- init("TODO!!!");
- }
-
- private void init(String locatorId) {
- this.locatorId = locatorId;
- if (!SeleniumUtility.isUseDefaultIds()) {
- String unsafeId = "Tab-" + locatorId;
- setID(SeleniumUtility.getSafeId(unsafeId));
- }
- }
-
- public String getLocatorId() {
- return locatorId;
- }
-
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
deleted file mode 100644
index 667a69b..0000000
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/LocatableTabSet.java
+++ /dev/null
@@ -1,114 +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.util.selenium;
-
-import com.smartgwt.client.widgets.tab.Tab;
-import com.smartgwt.client.widgets.tab.TabSet;
-
-/**
- * Wrapper for com.smartgwt.client.widgets.tab.Tab that sets the ID for use with selenium
scLocators.
- *
- * @author Jay Shaughnessy
- */
-public class LocatableTabSet extends TabSet {
-
- private String locatorId;
-
- /**
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @param locatorId not null or empty.
- */
- public LocatableTabSet(String locatorId) {
- super();
- this.locatorId = locatorId;
- SeleniumUtility.setID(this, locatorId);
- }
-
- public LocatableTabSet() {
- super();
- this.locatorId = "TODO";
- SeleniumUtility.setID(this, locatorId);
- }
-
- public void setTabs(LocatableTab... tabs) {
- super.setTabs(tabs);
- }
-
- public LocatableTab[] getTabs() {
- Tab[] tabs = super.getTabs();
- LocatableTab[] locatableTabs = new LocatableTab[tabs.length];
- for (int i = 0, tabsLength = tabs.length; i < tabsLength; i++) {
- Tab tab = tabs[i];
- if (!(tab instanceof LocatableTab)) {
- throw new IllegalStateException("LocatableTabSet contains a Tab that
is not a LocatableTab.");
- }
- locatableTabs[i] = (LocatableTab) tab;
- }
- return locatableTabs;
- }
-
- /**
- * Returns the locatorId. This can be useful for constructing more granular
locatorIds. For example, if
- * the widget contains sub-widgets. Note, this is the raw locatorId for the widget,
to get the fully
- * formed ID, typically of the form "simpleClassname_locatorId", call
- * {@link com.smartgwt.client.widgets.Canvas#getID()}.
- *
- * @return the locatorId
- */
- public String getLocatorId() {
- return locatorId;
- }
-
- /**
- * Extends this widget's original locatorId with an extension. This can be useful
for constructing more
- * granular locatorIds. For example, if the widget contains sub-widgets.
- * <pre>
- * ID Format: "getLocatorId()_extension"
- * </pre>
- *
- * @param extension not null or empty.
- *
- * @return the new, extended locatorId
- */
- public String extendLocatorId(String extension) {
- return this.locatorId + "_" + extension;
- }
-
- public LocatableTab getTabByTitle(String title) {
- LocatableTab[] tabs = getTabs();
- for (LocatableTab tab : tabs) {
- if (tab.getTitle().equals(title)) {
- return tab;
- }
- }
- return null;
- }
-
- public LocatableTab getTabByLocatorId(String locatorId) {
- LocatableTab[] tabs = getTabs();
- for (LocatableTab tab : tabs) {
- if (tab.getLocatorId().equals(locatorId)) {
- return tab;
- }
- }
- return null;
- }
-}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java
index 60291bc..5c082dc 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/selenium/SeleniumUtility.java
@@ -1,14 +1,8 @@
package org.rhq.enterprise.gui.coregui.client.util.selenium;
-import com.google.gwt.user.client.ui.UIObject;
-import com.smartgwt.client.widgets.BaseWidget;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.layout.Layout;
-import org.rhq.enterprise.gui.coregui.client.CoreGUI;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message;
-import org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
-
/**
* Utilities for assisting with Selenium Automation
*
@@ -16,45 +10,6 @@ import
org.rhq.enterprise.gui.coregui.client.util.message.Message.Severity;
*/
public class SeleniumUtility {
- /** A default id that is not ecommended as it will clash with any other element set
to the default */
- public static final String DEFAULT_ID = "DefaultID";
-
- /**
- * When true ignore any explicit locatorId assignment and use the standard
- * ids generated by smartgwt.
- */
- private static boolean useDefaultIds = true;
-
- /**
- * A utility for assigning an ID to a smartgwt widget. Any current ID will be
overwritten. The algorithm is:
- * <pre>
- * ID Format: "simpleClassname_locatorId"
- * </pre>
- * @return the updated widget
- */
- static public <T extends BaseWidget> T setID(final T widget, String locatorId)
{
- if (useDefaultIds) {
- return widget;
- }
-
- String unsafeId = getSimpleClassName(widget) + "_" + locatorId;
- String safeId = SeleniumUtility.getSafeId(unsafeId, DEFAULT_ID);
- Canvas canvasWithId = Canvas.getById(safeId);
- if (null != canvasWithId) {
- try {
- canvasWithId.destroy();
- CoreGUI.getMessageCenter().notify(
- new Message("ID Conflict resolved: " + safeId,
getSmallStackTrace(null), Severity.Warning));
- } catch (Throwable t) {
- CoreGUI.getMessageCenter().notify(
- new Message("ID Conflict unresolved: " +
getSmallStackTrace(t), Severity.Info));
- }
- }
- widget.setID(safeId);
-
- return widget;
- }
-
static public String getSimpleClassName(final Object widget) {
String className = widget.getClass().getName();
return className.substring(className.lastIndexOf(".") + 1);
@@ -74,43 +29,6 @@ public class SeleniumUtility {
return smallStack.toString();
}
- /**
- * A utility for assigning an ID to a gwt uiobject. For a smartgwt widget use {@link
setId(BaseWidget)}.
- * Any current ID will be overwritten. The algorithm is:
- * <pre>
- * If the unsafeId parameter is non-empty, the ID is set to the unsafeId, with
spaces removed.
- * Else the ID is set to the uiobject's hashcode
- * </pre>
- *
- * @param uiObject
- * @param unsafeId
- * @return the updated uiObject
- */
- static public <T extends UIObject> T setHtmlId(final T uiObject, String
unsafeId) {
- if (useDefaultIds) {
- return uiObject;
- }
-
- String id = getSafeId(unsafeId, String.valueOf(uiObject.hashCode()));
- uiObject.getElement().setAttribute("id", id);
-
- return uiObject;
- }
-
- /**
- * Use only if you are sure the unsafeId is not null or empty, or if DEFAULT_ID is
acceptable.
- * <pre>
- * Equivalent to:
- *
- * getSafeId( unsafeId, DEFAULT_ID );
- * </pre>
- * @param unsafeId The desired Id but with potential problems
- * @return a safe version of unsafeId, or, if unsafeId is null or empty, DEFAULT_ID
- */
- static public String getSafeId(String unsafeId) {
- return getSafeId(unsafeId, DEFAULT_ID);
- }
-
/**
* Currently performs the following:
* <pre>
@@ -131,8 +49,18 @@ public class SeleniumUtility {
return safeId;
}
- static public boolean isUseDefaultIds() {
- return useDefaultIds;
+ /**
+ * Use only if you are sure the unsafeId is not null or empty, or if DEFAULT_ID is
acceptable.
+ * <pre>
+ * Equivalent to:
+ *
+ * getSafeId( unsafeId, DEFAULT_ID );
+ * </pre>
+ * @param unsafeId The desired Id but with potential problems
+ * @return a safe version of unsafeId, or, if unsafeId is null or empty, DEFAULT_ID
+ */
+ static public String getSafeId(String unsafeId) {
+ return getSafeId(unsafeId, "DEFAULTID");
}
/**
@@ -156,33 +84,4 @@ public class SeleniumUtility {
}
}
- public static boolean getUseDefaultIds() {
- return SeleniumUtility.useDefaultIds;
- }
-
- public static void setUseDefaultIds(boolean useDefaultIds) {
- SeleniumUtility.useDefaultIds = useDefaultIds;
- }
-
- /**
- * Return a locatable href element for locatable links: The return id will be:
- * <pre>
- * value[_suffix]
- *
- * Unsafe characters will be removed or converted as per getSafeId(). The
"_suffix" is
- * added only if a non-null suffix is supplied. The suffix can be used a
discriminator, if necessary,
- * for unique ids among duplicated values.
- * </pre>
- *
- * @param url the target url
- * @param value the display value for the link
- * @param suffix optional discriminator
- * @return
- */
- static public String getLocatableHref(String url, String value, String suffix) {
- String safeId = getSafeId(value + ((null == suffix) ? "" :
("_" + suffix)));
- String result = "<a id=\"" + safeId + "\"
href=\"" + url + "\">" + value + "</a>";
- return result;
- }
-
}