Merged 5.2.N (5.2.1) to HEAD (5.2)

125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
         125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:45:04 +00:00
parent 4818f7ccf5
commit 22512d8c9e
265 changed files with 44099 additions and 44099 deletions

View File

@@ -1,76 +1,76 @@
package org.alfresco.web.bean.users;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
/**
* Implementation of remove content user dialog.
*
* @author gavinc
*/
public class RemoveContentUserDialog extends BaseDialogBean
{
private static final long serialVersionUID = -3090054828215666084L;
private static final String MSG_REMOVE_USER = "remove_user";
private final static String MSG_LEFT_QUOTE = "left_qoute";
private final static String MSG_RIGHT_QUOTE = "right_quote";
private ContentUsersBean contentUsersBean;
@Override
public boolean getFinishButtonDisabled()
{
return false;
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
contentUsersBean.removeOK();
return outcome;
}
@Override
public String getContainerTitle()
{
FacesContext fc = FacesContext.getCurrentInstance();
return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE)
+ this.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
}
@Override
public String getContainerSubTitle()
{
return this.browseBean.getDocument().getName();
}
public void setupUserAction(ActionEvent event)
{
this.contentUsersBean.setupUserAction(event);
}
public String getPersonName()
{
return this.contentUsersBean.getPersonName();
}
public void setPersonName(String personName)
{
this.contentUsersBean.setPersonName(personName);
}
public ContentUsersBean getContentUsersBean()
{
return contentUsersBean;
}
public void setContentUsersBean(ContentUsersBean contentUsersBean)
{
this.contentUsersBean = contentUsersBean;
}
}
package org.alfresco.web.bean.users;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
import org.alfresco.web.app.Application;
import org.alfresco.web.bean.dialog.BaseDialogBean;
/**
* Implementation of remove content user dialog.
*
* @author gavinc
*/
public class RemoveContentUserDialog extends BaseDialogBean
{
private static final long serialVersionUID = -3090054828215666084L;
private static final String MSG_REMOVE_USER = "remove_user";
private final static String MSG_LEFT_QUOTE = "left_qoute";
private final static String MSG_RIGHT_QUOTE = "right_quote";
private ContentUsersBean contentUsersBean;
@Override
public boolean getFinishButtonDisabled()
{
return false;
}
@Override
protected String finishImpl(FacesContext context, String outcome) throws Exception
{
contentUsersBean.removeOK();
return outcome;
}
@Override
public String getContainerTitle()
{
FacesContext fc = FacesContext.getCurrentInstance();
return Application.getMessage(fc, MSG_REMOVE_USER) + " " + Application.getMessage(fc, MSG_LEFT_QUOTE)
+ this.getPersonName() + Application.getMessage(fc, MSG_RIGHT_QUOTE);
}
@Override
public String getContainerSubTitle()
{
return this.browseBean.getDocument().getName();
}
public void setupUserAction(ActionEvent event)
{
this.contentUsersBean.setupUserAction(event);
}
public String getPersonName()
{
return this.contentUsersBean.getPersonName();
}
public void setPersonName(String personName)
{
this.contentUsersBean.setPersonName(personName);
}
public ContentUsersBean getContentUsersBean()
{
return contentUsersBean;
}
public void setContentUsersBean(ContentUsersBean contentUsersBean)
{
this.contentUsersBean = contentUsersBean;
}
}