opendev/gerrit
Code Issues Proposed changes

Merge "Rename GerritUiOptions to GerritOptions"

Browse Source
This commit is contained in:
David Pursehouse
2014-09-12 21:42:34 +00:00
committed by Gerrit Code Review
parent 3e121c6987 6b60160dda
commit 7936891a8a
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritUiOptions.java → gerrit-httpd/src/main/java/com/google/gerrit/httpd/GerritOptions.java
View File

@@ -14,10 +14,10 @@
package com.google.gerrit.httpd;
public class GerritUiOptions {
public class GerritOptions {
private final boolean headless;
public GerritUiOptions(boolean headless) {
public GerritOptions(boolean headless) {
this.headless = headless;
}

8
gerrit-httpd/src/main/java/com/google/gerrit/httpd/UrlModule.java
View File

@@ -63,11 +63,11 @@ class UrlModule extends ServletModule {
}
private final UrlConfig cfg;
private GerritUiOptions uiOptions;
private GerritOptions options;
UrlModule(UrlConfig cfg, GerritUiOptions uiOptions) {
UrlModule(UrlConfig cfg, GerritOptions options) {
this.cfg = cfg;
this.uiOptions = uiOptions;
this.options = options;
}
@Override
@@ -75,7 +75,7 @@ class UrlModule extends ServletModule {
filter("/*").through(Key.get(CacheControlFilter.class));
bind(Key.get(CacheControlFilter.class)).in(SINGLETON);
if (uiOptions.enableDefaultUi()) {
if (options.enableDefaultUi()) {
serve("/").with(HostPageServlet.class);
serve("/Gerrit").with(LegacyGerritServlet.class);
serve("/Gerrit/*").with(legacyGerritScreen());

8
gerrit-httpd/src/main/java/com/google/gerrit/httpd/WebModule.java
View File

@@ -50,18 +50,18 @@ public class WebModule extends LifecycleModule {
private final UrlModule.UrlConfig urlConfig;
private final boolean wantSSL;
private final GitWebConfig gitWebConfig;
private final GerritUiOptions uiOptions;
private final GerritOptions options;
@Inject
WebModule(final AuthConfig authConfig,
final UrlModule.UrlConfig urlConfig,
@CanonicalWebUrl @Nullable final String canonicalUrl,
GerritUiOptions uiOptions,
GerritOptions options,
final Injector creatingInjector) {
this.authConfig = authConfig;
this.urlConfig = urlConfig;
this.wantSSL = canonicalUrl != null && canonicalUrl.startsWith("https:");
this.uiOptions = uiOptions;
this.options = options;
this.gitWebConfig =
creatingInjector.createChildInjector(new AbstractModule() {
@@ -110,7 +110,7 @@ public class WebModule extends LifecycleModule {
throw new ProvisionException("Unsupported loginType: " + authConfig.getAuthType());
}
install(new UrlModule(urlConfig, uiOptions));
install(new UrlModule(urlConfig, options));
install(new UiRpcModule());
install(new GerritRequestModule());
install(new GitOverHttpServlet.Module());