From 1d78b8b372f15d89f10fd32cb0227a6a7966de3c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 17 Apr 2014 23:08:07 -0400
Subject: [PATCH] [findbugs] Clarify class used for resource loading

---
 src/main/java/com/gitblit/manager/IGitblit.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IGitblit.java b/src/main/java/com/gitblit/manager/IGitblit.java
index c0167f0..50ec8b1 100644
--- a/src/main/java/com/gitblit/manager/IGitblit.java
+++ b/src/main/java/com/gitblit/manager/IGitblit.java
@@ -26,9 +26,12 @@
 import com.gitblit.models.RepositoryUrl;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
+import com.gitblit.tickets.ITicketService;
+import com.gitblit.transport.ssh.IPublicKeyManager;
 
 public interface IGitblit extends IManager,
 									IRuntimeManager,
+									IPluginManager,
 									INotificationManager,
 									IUserManager,
 									IAuthenticationManager,
@@ -43,29 +46,48 @@
 	 * @param user
 	 * @param repository
 	 * @return a list of repository urls
+	 * @since 1.4.0
 	 */
 	List<RepositoryUrl> getRepositoryUrls(HttpServletRequest request, UserModel user, RepositoryModel repository);
 
 	/**
-	 * Adds/updates a complete user object keyed by username. This method allows
-	 * for renaming a user.
+	 * Creates a complete user object.
 	 *
-	 * @see IUserService.updateUserModel(String, UserModel)
-	 * @param username
 	 * @param user
 	 * @param isCreate
 	 * @throws GitBlitException
+	 * @since 1.4.0
 	 */
-	void updateUserModel(String username, UserModel user, boolean isCreate) throws GitBlitException;
+	void addUser(UserModel user) throws GitBlitException;
+
+	/**
+	 * Updates a complete user object keyed by username. This method allows
+	 * for renaming a user.
+	 *
+	 * @param username
+	 * @param user
+	 * @throws GitBlitException
+	 * @since 1.4.0
+	 */
+	void reviseUser(String username, UserModel user) throws GitBlitException;
+
+	/**
+	 * Creates a TeamModel object.
+	 *
+	 * @param team
+	 * @param isCreate
+	 * @since 1.4.0
+	 */
+	void addTeam(TeamModel team) throws GitBlitException;
 
 	/**
 	 * Updates the TeamModel object for the specified name.
 	 *
 	 * @param teamname
 	 * @param team
-	 * @param isCreate
+	 * @since 1.4.0
 	 */
-	void updateTeamModel(String teamname, TeamModel team, boolean isCreate) throws GitBlitException;
+	void reviseTeam(String teamname, TeamModel team) throws GitBlitException;
 
 	/**
 	 * Creates a personal fork of the specified repository. The clone is view
@@ -76,6 +98,7 @@
 	 * @param user
 	 * @return the repository model of the fork, if successful
 	 * @throws GitBlitException
+	 * @since 1.4.0
 	 */
 	RepositoryModel fork(RepositoryModel repository, UserModel user) throws GitBlitException;
 
@@ -84,7 +107,24 @@
 	 * repository url panel;
 	 *
 	 * @return a collection of client applications
+	 * @since 1.4.0
 	 */
 	Collection<GitClientApplication> getClientApplications();
 
+	/**
+	 * Returns the ticket service.
+	 *
+	 * @return a ticket service
+	 * @since 1.4.0
+	 */
+	ITicketService getTicketService();
+
+	/**
+	 * Returns the SSH public key manager.
+	 *
+	 * @return the SSH public key manager
+	 * @since 1.5.0
+	 */
+	IPublicKeyManager getPublicKeyManager();
+
 }
\ No newline at end of file

--
Gitblit v1.9.1