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 da8101a5ba
commit 19fcf2c411
325 changed files with 59952 additions and 59952 deletions

View File

@@ -1,98 +1,98 @@
package org.alfresco.rest.api.tests;
import org.alfresco.rest.api.tests.client.data.Company;
public class PersonInfo
{
protected Company company;
protected String firstName;
protected String lastName;
protected String username;
protected String password;
protected String skype;
protected String location;
protected String tel;
protected String mob;
protected String instantmsg;
protected String google;
protected boolean networkAdmin;
public PersonInfo(String firstName, String lastName, String username,
String password, Company company, String skype,
String location, String tel, String mob, String instantmsg,
String google)
{
super();
if(username == null)
{
throw new IllegalArgumentException();
}
this.company = company;
this.networkAdmin = false;
this.firstName = firstName;
this.lastName = lastName;
this.username = username;
this.password = password;
this.skype = skype;
this.location = location;
this.tel = tel;
this.mob = mob;
this.instantmsg = instantmsg;
this.google = google;
}
public boolean isNetworkAdmin()
{
return networkAdmin;
}
public Company getCompany()
{
return company;
}
public String getFirstName()
{
return firstName;
}
public String getLastName()
{
return lastName;
}
public String getUsername()
{
return username;
}
public String getPassword()
{
return password;
}
public String getSkype() {
return skype;
}
public String getLocation() {
return location;
}
public String getTel() {
return tel;
}
public String getMob() {
return mob;
}
public String getInstantmsg() {
return instantmsg;
}
public String getGoogle() {
return google;
}
}
package org.alfresco.rest.api.tests;
import org.alfresco.rest.api.tests.client.data.Company;
public class PersonInfo
{
protected Company company;
protected String firstName;
protected String lastName;
protected String username;
protected String password;
protected String skype;
protected String location;
protected String tel;
protected String mob;
protected String instantmsg;
protected String google;
protected boolean networkAdmin;
public PersonInfo(String firstName, String lastName, String username,
String password, Company company, String skype,
String location, String tel, String mob, String instantmsg,
String google)
{
super();
if(username == null)
{
throw new IllegalArgumentException();
}
this.company = company;
this.networkAdmin = false;
this.firstName = firstName;
this.lastName = lastName;
this.username = username;
this.password = password;
this.skype = skype;
this.location = location;
this.tel = tel;
this.mob = mob;
this.instantmsg = instantmsg;
this.google = google;
}
public boolean isNetworkAdmin()
{
return networkAdmin;
}
public Company getCompany()
{
return company;
}
public String getFirstName()
{
return firstName;
}
public String getLastName()
{
return lastName;
}
public String getUsername()
{
return username;
}
public String getPassword()
{
return password;
}
public String getSkype() {
return skype;
}
public String getLocation() {
return location;
}
public String getTel() {
return tel;
}
public String getMob() {
return mob;
}
public String getInstantmsg() {
return instantmsg;
}
public String getGoogle() {
return google;
}
}