opendev/gerrit
Code Issues Proposed changes

Format all Java files with google-java-format

Browse Source 
Having a standard tool for formatting saves reviewers' valuable time.
google-java-format is Google's standard formatter and is somewhat
inspired by gofmt[1]. This commit formats everything using
google-java-format version 1.2.

The downside of this one-off formatting is breaking blame. This can be
somewhat hacked around with a tool like git-hyper-blame[2], but it's
definitely not optimal until/unless this kind of feature makes its way
to git core.

Not in this change:
* Tool support, e.g. Eclipse. The command must be run manually [3].
* Documentation of best practice, e.g. new 100-column default.

[1] https://talks.golang.org/2015/gofmt-en.slide#3
[2] https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/git-hyper-blame.html
[3] git ls-files | grep java$ | xargs google-java-format -i

Change-Id: Id5f3c6de95ce0b68b41f0a478b5c99a93675aaa3
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
This commit is contained in:
Dave Borowitz
2016-11-13 09:56:32 -08:00
committed by David Pursehouse
parent 6723b6d0fa
commit 292fa154c1
2443 changed files with 54816 additions and 57825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
gerrit-gwtui/src/main/java/com/google/gerrit/client/account/MyPasswordScreen.java
View File

@@ -56,20 +56,22 @@ public class MyPasswordScreen extends SettingsScreen {
password.addStyleName(Gerrit.RESOURCES.css().accountPassword());
generatePassword = new Button(Util.C.buttonGeneratePassword());
generatePassword.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
doGeneratePassword();
}
});
generatePassword.addClickHandler(
new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
doGeneratePassword();
}
});
clearPassword = new Button(Util.C.buttonClearPassword());
clearPassword.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
doClearPassword();
}
});
clearPassword.addClickHandler(
new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
doClearPassword();
}
});
final Grid userInfo = new Grid(2, 2);
final CellFormatter fmt = userInfo.getCellFormatter();
@@ -104,43 +106,46 @@ public class MyPasswordScreen extends SettingsScreen {
}
enableUI(false);
AccountApi.getUsername("self", new GerritCallback<NativeString>() {
@Override
public void onSuccess(NativeString user) {
Gerrit.getUserAccount().username(user.asString());
refreshHttpPassword();
}
AccountApi.getUsername(
"self",
new GerritCallback<NativeString>() {
@Override
public void onSuccess(NativeString user) {
Gerrit.getUserAccount().username(user.asString());
refreshHttpPassword();
}
@Override
public void onFailure(final Throwable caught) {
if (RestApi.isNotFound(caught)) {
Gerrit.getUserAccount().username(null);
display();
} else {
super.onFailure(caught);
}
}
});
@Override
public void onFailure(final Throwable caught) {
if (RestApi.isNotFound(caught)) {
Gerrit.getUserAccount().username(null);
display();
} else {
super.onFailure(caught);
}
}
});
}
private void refreshHttpPassword() {
AccountApi.getHttpPassword("self", new ScreenLoadCallback<NativeString>(
this) {
@Override
protected void preDisplay(NativeString httpPassword) {
display(httpPassword.asString());
}
AccountApi.getHttpPassword(
"self",
new ScreenLoadCallback<NativeString>(this) {
@Override
protected void preDisplay(NativeString httpPassword) {
display(httpPassword.asString());
}
@Override
public void onFailure(final Throwable caught) {
if (RestApi.isNotFound(caught)) {
display(null);
display();
} else {
super.onFailure(caught);
}
}
});
@Override
public void onFailure(final Throwable caught) {
if (RestApi.isNotFound(caught)) {
display(null);
display();
} else {
super.onFailure(caught);
}
}
});
}
private void display(String pass) {
@@ -149,8 +154,7 @@ public class MyPasswordScreen extends SettingsScreen {
enableUI(true);
}
private void row(final Grid info, final int row, final String name,
final Widget field) {
private void row(final Grid info, final int row, final String name, final Widget field) {
final CellFormatter fmt = info.getCellFormatter();
if (LocaleInfo.getCurrentLocale().isRTL()) {
info.setText(row, 1, name);
@@ -166,7 +170,8 @@ public class MyPasswordScreen extends SettingsScreen {
private void doGeneratePassword() {
if (Gerrit.getUserAccount().username() != null) {
enableUI(false);
AccountApi.generateHttpPassword("self",
AccountApi.generateHttpPassword(
"self",
new GerritCallback<NativeString>() {
@Override
public void onSuccess(NativeString newPassword) {
@@ -184,7 +189,8 @@ public class MyPasswordScreen extends SettingsScreen {
private void doClearPassword() {
if (Gerrit.getUserAccount().username() != null) {
enableUI(false);
AccountApi.clearHttpPassword("self",
AccountApi.clearHttpPassword(
"self",
new GerritCallback<VoidResult>() {
@Override
public void onSuccess(VoidResult result) {