Merge remote-tracking branch 'origin/master'

This commit is contained in:
Owain van Brakel
2020-03-08 01:00:10 +01:00

View File

@@ -17,6 +17,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@@ -125,7 +126,27 @@ class ExternalPluginManager
@Override @Override
protected PluginRepository createPluginRepository() protected PluginRepository createPluginRepository()
{ {
return new JarPluginRepository(getPluginsRoot()); return new JarPluginRepository(getPluginsRoot())
{
@Override
public List<Path> getPluginPaths()
{
File[] files = pluginsRoot.toFile().listFiles(filter);
if ((files == null) || files.length == 0)
{
return Collections.emptyList();
}
List<Path> paths = new ArrayList<>(files.length);
for (File file : files)
{
paths.add(file.toPath());
}
return paths;
}
};
} }
@Override @Override