opendev/gerrit
Code Issues Proposed changes

Switch to using new PluginData class

Browse Source 
176b801295 added PluginData class but
missed to switch the code to use the new class.

Change-Id: Iee6665cd4643ad9251e8feadc31894212bd5ee4c
This commit is contained in:
David Ostrovsky
2014-04-30 08:49:45 +02:00
committed by Dariusz Luksza
parent e84df7f5d2
commit abbd20df2a
2 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
View File

@@ -18,9 +18,9 @@ import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.gerrit.common.PageLinks;
import com.google.gerrit.common.PluginData;
import com.google.gerrit.pgm.init.Browser;
import com.google.gerrit.pgm.init.InitPlugins;
import com.google.gerrit.pgm.init.InitPlugins.PluginData;
import com.google.gerrit.pgm.util.ConsoleUI;
import com.google.gerrit.pgm.util.ErrorLogFile;
import com.google.gerrit.pgm.util.IoUtil;
@@ -36,8 +36,8 @@ import org.kohsuke.args4j.Option;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
/** Initialize a new Gerrit installation. */
public class Init extends BaseInit {

13
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/InitPlugins.java
View File

@@ -15,6 +15,7 @@
package com.google.gerrit.pgm.init;
import com.google.common.collect.Lists;
import com.google.gerrit.common.PluginData;
import com.google.gerrit.pgm.util.ConsoleUI;
import com.google.gerrit.server.config.SitePaths;
import com.google.gerrit.server.plugins.PluginLoader;
@@ -34,18 +35,6 @@ public class InitPlugins implements InitStep {
public static final String PLUGIN_DIR = "WEB-INF/plugins/";
public static final String JAR = ".jar";
public static class PluginData {
public final String name;
public final String version;
public final File pluginFile;
private PluginData(String name, String version, File pluginFile) {
this.name = name;
this.version = version;
this.pluginFile = pluginFile;
}
}
public static List<PluginData> listPlugins(SitePaths site,
PluginsDistribution pluginsDistribution) throws IOException {
return listPlugins(site, false, pluginsDistribution);