Merged 5.0.N (5.0.3) to HEAD (5.1)

110009: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3)
      109965: Code style fixes in prep for MNT-14579


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@110015 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-08-13 08:00:13 +00:00
parent 96a8d8f581
commit f00b22bbbf

View File

@@ -95,20 +95,13 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
localName = srvName;
}
/*
* (non-Javadoc)
* @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.
* ApplicationContext)
*/
@Override
public void setApplicationContext(ApplicationContext ctx)
{
this.ctx = ctx;
}
/*
* (non-Javadoc)
* @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
*/
@Override
public void afterPropertiesSet() throws Exception
{
if (this.allowWrite)
@@ -147,10 +140,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
}
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.admin.SysAdminParams#getAllowedUserList()
*/
@Override
public List<String> getAllowedUserList()
{
return this.allowedUsers;
@@ -167,10 +157,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.maxUsers = new Integer(maxUsers);
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.admin.SysAdminParams#getMaxUsers()
*/
@Override
public int getMaxUsers()
{
return this.maxUsers;
@@ -187,15 +174,13 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.allowWrite = allowWrite;
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.admin.SysAdminParams#getAllowWrite()
*/
@Override
public boolean getAllowWrite()
{
return this.allowWrite;
}
@Override
public String getAlfrescoContext()
{
return alfrescoContext;
@@ -206,6 +191,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.alfrescoContext = alfrescoContext;
}
@Override
public String getAlfrescoHost()
{
return alfrescoHost;
@@ -216,6 +202,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.alfrescoHost = subsituteHost(alfrescoHost);
}
@Override
public int getAlfrescoPort()
{
return alfrescoPort;
@@ -226,6 +213,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.alfrescoPort = alfrescoPort;
}
@Override
public String getAlfrescoProtocol()
{
return alfrescoProtocol;
@@ -236,6 +224,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.alfrescoProtocol = alfrescoProtocol;
}
@Override
public String getShareContext()
{
return shareContext;
@@ -246,6 +235,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.shareContext = shareContext;
}
@Override
public String getShareHost()
{
return shareHost;
@@ -256,6 +246,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.shareHost = subsituteHost(shareHost);
}
@Override
public int getSharePort()
{
return sharePort;
@@ -266,6 +257,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
this.sharePort = sharePort;
}
@Override
public String getShareProtocol()
{
return shareProtocol;
@@ -288,10 +280,7 @@ public class SysAdminParamsImpl implements SysAdminParams, ApplicationContextAwa
return hostName.replace(TOKEN_LOCAL_NAME, localName);
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.admin.SysAdminParams#getSitePublicGroup()
*/
@Override
public String getSitePublicGroup()
{
return this.sitePublicGroup;