Ticket Reference handling #1048

Paul Martin

2016-04-27 c2188a840bc4153ae92112b04b2e06a90d3944aa

 src/main/java/com/gitblit/models/PluginRegistry.java

@@ -23,7 +23,7 @@


import org.parboiled.common.StringUtils;



import ro.fortsoft.pf4j.PluginVersion;

import ro.fortsoft.pf4j.Version;



/**

 * Represents a list of plugin registrations.

@@ -47,10 +47,9 @@
      }

   }



   public PluginRegistration lookup(String idOrName) {

   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;

         }

      }

@@ -63,7 +62,7 @@
   }



   public static enum InstallState {

      NOT_INSTALLED, INSTALLED, CAN_UPDATE, UNKNOWN

      NOT_INSTALLED, INSTALLED, UPDATE_AVAILABLE, UNKNOWN

   }



   /**

@@ -75,15 +74,11 @@


      public final String id;



      public String name;



      public String description;



      public String provider;



      public String projectUrl;



      public String currentRelease;



      public transient String installedRelease;



@@ -96,19 +91,19 @@
         this.releases = new ArrayList<PluginRelease>();

      }



      public PluginRelease getCurrentRelease() {

      public PluginRelease getCurrentRelease(Version system) {

         PluginRelease current = null;

         if (!StringUtils.isEmpty(currentRelease)) {

            // find specified

            current = getRelease(currentRelease);

         }

         Date date = new Date(0);

         for (PluginRelease pv : releases) {

            Version requires = Version.ZERO;

            if (!StringUtils.isEmpty(pv.requires)) {

               requires = Version.createVersion(pv.requires);

            }



         if (current == null) {

            // find by date

            Date date = new Date(0);

            for (PluginRelease pv : releases) {

            if (system.isZero() || system.atLeast(requires)) {

               if (pv.date.after(date)) {

                  current = pv;

                  date = pv.date;

               }

            }

         }

@@ -124,17 +119,21 @@
         return null;

      }



      public InstallState getInstallState() {

      public InstallState getInstallState(Version system) {

         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.ZERO;

         PluginRelease curr = getCurrentRelease(system);

         if (curr != null) {

            cr = Version.createVersion(curr.version);

         }

         switch (ir.compareTo(cr)) {

         case -1:

            return InstallState.UNKNOWN;

         case 1:

            return InstallState.CAN_UPDATE;

            return InstallState.UPDATE_AVAILABLE;

         default:

            return InstallState.INSTALLED;

         }

@@ -146,7 +145,10 @@
      }

   }



   public static class PluginRelease implements Comparable<PluginRelease> {

   public static class PluginRelease implements Serializable, Comparable<PluginRelease> {



      private static final long serialVersionUID = 1L;



      public String version;

      public Date date;

      public String requires;

@@ -154,7 +156,7 @@


      @Override

      public int compareTo(PluginRelease o) {

         return PluginVersion.createVersion(version).compareTo(PluginVersion.createVersion(o.version));

         return Version.createVersion(version).compareTo(Version.createVersion(o.version));

      }

   }

}