diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java index d812d947cb7..8f2d3a0ed21 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java @@ -3414,7 +3414,7 @@ public static void saveTask(PrismObject oldTask, OperationResult resul pageBase.getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result); } catch (Exception e){ LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save task.", e); - result.recordFatalError("Couldn't save task.", e); + result.recordFatalError(pageBase.createStringResource("WebModelUtils.couldntSaveTask").getString(), e); } result.recomputeStatus(); } @@ -3576,7 +3576,7 @@ public static void workItemApproveActionPerformed(AjaxRequestTarget target, Case dropPowerOfAttorneyIfRequested(result, powerDonor, pageBase); } } catch (Exception ex) { - result.recordFatalError("Couldn't save work item.", ex); + result.recordFatalError(pageBase.createStringResource("WebModelUtils.couldntSaveWorkItem").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save work item", ex); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java index 5483c9051c1..e3ba3a77ccd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebModelServiceUtils.java @@ -295,11 +295,11 @@ public static PrismObject loadObject(Class type, St LOGGER.debug("{} {} does not exist", type.getSimpleName(), oid, e); return null; } else { - subResult.recordFatalError("WebModelUtils.couldntLoadObject", e); + subResult.recordFatalError(page.createStringResource("WebModelUtils.couldntLoadObject").getString(), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", e); } } catch (Exception ex) { - subResult.recordFatalError("WebModelUtils.couldntLoadObject", ex); + subResult.recordFatalError(page.createStringResource("WebModelUtils.couldntLoadObject").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex); } finally { subResult.computeStatus(); @@ -417,7 +417,7 @@ public static List> searchObjects(Class objects.addAll(list); } } catch (Exception ex) { - subResult.recordFatalError("WebModelUtils.couldntSearchObjects", ex); + subResult.recordFatalError(page.createStringResource("WebModelUtils.couldntSearchObjects").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't search objects", ex); } finally { subResult.computeStatus(); @@ -441,7 +441,7 @@ public static int countObjects(Class type, ObjectQuery count = page.getModelService().countObjects(type, query, null, task, parentResult); } catch (SchemaException | ObjectNotFoundException | SecurityViolationException | ConfigurationException | CommunicationException | ExpressionEvaluationException ex) { - parentResult.recordFatalError("WebModelUtils.couldntCountObjects", ex); + parentResult.recordFatalError(page.createStringResource("WebModelUtils.couldntCountObjects").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex); } @@ -478,7 +478,7 @@ public static void deleteObject(Class type, String oid page.getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), options, task, subResult); } catch (Exception ex) { - subResult.recordFatalError("WebModelUtils.couldntDeleteObject", ex); + subResult.recordFatalError(page.createStringResource("WebModelUtils.couldntDeleteObject").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete object", ex); } finally { subResult.computeStatus(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java index 6009efc4626..7fed311e682 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebPrismUtil.java @@ -82,7 +82,7 @@ public static boolean match(IW wrapper) { QName type = wrapper.getTypeName(); - return DOMUtil.XSD_STRING.equals(type) || DOMUtil.XSD_DURATION.equals(type) + return DOMUtil.XSD_STRING.equals(type) || DOMUtil.XSD_DURATION.equals(type) || DOMUtil.XSD_LONG.equals(type) || DOMUtil.XSD_ANYURI.equals(type) || DOMUtil.XSD_INT.equals(type); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java index fe3c729a03b..232094e56ad 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValuePanel.java @@ -448,7 +448,7 @@ private void prepareNewContainers(AjaxRequestTarget target, List getReconstructedObject(String oid, String eventIdentifier PrismObject object = WebModelServiceUtils.reconstructObject(type, oid, eventIdentifier, task, result); return object; } catch (Exception ex) { - result.recordFatalError("Couldn't restruct object.", ex); + result.recordFatalError(getPageBase().createStringResource("ObjectHistoryTabPanel.message.getReconstructedObject.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't restruct object", ex); } return null; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java index bb6bf9d819b..cb58ab46749 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/DynamicFormPanel.java @@ -139,7 +139,7 @@ private PrismObjectWrapper createObjectWrapper(PrismObjectWrapperFactory f context); result.recordSuccess(); } catch (SchemaException e) { - result.recordFatalError("Cannot initialize form, " + e.getMessage()); + result.recordFatalError(createStringResource("DynamicFormPanel.message.createObjectWrapper.fatalError", e.getMessage()).getString()); getPageBase().showResult(result); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java index 1b4f1facab7..175df23263c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/PreviewChangesTabPanel.java @@ -144,7 +144,8 @@ public SceneDto getObject() { result.computeStatus(); } catch (Throwable t) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't prepare approval information", t); - result.recordFatalError("Couldn't prepare approval information: " + t.getMessage(), t); + result.recordFatalError( + createStringResource("PreviewChangesTabPanel.message.prepareApproval.fatalError", t.getMessage()).getString(), t); } if (WebComponentUtil.showResultInPage(result)) { getPageBase().showResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java index 563b9709076..a267a38b578 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java @@ -218,7 +218,7 @@ public void deleteConfirmedPerformed(AjaxRequestTarget target, F selectedObject) subResult.computeStatus(); } catch (RuntimeException ex) { subResult.recomputeStatus(); - subResult.recordFatalError("Couldn't delete object.", ex); + subResult.recordFatalError("FocusListInlineMenuHelper.message.delete.fatalError", ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete object", ex); } } @@ -256,10 +256,10 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enablin } catch (CommonException|RuntimeException ex) { subResult.recomputeStatus(); if (enabling) { - subResult.recordFatalError("Couldn't enable object.", ex); + subResult.recordFatalError("FocusListInlineMenuHelper.message.enable.fatalError", ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't enable object", ex); } else { - subResult.recordFatalError("Couldn't disable object.", ex); + subResult.recordFatalError("FocusListInlineMenuHelper.message.disable.fatalError", ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't disable object", ex); } } @@ -291,7 +291,8 @@ private void reconcilePerformed(AjaxRequestTarget target, F selectedObject) { opResult.computeStatusIfUnknown(); } catch (CommonException|RuntimeException ex) { opResult.recomputeStatus(); - opResult.recordFatalError("Couldn't reconcile object " + object + ".", ex); + opResult.recordFatalError( + parentPage.createStringResource("FocusListInlineMenuHelper.message.reconcile.fatalError", object).getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile object " + object + ".", ex); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java index 903771812c5..ced738698ac 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wf/SwitchableApprovalProcessPreviewsPanel.java @@ -88,7 +88,8 @@ protected ApprovalSchemaExecutionInformationType load() { result.computeStatus(); } catch (Throwable t) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get approval schema execution information for {}", t, getModelObject()); - opTask.getResult().recordFatalError("Couldn't get approval schema execution information: " + t.getMessage(), t); + opTask.getResult().recordFatalError( + createStringResource("SwitchableApprovalProcessPreviewsPanel.message.approvalSchemaExecution.fatalError",t.getMessage()).getString(), t); } if (WebComponentUtil.showResultInPage(result)) { parentPage.showResult(result); @@ -125,7 +126,8 @@ private ApprovalProcessExecutionInformationDto createApprovalProcessExecutionInf result.computeStatus(); } catch (Throwable t) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't create approval process execution information for {}", t, getModelObject()); - opTask.getResult().recordFatalError("Couldn't create approval process execution information: " + t.getMessage(), t); + opTask.getResult().recordFatalError( + createStringResource("SwitchableApprovalProcessPreviewsPanel.message.createApprovalProcess.fatalError", t.getMessage()).getString(), t); } if (WebComponentUtil.showResultInPage(result)) { ; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java index 46f66308fbc..bb82e9813ed 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java @@ -409,7 +409,7 @@ private void savePerformed() { } } catch (CommonException|RuntimeException e){ LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save capabilities", e); - result.recordFatalError("Couldn't save capabilities", e); + result.recordFatalError(getString("CapabilityStep.message.cantSaveCaps"), e); } finally { result.computeStatusIfUnknown(); setResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java index 12c60c9ee4e..797b9c56df2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java @@ -302,7 +302,7 @@ private void saveChanges() { } } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Error occurred during saving changes", ex); - result.recordFatalError("Couldn't save configuration changes.", ex); + result.recordFatalError(getString("ConfigurationStep.message.saveConfiguration.fatalError"), ex); } finally { result.computeStatusIfUnknown(); setResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java index 0b1cc044620..422a70d8a67 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/NameStep.java @@ -497,7 +497,7 @@ public void applyState() { } catch (RuntimeException|SchemaException ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save resource", ex); - result.recordFatalError("Couldn't save resource, reason: " + ex.getMessage(), ex); + result.recordFatalError(createStringResource("NameStep.message.saveResource.fatalError", ex.getMessage()).getString(), ex); } finally { result.computeStatusIfUnknown(); setResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java index 55d19884d1f..6047b0efbd5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/SchemaStep.java @@ -137,7 +137,7 @@ private void reloadPerformed(AjaxRequestTarget target) { result.computeStatusIfUnknown(); } catch (CommonException|RuntimeException e) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reload the schema", e); - result.recordFatalError("Couldn't reload the schema: " + e.getMessage(), e); + result.recordFatalError(createStringResource("SchemaStep.message.reload.fatalError", e.getMessage()).getString(), e); } // if (result.isSuccess()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java index fd5eb45ee44..3e52d706c08 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceCredentialsEditor.java @@ -242,7 +242,7 @@ private List createPasswordPolicyList(){ policies = getPageBase().getModelService().searchObjects(ValuePolicyType.class, null, null, task, result); result.recomputeStatus(); } catch (CommonException |RuntimeException e) { - result.recordFatalError("Couldn't load password policies.", e); + result.recordFatalError(getString("ResourceCredentialsEditor.message.createPasswordPolicyList.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load password policies", e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java index cb312a0dac6..45cfe5305d3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceDependencyEditor.java @@ -277,7 +277,7 @@ private List createResourceList(){ resources = getPageBase().getModelService().searchObjects(ResourceType.class, null, null, task, result); result.recomputeStatus(); } catch (CommonException|RuntimeException e){ - result.recordFatalError("Couldn't get resource list.", e); + result.recordFatalError(getString("ResourceDependencyEditor.message.createResourceList.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get resource list.", e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java index 846e0f54ebd..b7b053ab526 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/ExpressionVariableEditorDialog.java @@ -218,7 +218,7 @@ private List createObjectReferenceListDeprecated() { result); result.recomputeStatus(); } catch (CommonException|RuntimeException e) { - result.recordFatalError("Couldn't load objects from repository.", e); + result.recordFatalError("ExpressionVariableEditorDialog.message.createObjectReferenceListDeprecated.fatalError", e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load objects from repository", e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java index 31bc9f67879..b39a46bd6ca 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/modal/MappingEditorDialog.java @@ -571,7 +571,7 @@ private List createPasswordPolicyList() { task, result); result.recomputeStatus(); } catch (CommonException|RuntimeException e) { - result.recordFatalError("Couldn't load password policies.", e); + result.recordFatalError(getString("MappingEditorDialog.message.createPasswordPolicyList.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load password policies", e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java index 77800540193..2ca0fb5e51e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/synchronization/SynchronizationReactionEditor.java @@ -263,7 +263,7 @@ private List createObjectTemplateList(){ templates = getPageBase().getModelService().searchObjects(ObjectTemplateType.class, null, null, task, result); result.recomputeStatus(); } catch (CommonException|RuntimeException e){ - result.recordFatalError("Couldn't load object templates from repository. ", e); + result.recordFatalError(getString("SynchronizationReactionEditor.message.createObjectTemplateList.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object templates from repository", e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java index 0bb91e60b9d..ddc5e838a6f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java @@ -316,7 +316,7 @@ public void loadFullShadow(PrismObjectValueWrapper shadowWrapperValu result, createLoadOptionForShadowWrapper()); if (projection == null) { - result.recordFatalError("Cannot full projection for " + shadowWrapperValue.getRealValue()); + result.recordFatalError(getString("PageAdminFocus.message.loadFullShadow.fatalError", shadowWrapperValue.getRealValue())); showResult(result); target.add(getFeedbackPanel()); return; @@ -595,7 +595,7 @@ protected boolean executeForceDelete(PrismObjectWrapper userWrapper, Task tas options, task, result); } } catch (Exception ex) { - result.recordFatalError("Failed to execute delete operation with force."); + result.recordFatalError(getString("PageAdminFocus.message.executeForceDelete.fatalError")); LoggingUtils.logUnexpectedException(LOGGER, "Failed to execute delete operation with force", ex); return false; } @@ -739,7 +739,7 @@ private List> getShadowModifyDeltas(OperationR deltas.add(delta); } catch (Exception ex) { - result.recordFatalError("Couldn't compute account delta.", ex); + result.recordFatalError(getString("PageAdminFocus.message.getShadowModifyDeltas.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't compute account delta", ex); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java index c3cd4c21c85..51bb27a9fc2 100755 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java @@ -331,7 +331,7 @@ protected PrismObjectWrapper loadObjectWrapper(PrismObject objectToEdit, b result.recordSuccess(); } catch (Exception ex) { - result.recordFatalError("Couldn't get object.", ex); + result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex); } @@ -366,8 +366,8 @@ protected PrismObjectWrapper loadObjectWrapper(PrismObject objectToEdit, b try { wrapper = factory.createObjectWrapper(object, itemStatus, context); } catch (Exception ex) { - result.recordFatalError("Couldn't get user.", ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user", ex); + result.recordFatalError(getString("PageAdminObjectDetails.message.loadObjectWrapper.fatalError"), ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load object", ex); try { wrapper = factory.createObjectWrapper(object, itemStatus, context); } catch (SchemaException e) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java index bb5530c6e98..774bf3641f9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemActionsPanel.java @@ -162,7 +162,7 @@ private void delegateConfirmedPerformed(AjaxRequestTarget target, UserType deleg WebComponentUtil.dropPowerOfAttorneyIfRequested(result, getPowerDonor(), getPageBase()); } } catch (Exception ex) { - result.recordFatalError("Couldn't delegate work item.", ex); + result.recordFatalError(getString("CaseWorkItemActionsPanel.message.delegateConfirmedPerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delegate work item", ex); } getPageBase().processResult(target, result, false); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java index 66d83cb500c..a483b7e3676 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java @@ -172,7 +172,7 @@ private CaseType loadCaseIfNecessary() { result.recordFatalError(getString("PageCaseWorkItem.couldNotGetCase"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get case because it does not exist. (It might have been already completed or deleted.)", ex); } catch (RuntimeException ex) { - result.recordFatalError("Couldn't get case.", ex); + result.recordFatalError(getString("PageCaseWorkItem.couldNotGetCase.runtime"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get case.", ex); } showResult(result, false); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java index caf6c0bc757..4315e9380cb 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCases.java @@ -255,7 +255,7 @@ private void stopCaseProcessConfirmed(AjaxRequestTarget target, List c getWorkflowService().cancelCase(caseObject.getOid(), task, result); } catch (Exception ex){ LOGGER.error("Couldn't stop case process, ", ex.getLocalizedMessage()); - result.recordFatalError("Couldn't stop case process, ", ex); + result.recordFatalError(createStringResource("PageCases.message.stopCaseProcessConfirmed.fatalError").getString(), ex); } }); result.computeStatusComposite(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java index 98c0ef0fd1d..dbe24553963 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/dto/CaseWorkItemDtoProvider.java @@ -79,7 +79,7 @@ public Iterator internalIterator(long first, long count) { getAvailableData().add(new CaseWorkItemDto(workItem)); } } catch (Exception ex) { - result.recordFatalError("Couldn't list case work items.", ex); + result.recordFatalError(getPage().createStringResource("CaseWorkItemDtoProvider.message.internalIterator.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't list case work items", ex); } finally { result.computeStatusIfUnknown(); @@ -111,7 +111,7 @@ protected int internalSize() { Collection> resolveNames = createCollection(createResolveNames()); count = modelService.countContainers(CaseWorkItemType.class, query, resolveNames, task, result); } catch (Exception ex) { - result.recordFatalError("Couldn't count objects.", ex); + result.recordFatalError(getPage().createStringResource("CaseWorkItemDtoProvider.message.internalSize.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex); } finally { result.computeStatusIfUnknown(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java index 812f6c3d4eb..3e3af39b4b5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java @@ -171,7 +171,7 @@ private AccessCertificationCasesStatisticsType loadStatistics() { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get campaign statistics", ex); - result.recordFatalError("Couldn't get campaign statistics.", ex); + result.recordFatalError(getString("PageCertCampaign.message.loadStatistics.fatalerror"), ex); } result.recomputeStatus(); @@ -195,7 +195,7 @@ private CertCampaignDto loadCampaign() { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get campaign", ex); - result.recordFatalError("Couldn't get campaign.", ex); + result.recordFatalError(getString("PageCertCampaign.message.loadCampaign.fatalerror"), ex); } result.recomputeStatus(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java index 22aabfbc24a..3a9fbfa7621 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java @@ -128,7 +128,7 @@ private CertDefinitionDto loadDefinition(String definitionOid) { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get definition", ex); - result.recordFatalError("Couldn't get definition.", ex); + result.recordFatalError(getString("PageCertDefinition.message.loadDefinition.fatalError"), ex); } result.recomputeStatus(); @@ -267,7 +267,7 @@ public void savePerformed(AjaxRequestTarget target) { } result.computeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't save object: " + ex.getMessage(), ex); + result.recordFatalError(getString("PageCertDefinition.message.savePerformed.fatalError", ex.getMessage()), ex); } showResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java index 6948e58900d..133c2e81412 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java @@ -81,7 +81,7 @@ public Iterator internalIterator(long first, long count) getAvailableData().add(new CertCaseDto(_case, getPage(), task, result)); } } catch (Exception ex) { - result.recordFatalError("Couldn't list decisions.", ex); + result.recordFatalError(getPage().createStringResource("CertCaseDtoProvider.message.internalIterator.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't list decisions", ex); } finally { result.computeStatusIfUnknown(); @@ -109,7 +109,7 @@ protected int internalSize() { Task task = getPage().createSimpleTask(OPERATION_COUNT_OBJECTS); count = countCases(campaignOid, null, getPage().getPrismContext(), task, result); } catch (Exception ex) { - result.recordFatalError("Couldn't count objects.", ex); + result.recordFatalError(getPage().createStringResource("CertCaseDtoProvider.message.internalSize.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects", ex); } finally { result.computeStatusIfUnknown(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDtoProvider.java index 448559c16ab..61c91a3c523 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertWorkItemDtoProvider.java @@ -85,7 +85,7 @@ public Iterator internalIterator(long first, long count) { getAvailableData().add(new CertWorkItemDto(workItem, getPage())); } } catch (Exception ex) { - result.recordFatalError("Couldn't list decisions.", ex); + result.recordFatalError(getPage().createStringResource("CertCaseDtoProvider.message.internalIterator.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't list decisions", ex); } finally { result.computeStatusIfUnknown(); @@ -113,7 +113,8 @@ protected int internalSize() { ObjectQuery query = getQuery().clone(); count = acs.countOpenWorkItems(query, notDecidedOnly, null, task, result); } catch (Exception ex) { - result.recordFatalError("Couldn't count objects: " + ex.getMessage(), ex); + result.recordFatalError( + getPage().createStringResource("CertWorkItemDtoProvider.message.internalSize.fatalError", ex.getMessage()).getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count objects: " + ex.getMessage(), ex); } finally { result.computeStatusIfUnknown(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsMemoryPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsMemoryPanel.java index f80de5f1d89..c362a51477e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsMemoryPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsMemoryPanel.java @@ -79,7 +79,7 @@ private void executeShow(AjaxRequestTarget target) { String information = getPageBase().getModelDiagnosticService().getMemoryInformation(task, result); informationModel.setObject(information); } catch (Throwable t) { - result.recordFatalError("Couldn't get memory information", t); + result.recordFatalError(getString("InternalsMemoryPanel.message.executeShow.fatalError"), t); informationModel.setObject(ExceptionUtil.printStackTrace(t)); } finally { result.computeStatusIfUnknown(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsThreadsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsThreadsPanel.java index 9c795a1ab76..490a9f94348 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsThreadsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsThreadsPanel.java @@ -98,7 +98,7 @@ private void executeShowAllThreads(AjaxRequestTarget target) { LOGGER.debug("Threads:\n{}", dump); resultModel.setObject(dump); } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't get threads", e); + result.recordFatalError(getString("InternalsThreadsPanel.message.executeShowAllThreads.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get threads", e); } finally { result.computeStatus(); @@ -116,7 +116,7 @@ private void executeShowTasksThreads(AjaxRequestTarget target) { LOGGER.debug("Running tasks' threads:\n{}", dump); resultModel.setObject(dump); } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't get tasks' threads", e); + result.recordFatalError(getString("InternalsThreadsPanel.message.executeShowTasksThreads.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get tasks' threads", e); } finally { result.computeStatus(); @@ -133,7 +133,7 @@ private void executeRecordTasksThreads(AjaxRequestTarget target) { String info = getPageBase().getTaskService().recordRunningTasksThreadsDump(SchemaConstants.USER_REQUEST_URI, task, result); resultModel.setObject(info); } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't record tasks' threads", e); + result.recordFatalError(getString("InternalsThreadsPanel.message.executeRecordTasksThreads.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't record tasks' threads", e); } finally { result.computeStatus(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java index 5c372d2e26f..93b8a15b905 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.java @@ -329,7 +329,7 @@ private RepositoryDiag loadRepoDiagModel() { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get repo diagnostics", ex); - result.recordFatalError("Couldn't get repo diagnostics.", ex); + result.recordFatalError(getString("PageAbout.message.loadRepoDiagModel.fatalError"), ex); } result.recomputeStatus(); @@ -350,7 +350,7 @@ private ProvisioningDiag loadProvisioningDiagModel() { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get provisioning diagnostics", ex); - result.recordFatalError("Couldn't get provisioning diagnostics.", ex); + result.recordFatalError(getString("PageAbout.message.loadProvisioningDiagModel.fatalError"), ex); } result.recomputeStatus(); @@ -471,7 +471,7 @@ private void resetStateToInitialConfig(AjaxRequestTarget target) { } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't delete all objects.", ex); + result.recordFatalError(getString("PageAbout.message.resetStateToInitialConfig.allObject.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete all objects", ex); } @@ -496,7 +496,7 @@ public Object run() { getModelService().executeChanges(deltaCollection, null, task, result); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't delete task.", ex); + result.recordFatalError(getString("PageAbout.message.resetStateToInitialConfig.task.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete task", ex); } @@ -522,14 +522,10 @@ public Object run() { } catch (Exception ex) { - result.recomputeStatus(); - result.recordFatalError("Couldn't import initial objects.", ex); - - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't import initial objects", ex); + result.recomputeStatus(); + result.recordFatalError(getString("PageAbout.message.resetStateToInitialConfig.import.fatalError"), ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't import initial objects", ex); } - - - showResult(result); target.add(getFeedbackPanel()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java index dd1428223fc..0e27e0a4052 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java @@ -874,9 +874,9 @@ private void deleteAllTypeConfirmed(AjaxRequestTarget target) { info(getString("pageDebugList.messsage.deleteAllOfType", dto.getType())); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't delete objects of type " + dto.getType(), ex); + result.recordFatalError(getString("pageDebugList.messsage.notDeleteObjects", dto.getType()), ex); - LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete objects of type " + dto.getType(), ex); + LoggingUtils.logUnexpectedException(LOGGER, "" + dto.getType(), ex); } showResult(result); @@ -988,7 +988,7 @@ private void deleteAllShadowsOnResourceConfirmed(AjaxRequestTarget target) { info(getString("pageDebugList.messsage.deleteAllShadowsStarted", dto.getResource().getName())); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't delete shadows.", ex); + result.recordFatalError(getString("pageDebugList.messsage.notDeleteShadows"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete shadows", ex); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java index 86ced7716b4..ca3fcba2e57 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java @@ -161,7 +161,7 @@ protected ObjectViewDto load() { result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't load object.", ex); + result.recordFatalError(getString("WebModelUtils.couldntLoadObject"), ex); } showResult(result, false); @@ -346,7 +346,7 @@ public void savePerformed(AjaxRequestTarget target) { result.computeStatus(); } } catch (Exception ex) { - result.recordFatalError("Couldn't save object.", ex); + result.recordFatalError(getString("WebModelUtils.couldntSaveObject"), ex); } if (result.isError()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java index 51a79297fb1..7b498ee709e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageEvaluateMapping.java @@ -195,7 +195,7 @@ private void executeMappingPerformed(AjaxRequestTarget target) { dto.setResultText(response.getResponse()); } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't execute mapping", e); + result.recordFatalError(getString("PageEvaluateMapping.message.executeMappingPerformed.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't execute mapping", e); StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java index 844807e734d..59f847163e3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java @@ -353,7 +353,7 @@ private void savePerformed(boolean raw, String operationName, AjaxRequestTarget result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't import file.", ex); + result.recordFatalError(getString("PageImportObject.message.savePerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't import file", ex); } finally { if (stream != null) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java index 13428a966d5..8f75942977e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java @@ -418,7 +418,7 @@ private void useInObjectListPerformed(AjaxRequestTarget target) { storage.setSearch(search); setResponsePage(listPageClass); } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't parse query: " + e.getMessage(), e); + result.recordFatalError(getString("PageRepositoryQuery.message.couldNotParseQuery", e.getMessage()), e); showResult(result); target.add(this); } @@ -495,7 +495,7 @@ private void queryPerformed(Action action, AjaxRequestTarget target) { dto.setQueryResultObject(null); } } catch (CommonException | RuntimeException e) { - result.recordFatalError("Couldn't execute query", e); + result.recordFatalError(getString("PageRepositoryQuery.message.couldNotExecuteQuery"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't execute query", e); dto.setQueryResultText(e.getMessage()); dto.setQueryResultObject(e); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java index f5cbeb2f01b..bb9ddc14d0e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java @@ -419,7 +419,7 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res while(task.isClosed()) {TimeUnit.SECONDS.sleep(1);} } catch ( InterruptedException ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't use sleep", ex); + result.recordFatalError(getString("PageSystemConfiguration.message.saveOrPreviewPerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't use sleep", ex); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java index 6625242945f..10572671f5d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyPanel.java @@ -383,7 +383,7 @@ public List getObject() { null, null, task, result); result.recomputeStatus(); } catch (Exception e) { - result.recordFatalError("Could not get list of object templates", e); + result.recordFatalError(getString("ObjectPolicyPanel.message.createObjectTemplateList.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Could not get list of object templates", e); // TODO - show this error in GUI } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java index e5bda598f6b..30354848f8f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/PageDebugDownloadBehaviour.java @@ -124,7 +124,7 @@ protected File initFile() { result.recomputeStatus(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't init download link", ex); - result.recordFatalError("Couldn't init download link", ex); + result.recordFatalError(getPage().createStringResource("PageDebugDownloadBehaviour.message.initFile.fatalError").getString(), ex); } finally { if (writer != null) { IOUtils.closeQuietly(writer); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java index 95ac9d90bd3..cdfeacf9f29 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java @@ -332,7 +332,7 @@ public void initLayout(){ } catch (Exception ex) { - result.recordFatalError("Couldn't load system configuration.", ex); + result.recordFatalError(getString("PageMyPasswordQuestions.message.couldNotLoadSysConfig"), ex); } @@ -484,7 +484,7 @@ private PrismObjectWrapper loadUserWrapper(PrismObject userT result.recordSuccess(); } catch (Exception ex) { - result.recordFatalError("Couldn't get user.", ex); + result.recordFatalError(getString("PageMyPasswordQuestions.message.loadUserWrapper.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user PageMyQuestions", ex); } @@ -502,7 +502,7 @@ private PrismObjectWrapper loadUserWrapper(PrismObject userT try{ wrapper = factory.createObjectWrapper(user, ItemStatus.NOT_CHANGED, context); } catch (Exception ex){ - result.recordFatalError("Couldn't get user.", ex); + result.recordFatalError(getString("PageMyPasswordQuestions.message.loadUserWrapper.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user", ex); try { wrapper = factory.createObjectWrapper(user, ItemStatus.NOT_CHANGED, context); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java index 34bd65f8dcb..5379a3d761c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/AbstractOrgTabPanel.java @@ -190,7 +190,7 @@ private List> loadOrgRoots() { } } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unable to load org. unit", ex); - result.recordFatalError("Unable to load org unit", ex); + result.recordFatalError(getString("AbstractOrgTabPanel.message.loadOrgRoots.fatalError"), ex); } finally { result.computeStatus(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java index 0fb67d3a134..5171a5ba342 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java @@ -445,7 +445,8 @@ private void deleteSelectedConfirmedPerformed(AjaxRequestTarget target, List mod } } catch (SchemaException | ClassNotFoundException e) { OperationResult result = new OperationResult("Parameters serialization"); - result.recordFatalError("Could not serialize parameters"); + result.recordFatalError(getString("RunReportPopupPanel.message.runConfirmPerformed.fatalError")); getPageBase().showResult(result); return; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java index 41a1cd6e587..f8316ec95a3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/dto/AuditEventRecordProvider.java @@ -121,7 +121,8 @@ protected int internalSize() { try { count = (int) getAuditService().countObjects(query, parameters, task, result); } catch (Exception e) { - result.recordFatalError("Cannot count audit records: " + e.getMessage(), e); + result.recordFatalError( + getPage().createStringResource("AuditEventRecordProvider.message.internalSize.fatalError", e.getMessage()).getString(), e); LoggingUtils.logException(LOGGER, "Cannot count audit records: " + e.getMessage(), e); } @@ -151,7 +152,8 @@ private List listRecords(boolean ordered, long first, long try { auditRecords = getAuditService().listRecords(query, parameters, task, result); } catch (Exception e) { - result.recordFatalError("Cannot search audit records: " + e.getMessage(), e); + result.recordFatalError( + getPage().createStringResource("AuditEventRecordProvider.message.listRecords.fatalError", e.getMessage()).getString(), e); LoggingUtils.logException(LOGGER, "Cannot search audit records: " + e.getMessage(), e); } if (auditRecords == null) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java index d89f7210f8c..53b84dec180 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java @@ -479,7 +479,7 @@ private void testResourcePerformed(AjaxRequestTarget target, ResourceType resour // handling section getModelService().getObject(ResourceType.class, resourceType.getOid(), null, task, result); } catch (Exception ex) { - result.recordFatalError("Failed to test resource connection", ex); + result.recordFatalError(createStringResource("PageResources.message.testResourcePerformed.fatalError").getString(), ex); } // a bit of hack: result of TestConnection contains a result of diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java index 4bedc907706..f01edff6113 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/component/TestConnectionMessagesPanel.java @@ -74,7 +74,7 @@ private void initResultsModel(String resourceOid) { try { result = parentPage.getModelService().testResource(resourceOid, task); } catch (ObjectNotFoundException e) { - result.recordFatalError("Failed to test resource connection", e); + result.recordFatalError(getString("TestConnectionMessagesPanel.message.testConnection.fatalError"), e); } for (OperationResult subresult: result.getSubresults()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java index c18b00c8864..2e35ad5d3bc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageAccount.java @@ -138,7 +138,7 @@ private ShadowWrapper loadAccount(PageParameters parameters) { //TODO: fetch result??? } catch (SchemaException e) { LOGGER.error("Cannot create wrapper for shadow {}", account); - result.recordFatalError("Cannot create "); + result.recordFatalError(getString("PageAccount.message.loadAccount.fatalError")); throw new RestartResponseException(PageResources.class); } @@ -286,7 +286,7 @@ private void savePerformed(AjaxRequestTarget target) { getModelService().executeChanges(deltas, null, task, result); result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't save account.", ex); + result.recordFatalError(getString("PageAccount.message.savePerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save account", ex); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java index c05fed903f5..44ac3c721e5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/MemberOperationsHelper.java @@ -77,7 +77,7 @@ public static void unassignMembersPerformed(PageBas value.applyDefinition(def); } catch (SchemaException e) { LoggingUtils.logUnexpectedException(LOGGER, "Can not aply definition " + def, e); - operationalTask.getResult().recordFatalError("Can not aply definition " + def, e); + operationalTask.getResult().recordFatalError(pageBase.createStringResource("MemberOperationsHelper.message.unassignMembersPerformed.fatalError", def).getString(), e); } expression.parameter(new ActionParameterValueType().name(ROLE_PARAMETER).value( new RawType(value, DOMUtil.XSD_STRING, pageBase.getPrismContext()))); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java index 0a0f465ad46..cee887c19ed 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.java @@ -631,7 +631,7 @@ private List createResourceList() { resources = getModelService().searchObjects(ResourceType.class, null, null, task, result); result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't get resource list.", ex); + result.recordFatalError(getString("PageTaskAdd.message.createResourceList.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get resource list", ex); } @@ -667,7 +667,7 @@ private void savePerformed(AjaxRequestTarget target) { setResponsePage(PageTasks.class); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Unable to save task.", ex); + result.recordFatalError(getString("PageTaskAdd.message.savePerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't add new task", ex); } showResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java index a353154ff64..97783cf2c1b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskController.java @@ -111,7 +111,7 @@ void savePerformed(AjaxRequestTarget target) { result.recomputeStatus(); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't save task.", ex); + result.recordFatalError(parentPage.createStringResource("PageTaskController.message.savePerformed.fatalError").getString(), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save task modifications", ex); } afterSave(target, result); @@ -230,7 +230,8 @@ void stopApprovalProcessPerformed(AjaxRequestTarget target) { result.computeStatusIfUnknown(); } catch (SchemaException | ObjectNotFoundException | SecurityViolationException | ExpressionEvaluationException | RuntimeException | CommunicationException | ConfigurationException | ObjectAlreadyExistsException e) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't stop approval process instance {}", e, instanceId); - result.recordFatalError("Couldn't stop approval process instance " + instanceId + ": " + e.getMessage(), e); + result.recordFatalError( + parentPage.createStringResource("PageTaskController.message.stopApprovalProcessPerformed.fatalError", instanceId, e.getMessage()).getString(), e); } afterStateChangingOperation(target, result); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java index 2de56474290..9795895b68d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.java @@ -165,7 +165,7 @@ private TaskType loadTaskType(String taskOid, Task operationTask, OperationResul .build(); taskType = getModelService().getObject(TaskType.class, taskOid, options, operationTask, result).asObjectable(); } catch (Exception ex) { - result.recordFatalError("Couldn't get task.", ex); + result.recordFatalError(getString("PageTaskEdit.message.loadTaskType.fatalError"), ex); } return taskType; } @@ -330,7 +330,7 @@ private void refreshTaskModels() { objectWrapperModel.setObject(newWrapper); } catch (SchemaException|RuntimeException|Error e) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't refresh task {}", e, oldTaskDto); - result.recordFatalError("Couldn't refresh task: " + e.getMessage(), e); + result.recordFatalError(getString("PageTaskEdit.message.refreshTaskModels.fatalError", e.getMessage()), e); } result.computeStatusIfUnknown(); if (!result.isSuccess()) { @@ -348,7 +348,7 @@ protected PrismObjectWrapper loadObjectWrapper(PrismObject o WrapperContext context = new WrapperContext(task, result); wrapper = owf.createObjectWrapper(object, ItemStatus.NOT_CHANGED, context); } catch (Exception ex) { - result.recordFatalError("Couldn't get user.", ex); + result.recordFatalError(getString("PageTaskEdit.message.loadObjectWrapper.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load user", ex); try { WrapperContext context = new WrapperContext(task, result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java index aa55a0555d3..0dc942eb72f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/NodeDtoProvider.java @@ -68,7 +68,7 @@ public Iterator internalIterator(long first, long count) { result.recordSuccess(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing nodes", ex); - result.recordFatalError("Couldn't list nodes.", ex); + result.recordFatalError(getPage().createStringResource("NodeDtoProvider.message.internalIterator.fatalError").getString(), ex); } setSelectedOids(selectedOids); @@ -108,7 +108,7 @@ protected int internalSize() { result.recomputeStatus(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when counting nodes", ex); - result.recordFatalError("Couldn't count nodes.", ex); + result.recordFatalError(getPage().createStringResource("NodeDtoProvider.message.internalSize.fatalError").getString(), ex); } if (!result.isSuccess()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java index 0e84ccd21ab..b7bb7060353 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoProvider.java @@ -100,7 +100,7 @@ public Iterator internalIterator(long first, long count) { } } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing tasks", ex); - result.recordFatalError("Couldn't list tasks.", ex); + result.recordFatalError(getPage().createStringResource("TaskDtoProvider.message.internalIterator.fatalError").getString(), ex); } finally { if (result.hasUnknownStatus()) { result.recomputeStatus(); @@ -145,7 +145,7 @@ protected int internalSize() { result.recomputeStatus(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when counting tasks", ex); - result.recordFatalError("Couldn't count tasks.", ex); + result.recordFatalError(getPage().createStringResource("TaskDtoProvider.message.internalSize.fatalError").getString(), ex); } if (!result.isSuccess()) { getPage().showResult(result); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java index 4a41f50702e..660bb5c00d8 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/handlers/ResourceRelatedHandlerPanel.java @@ -242,7 +242,7 @@ private List createResourceList() { resources = parentPage.getModelService().searchObjects(ResourceType.class, null, null, task, result); result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't get resource list.", ex); + result.recordFatalError(getString("ResourceRelatedHandlerPanel.message.createResourceList.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get resource list", ex); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java index b22c574f050..135a0fe629f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java @@ -241,7 +241,7 @@ public void saveOrPreviewPerformed(AjaxRequestTarget target, OperationResult res } catch (Exception ex){ result.recomputeStatus(); - result.recordFatalError("Couldn't merge objects.", ex); + result.recordFatalError(getString("PageMergeObjects.message.saveOrPreviewPerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't merge objects", ex); showResult(result); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java index e1bcdc36957..b00ed28d158 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java @@ -433,7 +433,7 @@ private void deleteConfirmedPerformed(AjaxRequestTarget target, UserType userToD subResult.computeStatus(); } catch (Exception ex) { subResult.recomputeStatus(); - subResult.recordFatalError("Couldn't delete user.", ex); + subResult.recordFatalError(getString("PageUsers.message.delete.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete user", ex); } } @@ -494,7 +494,7 @@ private void unlockPerformed(AjaxRequestTarget target, UserType selectedUser) { opResult.computeStatusIfUnknown(); } catch (Exception ex) { opResult.recomputeStatus(); - opResult.recordFatalError("Couldn't unlock user " + user + ".", ex); + opResult.recordFatalError(getString("PageUsers.message.unlock.fatalError", user), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't unlock user " + user + ".", ex); } } @@ -527,7 +527,7 @@ private void reconcilePerformed(AjaxRequestTarget target, UserType selectedUser) opResult.computeStatusIfUnknown(); } catch (Exception ex) { opResult.recomputeStatus(); - opResult.recordFatalError("Couldn't reconcile user " + user + ".", ex); + opResult.recordFatalError(getString("PageUsers.message.reconcile.fatalError", user), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't reconcile user " + user + ".", ex); } } @@ -592,10 +592,10 @@ private void updateActivationPerformed(AjaxRequestTarget target, boolean enablin } catch (Exception ex) { subResult.recomputeStatus(); if (enabling) { - subResult.recordFatalError("Couldn't enable user.", ex); + subResult.recordFatalError(getString("PageUsers.message.enable.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't enable user", ex); } else { - subResult.recordFatalError("Couldn't disable user.", ex); + subResult.recordFatalError(getString("PageUsers.message.disable.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't disable user", ex); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java index e7bf57828fd..84b47be2464 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java @@ -243,7 +243,7 @@ private PrismObject getMergeObjectsResult() { mergeObjectModel.getObject().getOid(), mergeWithObjectModel.getObject().getOid(), currentMergeType, task, result); } catch (Exception ex) { result.recomputeStatus(); - result.recordFatalError("Couldn't get merge object for preview.", ex); + result.recordFatalError(getString("MergeObjectsPanel.message.getMergeObjectsResult.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get merge object for preview", ex); pageBase.showResult(result); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java index 0eccacd161d..57a3be818c6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java @@ -110,7 +110,7 @@ public long size() { LOGGER.debug("Found {} sub-orgs.", orgs); } catch (CommonException|RuntimeException ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load children", ex); - result.recordFatalError("Unable to load children for unit", ex); + result.recordFatalError(getPageBase().createStringResource("OrgTreeProvider.message.getChildren.fatalError").getString(), ex); } finally { result.computeStatus(); } @@ -170,7 +170,7 @@ public Iterator> getChildren(SelectableBean(); } finally { result.computeStatus(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java index e4669ad215e..955053edbc7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java @@ -202,7 +202,7 @@ private WebMarkupContainer createManagerPanel(OrgType org) { managerWrapper = getPageBase().getRegistry().getObjectWrapperFactory(manager.getDefinition()).createObjectWrapper(manager, ItemStatus.NOT_CHANGED, context); } catch (SchemaException e) { LoggingUtils.logException(LOGGER, "Cannoot create wrapper for {}" + manager, e); - searchManagersResult.recordFatalError("Cannot create wrapper for: " + manager, e); + searchManagersResult.recordFatalError(getString("TreeTablePanel.message.createManagerPanel.fatalError", manager), e); getPageBase().showResult(searchManagersResult); continue; } @@ -557,7 +557,7 @@ private void moveConfirmPerformed(SelectableBean orgToMove, SelectableB } catch (ObjectAlreadyExistsException | ObjectNotFoundException | SchemaException | ExpressionEvaluationException | CommunicationException | ConfigurationException | PolicyViolationException | SecurityViolationException e) { - result.recordFatalError("Failed to move organization unit " + toMove, e); + result.recordFatalError(getString("TreeTablePanel.message.moveConfirmPerformed.fatalError", toMove), e); LoggingUtils.logUnexpectedException(LOGGER, "Failed to move organization unit" + toMove, e); } @@ -599,7 +599,7 @@ private void makeRootPerformed(SelectableBean newRoot, AjaxRequestTarge } catch (ObjectAlreadyExistsException | ObjectNotFoundException | SchemaException | ExpressionEvaluationException | CommunicationException | ConfigurationException | PolicyViolationException | SecurityViolationException e) { - result.recordFatalError("Failed to move organization unit " + toMove, e); + result.recordFatalError(getString("TreeTablePanel.message.moveConfirmPerformed.fatalError", toMove), e); LoggingUtils.logUnexpectedException(LOGGER, "Failed to move organization unit" + toMove, e); } @@ -687,7 +687,7 @@ private boolean hasChildren(SelectableBean orgToDelete) { } catch (SchemaException | ObjectNotFoundException | SecurityViolationException | ConfigurationException | CommunicationException | ExpressionEvaluationException e) { LoggingUtils.logUnexpectedException(LOGGER, e.getMessage(), e); - result.recordFatalError("Could not count members for org " + orgToDelete.getValue(), e); + result.recordFatalError(getString("TreeTablePanel.message.hasChildren.fatalError", orgToDelete.getValue()), e); return false; } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java index c985d2dde7b..9a19dfe5dc0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/valuePolicy/PageValuePolicy.java @@ -160,7 +160,7 @@ private PrismObjectWrapper loadValuePolicy(String policyOid) { result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get definition", ex); - result.recordFatalError("Couldn't get definition.", ex); + result.recordFatalError(getString("PageValuePolicy.message.loadValuePolicy.fatalError"), ex); } result.recomputeStatus(); @@ -259,7 +259,7 @@ private void savePerformed(AjaxRequestTarget target) { getModelService().executeChanges(deltas, null, task, result); result.recomputeStatus(); } catch (Exception ex) { - result.recordFatalError("Couldn't save value policy.", ex); + result.recordFatalError(getString("PageValuePolicy.message.savePerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save value policy", ex); } if (!result.isSuccess()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java index 85cdce0dbcb..2444d665ddd 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/PageWorkItem.java @@ -197,7 +197,7 @@ private WorkItemDto loadWorkItemDtoIfNecessary() { result.recordFatalError(getString("PageWorkItem.couldNotGetWorkItem"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get work item because it does not exist. (It might have been already completed or deleted.)", ex); } catch (CommonException|RuntimeException ex) { - result.recordFatalError("Couldn't get work item.", ex); + result.recordFatalError(getString("PageWorkItem.message.couldNotGetWorkItem.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't get work item.", ex); } showResult(result, false); @@ -336,7 +336,7 @@ private void savePerformed(AjaxRequestTarget target, boolean approved) { dropPowerOfAttorneyIfRequested(result); } } catch (Exception ex) { - result.recordFatalError("Couldn't save work item.", ex); + result.recordFatalError(getString("PageWorkItem.message.savePerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't save work item", ex); } processResult(target, result, false); @@ -373,7 +373,7 @@ private void delegateConfirmedPerformed(AjaxRequestTarget target, UserType deleg dropPowerOfAttorneyIfRequested(result); } } catch (Exception ex) { - result.recordFatalError("Couldn't delegate work item.", ex); + result.recordFatalError(getString("PageWorkItem.message.delegateConfirmedPerformed.fatalError"), ex); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delegate work item", ex); } processResult(target, result, false); @@ -386,7 +386,7 @@ private void claimPerformed(AjaxRequestTarget target) { try { workflowService.claimWorkItem(workItemDtoModel.getObject().getWorkItemId(), task, result); } catch (SecurityViolationException | ObjectNotFoundException | RuntimeException | SchemaException | ObjectAlreadyExistsException | CommunicationException | ConfigurationException | ExpressionEvaluationException e) { - result.recordFatalError("Couldn't claim work item due to an unexpected exception.", e); + result.recordFatalError(getString("PageWorkItem.message.claimPerformed.fatalError"), e); } processResult(target, result, true); } @@ -398,7 +398,7 @@ private void releasePerformed(AjaxRequestTarget target) { try { workflowService.releaseWorkItem(WorkItemId.of(workItemDtoModel.getObject().getWorkItem()), task, result); } catch (SecurityViolationException | ObjectNotFoundException | RuntimeException | SchemaException | ObjectAlreadyExistsException | CommunicationException | ConfigurationException | ExpressionEvaluationException e) { - result.recordFatalError("Couldn't release work item due to an unexpected exception.", e); + result.recordFatalError(getString("PageWorkItem.message.releasePerformed.fatalError"), e); } processResult(target, result, true); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java index 02b131a9ecf..c6d18b513b9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/ProcessInstanceDtoProvider.java @@ -111,7 +111,7 @@ public Iterator internalIterator(long first, long } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing wf-related tasks", ex); - result.recordFatalError("Couldn't list wf-related tasks.", ex); + result.recordFatalError(getPage().createStringResource("ProcessInstanceDtoProvider.message.internalIterator.fatalError").getString(), ex); } if (result.isUnknown()) { @@ -151,9 +151,8 @@ protected int internalSize() { ObjectQuery query = getObjectQuery(); count = getModel().countObjects(TaskType.class, query, null, opTask, result); } catch (Exception ex) { - String msg = "Couldn't count process instances"; - LoggingUtils.logUnexpectedException(LOGGER, msg, ex); - result.recordFatalError(msg, ex); + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't count process instances", ex); + result.recordFatalError(getPage().createStringResource("ProcessInstanceDtoProvider.message.internalSize.fatalError").getString(), ex); } if (result.isUnknown()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java index 59d74ed3166..7bab51f571a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDtoProvider.java @@ -138,13 +138,13 @@ public Iterator internalIterator(long first, long count) getAvailableData().add(new WorkItemDto(item, getPage())); } catch (Exception e) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing work item {}", e, item); - result.recordFatalError("Couldn't list work item.", e); + result.recordFatalError(getPage().createStringResource("WorkItemDtoProvider.message.couldNotListWorkItem").getString(), e); } } } catch (CommonException | RuntimeException ex) { LoggingUtils.logUnexpectedException(LOGGER, "Unhandled exception when listing work items", ex); - result.recordFatalError("Couldn't list work items.", ex); + result.recordFatalError(getPage().createStringResource("WorkItemDtoProvider.message.couldNotListWorkItem").getString(), ex); } if (result.isUnknown()) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java index 8a1c52f4c44..86cdfdcaa8c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java @@ -451,7 +451,7 @@ public OperationResult run() { WebModelServiceUtils.save(nonceDelta, result, task, PageForgotPassword.this); } catch (SchemaException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException | SecurityViolationException e) { - result.recordFatalError("Failed to generate nonce for user"); + result.recordFatalError(getString("PageForgotPassword.message.saveUserNonce.fatalError")); LoggingUtils.logException(LOGGER, "Failed to generate nonce for user: " + e.getMessage(), e); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java index 3f0567a90cc..d52abd22dbc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java @@ -123,7 +123,7 @@ private UsernamePasswordAuthenticationToken authenticateUser(String username, St } catch (AuthenticationException ex) { getSession() .error(getString(ex.getMessage())); - result.recordFatalError("Failed to validate user"); + result.recordFatalError(getString("PageResetPasswordConfirmation.message.authenticateUser.fatalError")); LoggingUtils.logException(LOGGER, ex.getMessage(), ex); return null; } catch (Exception ex) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java index 880204e629b..6ad1c3b6fb4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java @@ -121,12 +121,12 @@ private UserType checkUserCredentials(String username, String nonce, OperationRe nonce, getSelfRegistrationConfiguration().getNoncePolicy())); } catch (AuthenticationException ex) { getSession().error(getString(ex.getMessage())); - result.recordFatalError("Failed to validate user", ex); + result.recordFatalError(getString("PageRegistrationConfirmation.message.failedValidUser.fatalError"), ex); LoggingUtils.logException(LOGGER, ex.getMessage(), ex); throw ex; } catch (Exception ex) { getSession().error(createStringResource("PageRegistrationConfirmation.authnetication.failed").getString()); - result.recordFatalError("Failed to confirm registration", ex); + result.recordFatalError(getString("PageRegistrationConfirmation.message.failedconfirmRegistration.fatalError"), ex); LoggingUtils.logException(LOGGER, "Failed to confirm registration", ex); throw ex; } finally { @@ -155,7 +155,7 @@ private void assignDefaultRoles(String userOid, PrismObject administra return null; }, administrator); } catch (CommonException|RuntimeException e) { - result.recordFatalError("Couldn't assign default roles", e); + result.recordFatalError(getString("PageRegistrationConfirmation.message.assignDefaultRoles.fatalError"), e); throw e; } finally { result.computeStatusIfUnknown(); @@ -177,7 +177,7 @@ private void removeNonceAndSetLifecycleState(String userOid, NonceType nonce, Pr return null; }, administrator); } catch (CommonException|RuntimeException e) { - result.recordFatalError("Couldn't remove nonce and set lifecycle state", e); + result.recordFatalError(getString("PageRegistrationConfirmation.message.removeNonceAndSetLifecycleState.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't remove nonce and set lifecycle state", e); throw e; } finally { @@ -208,7 +208,7 @@ private void assignAdditionalRoleIfPresent(String userOid, NonceType nonceType, return null; }, administrator); } catch (CommonException|RuntimeException e) { - result.recordFatalError("Couldn't assign additional role", e); + result.recordFatalError(getString("PageRegistrationConfirmation.message.assignAdditionalRoleIfPresent.fatalError"), e); LoggingUtils.logUnexpectedException(LOGGER, "Couldn't assign additional role", e); throw e; } finally { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java index 643a5f7530d..52d08c1977a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java @@ -391,7 +391,7 @@ private void saveUser(Task task, OperationResult result) { try { userDelta = prepareUserDelta(task, result); } catch (SchemaException | ExpressionEvaluationException | ObjectNotFoundException | CommunicationException | ConfigurationException | SecurityViolationException e) { - result.recordFatalError("Failed to create delta for user: " + e.getMessage(), e); + result.recordFatalError(getString("PageSelfRegistration.message.saveUser.fatalError", e.getMessage()), e); return; } userDelta.setPrismContext(getPrismContext()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java index bc6d69640f8..1938954f01a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java @@ -179,14 +179,14 @@ private MyPasswordsDto loadPageModel() { subResult.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load account", ex); - subResult.recordFatalError("Couldn't load account.", ex); + subResult.recordFatalError(getString("PageAbstractSelfCredentials.message.couldntLoadAccount.fatalError"), ex); } } } result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load accounts", ex); - result.recordFatalError("Couldn't load accounts", ex); + result.recordFatalError(getString("PageAbstractSelfCredentials.message.couldntLoadAccounts.fatalError"), ex); } finally { result.recomputeStatus(); } @@ -309,7 +309,8 @@ protected void onSavePerformed(AjaxRequestTarget target) { } } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't check password", ex); - checkPasswordResult.recordFatalError("Couldn't check password." + ex.getMessage(), ex); + checkPasswordResult.recordFatalError( + getString("PageAbstractSelfCredentials.message.onSavePerformed.fatalError", ex.getMessage()), ex); target.add(getFeedbackPanel()); return; } finally { @@ -442,7 +443,8 @@ private CredentialsPolicyType getPasswordCredentialsPolicy (){ result.recordSuccessIfUnknown(); } catch (Exception ex) { LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load credentials policy", ex); - result.recordFatalError("Couldn't load credentials policy." + ex.getMessage(), ex); + result.recordFatalError( + getString("PageAbstractSelfCredentials.message.getPasswordCredentialsPolicy.fatalError", ex.getMessage()), ex); } finally { result.computeStatus(); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java index 35028eb6c7b..cefa5897ae2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java @@ -580,7 +580,7 @@ private ObjectDelta prepareDelta(PrismObject user, OperationResult res } } catch (SchemaException e) { LoggingUtils.logUnexpectedException(LOGGER, "Failed to prepare delta for operation " + OPERATION_REQUEST_ASSIGNMENTS, e); - result.recordFatalError("Failed to prepare delta for operation " + OPERATION_REQUEST_ASSIGNMENTS, e); + result.recordFatalError(getString("PageAssignmentsList.message.prepareDelta.fatalError", OPERATION_REQUEST_ASSIGNMENTS), e); } return delta; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java index ced957cd10b..ac384f5f5a3 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PagePostAuthentication.java @@ -143,7 +143,7 @@ protected WebMarkupContainer initStaticLayout() { try { objectWrapper = factory.createObjectWrapper(userModel.getObject().asPrismObject(), ItemStatus.NOT_CHANGED, context); } catch (SchemaException e) { - result.recordFatalError("Could not perform post authentication. Please, contact system administrator."); //TODO localization + result.recordFatalError(getString("PagePostAuthentication.message.couldntPerformPostAuth.fatalError")); showResult(result); throw new RestartResponseException(PageLogin.class); } @@ -194,7 +194,7 @@ protected void submitRegistration(AjaxRequestTarget target) { result.recordSuccessIfUnknown(); } catch (SchemaException e) { LoggingUtils.logException(LOGGER, "Error during saving user.", e); - result.recordFatalError("Could not save user.", e); + result.recordFatalError(getString("PagePostAuthentication.message.submitRegistration.fatalError"), e); } result.computeStatus(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java index dec12adfe30..ed989474553 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java @@ -318,7 +318,7 @@ OtherPrivilegesLimitationType.F_APPROVAL_WORK_ITEMS, getRelationRegistry()) List workItems = getModelService().searchContainers(CaseWorkItemType.class, query, options, task, result); callableResult.setValue(workItems); } catch (Exception e) { - result.recordFatalError("Couldn't get list of work items.", e); + result.recordFatalError(getString("PageSelfDashboard.message.loadWorkItems.fatalError"), e); } result.recordSuccessIfUnknown(); @@ -362,7 +362,7 @@ private CallableResult> loadMyRequests() { cases.forEach(caseObj -> list.add(caseObj.asObjectable())); callableResult.setValue(list); } catch (Exception e) { - result.recordFatalError("Couldn't get list of work items.", e); + result.recordFatalError(getString("PageSelfDashboard.message.loadWorkItems.fatalError"), e); } result.recordSuccessIfUnknown();