Remove issue artifacts from classes missed in previous purge

Change-Id: Ie0b7d1e11d634577e943c8e4dbab080b0078f1b4

diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 3ac7082edaefe43b4fd8754636866123c15804a5..b36321e351eae6deea0359958000038b5c731084 100644 (file)
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -389,7 +389,7 @@ public class Constants {
         * The types of objects that can be indexed and queried.\r
         */\r
        public static enum SearchObjectType {\r
-               commit, blob, issue;\r
+               commit, blob;\r
 \r
                static SearchObjectType fromName(String name) {\r
                        for (SearchObjectType value : values()) {\r

diff --git a/src/main/java/com/gitblit/LuceneExecutor.java b/src/main/java/com/gitblit/LuceneExecutor.java
index 3446289a357b857bb4b9787ca9e4cd0b0cb43462..376a763ad09b34947d30ca721544527b5f927701 100644 (file)
--- a/src/main/java/com/gitblit/LuceneExecutor.java
+++ b/src/main/java/com/gitblit/LuceneExecutor.java
@@ -114,7 +114,6 @@ public class LuceneExecutor implements Runnable {
        private static final String FIELD_COMMITTER = "committer";\r
        private static final String FIELD_DATE = "date";\r
        private static final String FIELD_TAG = "tag";\r
-       private static final String FIELD_LABEL = "label";\r
 \r
        private static final String CONF_FILE = "lucene.conf";\r
        private static final String LUCENE_DIR = "lucene";\r
@@ -924,9 +923,6 @@ public class LuceneExecutor implements Runnable {
                if (doc.get(FIELD_TAG) != null) {\r
                        result.tags = StringUtils.getStringsFromValue(doc.get(FIELD_TAG));\r
                }\r
-               if (doc.get(FIELD_LABEL) != null) {\r
-                       result.labels = StringUtils.getStringsFromValue(doc.get(FIELD_LABEL));\r
-               }\r
                return result;\r
        }\r
 \r
@@ -1197,13 +1193,11 @@ public class LuceneExecutor implements Runnable {
                int branchCount;\r
                int commitCount;\r
                int blobCount;\r
-               int issueCount;\r
                \r
                void add(IndexResult result) {\r
                        this.branchCount += result.branchCount;\r
                        this.commitCount += result.commitCount;\r
                        this.blobCount += result.blobCount;\r
-                       this.issueCount += result.issueCount;                   \r
                }\r
                \r
                void success() {\r

diff --git a/src/main/java/com/gitblit/models/SearchResult.java b/src/main/java/com/gitblit/models/SearchResult.java
index efd1b075cba52dcb488a8696f9b953bcff007691..ee27a063a878d3432ff0c7ee45cb079eacc6cadd 100644 (file)
--- a/src/main/java/com/gitblit/models/SearchResult.java
+++ b/src/main/java/com/gitblit/models/SearchResult.java
@@ -40,12 +40,8 @@ public class SearchResult implements Serializable {
        \r
        public String path;\r
        \r
-       public String issueId;\r
-\r
        public List<String> tags;\r
        \r
-       public List<String> labels;\r
-\r
        public SearchObjectType type;\r
 \r
        public SearchResult() {\r
@@ -57,8 +53,6 @@ public class SearchResult implements Serializable {
                        return path;\r
                case commit:\r
                        return commitId;\r
-               case issue:\r
-                       return issueId;\r
                }\r
                return commitId;\r
        }\r

diff --git a/src/main/java/com/gitblit/wicket/WicketUtils.java b/src/main/java/com/gitblit/wicket/WicketUtils.java
index aa86686c4fd56be999f5fd857fcc8dffb77e526f..1cf465e16f33153a81cbf00fcf4e321ad8c1d001 100644 (file)
--- a/src/main/java/com/gitblit/wicket/WicketUtils.java
+++ b/src/main/java/com/gitblit/wicket/WicketUtils.java
@@ -95,22 +95,6 @@ public class WicketUtils {
                }\r
        }\r
 \r
-       public static void setTicketCssClass(Component container, String state) {\r
-               String css = null;\r
-               if (state.equals("open")) {\r
-                       css = "label label-important";\r
-               } else if (state.equals("hold")) {\r
-                       css = "label label-warning";\r
-               } else if (state.equals("resolved")) {\r
-                       css = "label label-success";\r
-               } else if (state.equals("invalid")) {\r
-                       css = "label";\r
-               }\r
-               if (css != null) {\r
-                       setCssClass(container, css);\r
-               }\r
-       }\r
-       \r
        public static void setPermissionClass(Component container, AccessPermission permission) {\r
                if (permission == null) {\r
                        setCssClass(container, "badge");\r

diff --git a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
index 79795ff2e055b02e60d8187ac0761f0e13573df0..98738b63313a7c503be80c1266ff2d38cb919ada 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LuceneSearchPage.java
@@ -218,14 +218,6 @@ public class LuceneSearchPage extends RootPage {
                                        item.add(new Label("tags").setVisible(false));\r
                                        break;\r
                                }\r
-                               case issue: {\r
-                                       Label icon = WicketUtils.newIcon("type", "icon-file");\r
-                                       WicketUtils.setHtmlTooltip(icon, "issue");\r
-                                       item.add(icon);\r
-                                       item.add(new Label("summary", "issue: " + sr.issueId));\r
-                                       item.add(new Label("tags").setVisible(false));\r
-                                       break;\r
-                               }\r
                                }\r
                                item.add(new Label("fragment", sr.fragment).setEscapeModelStrings(false).setVisible(!StringUtils.isEmpty(sr.fragment)));\r
                                item.add(new LinkPanel("repository", null, sr.repository, SummaryPage.class, WicketUtils.newRepositoryParameter(sr.repository)));\r