Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.

1 files changed, 5 insertions, 28 deletions

diff --git a/src/com/gitblit/wicket/models/UserModel.java b/src/com/gitblit/wicket/models/UserModel.java
index e60b4dac..1181ee15 100644
--- a/src/com/gitblit/wicket/models/UserModel.java
+++ b/src/com/gitblit/wicket/models/UserModel.java
@@ -23,35 +23,16 @@ public class UserModel implements Serializable {
 

 	private static final long serialVersionUID = 1L;

 

-	private String username;

-	private String password;

-	private boolean canAdmin = false;

-	private List<String> repositories = new ArrayList<String>();

+	// field names are reflectively mapped in EditUser page

+	public String username;

+	public String password;

+	public boolean canAdmin;

+	public final List<String> repositories = new ArrayList<String>();

 

 	public UserModel(String username) {

 		this.username = username;

 	}

 

-	public String getUsername() {

-		return username;

-	}

-

-	public String getPassword() {

-		return password;

-	}

-

-	public void setPassword(String password) {

-		this.password = password;

-	}

-

-	public void canAdmin(boolean value) {

-		canAdmin = value;

-	}

-

-	public boolean canAdmin() {

-		return canAdmin;

-	}

-

 	public boolean canAccessRepository(String repositoryName) {

 		return canAdmin || repositories.contains(repositoryName);

 	}

@@ -65,10 +46,6 @@ public class UserModel implements Serializable {
 		repositories.add(name.toLowerCase());

 	}

 

-	public List<String> getRepositories() {

-		return repositories;

-	}

-

 	@Override

 	public String toString() {

 		return username;