opendev/gerrit
Code Issues Proposed changes

Format Java files with google-java-format

Browse Source 
Change-Id: If2c9ef1ca5c97b792478cd664b68e8d3ff959443
This commit is contained in:
David Pursehouse
2017-04-05 09:55:15 +09:00
parent 87db31bfc1
commit c57fb21c3f
4 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen.java
View File

@@ -378,8 +378,7 @@ public class ChangeScreen extends Screen {
return resolveRevisionToDisplay(info);
}
private void addExtensionPoints(ChangeInfo change, RevisionInfo rev,
Entry result) {
private void addExtensionPoints(ChangeInfo change, RevisionInfo rev, Entry result) {
addExtensionPoint(GerritUiExtensionPoint.CHANGE_SCREEN_HEADER, headerExtension, change, rev);
addExtensionPoint(
GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_BUTTONS,
@@ -393,7 +392,9 @@ public class ChangeScreen extends Screen {
rev);
addExtensionPoint(
GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK,
changeExtension, change, rev,
changeExtension,
change,
rev,
result.getExtensionPanelNames(
GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK.toString()));
addExtensionPoint(
@@ -411,8 +412,11 @@ public class ChangeScreen extends Screen {
}
private void addExtensionPoint(
GerritUiExtensionPoint extensionPoint, Panel p, ChangeInfo change,
RevisionInfo rev, List<String> panelNames) {
GerritUiExtensionPoint extensionPoint,
Panel p,
ChangeInfo change,
RevisionInfo rev,
List<String> panelNames) {
ExtensionPanel extensionPanel = new ExtensionPanel(extensionPoint, panelNames);
extensionPanel.putObject(GerritUiExtensionPoint.Key.CHANGE_INFO, change);
extensionPanel.putObject(GerritUiExtensionPoint.Key.REVISION_INFO, rev);

3
gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfo.java
View File

@@ -116,7 +116,8 @@ public class ConfigInfo extends JavaScriptObject {
final native ThemeInfo theme() /*-{ return this.theme; }-*/;
final native NativeMap<JsArrayString> extensionPanelNames() /*-{ return this.extension_panel_names; }-*/;
final native NativeMap<JsArrayString>
extensionPanelNames() /*-{ return this.extension_panel_names; }-*/;
protected ConfigInfo() {}

11
gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java
View File

@@ -121,16 +121,15 @@ public final class Plugin extends JavaScriptObject {
*
* @param extensionPoint the UI extension point for which the panel should be registered.
* @param entry callback function invoked to create the panel widgets.
* @param name the name of the panel which can be used to specify panel
* ordering via project config
* @param name the name of the panel which can be used to specify panel ordering via project
* config
*/
public final void panel(GerritUiExtensionPoint extensionPoint,
Panel.EntryPoint entry, String name) {
public final void panel(
GerritUiExtensionPoint extensionPoint, Panel.EntryPoint entry, String name) {
panel(extensionPoint.name(), wrap(entry), name);
}
private native void panel(String i, JavaScriptObject e, String n)
/*-{ this.panel(i, e, n) }-*/;
private native void panel(String i, JavaScriptObject e, String n)/*-{ this.panel(i, e, n) }-*/ ;
protected Plugin() {}

3
gerrit-server/src/main/java/com/google/gerrit/server/edit/ChangeEditUtil.java
View File

@@ -195,7 +195,8 @@ public class ChangeEditUtil {
// Previously checked that the base patch set is the current patch set.
ObjectId prior = ObjectId.fromString(basePatchSet.getRevision().get());
ChangeKind kind = changeKindCache.getChangeKind(change.getProject(), repo, rw, prior, squashed);
ChangeKind kind =
changeKindCache.getChangeKind(change.getProject(), repo, rw, prior, squashed);
if (kind == ChangeKind.NO_CODE_CHANGE) {
message.append("Commit message was updated.");
inserter.setDescription("Edit commit message");