Follow gerrit's changes in Gitweb class names Gerrit core moved GitWebConfig into a different package in 7023f47c4bb359ceef667b00a481531193e46b19 and the class names were changed to use consistent lowercase in a3d67882125065c86ae55ccbb45e36d2ca6e453e . We follow those moves to allow compiling against gerrit's master. Bug: Issue 3431 Change-Id: If656bbb9822d0118d9124ac469e5f6754bc79575
diff --git a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java index f11d989..aa98e68 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java +++ b/src/main/java/com/googlesource/gerrit/plugins/branchnetwork/canvas/GitGraphServlet.java
@@ -26,10 +26,10 @@ import org.eclipse.jgit.errors.RepositoryNotFoundException; import org.eclipse.jgit.lib.Repository; -import com.google.gerrit.common.data.GitWebType; +import com.google.gerrit.common.data.GitwebType; import com.google.gerrit.extensions.annotations.PluginCanonicalWebUrl; -import com.google.gerrit.httpd.GitWebConfig; import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.server.config.GitwebConfig; import com.google.gerrit.server.git.GitRepositoryManager; import com.google.gerrit.server.project.NoSuchProjectException; import com.google.gerrit.server.project.ProjectControl; @@ -46,12 +46,12 @@ private String canonicalPath; private Factory projectControl; private GitRepositoryManager repoManager; - private GitWebConfig gitWebConfig; + private GitwebConfig gitWebConfig; private String pluginCanonicalWebUrl; @Inject public GitGraphServlet(@PluginCanonicalWebUrl String url, - GitWebConfig gitWebConfig, + GitwebConfig gitWebConfig, final ProjectControl.Factory projectControl, final GitRepositoryManager repoManager) throws MalformedURLException { @@ -111,7 +111,7 @@ String.format("%1$snetwork_data_chunk/%2$s/?nethash=", canonicalPath, repoName); - GitWebType type = gitWebConfig.getGitWebType(); + GitwebType type = gitWebConfig.getGitwebType(); if (type == null) { out.println("<html>ERROR: invalid gitweb configuration</html>"); } else {