From fbe265fa787e4be9cb63c6bae2ef30b9400d9afc Mon Sep 17 00:00:00 2001
From: Simon Harrer <simon.harrer@gmail.com>
Date: Thu, 18 Jul 2013 10:11:04 -0400
Subject: [PATCH] Fixes findbugs warning - dereferencing null in exception case
---
src/main/java/com/gitblit/wicket/panels/RefsPanel.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
index dc852e2..e477b65 100644
--- a/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/RefsPanel.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.panels;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -28,11 +29,12 @@
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitblit.Constants;
import com.gitblit.models.RefModel;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.LogPage;
@@ -42,10 +44,6 @@
private static final long serialVersionUID = 1L;
- private static final String R_CHANGES = "refs/changes/";
-
- private static final String R_PULL= "refs/pull/";
-
public RefsPanel(String id, final String repositoryName, RevCommit c,
Map<ObjectId, List<RefModel>> refs) {
this(id, repositoryName, refs.get(c.getId()));
@@ -103,6 +101,7 @@
boolean breakLine = false;
Class<? extends WebPage> linkClass = CommitPage.class;
String cssClass = "";
+ String tooltip = "";
if (name.startsWith(Constants.R_HEADS)) {
// local branch
linkClass = LogPage.class;
@@ -112,17 +111,21 @@
// local head
linkClass = LogPage.class;
cssClass = "headRef";
- } else if (name.startsWith(R_CHANGES)) {
+ } else if (name.startsWith(Constants.R_CHANGES)) {
// Gerrit change ref
- name = name.substring(R_CHANGES.length());
+ name = name.substring(Constants.R_CHANGES.length());
+ // strip leading nn/ from nn/#####nn/ps = #####nn-ps
+ name = name.substring(name.indexOf('/') + 1).replace('/', '-');
+ String [] values = name.split("-");
+ tooltip = MessageFormat.format(getString("gb.reviewPatchset"), values[0], values[1]);
cssClass = "otherRef";
- } else if (name.startsWith(R_PULL)) {
+ } else if (name.startsWith(Constants.R_PULL)) {
// Pull Request ref
- name = "pull #" + name.substring(R_PULL.length());
+ name = "pull #" + name.substring(Constants.R_PULL.length());
if (name.endsWith("/head")) {
// strip pull request head from name
name = name.substring(0, name.length() - "/head".length());
- }
+ }
cssClass = "pullRef";
} else if (name.startsWith(Constants.R_REMOTES)) {
// remote branch
@@ -158,7 +161,11 @@
Component c = new LinkPanel("refName", null, name, linkClass,
WicketUtils.newObjectParameter(repositoryName, objectid));
WicketUtils.setCssClass(c, cssClass);
- WicketUtils.setHtmlTooltip(c, name);
+ if (StringUtils.isEmpty(tooltip)) {
+ WicketUtils.setHtmlTooltip(c, name);
+ } else {
+ WicketUtils.setHtmlTooltip(c, tooltip);
+ }
item.add(c);
Label lb = new Label("lineBreak", "<br/>");
lb.setVisible(breakLine);
--
Gitblit v1.9.1