mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Some files Kev needed from 1.4 branch.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -131,12 +131,12 @@ public abstract class BaseDialogBean implements IDialogBean
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getTitle()
|
public String getContainerTitle()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDescription()
|
public String getContainerDescription()
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@@ -141,7 +141,7 @@ public final class DialogManager
|
|||||||
public String getTitle()
|
public String getTitle()
|
||||||
{
|
{
|
||||||
// try and get the title directly from the dialog
|
// try and get the title directly from the dialog
|
||||||
String title = this.currentDialogState.getDialog().getTitle();
|
String title = this.currentDialogState.getDialog().getContainerTitle();
|
||||||
|
|
||||||
if (title == null)
|
if (title == null)
|
||||||
{
|
{
|
||||||
@@ -170,7 +170,7 @@ public final class DialogManager
|
|||||||
public String getDescription()
|
public String getDescription()
|
||||||
{
|
{
|
||||||
// try and get the description directly from the dialog
|
// try and get the description directly from the dialog
|
||||||
String desc = this.currentDialogState.getDialog().getDescription();
|
String desc = this.currentDialogState.getDialog().getContainerDescription();
|
||||||
|
|
||||||
if (desc == null)
|
if (desc == null)
|
||||||
{
|
{
|
||||||
|
@@ -73,7 +73,7 @@ public interface IDialogBean
|
|||||||
*
|
*
|
||||||
* @return The title or null if the title is to be acquired via configuration
|
* @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
|
* 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
|
* @return The title or null if the title is to be acquired via configuration
|
||||||
*/
|
*/
|
||||||
public String getDescription();
|
public String getContainerDescription();
|
||||||
}
|
}
|
||||||
|
@@ -152,7 +152,7 @@ public final class WizardManager
|
|||||||
public String getTitle()
|
public String getTitle()
|
||||||
{
|
{
|
||||||
// try and get the title directly from the wizard
|
// try and get the title directly from the wizard
|
||||||
String title = this.currentWizardState.getWizard().getTitle();
|
String title = this.currentWizardState.getWizard().getContainerTitle();
|
||||||
|
|
||||||
if (title == null)
|
if (title == null)
|
||||||
{
|
{
|
||||||
@@ -181,7 +181,7 @@ public final class WizardManager
|
|||||||
public String getDescription()
|
public String getDescription()
|
||||||
{
|
{
|
||||||
// try and get the description directly from the dialog
|
// try and get the description directly from the dialog
|
||||||
String desc = this.currentWizardState.getWizard().getDescription();
|
String desc = this.currentWizardState.getWizard().getContainerDescription();
|
||||||
|
|
||||||
if (desc == null)
|
if (desc == null)
|
||||||
{
|
{
|
||||||
|
@@ -218,7 +218,7 @@ public class ManageTaskDialog extends BaseDialogBean
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTitle()
|
public String getContainerTitle()
|
||||||
{
|
{
|
||||||
String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "manage_task_title");
|
String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "manage_task_title");
|
||||||
|
|
||||||
@@ -226,7 +226,7 @@ public class ManageTaskDialog extends BaseDialogBean
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getDescription()
|
public String getContainerDescription()
|
||||||
{
|
{
|
||||||
return this.task.description;
|
return this.task.description;
|
||||||
}
|
}
|
||||||
|
@@ -39,7 +39,7 @@ public class ViewCompletedTaskDialog extends ManageTaskDialog
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTitle()
|
public String getContainerTitle()
|
||||||
{
|
{
|
||||||
String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "view_completed_task_title");
|
String titleStart = Application.getMessage(FacesContext.getCurrentInstance(), "view_completed_task_title");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user