inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/java/org/alfresco/repo/admin/SysAdminParamsImpl.java
View File

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