From 6b18b0761b726fd9aef1ebcc21b760378f7d4b5c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 16 Jun 2014 17:36:12 -0400
Subject: [PATCH] Merge release 1.6.0
---
src/main/java/com/gitblit/tickets/NullTicketService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/NullTicketService.java b/src/main/java/com/gitblit/tickets/NullTicketService.java
index cc89302..d410cdd 100644
--- a/src/main/java/com/gitblit/tickets/NullTicketService.java
+++ b/src/main/java/com/gitblit/tickets/NullTicketService.java
@@ -17,10 +17,10 @@
import java.util.Collections;
import java.util.List;
-
-import javax.inject.Inject;
+import java.util.Set;
import com.gitblit.manager.INotificationManager;
+import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
@@ -37,14 +37,15 @@
*/
public class NullTicketService extends ITicketService {
- @Inject
public NullTicketService(
IRuntimeManager runtimeManager,
+ IPluginManager pluginManager,
INotificationManager notificationManager,
IUserManager userManager,
IRepositoryManager repositoryManager) {
super(runtimeManager,
+ pluginManager,
notificationManager,
userManager,
repositoryManager);
@@ -78,6 +79,11 @@
}
@Override
+ public synchronized Set<Long> getIds(RepositoryModel repository) {
+ return Collections.emptySet();
+ }
+
+ @Override
public synchronized long assignNewId(RepositoryModel repository) {
return 0L;
}
@@ -93,6 +99,11 @@
}
@Override
+ protected List<Change> getJournalImpl(RepositoryModel repository, long ticketId) {
+ return null;
+ }
+
+ @Override
public boolean supportsAttachments() {
return false;
}
--
Gitblit v1.9.1