modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundleView.java | 11 +++++++++- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties | 7 +++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_de.properties | 7 +++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties | 7 +++--- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties | 7 +++--- 8 files changed, 29 insertions(+), 13 deletions(-)
New commits: commit 97867e2b4b241fa5ea33d0f439b1026914def5be Author: Jirka Kremser jkremser@redhat.com Date: Thu Aug 23 16:55:00 2012 +0200
[BZ 851239 - Globally uncaught exception on clicking the link Bundles->Repositories->JBoss Patches] Defensive programming - check for null/empty list -> exception is not thrown
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 6eaa263..1f2f660 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 @@ -42,7 +42,11 @@ import org.rhq.core.domain.bundle.Bundle; import org.rhq.core.domain.criteria.BundleCriteria; import org.rhq.core.domain.tagging.Tag; import org.rhq.core.domain.util.PageList; -import org.rhq.enterprise.gui.coregui.client.*; +import org.rhq.enterprise.gui.coregui.client.BookmarkableView; +import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.IconEnum; +import org.rhq.enterprise.gui.coregui.client.ViewId; +import org.rhq.enterprise.gui.coregui.client.ViewPath; import org.rhq.enterprise.gui.coregui.client.bundle.BundleTopView; import org.rhq.enterprise.gui.coregui.client.bundle.deploy.BundleDeployWizard; import org.rhq.enterprise.gui.coregui.client.bundle.deployment.BundleDeploymentView; @@ -286,6 +290,11 @@ public class BundleView extends LocatableVLayout implements BookmarkableView { }
public void onSuccess(PageList<Bundle> result) { + if (result == null || result.isEmpty()) { + CoreGUI.getMessageCenter().notify( + new Message(MSG.view_bundle_list_error4(), Message.Severity.Error)); + return; + } Bundle bundle = result.get(0); viewBundle(bundle, viewPath.getCurrent()); } 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 cfa1f6d..9681ea1 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 @@ -413,10 +413,10 @@ filter_from_date = From filter_to_date = To group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource -search_invalid_search_expression = Invalid search expression. -search_failed_to_save_search = Failed to Save Search: {0} search_failed_to_retrieve_saved_search = Failed to retrieve saved search search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion +search_failed_to_save_search = Failed to Save Search: {0} +search_invalid_search_expression = Invalid search expression. search_name_your_search = name you search search_successfully_saved_search = Successfully Saved Search: {0} util_ancestry_parentAncestry = Parent Ancestry for: @@ -1127,6 +1127,7 @@ view_bundle_list_destinationsCount = Destinations Count view_bundle_list_error1 = Failed to load bundle to deploy [{0}] view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] view_bundle_list_error3 = Failed to load bundle +view_bundle_list_error4 = No bundles found in this repository view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] @@ -1182,7 +1183,7 @@ view_configEdit_error_3 = Cannot add property named [{0}]. The property name is view_configEdit_files = Files view_configEdit_hideAll = Hide All view_configEdit_jumpToSection = Jump to Section -view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} +view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0} view_configEdit_msg_1 = Added property [{0}] to the set. view_configEdit_msg_2 = Removed properties from the set. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties index 5be0d57..b2a842d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_cs.properties @@ -1146,6 +1146,7 @@ view_bundle_list_destinationsCount = Počet cílů view_bundle_list_error1 = Nepodařilo se načíst balík k nasazení [{0}] view_bundle_list_error2 = Nepodařilo se získat 1 balík k nasazení [{0}] view_bundle_list_error3 = Nepodařilo se získat balík +view_bundle_list_error3 = V tomto repozitáři nejsou žádné balíky view_bundle_list_loadFailure = Nepodařilo se získat balík k nasazení [{0}] view_bundle_list_loadWithLatestFailure = Nepodařilo se získat balík s poslední verzí view_bundle_list_singleLoadFailure = Nepodařilo se získat 1 balík k nasazení [{0}] 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 d39f16a..4fe89d0 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 @@ -397,10 +397,10 @@ filter_from_date = Von filter_to_date = Bis ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} der {1} Gruppenmitglieder haben eine ''{2}'' Ressource -##search_invalid_search_expression = Invalid search expression. -##search_failed_to_save_search = Failed to Save Search: {0} ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion +##search_failed_to_save_search = Failed to Save Search: {0} +##search_invalid_search_expression = Invalid search expression. ##search_name_your_search = name you search ##search_successfully_saved_search = Successfully Saved Search: {0} util_disambiguationReportDecorator_pluginSuffix = ({0} Plugin) @@ -1013,6 +1013,7 @@ view_bundle_list_destinationsCount = Anzahl Ziele ##view_bundle_list_error1 = Failed to load bundle to deploy [{0}] ##view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] view_bundle_list_error3 = Konnte das Bundle nicht laden +##view_bundle_list_error4 = No bundles found in this repository ##view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] ##view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data ##view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] @@ -1066,7 +1067,7 @@ view_configEdit_confirm_2 = Sind Sie sicher dass sie diese Zeile löschen wollen view_configEdit_files = Dateien view_configEdit_hideAll = Alle verbergen view_configEdit_jumpToSection = Zum Abschnitt springen -##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} +##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} ##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0} view_configEdit_msg_1 = Eigentschaft [{0}] zur Menge hinzugefügt ##view_configEdit_msg_2 = Removed properties from the set. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties index 6c2044a..e2e25e8 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ja.properties @@ -1123,6 +1123,7 @@ view_bundle_list_destinationsCount = 宛先数 view_bundle_list_error1 = [{0}] をデプロイするためのバンドルのロードに失敗しました view_bundle_list_error2 = [{0}] をデプロイするための単一バンドルの取得に失敗しました view_bundle_list_error3 = バンドルのロードに失敗しました +##view_bundle_list_error4 = No bundles found in this repository view_bundle_list_loadFailure = デプロイされるバンドル [{0}] のロードに失敗しました view_bundle_list_loadWithLatestFailure = 最新バージョンデータを持つバンドルのロードに失敗しました view_bundle_list_singleLoadFailure = デプロイされる単一バンドル [{0}] の取得に失敗しました diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties index 9f00c55..e3f044f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_pt.properties @@ -416,10 +416,10 @@ favorites_resources = Recursos Favoritos ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = {0} out of {1} group members have a ''{2}'' resource -##search_invalid_search_expression = Invalid search expression. -##search_failed_to_save_search = Failed to Save Search: {0} ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion +##search_failed_to_save_search = Failed to Save Search: {0} +##search_invalid_search_expression = Invalid search expression. ##search_name_your_search = name you search ##search_successfully_saved_search = Successfully Saved Search: {0} util_ancestry_parentAncestry = Ancestral para: @@ -1133,6 +1133,7 @@ view_bundle_list_destinationsCount = Soma das Destina\u00E7\u00F5es view_bundle_list_error1 = Falha ao carregar bundle [{0}] para implantar view_bundle_list_error2 = Falha ao obter um \u00FAnico bundle [{0}] para deploy view_bundle_list_error3 = Falha ao carregar o bundle +##view_bundle_list_error4 = No bundles found in this repository view_bundle_list_loadFailure = Falha ao carregar o bundle [{0}] para ser implantado view_bundle_list_loadWithLatestFailure = Falha ao carregar o bundle com os dados da \u00FAltima vers\u00E3o view_bundle_list_singleLoadFailure = Falha ao obter um \u00FAnico bundle [{0}] para ser implantado @@ -1188,7 +1189,7 @@ view_configEdit_error_3 = N\u00E3o f\u00F3 poss\u00EDvel adicionar a propriedade view_configEdit_files = Arquivos view_configEdit_hideAll = Ocultar todos view_configEdit_jumpToSection = Ir direto para a Sele\u00E7\u00E3o -##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} +##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} ##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0} view_configEdit_msg_1 = Propriedade [{0}] adicionada ao conjunto. view_configEdit_msg_2 = Propriedades removidas do conjunto. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties index 25671e1..e27ce16 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_ru.properties @@ -2464,6 +2464,7 @@ view_admin_downloads_cli_version = Версия CLI ##view_admin_downloads_connectors_none = No connectors are available for download ##view_alert_details_field_resource_ancestry = Resource Ancestry ##view_alert_details_field_watched_resource = Watched Resource +##view_bundle_list_error4 = No bundles found in this repository ##view_bundle_revertWizard_getInfoStep_revertDeployDescFull = [REVERT From] {0} [REVERT To] {1} ##view_configEdit_property = Property ##view_configEdit_unset = Unset? diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties index 827e01b..2de43cc 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages_zh.properties @@ -405,10 +405,10 @@ favorites_resources = \u8d44\u6e90\u6536\u85cf\u5939 ##filter_to_date = To ##group_tree_groupOfResourceType = Group of [{0}] group_tree_partialClusterTooltip = \u9664\u53bb {1},{0}\u7684\u7ec4\u6210\u5458\u62e5\u6709 \u4e00\u4e2a''{2}''\u8d44\u6e90 -##search_invalid_search_expression = Invalid search expression. -##search_failed_to_save_search = Failed to Save Search: {0} ##search_failed_to_retrieve_saved_search = Failed to retrieve saved search ##search_failed_to_retrieve_search_suggestion = Failed to retrieve search suggestion +##search_failed_to_save_search = Failed to Save Search: {0} +##search_invalid_search_expression = Invalid search expression. ##search_name_your_search = name you search ##search_successfully_saved_search = Successfully Saved Search: {0} util_ancestry_parentAncestry = Parent Ancestry for: @@ -1117,6 +1117,7 @@ view_bundle_list_destinationsCount = \u76ee\u7684\u5730\u6570 view_bundle_list_error1 = Failed to load bundle to deploy [{0}] view_bundle_list_error2 = Failed to get a single bundle to deploy [{0}] view_bundle_list_error3 = \u52a0\u8f7dbundle\u5931\u8d25 +##view_bundle_list_error4 = No bundles found in this repository view_bundle_list_loadFailure = Failed to load the bundle to be deployed [{0}] view_bundle_list_loadWithLatestFailure = Failed to load bundle with the latest version data view_bundle_list_singleLoadFailure = Failed to get a single bundle to be deployed [{0}] @@ -1172,7 +1173,7 @@ view_configEdit_error_3 = \u65e0\u6cd5\u6dfb\u52a0\u540d\u4e3a[{0}]\u7684\u5c5e\ view_configEdit_files = \u6587\u4ef6 view_configEdit_hideAll = \u9690\u85cf\u6240\u6709 view_configEdit_jumpToSection = \u8df3\u81f3\u6a21\u5757 -##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} +##view_configEdit_maxBoundsExceeded = Cannot add another entry because the maximum size bounds has been met: {0} ##view_configEdit_minBoundsExceeded = Cannot delete this entry as the minimum has been set to: {0} view_configEdit_msg_1 = \u589e\u52a0\u5c5e\u6027 [{0}]\u5230\u96c6\u5408. view_configEdit_msg_2 = \u79fb\u9664\u96c6\u5408\u5185\u6240\u6709\u7684\u5c5e\u6027.