Merge from HEAD to WCM-DEV2.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3659 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/web/bean/dialog/BaseDialogBean.java

@@ -59,6 +59,11 @@ public abstract class BaseDialogBean implements IDialogBean
       this.isFinished = false;
    }
    
+   public void restored()
+   {
+      // do nothing by default, subclasses can override if necessary
+   }
+   
    public String cancel()
    {
       return getDefaultCancelOutcome();
@@ -126,6 +131,16 @@ public abstract class BaseDialogBean implements IDialogBean
       return true;
    }
 
+   public String getTitle()
+   {
+      return null;
+   }
+   
+   public String getDescription()
+   {
+      return null;
+   }
+
    /**
     * @param browseBean The BrowseBean to set.
     */