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/GitblitManager.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/gitblit/manager/GitblitManager.java b/src/main/java/com/gitblit/manager/GitblitManager.java
index 56a71d4..790445a 100644
--- a/src/main/java/com/gitblit/manager/GitblitManager.java
+++ b/src/main/java/com/gitblit/manager/GitblitManager.java
@@ -44,6 +44,7 @@
import ro.fortsoft.pf4j.PluginState;
import ro.fortsoft.pf4j.PluginWrapper;
+import ro.fortsoft.pf4j.Version;
import com.gitblit.Constants;
import com.gitblit.Constants.AccessPermission;
@@ -440,7 +441,7 @@
// no user definitions, use system definitions
if (!clientApplications.hasCurrent("system", new Date(0))) {
try {
- InputStream is = getClass().getResourceAsStream("/clientapps.json");
+ InputStream is = GitblitManager.class.getResourceAsStream("/clientapps.json");
Collection<GitClientApplication> clients = readClientApplications(is);
is.close();
if (clients != null) {
@@ -482,7 +483,7 @@
// Read bundled Gitblit properties to extract setting descriptions.
// This copy is pristine and only used for populating the setting
// models map.
- InputStream is = getClass().getResourceAsStream("/reference.properties");
+ InputStream is = GitblitManager.class.getResourceAsStream("/reference.properties");
BufferedReader propertiesReader = new BufferedReader(new InputStreamReader(is));
StringBuilder description = new StringBuilder();
SettingModel setting = new SettingModel();
@@ -1190,6 +1191,11 @@
*/
@Override
+ public Version getSystemVersion() {
+ return pluginManager.getSystemVersion();
+ }
+
+ @Override
public void startPlugins() {
pluginManager.startPlugins();
}
@@ -1245,8 +1251,8 @@
}
@Override
- public boolean deletePlugin(String pluginId) {
- return pluginManager.deletePlugin(pluginId);
+ public boolean uninstallPlugin(String pluginId) {
+ return pluginManager.uninstallPlugin(pluginId);
}
@Override
--
Gitblit v1.9.1