diff --git a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java index 8980e92616..1ab93551cf 100644 --- a/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java +++ b/source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java @@ -131,12 +131,12 @@ public abstract class BaseDialogBean implements IDialogBean return true; } - public String getTitle() + public String getContainerTitle() { return null; } - public String getDescription() + public String getContainerDescription() { return null; } diff --git a/source/java/org/alfresco/web/bean/dialog/DialogManager.java b/source/java/org/alfresco/web/bean/dialog/DialogManager.java index c7998ab253..abeff99b4d 100644 --- a/source/java/org/alfresco/web/bean/dialog/DialogManager.java +++ b/source/java/org/alfresco/web/bean/dialog/DialogManager.java @@ -141,7 +141,7 @@ public final class DialogManager public String getTitle() { // try and get the title directly from the dialog - String title = this.currentDialogState.getDialog().getTitle(); + String title = this.currentDialogState.getDialog().getContainerTitle(); if (title == null) { @@ -170,7 +170,7 @@ public final class DialogManager public String getDescription() { // try and get the description directly from the dialog - String desc = this.currentDialogState.getDialog().getDescription(); + String desc = this.currentDialogState.getDialog().getContainerDescription(); if (desc == null) { diff --git a/source/java/org/alfresco/web/bean/dialog/IDialogBean.java b/source/java/org/alfresco/web/bean/dialog/IDialogBean.java index becb29932b..b2a228f83f 100644 --- a/source/java/org/alfresco/web/bean/dialog/IDialogBean.java +++ b/source/java/org/alfresco/web/bean/dialog/IDialogBean.java @@ -73,7 +73,7 @@ public interface IDialogBean * * @return The title or null if the title is to be acquired via configuration */ - public String getTitle(); + public String getContainerTitle(); /** * Returns the description to be used for the dialog @@ -82,5 +82,5 @@ public interface IDialogBean * * @return The title or null if the title is to be acquired via configuration */ - public String getDescription(); + public String getContainerDescription(); } diff --git a/source/java/org/alfresco/web/bean/wizard/WizardManager.java b/source/java/org/alfresco/web/bean/wizard/WizardManager.java index c70115e53b..333f236118 100644 --- a/source/java/org/alfresco/web/bean/wizard/WizardManager.java +++ b/source/java/org/alfresco/web/bean/wizard/WizardManager.java @@ -152,7 +152,7 @@ public final class WizardManager public String getTitle() { // try and get the title directly from the wizard - String title = this.currentWizardState.getWizard().getTitle(); + String title = this.currentWizardState.getWizard().getContainerTitle(); if (title == null) { @@ -181,7 +181,7 @@ public final class WizardManager public String getDescription() { // try and get the description directly from the dialog - String desc = this.currentWizardState.getWizard().getDescription(); + String desc = this.currentWizardState.getWizard().getContainerDescription(); if (desc == null) { diff --git a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java index 936199c415..227b6ca416 100644 --- a/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ManageTaskDialog.java @@ -218,7 +218,7 @@ public class ManageTaskDialog extends BaseDialogBean } @Override - public String getTitle() + public String getContainerTitle() { String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "manage_task_title"); @@ -226,7 +226,7 @@ public class ManageTaskDialog extends BaseDialogBean } @Override - public String getDescription() + public String getContainerDescription() { return this.task.description; } diff --git a/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java b/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java index b037ad74ce..e8b2a45cf5 100644 --- a/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java +++ b/source/java/org/alfresco/web/bean/workflow/ViewCompletedTaskDialog.java @@ -39,7 +39,7 @@ public class ViewCompletedTaskDialog extends ManageTaskDialog } @Override - public String getTitle() + public String getContainerTitle() { String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "view_completed_task_title");