From ed9717d4e8d36bdc37a48bb0bdf8a000a1362127 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:10:46 -0400
Subject: [PATCH] Remove issue artifacts from classes missed in previous purge
---
src/main/java/com/gitblit/LuceneExecutor.java | 6 ------
src/main/java/com/gitblit/models/SearchResult.java | 6 ------
src/main/java/com/gitblit/Constants.java | 2 +-
src/main/java/com/gitblit/wicket/WicketUtils.java | 16 ----------------
src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java | 8 --------
5 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 3ac7082..b36321e 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -389,7 +389,7 @@
* The types of objects that can be indexed and queried.
*/
public static enum SearchObjectType {
- commit, blob, issue;
+ commit, blob;
static SearchObjectType fromName(String name) {
for (SearchObjectType value : values()) {
diff --git a/src/main/java/com/gitblit/LuceneExecutor.java b/src/main/java/com/gitblit/LuceneExecutor.java
index 3446289..376a763 100644
--- a/src/main/java/com/gitblit/LuceneExecutor.java
+++ b/src/main/java/com/gitblit/LuceneExecutor.java
@@ -114,7 +114,6 @@
private static final String FIELD_COMMITTER = "committer";
private static final String FIELD_DATE = "date";
private static final String FIELD_TAG = "tag";
- private static final String FIELD_LABEL = "label";
private static final String CONF_FILE = "lucene.conf";
private static final String LUCENE_DIR = "lucene";
@@ -924,9 +923,6 @@
if (doc.get(FIELD_TAG) != null) {
result.tags = StringUtils.getStringsFromValue(doc.get(FIELD_TAG));
}
- if (doc.get(FIELD_LABEL) != null) {
- result.labels = StringUtils.getStringsFromValue(doc.get(FIELD_LABEL));
- }
return result;
}
@@ -1197,13 +1193,11 @@
int branchCount;
int commitCount;
int blobCount;
- int issueCount;
void add(IndexResult result) {
this.branchCount += result.branchCount;
this.commitCount += result.commitCount;
this.blobCount += result.blobCount;
- this.issueCount += result.issueCount;
}
void success() {
diff --git a/src/main/java/com/gitblit/models/SearchResult.java b/src/main/java/com/gitblit/models/SearchResult.java
index efd1b07..ee27a06 100644
--- a/src/main/java/com/gitblit/models/SearchResult.java
+++ b/src/main/java/com/gitblit/models/SearchResult.java
@@ -40,12 +40,8 @@
public String path;
- public String issueId;
-
public List<String> tags;
- public List<String> labels;
-
public SearchObjectType type;
public SearchResult() {
@@ -57,8 +53,6 @@
return path;
case commit:
return commitId;
- case issue:
- return issueId;
}
return commitId;
}
diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index aa86686..1cf465e 100644
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -95,22 +95,6 @@
}
}
- public static void setTicketCssClass(Component container, String state) {
- String css = null;
- if (state.equals("open")) {
- css = "label label-important";
- } else if (state.equals("hold")) {
- css = "label label-warning";
- } else if (state.equals("resolved")) {
- css = "label label-success";
- } else if (state.equals("invalid")) {
- css = "label";
- }
- if (css != null) {
- setCssClass(container, css);
- }
- }
-
public static void setPermissionClass(Component container, AccessPermission permission) {
if (permission == null) {
setCssClass(container, "badge");
diff --git a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
index 79795ff..98738b6 100644
--- a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
@@ -218,14 +218,6 @@
item.add(new Label("tags").setVisible(false));
break;
}
- case issue: {
- Label icon = WicketUtils.newIcon("type", "icon-file");
- WicketUtils.setHtmlTooltip(icon, "issue");
- item.add(icon);
- item.add(new Label("summary", "issue: " + sr.issueId));
- item.add(new Label("tags").setVisible(false));
- break;
- }
}
item.add(new Label("fragment", sr.fragment).setEscapeModelStrings(false).setVisible(!StringUtils.isEmpty(sr.fragment)));
item.add(new LinkPanel("repository", null, sr.repository, SummaryPage.class, WicketUtils.newRepositoryParameter(sr.repository)));
--
Gitblit v1.9.1