diff options
| author | James Moger <james.moger@gitblit.com> | 2012-01-09 21:07:01 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-01-09 21:07:01 -0500 |
| commit | d25c599b9967549fe0ebc7a56ca785c317ba3d4b (patch) | |
| tree | 4bb9a4462f538ce44babc5d427da626cf6cbaded /src | |
| parent | 11924dc5db4bc44cb32e905700a8557124b1fd56 (diff) | |
| download | gitblit-d25c599b9967549fe0ebc7a56ca785c317ba3d4b.tar.gz gitblit-d25c599b9967549fe0ebc7a56ca785c317ba3d4b.zip | |
Documentation. Find bugs. Organized imports.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/gitblit/GitBlit.java | 4 | ||||
| -rw-r--r-- | src/com/gitblit/models/FederationModel.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/utils/TimeUtils.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/pages/SummaryPage.java | 2 | ||||
| -rw-r--r-- | src/com/gitblit/wicket/panels/ObjectContainer.java | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 2448f7ae..bf3660d0 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -1759,9 +1759,7 @@ public class GitBlit implements ServletContextListener { try {
// check to see if this "file" is a login service class
Class<?> realmClass = Class.forName(realm);
- if (IUserService.class.isAssignableFrom(realmClass)) {
- loginService = (IUserService) realmClass.newInstance();
- }
+ loginService = (IUserService) realmClass.newInstance();
} catch (Throwable t) {
loginService = new GitblitUserService();
}
diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java index 61c8576b..1d211ce9 100644 --- a/src/com/gitblit/models/FederationModel.java +++ b/src/com/gitblit/models/FederationModel.java @@ -114,7 +114,7 @@ public class FederationModel implements Serializable, Comparable<FederationModel * @param status
*/
public void updateStatus(RepositoryModel repository, FederationPullStatus status) {
- if (!results.containsKey(repository)) {
+ if (!results.containsKey(repository.name)) {
results.put(repository.name, FederationPullStatus.PENDING);
}
if (status != null) {
diff --git a/src/com/gitblit/utils/TimeUtils.java b/src/com/gitblit/utils/TimeUtils.java index 6cc4dcb5..cd8e8956 100644 --- a/src/com/gitblit/utils/TimeUtils.java +++ b/src/com/gitblit/utils/TimeUtils.java @@ -268,8 +268,6 @@ public class TimeUtils { } else if (frequency.indexOf("hour") > -1) {
// convert to minutes
mins *= 60;
- } else if (frequency.indexOf("min") > -1) {
- // default mins
}
return mins;
}
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index d928b06d..904ec44d 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -37,9 +37,9 @@ import org.wicketstuff.googlecharts.LineStyle; import org.wicketstuff.googlecharts.MarkerType;
import org.wicketstuff.googlecharts.ShapeMarker;
+import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.Constants.AccessRestrictionType;
import com.gitblit.models.Metric;
import com.gitblit.models.PathModel;
import com.gitblit.models.RepositoryModel;
diff --git a/src/com/gitblit/wicket/panels/ObjectContainer.java b/src/com/gitblit/wicket/panels/ObjectContainer.java index 79bd3a7c..d7f1f789 100644 --- a/src/com/gitblit/wicket/panels/ObjectContainer.java +++ b/src/com/gitblit/wicket/panels/ObjectContainer.java @@ -32,8 +32,6 @@ import org.apache.wicket.protocol.http.request.WebClientInfo; import org.apache.wicket.request.ClientInfo;
import org.apache.wicket.util.value.IValueMap;
-import com.gitblit.wicket.WicketUtils;
-
/**
* https://cwiki.apache.org/WICKET/object-container-adding-flash-to-a-wicket-application.html
*/
|