modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
| 5
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
| 20 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
| 28 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
| 23 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
| 19 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
| 19 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
| 27 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
| 20 +-
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/resource/ResourceBundleDeploymentsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceConfigurationUpdatesPortlet.java
| 3
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
| 2
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 1
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
| 86 +++++++---
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
| 4
modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
| 8
21 files changed, 201 insertions(+), 101 deletions(-)
New commits:
commit ae5428243c5ae6639e3acac97ae476ad05b4f825
Merge: 40c5ede 15a53e5
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Thu Apr 28 10:48:43 2011 +0200
Merge branch 'master' into as7plugin
commit 15a53e58c10ba129ce0dd5b569aea1944de6836a
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Apr 27 16:06:30 2011 -0400
[BZ 699842 - ORA-00907: missing right parenthesis]
This is actually a fix to workaround HHH-3096 where hibernate generates
invalid SQL for "Select Count(entity)" if entity has a composite key.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
index 9b8c2ec..4bf2bae 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
@@ -306,13 +306,13 @@ public final class CriteriaQueryGenerator {
return EnumType.STRING; // catch-all
}
- // for testing purposes only, should use getQuery(EntityManager) or
getCountQuery(EntityManager) instead
public String getQueryString(boolean countQuery) {
StringBuilder results = new StringBuilder();
results.append("SELECT ");
if (countQuery) {
if (groupByClause == null) { // non-grouped method
-
results.append("COUNT(").append(alias).append(")").append(NL);
+ // use count(*) instead of count(alias) due to
https://bugzilla.redhat.com/show_bug.cgi?id=699842
+ results.append("COUNT(*)").append(NL);
} else {
// gets the count of the number of aggregate/grouped rows
// NOTE: this only works when the groupBy is a single element, as opposed
to a list of elements
commit 40c5eded43cd9e4d6050c9ca5ecbd06ddd1cd5b1
Merge: 9dc32bc f50680d
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 21:33:14 2011 +0200
Merge branch 'master' into as7plugin
commit f50680d02410d1da4665d9741003d061817cb716
Author: Heiko W. Rupp <hwr(a)redhat.com>
Date: Wed Apr 27 21:18:04 2011 +0200
Some more translations.
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
index 667f040..dfaf432 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties
@@ -162,6 +162,8 @@ common_msg_deleteConfirm = Are you sure you want to delete the #
selected {0}?~
common_msg_emphasizedNotePrefix = Achtung:
common_msg_loading = Laden...
common_msg_noItemsToShow=Keine Einträge vorhanden
+common_msg_step_x_of_y = Schritt {0} von {1}
+
# Common Values
#--------------
@@ -194,8 +196,8 @@ common_calendar_december_short=Dez
# Record Editor
#--------------
-widget_recordEditor_title_view = Anzeigen {0} [{1}]~
-widget_recordEditor_title_edit = Bearbeiten {0} [{1}]~
+widget_recordEditor_title_view = Anzeigen {0} [{1}]
+widget_recordEditor_title_edit = Bearbeiten {0} [{1}]
widget_recordEditor_title_new = Neue {0} anlegen
# // dup in common
widget_recordEditor_label_loading = Laden...
@@ -370,7 +372,7 @@ dataSource_problemResources_error_fetchFailure = Konnte die Liste der
Ressourcen
# Recent Operations
#----------------------------
dataSource_recentOperations_field_resource = Ressource
-dataSource_recentOperations_field_location = ort
+dataSource_recentOperations_field_location = Ort
dataSource_recentOperations_field_operation = Operation
dataSource_recentOperations_field_time = Zeitpunkt
dataSource_recentOperations_field_status = Status
@@ -399,7 +401,6 @@ dataSource_configurationHistory_error_fetchFailure = Konnte den
Verlauf der Ress
# Resource Errors
#-------------------------
dataSource_resourceErrors_field_summary = Zsuammenfassung
-dataSource_resourceErrors_field_detail = Detailierte Nachricht
dataSource_resourceErrors_field_errorType = Fehlertyp
dataSource_resourceErrors_field_timeOccured = Zeitpunkt
dataSource_resourceErrors_error_fetchFailure = Konnte die spezifischen Fehler für die
Ressource mit id [{0}] nicht laden.
@@ -448,9 +449,9 @@ view_adminRoles_failLdapGroupsRole = Failed to load LDAP groups
available for ro
view_adminRoles_failRoles = Konnte die Rollen nicht laden.
view_adminRoles_globalPerms = Applikationsweite Rechte
view_adminRoles_ldapGroups = LDAP-Gruppen
-view_adminRoles_ldapGroupsReadOnly = LDAP group data is read only~
+view_adminRoles_ldapGroupsReadOnly = LDAP Gruppendaten können nur gelesen werden
view_adminRoles_noItems = Keine Einträge vorhanden
-view_adminRoles_noLdap = The LDAP security integration is not configured. To configure
LDAP go to <a {0}>{1}</a>.~
+view_adminRoles_noLdap = Die LDAP-Integration ist nicht konfiguriert. Um LDAP zu
konfigurieren, wechseln sie zu <a {0}>{1}</a>.
view_adminRoles_perms = Rechte
view_adminRoles_resourcePerms = Rechte auf Ressourcen
view_adminRoles_roleAdded = Rolle [{0}] hinzugefügt
@@ -492,8 +493,8 @@ view_remoteAgentInstall_success = Agent installation complete~
view_remoteAgentInstall_updateStatus = Update Status~
#==================== Alerts ======================
-view_alerts_table_title_group=Group Alert History~
-view_alerts_table_title_resource=Resource Alert History~
+view_alerts_table_title_group=Verlauf Gruppen-Alarme
+view_alerts_table_title_resource=Verlauf Ressourcen-Alarme
view_alerts_table_filter_priority=Filter nach Priorität
view_alerts_field_created_time=Erstellungszeitpunkt
view_alerts_field_modified_time=Zuletzt geändert
@@ -531,13 +532,13 @@ view_alert_definitions_table_title_group=Alarm-Definitionen für
Gruppen
view_alert_definitions_table_title_resource=Alarm-Definitionen für Ressourcen
view_alert_definitions_loadFailed=Failed to fetch alert definition data~
view_alert_definitions_loadFailed_single=Failed to fetch data for alert definition with
id {0}~
-view_alert_definitions_enable_confirm=Enable the selected alert definition(s)?~
+view_alert_definitions_enable_confirm=Die auusgewählten Alarm-Definitionen aktivieren?
view_alert_definitions_enable_success=Successfully enabled {0} alert definitions~
view_alert_definitions_enable_failure=Failed to enable the selected alert definitions~
-view_alert_definitions_disable_confirm=Disable the selected alert definition(s)?~
+view_alert_definitions_disable_confirm=Die ausgewählten Alram-Definitionen deaktivieren?
view_alert_definitions_disable_success=Successfully disabled {0} alert definitions~
view_alert_definitions_disable_failure=Failed to disable the selected alert definitions~
-view_alert_definitions_delete_confirm=Delete the selected alert definition(s)?~
+view_alert_definitions_delete_confirm=Die ausgewählten Alarm-Definitionen löschen?
view_alert_definitions_delete_success=Successfully deleted {0} alert definitions~
view_alert_definitions_delete_failure=Failed to deleted the selected alert definitions~
view_alert_definitions_create_success=Alarm-Definition erfolgreich angelegt
@@ -928,13 +929,7 @@ view_groupConfigEdit_valsDiffForProp = Member Values for Property
[{0}]~
view_leftNav_unknownPage = Unknown page name [{0}] for section [{1}] - URL is invalid.~
view_measure_nan = --keine Daten verfügbar--~
-view_measureRange_day = 1 Tag
-view_measureRange_days = {0} Tage
-view_measureRange_hour = 1 Stunde
-view_measureRange_hours = {0} Stunden
view_measureRange_last = Letzte
-view_measureRange_minutes = {0} Minuten
-view_measureRange_range = Zeitraum
view_measureRange_simple = Einfach...
view_selector_assigned = Zugewiesen {0}
@@ -964,7 +959,6 @@ view_upload_error_results = Error uploading file, unexpected results:
[{0}]~
view_upload_inProgress = Can not submit, upload is currently in progress~
view_upload_prompt_1 = [{0}] File to Upload~
view_upload_prompt_2 = File to Upload~
-view_upload_tooltip_1 = Select a file to upload, then click Upload or Next~
view_upload_tooltip_2 = File upload had previously failed~
view_upload_success = File successfully uploaded~
view_upload_upload = Hochladen
@@ -972,13 +966,13 @@ view_upload_uploadFile = UploadFile~
# Group Create Wizard
view_groupCreateWizard_membersStepName=Wählen Sie die Gruppenmitglieder aus
-view_groupCreateWizard_createStepName=Group Settings~
+view_groupCreateWizard_createStepName=Einstellungen für die Gruppe
view_groupCreateWizard_createStep_recursive=Rekursiv
view_groupCreateWizard_title=Gruppe anlegen
view_groupCreateWizard_windowTitle=Gruppe anlegen
view_groupCreateWizard_createFailure=Konnte die Ressourcen-Gruppe nicht anlegen
-view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]~
-view_groupCreateWizard_createSuccessful_full=You have created a new [{0}] resource group
with the name [{1}] that contains [{2}] member resources~
+view_groupCreateWizard_createSuccessful_concise=Sie haben eine neue Ressourcen-Gruppe
angelegt. [<a href="{0}">Gruppe ansehen</a>]
+view_groupCreateWizard_createSuccessful_full=Sie haben eine neue [{0}] Gruppe mit dem
Namen [{1}] mit [{2}] Ressourcen angelegt.
# Resource Type / Plugin View/Datasources
view_type_resourceTypes=Ressourcen-Typen
@@ -1489,7 +1483,6 @@ common_title_resourceGroups=Ressourcen-Gruppen
common_title_server=Server
common_title_service=Dienste
common_title_users=Benutzer
-dataSource_operationHistory_startedTime=Startzeitpunkt
view_tabs_common_agent=Agent
common_title_bundle=Bundle
common_title_bundles=Bundles
@@ -1497,7 +1490,6 @@ common_val_n1st={0}er
common_val_n2nd={0}er
common_val_n3rd={0}er
common_val_nth={0}er
-dataSource_operationHistory_operationName=Name der Operation
view_autoDiscoveryQ_deleted=Gelöscht
view_adminRoles_permissions_globalPermissions=Globale Rechte
view_adminRoles_permissions_resourcePermissions=Rechte für Ressourcen
@@ -1683,6 +1675,54 @@ view_operationScheduleDetails_enterParametersBelow=Geben Sie die
Parameter unten
view_operationScheduleDetails_field_description=Beschreibung
view_operationScheduleDetails_field_parameters=Parameter
view_operationScheduleDetails_noParameters=Diese Operation benötigt keine Parameter.
+common_button_schedule=Planen
+common_button_set=Setzen
+common_status_deferred=Verzögert
+common_status_nochange=Keine Änderung
+common_status_partial=partiell
+common_title_compare_metrics=Metriken vergleichen
+common_title_config_update_status=Status aktualisieren
+common_title_dateRange=Zeitraum
+common_title_members_reporting=Anzahl berichtender Mitglieder
+common_title_group_member_health=Zustand der Gruppenmitglieder
+common_title_numeric_metrics=Numerische Metriken
+dataSource_operationHistory_field_createdTime=Erstellungszeitpunkt
+dataSource_operationHistory_field_operationName=Name der Operation
+dataSource_operationHistory_field_startedTime=Startzeitpunkt
+dataSource_operationHistory_field_subject=Ersteller
+dataSource_operationSchedule_field_description=Notizen
+dataSource_operationSchedule_field_nextFireTime=Nächste Ausführung
+dataSource_operationSchedule_field_operationDisplayName=Operation
+dataSource_operationSchedule_field_operationName=Operation
+dataSource_operationSchedule_field_subject=Eigentümer
+dataSource_operationSchedule_field_timeout=Timeout (in Sekunden)
+dataSource_resourceErrors_clickStatusIcon=Für mehr Details auf das Icon klicken
+dataSource_resourceErrors_deleteFailure=Konnte die Ressourcen-Fehler nicht löschen
+dataSource_resourceErrors_deleteSuccess=Sie haben erfolgreich [{0}]
Ressourcen-Fehlermeldungen gelöscht.
+group_tree_partialClusterTooltip={0} der {1} Gruppenmitglieder haben eine
''{2}'' Ressource
+view_adminTemplates_servers=Server
+view_adminTemplates_platforms=Platformen
+view_alert_definition_condition_editor_delete_confirm=Die ausgewählte(n)
Alarm-Bedingung(en) löschen?
+view_bundle_fileListView_md5=MD5
+view_bundle_fileListView_sha256=SHA256
+view_group_detail_failRecursiveChange=Konnte die Einstellung ''Rekursiv''
für die Gruppe [{0}] nicht aktualisieren
+view_group_detail_recursiveChange=Sie haben erfolgreich die
''Rekursiv''-Einstellung für die Gruppe [{0}] geändert.
+view_groupInventoryMembers_button_updateMembership=Mitgliedschaft aktualisieren...
+view_groupInventoryMembers_title_updateMembership=Mitgliedschaft aktualisieren
+view_measureRange_start=Zeitraum - Start
+view_measureTable_chartMetricValues=Graphen für ausgewählte Metriken anzeigen
+view_measureTable_getLive=Aktuellen Wert holen
+view_messageCenter_maxMessages=Alle Nachrichten
+view_resource_monitor_table_alerts=Alarme
+view_resource_monitor_table_avg=Durchschnitt
+view_resource_monitor_table_last=Letzter
+view_resource_monitor_table_max=Maximum
+view_resource_monitor_table_min=Minimum
+view_table_matchingRows=Zutreffende Zeilen: {0} (ausgewählt: {1})
+view_tabs_common_activity=Aktivität
+view_tabs_common_group_members=Gruppenmitglieder
+view_tabs_common_schedule=Zeitplan
+widget_resourceFactoryWizard_editConfigStep_nothingToDo=Es gibt keine Konfiguration, die
Sie für diese Ressource bearbeiten können.
commit c8592e93580faac85a0a482d1db8b86c38086e17
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Wed Apr 27 12:57:16 2011 -0400
[BZ 700176 - Several refresh issues in resource portlets]
There were a variety of contributing factors. In several cases the
resource portlets were not resetting the "loading" flag on initialization
which prevented subsequent refreshes from doing any work. And several
were locally caching config data that could go stale.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
index e8d51d1..530ed35 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/PortletWindow.java
@@ -95,9 +95,12 @@ public class PortletWindow extends LocatableWindow {
};
private ClickHandler refreshHandler = new ClickHandler() {
+
@SuppressWarnings("unchecked")
public void onClick(ClickEvent clickEvent) {
- if (PortletWindow.this.view instanceof Table) {
+ if (PortletWindow.this.view instanceof AutoRefreshPortlet) {
+ ((AutoRefreshPortlet) PortletWindow.this.view).refresh();
+ } else if (PortletWindow.this.view instanceof Table) {
((Table) PortletWindow.this.view).refresh();
} else {
((Canvas) PortletWindow.this.view).redraw();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
index f54ea54..944b674 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupBundleDeploymentsPortlet.java
@@ -70,8 +70,6 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
protected LocatableCanvas recentBundleDeployContent = new LocatableCanvas(
extendLocatorId("RecentBundleDeployments"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
// A non-displayed, persisted identifier for the portlet
public static final String KEY = "GroupBundleDeployments";
@@ -123,8 +121,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -154,6 +152,9 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -170,12 +171,13 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -187,6 +189,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
/** Fetches recent bundle deployment information and updates the DynamicForm instance
with details.
*/
protected void getRecentBundleDeployments() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int groupId = this.groupId;
GroupBundleDeploymentCriteria criteria = new GroupBundleDeploymentCriteria();
@@ -256,8 +260,8 @@ public class GroupBundleDeploymentsPortlet extends LocatableVLayout
implements C
}
recentBundleDeployContent.addChild(column);
recentBundleDeployContent.markForRedraw();
- markForRedraw();
currentlyLoading = false;
+ markForRedraw();
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
index c36b320..f4fa675 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupConfigurationUpdatesPortlet.java
@@ -106,8 +106,6 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
protected Canvas containerCanvas;
protected Timer refreshTimer;
- protected DashboardPortlet storedPortlet;
- protected Configuration portletConfig;
private ResourceGroupComposite groupComposite;
protected boolean portletConfigInitialized = false;
protected boolean currentlyLoading = false;
@@ -155,8 +153,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -173,6 +171,8 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -201,8 +201,6 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
@Override
public void onSubmitValues(SubmitValuesEvent event) {
- String selectedValue;
-
// //result sort order
// selectedValue =
resultSortSelector.getValue().toString();
// if ((selectedValue.trim().isEmpty()) ||
(selectedValue.equalsIgnoreCase(PageOrdering.DESC.name()))) {//then desc
@@ -211,21 +209,20 @@ public class GroupConfigurationUpdatesPortlet extends
LocatableVLayout implement
// portletConfig.put(new
PropertySimple(Constant.RESULT_SORT_ORDER, PageOrdering.ASC));
// }
//config status
- portletConfig =
AbstractActivityView.saveConfigUpdateStatusSelectorSettings(resultStatusSelector,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveConfigUpdateStatusSelectorSettings(
+ resultStatusSelector, portletConfig);
//result count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, updatedConfig);
//time range settings
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
+ updatedConfig);
//persist and reload portlet
storedPortlet.setConfiguration(portletConfig);
configure(portletWindow, storedPortlet);
- // refresh();
- redraw();
+ refresh();
}
});
form.markForRedraw();
@@ -297,6 +294,9 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
}
protected void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//populate composite data
//locate resourceGroupRef
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -352,7 +352,7 @@ public class GroupConfigurationUpdatesPortlet extends LocatableVLayout
implement
groupComposite);
}
- //update table for portlet display.
+ //update table for portlet display.
groupHistoryTable.setDataSource(new
GroupConfigurationUdpatesCriteriaDataSource(portletConfig,
groupId));
groupHistoryTable.setShowHeader(false);
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
index f88774f..9b5fb96 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java
@@ -88,8 +88,6 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
private int groupId = -1;
protected LocatableCanvas recentEventsContent = new
LocatableCanvas(extendLocatorId("RecentEvents"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
public GroupEventsPortlet(String locatorId) {
super(locatorId);
@@ -126,8 +124,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -159,6 +157,9 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
final LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//add range selector
final CustomConfigMeasurementRangeEditor measurementRangeEditor =
PortletConfigurationEditorComponent
.getMeasurementRangeEditor(portletConfig);
@@ -170,14 +171,13 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
public void onSubmitValues(SubmitValuesEvent event) {
//persist the measurement range selections
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(
+ measurementRangeEditor, portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- redraw();
- customSettings.markForRedraw();
+ refresh();
}
});
page.addMember(measurementRangeEditor);
@@ -193,6 +193,9 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
long end = System.currentTimeMillis();
long start = end - (24 * 60 * 60 * 1000);
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//result timeframe if enabled
PropertySimple property = portletConfig.getSimple(Constant.METRIC_RANGE_ENABLE);
if (Boolean.valueOf(property.getBooleanValue())) {//then proceed setting
@@ -287,8 +290,8 @@ public class GroupEventsPortlet extends LocatableVLayout implements
CustomSettin
}
recentEventsContent.addChild(column);
recentEventsContent.markForRedraw();
- markForRedraw();
setCurrentlyRefreshing(false);
+ markForRedraw();
}
});
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
index 7198004..1c5b526 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupMetricsPortlet.java
@@ -84,8 +84,6 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
private int groupId = -1;
protected LocatableCanvas recentMeasurementsContent = new
LocatableCanvas(extendLocatorId("RecentMetrics"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
protected String baseViewPath = "";
protected long start = -1;
protected long end = -1;
@@ -148,8 +146,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -185,6 +183,8 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
//embed range editor in it own container
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final CustomConfigMeasurementRangeEditor measurementRangeEditor =
PortletConfigurationEditorComponent
.getMeasurementRangeEditor(portletConfig);
@@ -193,13 +193,13 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
@Override
public void onSubmitValues(SubmitValuesEvent event) {
//retrieve range editor values
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
- portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(
+ measurementRangeEditor, portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
page.addMember(measurementRangeEditor);
@@ -212,6 +212,9 @@ public class GroupMetricsPortlet extends LocatableVLayout implements
CustomSetti
* digits.
*/
protected void getRecentMetrics() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//display container
final VLayout column = new VLayout();
column.setHeight(10);//pack
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
index 69ee7ee..aa1fdca 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOobsPortlet.java
@@ -74,8 +74,6 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
private int groupId = -1;
protected LocatableCanvas recentOobContent = new
LocatableCanvas(extendLocatorId("RecentOobs"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
// set on initial configuration, the window for this portlet view.
protected PortletWindow portletWindow;
@@ -122,8 +120,8 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -153,6 +151,9 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -169,12 +170,13 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -187,6 +189,9 @@ public class GroupOobsPortlet extends LocatableVLayout implements
CustomSettings
* oob change details.
*/
protected void getRecentOobs() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
final int groupId = this.groupId;
int resultCount = 5;//default to
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
index 196b55d..9606874 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupOperationsPortlet.java
@@ -103,8 +103,6 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
protected Canvas containerCanvas;
protected Timer refreshTimer;
- protected DashboardPortlet storedPortlet;
- protected Configuration portletConfig;
protected int groupId;
protected boolean portletConfigInitialized = false;
private ResourceGroupComposite groupComposite;
@@ -117,7 +115,7 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
this.locatorId = locatorId;
//figure out which page we're loading
String currentPage = History.getToken();
- String[] elements = currentPage.split("/");
+ //String[] elements = currentPage.split("/");
int groupId = AbstractActivityView.groupIdLookup(currentPage);
this.groupId = groupId;
//populate basepath
@@ -134,6 +132,9 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
}
private void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
//populate composite data
//locate resourceGroupRef
ResourceGroupCriteria criteria = new ResourceGroupCriteria();
@@ -189,8 +190,8 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
child.destroy();
}
recentOperationsContent.addChild(groupOperations);
- recentOperationsContent.markForRedraw();
currentlyRefreshing = false;
+ recentOperationsContent.markForRedraw();
}
});
}
@@ -218,8 +219,8 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -236,6 +237,9 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -265,23 +269,24 @@ public class GroupOperationsPortlet extends LocatableVLayout
implements CustomSe
public void onSubmitValues(SubmitValuesEvent event) {
//result count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//time range configuration
- portletConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
+ updatedConfig =
AbstractActivityView.saveMeasurementRangeEditorSettings(measurementRangeEditor,
portletConfig);
//operation priority
- portletConfig =
AbstractActivityView.saveOperationStatusSelectorSettings(operationStatusSelector,
+ updatedConfig =
AbstractActivityView.saveOperationStatusSelectorSettings(operationStatusSelector,
portletConfig);
//persist and reload portlet
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
//resynch the config object in the datasource
groupOperations.setDatasource(new
GroupOperationsCriteriaDataSource(portletConfig));
//apply latest settings to the visible result set
- redraw();
+ refresh();
}
});
form.markForRedraw();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
index 7e02ec9..742c0a7 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/groups/GroupPkgHistoryPortlet.java
@@ -71,8 +71,6 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout implements
CustomSe
private int groupId = -1;
protected LocatableCanvas recentPkgHistoryContent = new
LocatableCanvas(extendLocatorId("RecentPkgHistory"));
protected boolean currentlyLoading = false;
- protected Configuration portletConfig = null;
- protected DashboardPortlet storedPortlet;
public static final String ID = "id";
@@ -120,8 +118,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
if ((null == storedPortlet) || (null == storedPortlet.getConfiguration())) {
return;
}
- this.storedPortlet = storedPortlet;
- portletConfig = storedPortlet.getConfiguration();
+
+ Configuration portletConfig = storedPortlet.getConfiguration();
//lazy init any elements not yet configured.
for (String key :
PortletConfigurationEditorComponent.CONFIG_PROPERTY_INITIALIZATION.keySet()) {
@@ -151,6 +149,9 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
@Override
public DynamicForm getCustomSettingsForm() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
+
LocatableDynamicForm customSettings = new
LocatableDynamicForm(extendLocatorId("customSettings"));
LocatableVLayout page = new
LocatableVLayout(customSettings.extendLocatorId("page"));
//build editor form container
@@ -167,12 +168,13 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
public void onSubmitValues(SubmitValuesEvent event) {
//results count
- portletConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector, portletConfig);
+ Configuration updatedConfig =
AbstractActivityView.saveResultCounterSettings(resultCountSelector,
+ portletConfig);
//persist
- storedPortlet.setConfiguration(portletConfig);
+ storedPortlet.setConfiguration(updatedConfig);
configure(portletWindow, storedPortlet);
- loadData();
+ refresh();
}
});
@@ -184,6 +186,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
/** Fetches recent package history information and updates the DynamicForm instance
with details.
*/
protected void getRecentPkgHistory() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int groupId = this.groupId;
InstalledPackageHistoryCriteria criteria = new
InstalledPackageHistoryCriteria();
@@ -255,8 +259,8 @@ public class GroupPkgHistoryPortlet extends LocatableVLayout
implements CustomSe
}
recentPkgHistoryContent.addChild(column);
recentPkgHistoryContent.markForRedraw();
- markForRedraw();
currentlyLoading = false;
+ markForRedraw();
}
});
}
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 3d7521d..b26405b 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
@@ -289,10 +289,9 @@ public class OperationSchedulePortlet extends LocatableVLayout
implements Custom
new PropertySimple(OPERATIONS_RANGE_SCHEDULED_ENABLED, form
.getValue(OPERATIONS_RANGE_SCHEDULED_ENABLED)));
}
-
+ storedPortlet.setConfiguration(storedPortlet.getConfiguration());
configure(portletWindow, storedPortlet);
-
- redraw();
+ refresh();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
index 72a2449..be2dc7c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceBundleDeploymentsPortlet.java
@@ -27,8 +27,10 @@ import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.bundle.BundleDeployment;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.criteria.ResourceBundleDeploymentCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -76,6 +78,8 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
*/
@Override
protected void getRecentBundleDeployments() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
ResourceBundleDeploymentCriteria criteria = new
ResourceBundleDeploymentCriteria();
@@ -104,6 +108,7 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed bundle deployments for
resource [" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -146,6 +151,7 @@ public class ResourceBundleDeploymentsPortlet extends
GroupBundleDeploymentsPort
column.markForRedraw();
recentBundleDeployContent.addChild(column);
recentBundleDeployContent.markForRedraw();
+ currentlyLoading = false;
markForRedraw();
}
});
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 4ab8396..f9b2d9d 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
@@ -35,6 +35,7 @@ import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.resource.composite.ResourceComposite;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
@@ -98,6 +99,8 @@ public class ResourceConfigurationUpdatesPortlet extends
GroupConfigurationUpdat
@Override
protected void loadData() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
//populate composite data
//locate resourceRef
ResourceCriteria criteria = new ResourceCriteria();
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
index 7ceef8c..eb52924 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java
@@ -28,7 +28,9 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.event.EventSeverity;
import org.rhq.enterprise.gui.coregui.client.ImageManager;
import org.rhq.enterprise.gui.coregui.client.LinkManager;
@@ -77,6 +79,8 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
*/
@Override
protected void getRecentEventUpdates() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
long end = System.currentTimeMillis();
long start = end - (24 * 60 * 60 * 1000);
@@ -120,6 +124,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
@Override
public void onFailure(Throwable caught) {
Log.debug("Error retrieving event counts for resource [" +
resourceId + "]:" + caught.getMessage());
+ setCurrentlyRefreshing(false);
}
@Override
@@ -171,6 +176,7 @@ public class ResourceEventsPortlet extends GroupEventsPortlet {
child.destroy();
}
recentEventsContent.addChild(column);
+ setCurrentlyRefreshing(false);
recentEventsContent.markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
index 1adc6f3..0adf94b 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceMetricsPortlet.java
@@ -38,8 +38,10 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.criteria.ResourceCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.measurement.MeasurementDefinition;
import org.rhq.core.domain.measurement.composite.MeasurementDataNumericHighLowComposite;
import org.rhq.core.domain.resource.Resource;
@@ -97,6 +99,8 @@ public class ResourceMetricsPortlet extends GroupMetricsPortlet {
*/
@Override
protected void getRecentMetrics() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
//display container
final VLayout column = new VLayout();
column.setHeight(10);//pack
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
index a6c8005..a2dc372 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourceOobsPortlet.java
@@ -28,7 +28,9 @@ import com.smartgwt.client.widgets.form.fields.events.ClickEvent;
import com.smartgwt.client.widgets.form.fields.events.ClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.measurement.composite.MeasurementOOBComposite;
import org.rhq.core.domain.util.PageList;
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
@@ -76,6 +78,8 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
*/
@Override
protected void getRecentOobs() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
int resultCount = 5;//default to
@@ -96,6 +100,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
public void onFailure(Throwable caught) {
Log.debug("Error retrieving out of bound metrics for resource
[" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -142,6 +147,7 @@ public class ResourceOobsPortlet extends GroupOobsPortlet {
child.destroy();
}
recentOobContent.addChild(column);
+ currentlyLoading = false;
recentOobContent.markForRedraw();
}
});
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
index 6071704..0d91bd2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/resource/ResourcePkgHistoryPortlet.java
@@ -25,9 +25,11 @@ import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.form.fields.StaticTextItem;
import com.smartgwt.client.widgets.layout.VLayout;
+import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.PropertySimple;
import org.rhq.core.domain.content.InstalledPackageHistory;
import org.rhq.core.domain.criteria.InstalledPackageHistoryCriteria;
+import org.rhq.core.domain.dashboard.DashboardPortlet;
import org.rhq.core.domain.util.PageControl;
import org.rhq.core.domain.util.PageList;
import org.rhq.core.domain.util.PageOrdering;
@@ -74,6 +76,8 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet {
*/
@Override
protected void getRecentPkgHistory() {
+ final DashboardPortlet storedPortlet = this.portletWindow.getStoredPortlet();
+ final Configuration portletConfig = storedPortlet.getConfiguration();
final int resourceId = this.resourceId;
InstalledPackageHistoryCriteria criteria = new
InstalledPackageHistoryCriteria();
@@ -101,6 +105,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet
{
public void onFailure(Throwable caught) {
Log.debug("Error retrieving installed package history for group
[" + resourceId + "]:"
+ caught.getMessage());
+ currentlyLoading = false;
}
@Override
@@ -144,6 +149,7 @@ public class ResourcePkgHistoryPortlet extends GroupPkgHistoryPortlet
{
}
recentPkgHistoryContent.addChild(column);
recentPkgHistoryContent.markForRedraw();
+ currentlyLoading = false;
markForRedraw();
}
});
commit b40f968a004a227fbdd98ed0a8a3b6cb07610776
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 27 12:55:24 2011 -0400
set the log level to debug for this one message
diff --git
a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
index deddb02..6cea6b8 100644
---
a/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
+++
b/modules/enterprise/server/safe-invoker/src/main/java/org/rhq/enterprise/server/util/HibernateDetachUtility.java
@@ -93,9 +93,11 @@ public class HibernateDetachUtility {
return;
} else {
- // TODO: this can be tuned down to debug after we're done evaluating this
logic
- LOG.warn("UNEQUAL IDENTITY HASHCODE [" + valueIdentity +
"]\n\tCurrent : " + value.getClass().getName()
- + "\n\t" + value + "\n\tPrevious: " +
checkedObject.getClass().getName() + "\n\t" + checkedObject);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("UNEQUAL IDENTITY HASHCODE [" + valueIdentity +
"]\n\tCurrent : "
+ + value.getClass().getName() + "\n\t" + value +
"\n\tPrevious: "
+ + checkedObject.getClass().getName() + "\n\t" +
checkedObject);
+ }
}
if (value instanceof Object[]) {
commit 512eb56e0f87b42a7e0f2592fcc4069479ea5593
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Apr 27 12:00:43 2011 -0400
BZ 700158 - i18n wizard's step x of y message
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
index cdfd98b..6b82ade 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/wizard/WizardView.java
@@ -219,8 +219,8 @@ public class WizardView extends LocatableVLayout {
// a valid step, continue
currentStep = stepIndex;
- // TODO: i18n
- stepLabel.setContents("Step " + (stepIndex + 1) + " of " +
wizardSteps.size());
+ stepLabel.setContents(MSG.common_msg_step_x_of_y(String.valueOf(stepIndex + 1),
String.valueOf(wizardSteps
+ .size())));
stepLabel.setWrap(false);
WizardStep step = wizardSteps.get(currentStep);
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index e586fe3..01045ce 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -230,6 +230,7 @@ common_msg_loading = Loading...
common_msg_noItemsToShow = No items to show
common_msg_notYetImplemented = Not Yet Implemented
common_msg_see_more = see more...
+common_msg_step_x_of_y = Step {0} of {1}
# Common Values
#--------------
commit 7ca9bf695f0ce8e7bd360ecca6e1b65f92dc7d0c
Author: Simeon Pinder <spinder(a)redhat.com>
Date: Wed Apr 27 11:27:04 2011 -0400
widening the iframe window a little more for better viewing.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
index 1ffc4db..c1f1042 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/summary/AbstractActivityView.java
@@ -672,7 +672,7 @@ public abstract class AbstractActivityView extends LocatableVLayout
implements R
setShowCloseButton(true);
setIsModal(true);
setShowModalMask(true);
- setWidth(850);
+ setWidth(900);
setHeight(650);
setShowResizer(true);
setCanDragResize(true);