Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 08:25:44 +01:00
Code Issues Packages Projects Releases Activity

show plugin updates only once

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-07-29 19:44:25 +02:00
parent 746f781b68
commit c6df4f59aa
4 changed files with 155 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,10 +41,18 @@ import com.google.inject.Singleton;
import sonia.scm.plugin.DefaultPluginManager;
import sonia.scm.plugin.OverviewPluginFilter;
import sonia.scm.plugin.PluginInformation;
import sonia.scm.plugin.PluginInformationComparator;
import sonia.scm.util.Util;
//~--- JDK imports ------------------------------------------------------------
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -196,7 +204,29 @@ public class PluginResource
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Collection<PluginInformation> getOverview()
{
return pluginManager.get(OverviewPluginFilter.INSTANCE);
List<PluginInformation> plugins = new ArrayList<PluginInformation>(
pluginManager.get(
OverviewPluginFilter.INSTANCE));
Collections.sort(plugins, PluginInformationComparator.INSTANCE);
Iterator<PluginInformation> it = plugins.iterator();
String last = null;
while (it.hasNext())
{
PluginInformation pi = it.next();
String id = pi.getGroupId().concat(":").concat(pi.getArtifactId());
if ((last != null) && id.equals(last))
{
it.remove();
}
last = id;
}
return plugins;
}
//~--- fields ---------------------------------------------------------------

8
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -307,12 +307,12 @@ public class DefaultPluginManager implements PluginManager
Set<PluginInformation> infoSet = new HashSet<PluginInformation>();
for (PluginInformation pi : getPluginCenter().getPlugins())
for ( PluginInformation pi : getPluginCenter().getPlugins() )
{
System.out.println(pi.getArtifactId() + ": " + pi.getVersion() + ":"
+ pi.getState());
System.out.println( pi.getArtifactId() + ": " + pi.getVersion() + ":" + pi.getState() );
}
filter(infoSet, getInstalled(), filter);
filter(infoSet, getPluginCenter().getPlugins(), filter);