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/models/PluginRegistry.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/models/PluginRegistry.java b/src/main/java/com/gitblit/models/PluginRegistry.java
index c81a0f2..ef46316 100644
--- a/src/main/java/com/gitblit/models/PluginRegistry.java
+++ b/src/main/java/com/gitblit/models/PluginRegistry.java
@@ -19,10 +19,11 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.parboiled.common.StringUtils;
-import ro.fortsoft.pf4j.PluginVersion;
+import ro.fortsoft.pf4j.Version;
/**
* Represents a list of plugin registrations.
@@ -37,13 +38,18 @@
public PluginRegistry(String name) {
this.name = name;
- registrations = new ArrayList<PluginRegistration>();
+ registrations = new CopyOnWriteArrayList<PluginRegistration>();
}
- public PluginRegistration lookup(String idOrName) {
+ public void setup() {
+ for (PluginRegistration reg : registrations) {
+ reg.registry = name;
+ }
+ }
+
+ public PluginRegistration lookup(String id) {
for (PluginRegistration registration : registrations) {
- if (registration.id.equalsIgnoreCase(idOrName)
- || registration.name.equalsIgnoreCase(idOrName)) {
+ if (registration.id.equalsIgnoreCase(id)) {
return registration;
}
}
@@ -56,7 +62,7 @@
}
public static enum InstallState {
- NOT_INSTALLED, INSTALLED, CAN_UPDATE, UNKNOWN
+ NOT_INSTALLED, INSTALLED, UPDATE_AVAILABLE, UNKNOWN
}
/**
@@ -68,8 +74,6 @@
public final String id;
- public String name;
-
public String description;
public String provider;
@@ -79,6 +83,8 @@
public String currentRelease;
public transient String installedRelease;
+
+ public transient String registry;
public List<PluginRelease> releases;
@@ -90,10 +96,12 @@
public PluginRelease getCurrentRelease() {
PluginRelease current = null;
if (!StringUtils.isEmpty(currentRelease)) {
+ // find specified
current = getRelease(currentRelease);
}
if (current == null) {
+ // find by date
Date date = new Date(0);
for (PluginRelease pv : releases) {
if (pv.date.after(date)) {
@@ -117,13 +125,13 @@
if (StringUtils.isEmpty(installedRelease)) {
return InstallState.NOT_INSTALLED;
}
- PluginVersion ir = PluginVersion.createVersion(installedRelease);
- PluginVersion cr = PluginVersion.createVersion(currentRelease);
+ Version ir = Version.createVersion(installedRelease);
+ Version cr = Version.createVersion(currentRelease);
switch (ir.compareTo(cr)) {
case -1:
return InstallState.UNKNOWN;
case 1:
- return InstallState.CAN_UPDATE;
+ return InstallState.UPDATE_AVAILABLE;
default:
return InstallState.INSTALLED;
}
@@ -135,9 +143,15 @@
}
}
- public static class PluginRelease {
+ public static class PluginRelease implements Comparable<PluginRelease> {
public String version;
public Date date;
+ public String requires;
public String url;
+
+ @Override
+ public int compareTo(PluginRelease o) {
+ return Version.createVersion(version).compareTo(Version.createVersion(o.version));
+ }
}
}
--
Gitblit v1.9.1