From dfd6f5d75aebd7a0a41305831ec6d194ae092f5d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 17 Apr 2014 23:08:07 -0400
Subject: [PATCH] [findbugs] Fix potential NPE in DiffStat generation
---
src/main/java/com/gitblit/models/GitClientApplication.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/models/GitClientApplication.java b/src/main/java/com/gitblit/models/GitClientApplication.java
index dbdfa39..e5b2e6c 100644
--- a/src/main/java/com/gitblit/models/GitClientApplication.java
+++ b/src/main/java/com/gitblit/models/GitClientApplication.java
@@ -17,12 +17,13 @@
import java.io.Serializable;
+import com.gitblit.Constants.AccessPermission;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.StringUtils;
/**
* Model class to represent a git client application.
- *
+ *
* @author James Moger
*
*/
@@ -31,13 +32,17 @@
private static final long serialVersionUID = 1L;
public String name;
+ public String title;
+ public String description;
+ public String legal;
+ public String icon;
public String cloneUrl;
public String command;
public String productUrl;
- public String attribution;
- public boolean isApplication = true;
- public boolean isActive = true;
+ public String [] transports;
public String[] platforms;
+ public AccessPermission minimumPermission;
+ public boolean isActive;
public boolean allowsPlatform(String p) {
if (ArrayUtils.isEmpty(platforms)) {
@@ -55,4 +60,28 @@
}
return false;
}
+
+ public boolean supportsTransport(String transportOrUrl) {
+ if (ArrayUtils.isEmpty(transports)) {
+ return true;
+ }
+
+ String scheme = transportOrUrl;
+ if (transportOrUrl.indexOf(':') > -1) {
+ // strip scheme
+ scheme = transportOrUrl.substring(0, transportOrUrl.indexOf(':'));
+ }
+
+ for (String transport : transports) {
+ if (transport.equalsIgnoreCase(scheme)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return StringUtils.isEmpty(title) ? name : title;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1