502647092/Yum
1
0
Fork 0
mirror of https://e.coding.net/circlecloud/Yum.git synced 2024-11-22 14:28:46 +00:00
Code Issues Projects Releases Wiki Activity

修复repo显示null的问题...

Browse Source 
Signed-off-by: 502647092 <jtb1@163.com>
This commit is contained in:
502647092 2015-11-19 17:58:38 +08:00
parent 31cb47578f
commit e1541c27b8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java
View File

@ -17,6 +17,7 @@ import com.google.gson.JsonSyntaxException;
import cn.citycraft.PluginHelper.jsonresult.JsonResult; import cn.citycraft.PluginHelper.jsonresult.JsonResult;
import cn.citycraft.PluginHelper.utils.IOUtil; import cn.citycraft.PluginHelper.utils.IOUtil;
import cn.citycraft.PluginHelper.utils.StringUtil;
import cn.citycraft.Yum.manager.RepoSerialization.PackageInfo; import cn.citycraft.Yum.manager.RepoSerialization.PackageInfo;
import cn.citycraft.Yum.manager.RepoSerialization.Plugin; import cn.citycraft.Yum.manager.RepoSerialization.Plugin;
import cn.citycraft.Yum.manager.RepoSerialization.Repositories; import cn.citycraft.Yum.manager.RepoSerialization.Repositories;
@ -96,9 +97,9 @@ public class RepositoryManager {
public List<String> getAllPluginsInfo() { public List<String> getAllPluginsInfo() {
final List<String> li = new ArrayList<String>(); final List<String> li = new ArrayList<String>();
for (final Entry<String, PluginInfo> plugin : repocache.getPlugins().entrySet()) { for (final Entry<String, PluginInfo> pi : repocache.getPlugins().entrySet()) {
final Plugin pl = plugin.getValue().plugin; final Plugin plugin = pi.getValue().plugin;
li.add(String.format("§d%s §a%s(%s) §6- §e%s", plugin.getValue().repo, pl.name, pl.version, pl.description)); li.add(String.format("§d%s §a%s(%s) §6- §e%s", pi.getValue().repo, pi.getValue().name, plugin.version, plugin.description));
} }
return li; return li;
} }
@ -161,9 +162,9 @@ public class RepositoryManager {
public void updatePackage(final CommandSender sender, final PackageInfo pkg) { public void updatePackage(final CommandSender sender, final PackageInfo pkg) {
for (final Plugin plugin : pkg.plugins) { for (final Plugin plugin : pkg.plugins) {
final PluginInfo pi = new PluginInfo(); final PluginInfo pi = new PluginInfo();
pi.name = plugin.name == null ? plugin.artifactId : plugin.name; pi.name = StringUtil.getNotNull(plugin.name, plugin.artifactId);
pi.branch = plugin.branch == null ? "master" : plugin.branch; pi.branch = StringUtil.getNotNull(plugin.branch, "master");
pi.pom = plugin.pom == null ? pkg.pom : plugin.pom; pi.pom = StringUtil.getNotNull(plugin.pom, pkg.pom);
pi.plugin = plugin; pi.plugin = plugin;
pi.url = pkg.url; pi.url = pkg.url;
pi.repo = pkg.name; pi.repo = pkg.name;

2
src/main/java/cn/citycraft/Yum/manager/YumManager.java
View File

@ -34,7 +34,7 @@ public class YumManager {
public static boolean install(final CommandSender sender, final String pluginname, final String version) { public static boolean install(final CommandSender sender, final String pluginname, final String version) {
final PluginInfo pi = repo.getPlugin(pluginname); final PluginInfo pi = repo.getPlugin(pluginname);
if (pi != null) { if (pi != null) {
if (download.run(sender, pi.getMavenUrl(sender, version), new File("plugins", pi.plugin.name + ".jar"))) { if (download.run(sender, pi.getMavenUrl(sender, version), new File("plugins", pi.name + ".jar"))) {
return plugman.load(sender, pluginname); return plugman.load(sender, pluginname);
} }
} }