Merge changes from topic 'checkstyle-cleanup-1'

* changes:
  Remove explicit initialization of default values
  Remove redundant 'public' modifiers
  Remove redundant 'final' modifiers
This commit is contained in:
David Pursehouse
2016-04-13 08:05:24 +00:00
committed by Gerrit Code Review
48 changed files with 108 additions and 106 deletions

View File

@@ -62,7 +62,7 @@ public abstract class BinaryResult implements Closeable {
private Charset characterEncoding; private Charset characterEncoding;
private long contentLength = -1; private long contentLength = -1;
private boolean gzip = true; private boolean gzip = true;
private boolean base64 = false; private boolean base64;
private String attachmentName; private String attachmentName;
/** @return the MIME type of the result, for HTTP clients. */ /** @return the MIME type of the result, for HTTP clients. */

View File

@@ -246,7 +246,7 @@ public class PostGpgKeys implements RestModifyView<AccountResource, Input> {
} }
} }
private final AccountExternalId.Key toExtIdKey(byte[] fp) { private AccountExternalId.Key toExtIdKey(byte[] fp) {
return new AccountExternalId.Key( return new AccountExternalId.Key(
AccountExternalId.SCHEME_GPGKEY, AccountExternalId.SCHEME_GPGKEY,
BaseEncoding.base16().encode(fp)); BaseEncoding.base16().encode(fp));

View File

@@ -156,7 +156,7 @@ public class GitwebInfo extends JavaScriptObject {
return url() + pattern.replace(p); return url() + pattern.replace(p);
} }
private final String encode(String segment) { private String encode(String segment) {
if (type().urlEncode()) { if (type().urlEncode()) {
return URL.encodeQueryString(type().replacePathSeparator(segment)); return URL.encodeQueryString(type().replacePathSeparator(segment));
} else { } else {

View File

@@ -30,16 +30,16 @@ public final class NativeString extends JavaScriptObject {
} }
}-*/; }-*/;
static final NativeString wrap(String s) { static NativeString wrap(String s) {
return wrap0(TYPE, s); return wrap0(TYPE, s);
} }
private static native NativeString wrap0(JavaScriptObject T, String s) private static native NativeString wrap0(JavaScriptObject T, String s)
/*-{ return new T(s) }-*/; /*-{ return new T(s) }-*/;
public final native String asString() /*-{ return this.s; }-*/; public native String asString() /*-{ return this.s; }-*/;
public static final AsyncCallback<NativeString> public static AsyncCallback<NativeString>
unwrap(final AsyncCallback<String> cb) { unwrap(final AsyncCallback<String> cb) {
return new AsyncCallback<NativeString>() { return new AsyncCallback<NativeString>() {
@Override @Override
@@ -54,7 +54,7 @@ public final class NativeString extends JavaScriptObject {
}; };
} }
public static final boolean is(JavaScriptObject o) { public static boolean is(JavaScriptObject o) {
return is(TYPE, o); return is(TYPE, o);
} }

View File

@@ -138,7 +138,7 @@ public class AvatarImage extends Image implements LoadHandler {
private Timer showTimer; private Timer showTimer;
private Timer hideTimer; private Timer hideTimer;
public PopupHandler(AccountInfo account, UIObject target) { PopupHandler(AccountInfo account, UIObject target) {
this.account = account; this.account = account;
this.target = target; this.target = target;
} }

View File

@@ -205,7 +205,7 @@ public class SearchSuggestOracle extends HighlightSuggestOracle {
private static class SearchSuggestion implements SuggestOracle.Suggestion { private static class SearchSuggestion implements SuggestOracle.Suggestion {
private final String suggestion; private final String suggestion;
private final String fullQuery; private final String fullQuery;
public SearchSuggestion(String suggestion, String fullQuery) { SearchSuggestion(String suggestion, String fullQuery) {
this.suggestion = suggestion; this.suggestion = suggestion;
// Add a space to the query if it is a complete operation (e.g. // Add a space to the query if it is a complete operation (e.g.
// "status:open") so the user can keep on typing. // "status:open") so the user can keep on typing.

View File

@@ -727,7 +727,7 @@ public class ProjectInfoScreen extends ProjectScreen {
private static class LabeledWidgetsGrid extends FlexTable { private static class LabeledWidgetsGrid extends FlexTable {
private String labelSuffix; private String labelSuffix;
public LabeledWidgetsGrid() { LabeledWidgetsGrid() {
super(); super();
labelSuffix = ":"; labelSuffix = ":";
} }

View File

@@ -236,14 +236,14 @@ public class ApiGlue {
} }
} }
private static final String getPluginName() { private static String getPluginName() {
if (pluginName != null) { if (pluginName != null) {
return pluginName; return pluginName;
} }
return PluginName.fromUrl(PluginName.getCallerUrl()); return PluginName.fromUrl(PluginName.getCallerUrl());
} }
private static final void go(String urlOrToken) { private static void go(String urlOrToken) {
if (urlOrToken.startsWith("http:") if (urlOrToken.startsWith("http:")
|| urlOrToken.startsWith("https:") || urlOrToken.startsWith("https:")
|| urlOrToken.startsWith("//")) { || urlOrToken.startsWith("//")) {
@@ -253,35 +253,35 @@ public class ApiGlue {
} }
} }
private static final void refresh() { private static void refresh() {
Gerrit.display(History.getToken()); Gerrit.display(History.getToken());
} }
private static final ServerInfo getServerInfo() { private static ServerInfo getServerInfo() {
return Gerrit.info(); return Gerrit.info();
} }
private static final AccountInfo getCurrentUser() { private static AccountInfo getCurrentUser() {
return Gerrit.getUserAccount(); return Gerrit.getUserAccount();
} }
private static final GeneralPreferences getUserPreferences() { private static GeneralPreferences getUserPreferences() {
return Gerrit.getUserPreferences(); return Gerrit.getUserPreferences();
} }
private static final void refreshUserPreferences() { private static void refreshUserPreferences() {
Gerrit.refreshUserPreferences(); Gerrit.refreshUserPreferences();
} }
private static final void refreshMenuBar() { private static void refreshMenuBar() {
Gerrit.refreshMenuBar(); Gerrit.refreshMenuBar();
} }
private static final boolean isSignedIn() { private static boolean isSignedIn() {
return Gerrit.isSignedIn(); return Gerrit.isSignedIn();
} }
private static final void showError(String message) { private static void showError(String message) {
new ErrorDialog(message).center(); new ErrorDialog(message).center();
} }

View File

@@ -62,19 +62,19 @@ final class HtmlTemplate {
}; };
}-*/; }-*/;
private static final String css(String css) { private static String css(String css) {
String name = DOM.createUniqueId(); String name = DOM.createUniqueId();
StyleInjector.inject("." + name + "{" + css + "}"); StyleInjector.inject("." + name + "{" + css + "}");
return name; return name;
} }
private static final String id(IdMap idMap, String key) { private static String id(IdMap idMap, String key) {
String id = DOM.createUniqueId(); String id = DOM.createUniqueId();
idMap.put(id, key); idMap.put(id, key);
return " id='" + id + "'"; return " id='" + id + "'";
} }
private static final String html(ReplacementMap opts, String id) { private static String html(ReplacementMap opts, String id) {
int d = id.indexOf('.'); int d = id.indexOf('.');
if (0 < d) { if (0 < d) {
String name = id.substring(0, d); String name = id.substring(0, d);
@@ -84,7 +84,7 @@ final class HtmlTemplate {
return new SafeHtmlBuilder().append(opts.str(id)).asString(); return new SafeHtmlBuilder().append(opts.str(id)).asString();
} }
private static final Node parseHtml( private static Node parseHtml(
String html, String html,
IdMap ids, IdMap ids,
ReplacementMap opts, ReplacementMap opts,

View File

@@ -26,14 +26,14 @@ final class Plugin extends JavaScriptObject {
return create(TYPE, url, name); return create(TYPE, url, name);
} }
final native String url() /*-{ return this._scriptUrl }-*/; native String url() /*-{ return this._scriptUrl }-*/;
final native String name() /*-{ return this.name }-*/; native String name() /*-{ return this.name }-*/;
final native boolean loaded() /*-{ return this._success || this._failure != null }-*/; native boolean loaded() /*-{ return this._success || this._failure != null }-*/;
final native Exception failure() /*-{ return this._failure }-*/; native Exception failure() /*-{ return this._failure }-*/;
final native void failure(Exception e) /*-{ this._failure = e }-*/; native void failure(Exception e) /*-{ this._failure = e }-*/;
final native boolean success() /*-{ return this._success || false }-*/; native boolean success() /*-{ return this._success || false }-*/;
final native void _initialized() /*-{ this._success = true }-*/; native void _initialized() /*-{ this._success = true }-*/;
private static native Plugin create(JavaScriptObject T, String u, String n) private static native Plugin create(JavaScriptObject T, String u, String n)
/*-{ return new T(u,n) }-*/; /*-{ return new T(u,n) }-*/;

View File

@@ -51,7 +51,7 @@ public class QueryScreen extends PagedSingleListScreen implements
protected AsyncCallback<ChangeList> loadCallback() { protected AsyncCallback<ChangeList> loadCallback() {
return new GerritCallback<ChangeList>() { return new GerritCallback<ChangeList>() {
@Override @Override
public final void onSuccess(ChangeList result) { public void onSuccess(ChangeList result) {
if (isAttached()) { if (isAttached()) {
if (result.length() == 1 && isSingleQuery(query)) { if (result.length() == 1 && isSingleQuery(query)) {
ChangeInfo c = result.get(0); ChangeInfo c = result.get(0);

View File

@@ -45,7 +45,7 @@ public class DiffInfo extends JavaScriptObject {
return filterWebLinks(DiffView.UNIFIED_DIFF); return filterWebLinks(DiffView.UNIFIED_DIFF);
} }
private final List<WebLinkInfo> filterWebLinks(DiffView diffView) { private List<WebLinkInfo> filterWebLinks(DiffView diffView) {
List<WebLinkInfo> filteredDiffWebLinks = new LinkedList<>(); List<WebLinkInfo> filteredDiffWebLinks = new LinkedList<>();
List<DiffWebLinkInfo> allDiffWebLinks = Natives.asList(webLinks()); List<DiffWebLinkInfo> allDiffWebLinks = Natives.asList(webLinks());
if (allDiffWebLinks != null) { if (allDiffWebLinks != null) {

View File

@@ -28,10 +28,10 @@ import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
class DocTable extends NavigationTable<DocInfo> { class DocTable extends NavigationTable<DocInfo> {
private static final int C_TITLE = 1; private static final int C_TITLE = 1;
private int rows = 0; private int rows;
private int dataBeginRow = 0; private int dataBeginRow;
public DocTable() { DocTable() {
super(Util.C.docItemHelp()); super(Util.C.docItemHelp());
table.setText(0, C_TITLE, Util.C.docTableColumnTitle()); table.setText(0, C_TITLE, Util.C.docTableColumnTitle());
@@ -117,7 +117,7 @@ class DocTable extends NavigationTable<DocInfo> {
} }
public static class DocLink extends Anchor { public static class DocLink extends Anchor {
public DocLink(DocInfo d) { DocLink(DocInfo d) {
super(com.google.gerrit.client.changes.Util.cropSubject(d.title())); super(com.google.gerrit.client.changes.Util.cropSubject(d.title()));
setHref(d.getFullUrl()); setHref(d.getFullUrl());
} }

View File

@@ -85,7 +85,7 @@ public abstract class CherryPickDialog extends TextAreaActionDialog {
static class BranchSuggestion implements Suggestion { static class BranchSuggestion implements Suggestion {
private BranchInfo branch; private BranchInfo branch;
public BranchSuggestion(BranchInfo branch) { BranchSuggestion(BranchInfo branch) {
this.branch = branch; this.branch = branch;
} }

View File

@@ -35,7 +35,7 @@ public abstract class CommentedActionDialog extends AutoCenterDialogBox
protected final FlowPanel contentPanel; protected final FlowPanel contentPanel;
protected FocusWidget focusOn; protected FocusWidget focusOn;
protected boolean sent = false; protected boolean sent;
public CommentedActionDialog(final String title, final String heading) { public CommentedActionDialog(final String title, final String heading) {
super(/* auto hide */false, /* modal */true); super(/* auto hide */false, /* modal */true);

View File

@@ -98,7 +98,7 @@ public abstract class CreateChangeDialog extends TextAreaActionDialog {
static class BranchSuggestion implements Suggestion { static class BranchSuggestion implements Suggestion {
private BranchInfo branch; private BranchInfo branch;
public BranchSuggestion(BranchInfo branch) { BranchSuggestion(BranchInfo branch) {
this.branch = branch; this.branch = branch;
} }

View File

@@ -147,7 +147,7 @@ public abstract class RebaseDialog extends CommentedActionDialog {
private static class ChangeSuggestion implements Suggestion { private static class ChangeSuggestion implements Suggestion {
private ChangeInfo change; private ChangeInfo change;
public ChangeSuggestion(ChangeInfo change) { ChangeSuggestion(ChangeInfo change) {
this.change = change; this.change = change;
} }

View File

@@ -69,7 +69,7 @@ public class ThemeLoader {
} }
} }
private static final ExternalTextResource findTheme(Theme theme) { private static ExternalTextResource findTheme(Theme theme) {
for (ExternalTextResource r : THEMES) { for (ExternalTextResource r : THEMES) {
if (theme.name().toLowerCase().equals(r.getName())) { if (theme.name().toLowerCase().equals(r.getName())) {
return r; return r;

View File

@@ -98,7 +98,7 @@ public class GitOverHttpServlet extends GitServlet {
private final boolean enableReceive; private final boolean enableReceive;
public Module(boolean enableReceive) { Module(boolean enableReceive) {
this.enableReceive = enableReceive; this.enableReceive = enableReceive;
} }

View File

@@ -25,7 +25,7 @@ class ContextMapper {
private final String base; private final String base;
private final String authorizedBase; private final String authorizedBase;
public ContextMapper(String contextPath) { ContextMapper(String contextPath) {
base = Strings.nullToEmpty(contextPath) + PLUGINS_PREFIX; base = Strings.nullToEmpty(contextPath) + PLUGINS_PREFIX;
authorizedBase = Strings.nullToEmpty(contextPath) + AUTHORIZED_PREFIX; authorizedBase = Strings.nullToEmpty(contextPath) + AUTHORIZED_PREFIX;
} }

View File

@@ -91,7 +91,7 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
* *
* @throws IOException if there is a low-level I/O error * @throws IOException if there is a low-level I/O error
*/ */
public WrappableSearcherManager(IndexWriter writer, boolean applyAllDeletes, SearcherFactory searcherFactory) throws IOException { WrappableSearcherManager(IndexWriter writer, boolean applyAllDeletes, SearcherFactory searcherFactory) throws IOException {
if (searcherFactory == null) { if (searcherFactory == null) {
searcherFactory = new SearcherFactory(); searcherFactory = new SearcherFactory();
} }
@@ -108,7 +108,7 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
* *
* @throws IOException if there is a low-level I/O error * @throws IOException if there is a low-level I/O error
*/ */
public WrappableSearcherManager(Directory dir, SearcherFactory searcherFactory) throws IOException { WrappableSearcherManager(Directory dir, SearcherFactory searcherFactory) throws IOException {
if (searcherFactory == null) { if (searcherFactory == null) {
searcherFactory = new SearcherFactory(); searcherFactory = new SearcherFactory();
} }
@@ -127,7 +127,7 @@ final class WrappableSearcherManager extends ReferenceManager<IndexSearcher> {
* *
* @throws IOException if there is a low-level I/O error * @throws IOException if there is a low-level I/O error
*/ */
public WrappableSearcherManager(DirectoryReader reader, SearcherFactory searcherFactory) throws IOException { WrappableSearcherManager(DirectoryReader reader, SearcherFactory searcherFactory) throws IOException {
if (searcherFactory == null) { if (searcherFactory == null) {
searcherFactory = new SearcherFactory(); searcherFactory = new SearcherFactory();
} }

View File

@@ -52,7 +52,7 @@ public class Init extends BaseInit {
private boolean noAutoStart; private boolean noAutoStart;
@Option(name = "--skip-plugins", usage = "Don't install plugins") @Option(name = "--skip-plugins", usage = "Don't install plugins")
private boolean skipPlugins = false; private boolean skipPlugins;
@Option(name = "--list-plugins", usage = "List available plugins") @Option(name = "--list-plugins", usage = "List available plugins")
private boolean listPlugins; private boolean listPlugins;

View File

@@ -116,7 +116,7 @@ class Libraries {
return doGet(cfg, name, key, true); return doGet(cfg, name, key, true);
} }
private static final String doGet(Config cfg, String name, String key, private static String doGet(Config cfg, String name, String key,
boolean required) { boolean required) {
String val = cfg.getString("library", name, key); String val = cfg.getString("library", name, key);
if ((val == null || val.isEmpty()) && required) { if ((val == null || val.isEmpty()) && required) {

View File

@@ -39,48 +39,48 @@ public final class Plugin extends JavaScriptObject {
} }
/** Installed name of the plugin. */ /** Installed name of the plugin. */
public final String getName() { public String getName() {
return getPluginName(); return getPluginName();
} }
/** Installed name of the plugin. */ /** Installed name of the plugin. */
public final native String getPluginName() public native String getPluginName()
/*-{ return this.getPluginName() }-*/; /*-{ return this.getPluginName() }-*/;
/** Navigate the UI to the screen identified by the token. */ /** Navigate the UI to the screen identified by the token. */
public final native void go(String token) public native void go(String token)
/*-{ return this.go(token) }-*/; /*-{ return this.go(token) }-*/;
/** Refresh the current UI. */ /** Refresh the current UI. */
public final native void refresh() public native void refresh()
/*-{ return this.refresh() }-*/; /*-{ return this.refresh() }-*/;
/** Refresh Gerrit's menu bar. */ /** Refresh Gerrit's menu bar. */
public final native void refreshMenuBar() public native void refreshMenuBar()
/*-{ return this.refreshMenuBar() }-*/; /*-{ return this.refreshMenuBar() }-*/;
/** @return the preferences of the currently signed in user, the default preferences if not signed in */ /** @return the preferences of the currently signed in user, the default preferences if not signed in */
public final native GeneralPreferences getUserPreferences() public native GeneralPreferences getUserPreferences()
/*-{ return this.getUserPreferences() }-*/; /*-{ return this.getUserPreferences() }-*/;
/** Refresh the user preferences of the current user. */ /** Refresh the user preferences of the current user. */
public final native void refreshUserPreferences() public native void refreshUserPreferences()
/*-{ return this.refreshUserPreferences() }-*/; /*-{ return this.refreshUserPreferences() }-*/;
/** @return the server info */ /** @return the server info */
public final native ServerInfo getServerInfo() public native ServerInfo getServerInfo()
/*-{ return this.getServerInfo() }-*/; /*-{ return this.getServerInfo() }-*/;
/** @return the current user */ /** @return the current user */
public final native AccountInfo getCurrentUser() public native AccountInfo getCurrentUser()
/*-{ return this.getCurrentUser() }-*/; /*-{ return this.getCurrentUser() }-*/;
/** Check if user is signed in. */ /** Check if user is signed in. */
public final native boolean isSignedIn() public native boolean isSignedIn()
/*-{ return this.isSignedIn() }-*/; /*-{ return this.isSignedIn() }-*/;
/** Show message in Gerrit's ErrorDialog. */ /** Show message in Gerrit's ErrorDialog. */
public final native void showError(String message) public native void showError(String message)
/*-{ return this.showError(message) }-*/; /*-{ return this.showError(message) }-*/;
/** /**
@@ -90,7 +90,7 @@ public final class Plugin extends JavaScriptObject {
* regular expression matching use {@code screenRegex()} . * regular expression matching use {@code screenRegex()} .
* @param entry callback function invoked to create the screen widgets. * @param entry callback function invoked to create the screen widgets.
*/ */
public final void screen(String token, Screen.EntryPoint entry) { public void screen(String token, Screen.EntryPoint entry) {
screen(token, wrap(entry)); screen(token, wrap(entry));
} }
@@ -105,7 +105,7 @@ public final class Plugin extends JavaScriptObject {
* {@code Screen} object passed into the {@code Screen.EntryPoint}. * {@code Screen} object passed into the {@code Screen.EntryPoint}.
* @param entry callback function invoked to create the screen widgets. * @param entry callback function invoked to create the screen widgets.
*/ */
public final void screenRegex(String regex, Screen.EntryPoint entry) { public void screenRegex(String regex, Screen.EntryPoint entry) {
screenRegex(regex, wrap(entry)); screenRegex(regex, wrap(entry));
} }
@@ -118,7 +118,7 @@ public final class Plugin extends JavaScriptObject {
* @param token literal anchor token appearing after the plugin name. * @param token literal anchor token appearing after the plugin name.
* @param entry callback function invoked to create the settings screen widgets. * @param entry callback function invoked to create the settings screen widgets.
*/ */
public final void settingsScreen(String token, String menu, Screen.EntryPoint entry) { public void settingsScreen(String token, String menu, Screen.EntryPoint entry) {
settingsScreen(token, menu, wrap(entry)); settingsScreen(token, menu, wrap(entry));
} }
@@ -132,7 +132,7 @@ public final class Plugin extends JavaScriptObject {
* registered. * registered.
* @param entry callback function invoked to create the panel widgets. * @param entry callback function invoked to create the panel widgets.
*/ */
public final void panel(GerritUiExtensionPoint extensionPoint, Panel.EntryPoint entry) { public void panel(GerritUiExtensionPoint extensionPoint, Panel.EntryPoint entry) {
panel(extensionPoint.name(), wrap(entry)); panel(extensionPoint.name(), wrap(entry));
} }

View File

@@ -60,20 +60,20 @@ public class Panel extends SimplePanel {
} }
static final class Context extends JavaScriptObject { static final class Context extends JavaScriptObject {
final native Element body() /*-{ return this.body }-*/; native Element body() /*-{ return this.body }-*/;
final native String get(String k) /*-{ return this.p[k]; }-*/; native String get(String k) /*-{ return this.p[k]; }-*/;
final native int getInt(String k, int d) /*-{ native int getInt(String k, int d) /*-{
return this.p.hasOwnProperty(k) ? this.p[k] : d return this.p.hasOwnProperty(k) ? this.p[k] : d
}-*/; }-*/;
final native int getBoolean(String k, boolean d) /*-{ native int getBoolean(String k, boolean d) /*-{
return this.p.hasOwnProperty(k) ? this.p[k] : d return this.p.hasOwnProperty(k) ? this.p[k] : d
}-*/; }-*/;
final native JavaScriptObject getObject(String k) native JavaScriptObject getObject(String k)
/*-{ return this.p[k]; }-*/; /*-{ return this.p[k]; }-*/;
final native void detach(Panel p) /*-{ native void detach(Panel p) /*-{
this.onUnload($entry(function(){ this.onUnload($entry(function(){
p.@com.google.gwt.user.client.ui.Widget::onDetach()(); p.@com.google.gwt.user.client.ui.Widget::onDetach()();
})); }));

View File

@@ -62,12 +62,12 @@ public final class Screen extends SimplePanel {
} }
static final class Context extends JavaScriptObject { static final class Context extends JavaScriptObject {
final native Element body() /*-{ return this.body }-*/; native Element body() /*-{ return this.body }-*/;
final native JsArrayString token_match() /*-{ return this.token_match }-*/; native JsArrayString token_match() /*-{ return this.token_match }-*/;
final native void show() /*-{ this.show() }-*/; native void show() /*-{ this.show() }-*/;
final native void setTitle(String t) /*-{ this.setTitle(t) }-*/; native void setTitle(String t) /*-{ this.setTitle(t) }-*/;
final native void setWindowTitle(String t) /*-{ this.setWindowTitle(t) }-*/; native void setWindowTitle(String t) /*-{ this.setWindowTitle(t) }-*/;
final native void detach(Screen s) /*-{ native void detach(Screen s) /*-{
this.onUnload($entry(function(){ this.onUnload($entry(function(){
s.@com.google.gwt.user.client.ui.Widget::onDetach()(); s.@com.google.gwt.user.client.ui.Widget::onDetach()();
})); }));
@@ -87,7 +87,7 @@ public final class Screen extends SimplePanel {
} }
/** @return the token suffix after {@code "/#/x/plugin-name/"}. */ /** @return the token suffix after {@code "/#/x/plugin-name/"}. */
public final String getToken() { public String getToken() {
return getToken(0); return getToken(0);
} }
@@ -96,12 +96,12 @@ public final class Screen extends SimplePanel {
* group 0 is the entire token, see {@link #getToken()}. * group 0 is the entire token, see {@link #getToken()}.
* @return the token from the regex match group. * @return the token from the regex match group.
*/ */
public final String getToken(int group) { public String getToken(int group) {
return ctx.token_match().get(group); return ctx.token_match().get(group);
} }
/** @return total number of token groups. */ /** @return total number of token groups. */
public final int getTokenGroups() { public int getTokenGroups() {
return ctx.token_match().length(); return ctx.token_match().length();
} }
@@ -110,7 +110,7 @@ public final class Screen extends SimplePanel {
* *
* @param titleText text to display above the widget. * @param titleText text to display above the widget.
*/ */
public final void setPageTitle(String titleText) { public void setPageTitle(String titleText) {
ctx.setTitle(titleText); ctx.setTitle(titleText);
} }
@@ -119,7 +119,7 @@ public final class Screen extends SimplePanel {
* *
* @param titleText text to display in the window title bar. * @param titleText text to display in the window title bar.
*/ */
public final void setWindowTitle(String titleText) { public void setWindowTitle(String titleText) {
ctx.setWindowTitle(titleText); ctx.setWindowTitle(titleText);
} }
@@ -128,13 +128,13 @@ public final class Screen extends SimplePanel {
* *
* @param w child containing the content. * @param w child containing the content.
*/ */
public final void show(Widget w) { public void show(Widget w) {
setWidget(w); setWidget(w);
ctx.show(); ctx.show();
} }
/** Show this screen in the web interface. */ /** Show this screen in the web interface. */
public final void show() { public void show() {
ctx.show(); ctx.show();
} }
} }

View File

@@ -108,7 +108,7 @@ public class Move implements RestModifyView<ChangeResource, MoveInput> {
private Change change; private Change change;
private Branch.NameKey newDestKey; private Branch.NameKey newDestKey;
public Op(ChangeControl ctl, MoveInput input) { Op(ChangeControl ctl, MoveInput input) {
this.input = input; this.input = input;
this.caller = ctl.getUser().asIdentifiedUser(); this.caller = ctl.getUser().asIdentifiedUser();
} }

View File

@@ -90,7 +90,7 @@ public class PutTopic implements RestModifyView<ChangeResource, Input>,
private String oldTopicName; private String oldTopicName;
private String newTopicName; private String newTopicName;
public Op(Input input) { Op(Input input) {
this.input = input; this.input = input;
} }

View File

@@ -214,7 +214,7 @@ public class Revert implements RestModifyView<ChangeResource, RevertInput>,
private class SendEmailOp extends BatchUpdate.Op { private class SendEmailOp extends BatchUpdate.Op {
private final ChangeInserter ins; private final ChangeInserter ins;
public SendEmailOp(ChangeInserter ins) { SendEmailOp(ChangeInserter ins) {
this.ins = ins; this.ins = ins;
} }
@@ -236,7 +236,7 @@ public class Revert implements RestModifyView<ChangeResource, RevertInput>,
private class PostRevertedMessageOp extends BatchUpdate.Op { private class PostRevertedMessageOp extends BatchUpdate.Op {
private final ObjectId computedChangeId; private final ObjectId computedChangeId;
public PostRevertedMessageOp(ObjectId computedChangeId) { PostRevertedMessageOp(ObjectId computedChangeId) {
this.computedChangeId = computedChangeId; this.computedChangeId = computedChangeId;
} }

View File

@@ -49,7 +49,7 @@ class DbGroupMemberAuditListener implements GroupMemberAuditListener {
private final UniversalGroupBackend groupBackend; private final UniversalGroupBackend groupBackend;
@Inject @Inject
public DbGroupMemberAuditListener(SchemaFactory<ReviewDb> schema, DbGroupMemberAuditListener(SchemaFactory<ReviewDb> schema,
AccountCache accountCache, GroupCache groupCache, AccountCache accountCache, GroupCache groupCache,
UniversalGroupBackend groupBackend) { UniversalGroupBackend groupBackend) {
this.schema = schema; this.schema = schema;

View File

@@ -259,7 +259,7 @@ public class CreateBranch implements RestModifyView<ProjectResource, Input> {
public static final String MESSAGE = "Invalid Revision"; public static final String MESSAGE = "Invalid Revision";
public InvalidRevisionException() { InvalidRevisionException() {
super(MESSAGE); super(MESSAGE);
} }
} }

View File

@@ -473,8 +473,8 @@ public class RefControl {
} }
private static class AllowedRange { private static class AllowedRange {
private int allowMin = 0; private int allowMin;
private int allowMax = 0; private int allowMax;
private int blockMin = Integer.MIN_VALUE; private int blockMin = Integer.MIN_VALUE;
private int blockMax = Integer.MAX_VALUE; private int blockMax = Integer.MAX_VALUE;

View File

@@ -23,7 +23,7 @@ import java.util.TreeMap;
class RepositoryStatistics extends TreeMap<String, Object> { class RepositoryStatistics extends TreeMap<String, Object> {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public RepositoryStatistics(Properties p) { RepositoryStatistics(Properties p) {
for (Entry<Object, Object> e : p.entrySet()) { for (Entry<Object, Object> e : p.entrySet()) {
put(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, put(CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE,
e.getKey().toString()), e.getValue()); e.getKey().toString()), e.getValue());

View File

@@ -83,7 +83,7 @@ public class SubmitRuleEvaluator {
private static class UserTermExpected extends Exception { private static class UserTermExpected extends Exception {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public UserTermExpected(SubmitRecord.Label label) { UserTermExpected(SubmitRecord.Label label) {
super(String.format("A label with the status %s must contain a user.", super(String.format("A label with the status %s must contain a user.",
label.toString())); label.toString()));
} }

View File

@@ -30,7 +30,7 @@ class HANA extends BaseDataSourceType {
private Config cfg; private Config cfg;
@Inject @Inject
public HANA(@GerritServerConfig final Config cfg) { HANA(@GerritServerConfig final Config cfg) {
super("com.sap.db.jdbc.Driver"); super("com.sap.db.jdbc.Driver");
this.cfg = cfg; this.cfg = cfg;
} }

View File

@@ -29,7 +29,7 @@ class MaxDb extends BaseDataSourceType {
private Config cfg; private Config cfg;
@Inject @Inject
public MaxDb(@GerritServerConfig final Config cfg) { MaxDb(@GerritServerConfig final Config cfg) {
super("com.sap.dbtech.jdbc.DriverSapDB"); super("com.sap.dbtech.jdbc.DriverSapDB");
this.cfg = cfg; this.cfg = cfg;
} }

View File

@@ -28,7 +28,7 @@ class MySql extends BaseDataSourceType {
private Config cfg; private Config cfg;
@Inject @Inject
public MySql(@GerritServerConfig final Config cfg) { MySql(@GerritServerConfig final Config cfg) {
super("com.mysql.jdbc.Driver"); super("com.mysql.jdbc.Driver");
this.cfg = cfg; this.cfg = cfg;
} }

View File

@@ -30,7 +30,7 @@ class PostgreSQL extends BaseDataSourceType {
private Config cfg; private Config cfg;
@Inject @Inject
public PostgreSQL(@GerritServerConfig final Config cfg) { PostgreSQL(@GerritServerConfig final Config cfg) {
super("org.postgresql.Driver"); super("org.postgresql.Driver");
this.cfg = cfg; this.cfg = cfg;
} }

View File

@@ -21,11 +21,11 @@ public final class HostPlatform {
private static final boolean win32 = computeWin32(); private static final boolean win32 = computeWin32();
/** @return true if this JVM is running on a Windows platform. */ /** @return true if this JVM is running on a Windows platform. */
public static final boolean isWin32() { public static boolean isWin32() {
return win32; return win32;
} }
private static final boolean computeWin32() { private static boolean computeWin32() {
final String osDotName = final String osDotName =
AccessController.doPrivileged(new PrivilegedAction<String>() { AccessController.doPrivileged(new PrivilegedAction<String>() {
@Override @Override

View File

@@ -29,7 +29,7 @@ public class ColumnFormatterTest {
private PrintWriter printWriter; private PrintWriter printWriter;
private StringWriter stringWriter; private StringWriter stringWriter;
public PrintWriterComparator() { PrintWriterComparator() {
stringWriter = new StringWriter(); stringWriter = new StringWriter();
printWriter = new PrintWriter(stringWriter); printWriter = new PrintWriter(stringWriter);
} }

View File

@@ -268,7 +268,7 @@ public class SubmoduleSectionParserTest extends LocalDiskRepositoryTestCase {
private final String path; private final String path;
private final String branch; private final String branch;
public SubmoduleSection(final String url, final String path, SubmoduleSection(final String url, final String path,
final String branch) { final String branch) {
this.url = url; this.url = url;
this.path = path; this.path = path;

View File

@@ -289,7 +289,7 @@ public abstract class BaseCommand implements Command {
} }
} }
private final boolean isAdminHighPriorityCommand() { private boolean isAdminHighPriorityCommand() {
return getClass().getAnnotation(AdminHighPriorityCommand.class) != null; return getClass().getAnnotation(AdminHighPriorityCommand.class) != null;
} }

View File

@@ -81,7 +81,7 @@ final class AdminSetParent extends SshCommand {
@Inject @Inject
private Provider<ListChildProjects> listChildProjects; private Provider<ListChildProjects> listChildProjects;
private Project.NameKey newParentKey = null; private Project.NameKey newParentKey;
@Override @Override
protected void run() throws Failure { protected void run() throws Failure {

View File

@@ -123,6 +123,7 @@ final class ApproveOption implements Option, Setter<Short> {
public static class Handler extends OneArgumentOptionHandler<Short> { public static class Handler extends OneArgumentOptionHandler<Short> {
private final ApproveOption cmdOption; private final ApproveOption cmdOption;
// CS IGNORE RedundantModifier FOR NEXT 1 LINES. REASON: needed by org.kohsuke.args4j.Option
public Handler(final CmdLineParser parser, final OptionDef option, public Handler(final CmdLineParser parser, final OptionDef option,
final Setter<Short> setter) { final Setter<Short> setter) {
super(parser, option, setter); super(parser, option, setter);

View File

@@ -82,7 +82,7 @@ final class StreamEvents extends BaseCommand {
/** Special event to notify clients they missed other events. */ /** Special event to notify clients they missed other events. */
private static final class DroppedOutputEvent extends Event { private static final class DroppedOutputEvent extends Event {
private static final String TYPE = "dropped-output"; private static final String TYPE = "dropped-output";
public DroppedOutputEvent() { DroppedOutputEvent() {
super(TYPE); super(TYPE);
} }
} }

View File

@@ -36,7 +36,7 @@ class UnzippedDistribution implements PluginsDistribution {
private ServletContext servletContext; private ServletContext servletContext;
private File pluginsDir; private File pluginsDir;
public UnzippedDistribution(ServletContext servletContext) { UnzippedDistribution(ServletContext servletContext) {
this.servletContext = servletContext; this.servletContext = servletContext;
} }

View File

@@ -95,6 +95,7 @@ edited to remove noisy warnings.
</module> </module>
<module name="RedundantImport"/> <module name="RedundantImport"/>
<module name="RedundantModifier"/> <module name="RedundantModifier"/>
<module name="ExplicitInitialization"/>
</module> </module>
<module name="FileTabCharacter"> <module name="FileTabCharacter">
<property name="severity" value="ignore"/> <property name="severity" value="ignore"/>