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

renamed Plugin to InstalledPluginDescriptor and added PluginDescriptor interface

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-08-20 08:05:41 +02:00
parent ae19ad9327
commit 1a01216f62
19 changed files with 74 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,7 +131,7 @@ public class DefaultPluginManager implements PluginManager
for (InstalledPlugin wrapper : pluginLoader.getInstalledPlugins())
{
Plugin plugin = wrapper.getPlugin();
InstalledPluginDescriptor plugin = wrapper.getPlugin();
PluginInformation info = plugin.getInformation();
if ((info != null) && info.isValid())
@@ -192,7 +192,7 @@ public class DefaultPluginManager implements PluginManager
plugin.setState(PluginState.INSTALLED);
// ugly workaround
Plugin newPlugin = new Plugin();
InstalledPluginDescriptor newPlugin = new InstalledPluginDescriptor();
// TODO check
// newPlugin.setInformation(plugin);
@@ -220,8 +220,8 @@ public class DefaultPluginManager implements PluginManager
{
new ZipUnArchiver().extractArchive(packageStream, tempDirectory);
Plugin plugin = JAXB.unmarshal(new File(tempDirectory, "plugin.xml"),
Plugin.class);
InstalledPluginDescriptor plugin = JAXB.unmarshal(new File(tempDirectory, "plugin.xml"),
InstalledPluginDescriptor.class);
PluginCondition condition = plugin.getCondition();
@@ -262,7 +262,7 @@ public class DefaultPluginManager implements PluginManager
{
PluginPermissions.manage().check();
Plugin plugin = installedPlugins.get(id);
InstalledPluginDescriptor plugin = installedPlugins.get(id);
if (plugin == null)
{
@@ -457,7 +457,7 @@ public class DefaultPluginManager implements PluginManager
Set<PluginInformation> infoSet = new LinkedHashSet<>();
for (Plugin plugin : installedPlugins.values())
for (InstalledPluginDescriptor plugin : installedPlugins.values())
{
infoSet.add(plugin.getInformation());
}
@@ -647,7 +647,7 @@ public class DefaultPluginManager implements PluginManager
{
boolean core = false;
for (Plugin installedPlugin : installedPlugins.values())
for (InstalledPluginDescriptor installedPlugin : installedPlugins.values())
{
PluginInformation installed = installedPlugin.getInformation();
@@ -715,5 +715,5 @@ public class DefaultPluginManager implements PluginManager
private final SCMContextProvider context;
/** Field description */
private final Map<String, Plugin> installedPlugins;
private final Map<String, InstalledPluginDescriptor> installedPlugins;
}