show only newer plugins as updates

scm-core/src/main/java/sonia/scm/plugin/PluginState.java

@@ -39,5 +39,5 @@ package sonia.scm.plugin;
  */
 public enum PluginState
 {
-  CORE, AVAILABLE, INSTALLED, UPDATE_AVAILABLE;
+  CORE, AVAILABLE, INSTALLED, NEWER_VERSION_INSTALLED, UPDATE_AVAILABLE;
 }

scm-core/src/test/java/sonia/scm/plugin/PluginVersionTest.java

@@ -154,4 +154,16 @@ public class PluginVersionTest
     assertTrue(PluginVersion.createVersion("1.1").isNewer("1.1-alpha1"));
     assertTrue(PluginVersion.createVersion("1.1").isNewer("1.1-RC5"));
   }
+
+  /**
+   * Method description
+   *
+   */
+  @Test
+  public void testIsOlder()
+  {
+    assertFalse(PluginVersion.createVersion("1.0.1").isOlder("1.0"));
+    assertTrue(PluginVersion.createVersion("1.1-alpha1").isOlder("1.1"));
+    assertTrue(PluginVersion.createVersion("1.1-RC5").isOlder("1.1"));
+  }
 }

scm-webapp/src/main/java/sonia/scm/api/rest/resources/PluginResource.java

@@ -39,7 +39,9 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import sonia.scm.plugin.DefaultPluginManager;
+import sonia.scm.plugin.OverviewPluginFilter;
 import sonia.scm.plugin.PluginInformation;
+import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -137,9 +139,9 @@ public class PluginResource
    */
   @GET
   @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  public PluginInformation[] getAll()
+  public Collection<PluginInformation> getAll()
   {
-    return getArray(pluginManager.getAll());
+    return pluginManager.getAll();
   }
 
   /**
@@ -151,9 +153,9 @@ public class PluginResource
   @GET
   @Path("available")
   @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  public PluginInformation[] getAvailable()
+  public Collection<PluginInformation> getAvailable()
   {
-    return getArray(pluginManager.getAvailable());
+    return pluginManager.getAvailable();
   }
 
   /**
@@ -165,9 +167,9 @@ public class PluginResource
   @GET
   @Path("updates")
   @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  public PluginInformation[] getAvailableUpdates()
+  public Collection<PluginInformation> getAvailableUpdates()
   {
-    return getArray(pluginManager.getAvailableUpdates());
+    return pluginManager.getAvailableUpdates();
   }
 
   /**
@@ -179,34 +181,23 @@ public class PluginResource
   @GET
   @Path("installed")
   @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-  public PluginInformation[] getInstalled()
+  public Collection<PluginInformation> getInstalled()
   {
-    return getArray(pluginManager.getInstalled());
+    return pluginManager.getInstalled();
   }
 
   /**
    * Method description
    *
    *
-   * @param pluginCollection
-   *
    * @return
    */
-  private PluginInformation[] getArray(
+  @GET
-          Collection<PluginInformation> pluginCollection)
+  @Path("overview")
+  @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+  public Collection<PluginInformation> getOverview()
   {
-    PluginInformation[] plugins = null;
+    return pluginManager.get(OverviewPluginFilter.INSTANCE);
-
-    if (pluginCollection != null)
-    {
-      plugins = pluginCollection.toArray(new PluginInformation[0]);
-    }
-    else
-    {
-      plugins = new PluginInformation[0];
-    }
-
-    return plugins;
   }
 
   //~--- fields ---------------------------------------------------------------

scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java

@@ -418,10 +418,14 @@ public class DefaultPluginManager implements PluginManager
         {
           state = PluginState.INSTALLED;
         }
-        else
+        else if (isNewer(available, installed))
         {
           state = PluginState.UPDATE_AVAILABLE;
         }
+        else
+        {
+          state = PluginState.NEWER_VERSION_INSTALLED;
+        }
 
         break;
       }
@@ -513,6 +517,29 @@ public class DefaultPluginManager implements PluginManager
     return center;
   }
 
+  /**
+   * Method description
+   *
+   *
+   * @param available
+   * @param installed
+   *
+   * @return
+   */
+  private boolean isNewer(PluginInformation available,
+                          PluginInformation installed)
+  {
+    boolean result = false;
+    PluginVersion version = PluginVersion.createVersion(installed.getVersion());
+
+    if (version != null)
+    {
+      result = version.isNewer(available.getVersion());
+    }
+
+    return result;
+  }
+
   /**
    * Method description
    *

scm-webapp/src/main/java/sonia/scm/plugin/OverviewPluginFilter.java

@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2010, Sebastian Sdorra
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of SCM-Manager; nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
+ *    software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * http://bitbucket.org/sdorra/scm-manager
+ *
+ */
+
+
+
+package sonia.scm.plugin;
+
+/**
+ *
+ * @author Sebastian Sdorra
+ */
+public class OverviewPluginFilter implements PluginFilter
+{
+
+  /** Field description */
+  public static OverviewPluginFilter INSTANCE = new OverviewPluginFilter();
+
+  //~--- methods --------------------------------------------------------------
+
+  /**
+   * Method description
+   *
+   *
+   * @param plugin
+   *
+   * @return
+   */
+  @Override
+  public boolean accept(PluginInformation plugin)
+  {
+    return plugin.getState() != PluginState.NEWER_VERSION_INSTALLED;
+  }
+}

scm-webapp/src/main/webapp/resources/js/sonia.plugin.js

@@ -198,7 +198,7 @@ Sonia.plugin.Grid = Ext.extend(Sonia.rest.Grid, {
   initComponent: function(){
 
     Sonia.plugin.StoreInstance = new Sonia.plugin.Store({
-      url: restUrl + 'plugins.json'
+      url: restUrl + 'plugins/overview.json'
     });