diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java index 4404f94f74..c2e37872d7 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/GerritApi.java @@ -32,7 +32,7 @@ public interface GerritApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements GerritApi { + class NotImplemented implements GerritApi { @Override public Accounts accounts() { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java index 836d719efe..a45d8d3b62 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/AccountApi.java @@ -59,7 +59,7 @@ public interface AccountApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements AccountApi { + class NotImplemented implements AccountApi { @Override public AccountInfo get() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java index 9cddda985b..0d2e0255f8 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/Accounts.java @@ -75,7 +75,7 @@ public interface Accounts { * * @see #suggestAccounts() */ - public abstract class SuggestAccountsRequest { + abstract class SuggestAccountsRequest { private String query; private int limit; @@ -116,7 +116,7 @@ public interface Accounts { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements Accounts { + class NotImplemented implements Accounts { @Override public AccountApi id(String id) throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java index ffdcf87399..6f87e8b811 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/accounts/GpgKeyApi.java @@ -26,7 +26,7 @@ public interface GpgKeyApi { * A default implementation which allows source compatibility * when adding new methods to the interface. */ - public class NotImplemented implements GpgKeyApi { + class NotImplemented implements GpgKeyApi { @Override public GpgKeyInfo get() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java index ae5f0b81f1..3a64645875 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/ChangeApi.java @@ -157,7 +157,7 @@ public interface ChangeApi { ChangeInfo check() throws RestApiException; ChangeInfo check(FixInput fix) throws RestApiException; - public abstract class SuggestedReviewersRequest { + abstract class SuggestedReviewersRequest { private String query; private int limit; @@ -186,7 +186,7 @@ public interface ChangeApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements ChangeApi { + class NotImplemented implements ChangeApi { @Override public String id() { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java index b1381e7d77..aa67473328 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/Changes.java @@ -64,7 +64,7 @@ public interface Changes { QueryRequest query(); QueryRequest query(String query); - public abstract class QueryRequest { + abstract class QueryRequest { private String query; private int limit; private int start; @@ -140,7 +140,7 @@ public interface Changes { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements Changes { + class NotImplemented implements Changes { @Override public ChangeApi id(int id) throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java index d0c5633f1c..adac284031 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/CommentApi.java @@ -25,7 +25,7 @@ public interface CommentApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements CommentApi { + class NotImplemented implements CommentApi { @Override public CommentInfo get() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java index 80a71f853e..50335db96d 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/DraftApi.java @@ -26,7 +26,7 @@ public interface DraftApi extends CommentApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented extends CommentApi.NotImplemented + class NotImplemented extends CommentApi.NotImplemented implements DraftApi { @Override public CommentInfo update(DraftInput in) throws RestApiException { diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java index 5e995e2359..3641ac5d55 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/FileApi.java @@ -40,7 +40,7 @@ public interface FileApi { */ DiffRequest diffRequest() throws RestApiException; - public abstract class DiffRequest { + abstract class DiffRequest { private String base; private Integer context; private Boolean intraline; @@ -89,7 +89,7 @@ public interface FileApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements FileApi { + class NotImplemented implements FileApi { @Override public BinaryResult content() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java index 627917c293..b23c7f9051 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/changes/RevisionApi.java @@ -75,7 +75,7 @@ public interface RevisionApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements RevisionApi { + class NotImplemented implements RevisionApi { @Override public void delete() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java index 348cf4b4b3..3f4971e945 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Config.java @@ -26,7 +26,7 @@ public interface Config { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements Config { + class NotImplemented implements Config { @Override public Server server() { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java index c093b182d1..1c535dd174 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/config/Server.java @@ -27,7 +27,7 @@ public interface Server { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements Server { + class NotImplemented implements Server { @Override public String getVersion() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java index b909f317da..6b4f5f3f58 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/groups/Groups.java @@ -51,7 +51,7 @@ public interface Groups { /** @return new request for listing groups. */ ListRequest list(); - public abstract class ListRequest { + abstract class ListRequest { private final EnumSet options = EnumSet.noneOf(ListGroupsOption.class); private final List projects = new ArrayList<>(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java index e7c98e97e9..222248d214 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/BranchApi.java @@ -34,7 +34,7 @@ public interface BranchApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements BranchApi { + class NotImplemented implements BranchApi { @Override public BranchApi create(BranchInput in) throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java index a930f0d4d5..3bffac02b8 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ChildProjectApi.java @@ -26,7 +26,7 @@ public interface ChildProjectApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements ChildProjectApi { + class NotImplemented implements ChildProjectApi { @Override public ProjectInfo get() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java index e3eb4bec3c..16efdd19eb 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/ProjectApi.java @@ -31,7 +31,7 @@ public interface ProjectApi { ListRefsRequest branches(); ListRefsRequest tags(); - public abstract class ListRefsRequest { + abstract class ListRefsRequest { protected int limit; protected int start; protected String substring; @@ -108,7 +108,7 @@ public interface ProjectApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements ProjectApi { + class NotImplemented implements ProjectApi { @Override public ProjectApi create() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java index cd738f074e..fdbadb2b5d 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/Projects.java @@ -60,7 +60,7 @@ public interface Projects { ListRequest list(); - public abstract class ListRequest { + abstract class ListRequest { public enum FilterType { CODE, PARENT_CANDIDATES, PERMISSIONS, ALL } @@ -175,7 +175,7 @@ public interface Projects { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements Projects { + class NotImplemented implements Projects { @Override public ProjectApi name(String name) throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java index 6cc1ba4bad..3071fd259c 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/api/projects/TagApi.java @@ -24,7 +24,7 @@ public interface TagApi { * A default implementation which allows source compatibility * when adding new methods to the interface. **/ - public class NotImplemented implements TagApi { + class NotImplemented implements TagApi { @Override public TagInfo get() throws RestApiException { throw new NotImplementedException(); diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java index c7deedb2e8..45aec57f85 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/systemstatus/ServerInformation.java @@ -17,7 +17,7 @@ package com.google.gerrit.extensions.systemstatus; /** Exports current server information to an extension. */ public interface ServerInformation { /** Current state of the server. */ - public enum State { + enum State { /** * The server is starting up, and network connections are not yet being * accepted. Plugins or extensions starting during this time are starting diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java index bc418135ed..7ad12cd4cc 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/TopMenu.java @@ -22,7 +22,7 @@ import java.util.List; @ExtensionPoint public interface TopMenu { - public class MenuEntry { + class MenuEntry { public final String name; public final List items; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java index fb81e0c024..18076737e8 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/UiAction.java @@ -32,7 +32,7 @@ public interface UiAction extends RestView { Description getDescription(R resource); /** Describes an action invokable through the web interface. */ - public static class Description { + class Description { private String method; private String id; private String label; diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java index e497f7ddb4..fd677ca8ca 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/WebLink.java @@ -24,7 +24,7 @@ public interface WebLink { /** * Class that holds target defaults for WebLink anchors. */ - public static class Target { + class Target { /** * Opens the link in a new window or tab */ diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/ClippyResources.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/ClippyResources.java index f3435cca64..a97b39241c 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/ClippyResources.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/ClippyResources.java @@ -21,7 +21,7 @@ import com.google.gwt.resources.client.DataResource.DoNotEmbed; import com.google.gwt.resources.client.ImageResource; public interface ClippyResources extends ClientBundle { - public static final ClippyResources I = GWT.create(ClippyResources.class); + ClippyResources I = GWT.create(ClippyResources.class); @Source("clippy.css") ClippyCss css(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabelText.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabelText.java index 4a7f36e219..8e4d090fd7 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabelText.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/clippy/client/CopyableLabelText.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Constants; interface CopyableLabelText extends Constants { - final CopyableLabelText I = GWT.create(CopyableLabelText.class); + CopyableLabelText I = GWT.create(CopyableLabelText.class); String tooltip(); String copied(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyConstants.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyConstants.java index d26ca8c1cc..2b5984d9b0 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyConstants.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyConstants.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Constants; public interface KeyConstants extends Constants { - public static final KeyConstants I = GWT.create(KeyConstants.class); + KeyConstants I = GWT.create(KeyConstants.class); String applicationSection(); String showHelp(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyResources.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyResources.java index a52ca2a5e9..562e12d04d 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyResources.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/globalkey/client/KeyResources.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; public interface KeyResources extends ClientBundle { - public static final KeyResources I = GWT.create(KeyResources.class); + KeyResources I = GWT.create(KeyResources.class); @Source("key.css") KeyCss css(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressResources.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressResources.java index 0276e9a608..6bcf2c4b69 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressResources.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/progress/client/ProgressResources.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; public interface ProgressResources extends ClientBundle { - public static final ProgressResources I = GWT.create(ProgressResources.class); + ProgressResources I = GWT.create(ProgressResources.class); @Source("progress.css") ProgressCss css(); diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/Tooltip.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/Tooltip.java index 6a2e4447ac..7939697585 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/Tooltip.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/user/client/Tooltip.java @@ -23,7 +23,7 @@ import com.google.gwt.user.client.ui.UIObject; /** Displays custom tooltip message below an element. */ public class Tooltip { interface Resources extends ClientBundle { - final Resources I = GWT.create(Resources.class); + Resources I = GWT.create(Resources.class); @Source("tooltip.css") Css css(); diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonConstants.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonConstants.java index 032c47ce9f..5d0b93fe78 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonConstants.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonConstants.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Constants; public interface CommonConstants extends Constants { - public static final CommonConstants C = GWT.create(CommonConstants.class); + CommonConstants C = GWT.create(CommonConstants.class); String inTheFuture(); String month(); diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonMessages.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonMessages.java index aa5e3cffb4..5a5b4a37f6 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonMessages.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/CommonMessages.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Messages; public interface CommonMessages extends Messages { - public static final CommonMessages M = GWT.create(CommonMessages.class); + CommonMessages M = GWT.create(CommonMessages.class); String secondsAgo(long seconds); String minutesAgo(long minutes); diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java index 6ac0404a39..830dcb3548 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AccountInfo.java @@ -40,9 +40,9 @@ public class AccountInfo extends JavaScriptObject { return ts; } - private final native String registeredOnRaw() /*-{ return this.registered_on; }-*/; - private final native Timestamp _getRegisteredOn() /*-{ return this._cts; }-*/; - private final native void _setRegisteredOn(Timestamp ts) /*-{ this._cts = ts; }-*/; + private native String registeredOnRaw() /*-{ return this.registered_on; }-*/; + private native Timestamp _getRegisteredOn() /*-{ return this._cts; }-*/; + private native void _setRegisteredOn(Timestamp ts) /*-{ this._cts = ts; }-*/; /** * @return true if the server supplied avatar information about this account. @@ -64,7 +64,7 @@ public class AccountInfo extends JavaScriptObject { return null; } - private final native JsArray avatars() + private native JsArray avatars() /*-{ return this.avatars }-*/; public final native void name(String n) /*-{ this.name = n }-*/; diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java index 15d1c6cc2b..0e3c32bedb 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/AuthInfo.java @@ -90,8 +90,8 @@ public class AuthInfo extends JavaScriptObject { public final native String editFullNameUrl() /*-{ return this.edit_full_name_url; }-*/; public final native String httpPasswordUrl() /*-{ return this.http_password_url; }-*/; public final native boolean isGitBasicAuth() /*-{ return this.is_git_basic_auth || false; }-*/; - private final native String authTypeRaw() /*-{ return this.auth_type; }-*/; - private final native JsArrayString _editableAccountFields() + private native String authTypeRaw() /*-{ return this.auth_type; }-*/; + private native JsArrayString _editableAccountFields() /*-{ return this.editable_account_fields; }-*/; protected AuthInfo() { diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java index 2c8555613b..1153270711 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ChangeInfo.java @@ -71,8 +71,8 @@ public class ChangeInfo extends JavaScriptObject { return revList.get(revList.length() - 1).isEdit(); } - private final native Timestamp _getCts() /*-{ return this._cts; }-*/; - private final native void _setCts(Timestamp ts) /*-{ this._cts = ts; }-*/; + private native Timestamp _getCts() /*-{ return this._cts; }-*/; + private native void _setCts(Timestamp ts) /*-{ this._cts = ts; }-*/; public final Timestamp updated() { return JavaSqlTimestamp_JsonSerializer.parseTimestamp(updatedRaw()); @@ -112,12 +112,12 @@ public class ChangeInfo extends JavaScriptObject { public final native boolean mergeable() /*-{ return this.mergeable ? true : false; }-*/; public final native int insertions() /*-{ return this.insertions; }-*/; public final native int deletions() /*-{ return this.deletions; }-*/; - private final native String statusRaw() /*-{ return this.status; }-*/; + private native String statusRaw() /*-{ return this.status; }-*/; public final native String subject() /*-{ return this.subject; }-*/; public final native AccountInfo owner() /*-{ return this.owner; }-*/; - private final native String createdRaw() /*-{ return this.created; }-*/; - private final native String updatedRaw() /*-{ return this.updated; }-*/; - private final native String submittedRaw() /*-{ return this.submitted; }-*/; + private native String createdRaw() /*-{ return this.created; }-*/; + private native String updatedRaw() /*-{ return this.updated; }-*/; + private native String submittedRaw() /*-{ return this.submitted; }-*/; public final native boolean starred() /*-{ return this.starred ? true : false; }-*/; public final native boolean reviewed() /*-{ return this.reviewed ? true : false; }-*/; public final native NativeMap allLabels() /*-{ return this.labels; }-*/; @@ -142,7 +142,7 @@ public class ChangeInfo extends JavaScriptObject { public final native JsArray removableReviewers() /*-{ return this.removable_reviewers; }-*/; - private final native NativeMap> _reviewers() + private native NativeMap> _reviewers() /*-{ return this.reviewers; }-*/; public final Map> reviewers() { NativeMap> reviewers = _reviewers(); @@ -173,14 +173,14 @@ public class ChangeInfo extends JavaScriptObject { } return SubmitType.valueOf(submitType); } - private final native String _submitType() /*-{ return this.submit_type; }-*/; + private native String _submitType() /*-{ return this.submit_type; }-*/; public final boolean submittable() { init(); return _submittable(); } - private final native boolean _submittable() + private native boolean _submittable() /*-{ return this.submittable ? true : false; }-*/; /** @@ -259,7 +259,7 @@ public class ChangeInfo extends JavaScriptObject { return null; } - private final native NativeMap _values() /*-{ return this.values; }-*/; + private native NativeMap _values() /*-{ return this.values; }-*/; public final Set values() { return Natives.keys(_values()); } @@ -334,7 +334,7 @@ public class ChangeInfo extends JavaScriptObject { revisionInfo.takeFromEdit(edit); return revisionInfo; } - private final native void takeFromEdit(EditInfo edit) /*-{ + private native void takeFromEdit(EditInfo edit) /*-{ this._number = 0; this.name = edit.name; this.commit = edit.commit; @@ -435,7 +435,7 @@ public class ChangeInfo extends JavaScriptObject { public static class GitPerson extends JavaScriptObject { public final native String name() /*-{ return this.name; }-*/; public final native String email() /*-{ return this.email; }-*/; - private final native String dateRaw() /*-{ return this.date; }-*/; + private native String dateRaw() /*-{ return this.date; }-*/; public final Timestamp date() { return JavaSqlTimestamp_JsonSerializer.parseTimestamp(dateRaw()); @@ -449,7 +449,7 @@ public class ChangeInfo extends JavaScriptObject { public final native AccountInfo author() /*-{ return this.author; }-*/; public final native String message() /*-{ return this.message; }-*/; public final native int _revisionNumber() /*-{ return this._revision_number || 0; }-*/; - private final native String dateRaw() /*-{ return this.date; }-*/; + private native String dateRaw() /*-{ return this.date; }-*/; public final Timestamp date() { return JavaSqlTimestamp_JsonSerializer.parseTimestamp(dateRaw()); @@ -475,7 +475,7 @@ public class ChangeInfo extends JavaScriptObject { public final native JsArrayString branches() /*-{ return this.branches; }-*/; public final native JsArrayString tags() /*-{ return this.tags; }-*/; public final native JsArrayString external(String n) /*-{ return this.external[n]; }-*/; - private final native NativeMap external() /*-{ return this.external; }-*/; + private native NativeMap external() /*-{ return this.external; }-*/; protected IncludedInInfo() { } diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/DownloadInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/DownloadInfo.java index eee2847722..183e6af6ff 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/DownloadInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/DownloadInfo.java @@ -39,8 +39,8 @@ public class DownloadInfo extends JavaScriptObject { } public final native DownloadSchemeInfo scheme(String n) /*-{ return this.schemes[n]; }-*/; - private final native NativeMap _schemes() /*-{ return this.schemes; }-*/; - private final native JsArrayString _archives() /*-{ return this.archives; }-*/; + private native NativeMap _schemes() /*-{ return this.schemes; }-*/; + private native JsArrayString _archives() /*-{ return this.archives; }-*/; protected DownloadInfo() { } @@ -96,8 +96,8 @@ public class DownloadInfo extends JavaScriptObject { public final native boolean isAuthSupported() /*-{ return this.is_auth_supported || false; }-*/; public final native String command(String n) /*-{ return this.commands[n]; }-*/; public final native String cloneCommand(String n) /*-{ return this.clone_commands[n]; }-*/; - private final native NativeMap _commands() /*-{ return this.commands; }-*/; - private final native NativeMap _cloneCommands() /*-{ return this.clone_commands; }-*/; + private native NativeMap _commands() /*-{ return this.commands; }-*/; + private native NativeMap _cloneCommands() /*-{ return this.clone_commands; }-*/; protected DownloadSchemeInfo() { } diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java index 555e06eff0..9b290a5d21 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/FileInfo.java @@ -37,12 +37,12 @@ public class FileInfo extends JavaScriptObject { public final long size() { return (long)_size(); } - private final native double _size() /*-{ return this.size || 0; }-*/; + private native double _size() /*-{ return this.size || 0; }-*/; public final long sizeDelta() { return (long)_sizeDelta(); } - private final native double _sizeDelta() /*-{ return this.size_delta || 0; }-*/; + private native double _sizeDelta() /*-{ return this.size_delta || 0; }-*/; public final native int _row() /*-{ return this._row }-*/; public final native void _row(int r) /*-{ this._row = r }-*/; diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GeneralPreferences.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GeneralPreferences.java index 40e6278eb8..45953cb763 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GeneralPreferences.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GeneralPreferences.java @@ -65,7 +65,7 @@ public class GeneralPreferences extends JavaScriptObject { ? changesPerPage : GeneralPreferencesInfo.DEFAULT_PAGESIZE; } - private final native short get(String n, int d) + private native short get(String n, int d) /*-{ return this.hasOwnProperty(n) ? this[n] : d }-*/; public final native boolean showSiteHeader() @@ -81,21 +81,21 @@ public class GeneralPreferences extends JavaScriptObject { String s = downloadCommandRaw(); return s != null ? DownloadCommand.valueOf(s) : null; } - private final native String downloadCommandRaw() + private native String downloadCommandRaw() /*-{ return this.download_command }-*/; public final DateFormat dateFormat() { String s = dateFormatRaw(); return s != null ? DateFormat.valueOf(s) : null; } - private final native String dateFormatRaw() + private native String dateFormatRaw() /*-{ return this.date_format }-*/; public final TimeFormat timeFormat() { String s = timeFormatRaw(); return s != null ? TimeFormat.valueOf(s) : null; } - private final native String timeFormatRaw() + private native String timeFormatRaw() /*-{ return this.time_format }-*/; public final native boolean relativeDateInChangeTable() @@ -117,14 +117,14 @@ public class GeneralPreferences extends JavaScriptObject { String s = reviewCategeoryStrategyRaw(); return s != null ? ReviewCategoryStrategy.valueOf(s) : ReviewCategoryStrategy.NONE; } - private final native String reviewCategeoryStrategyRaw() + private native String reviewCategeoryStrategyRaw() /*-{ return this.review_category_strategy }-*/; public final DiffView diffView() { String s = diffViewRaw(); return s != null ? DiffView.valueOf(s) : null; } - private final native String diffViewRaw() + private native String diffViewRaw() /*-{ return this.diff_view }-*/; public final EmailStrategy emailStrategy() { @@ -132,7 +132,7 @@ public class GeneralPreferences extends JavaScriptObject { return s != null ? EmailStrategy.valueOf(s) : null; } - private final native String emailStrategyRaw() + private native String emailStrategyRaw() /*-{ return this.email_strategy }-*/; public final native JsArray my() @@ -159,13 +159,13 @@ public class GeneralPreferences extends JavaScriptObject { public final void dateFormat(DateFormat f) { dateFormatRaw(f != null ? f.toString() : null); } - private final native void dateFormatRaw(String f) + private native void dateFormatRaw(String f) /*-{ this.date_format = f }-*/; public final void timeFormat(TimeFormat f) { timeFormatRaw(f != null ? f.toString() : null); } - private final native void timeFormatRaw(String f) + private native void timeFormatRaw(String f) /*-{ this.time_format = f }-*/; public final native void relativeDateInChangeTable(boolean d) @@ -186,19 +186,19 @@ public class GeneralPreferences extends JavaScriptObject { public final void reviewCategoryStrategy(ReviewCategoryStrategy s) { reviewCategoryStrategyRaw(s != null ? s.toString() : null); } - private final native void reviewCategoryStrategyRaw(String s) + private native void reviewCategoryStrategyRaw(String s) /*-{ this.review_category_strategy = s }-*/; public final void diffView(DiffView d) { diffViewRaw(d != null ? d.toString() : null); } - private final native void diffViewRaw(String d) + private native void diffViewRaw(String d) /*-{ this.diff_view = d }-*/; public final void emailStrategy(EmailStrategy s) { emailStrategyRaw(s != null ? s.toString() : null); } - private final native void emailStrategyRaw(String s) + private native void emailStrategyRaw(String s) /*-{ this.email_strategy = s }-*/; public final void setMyMenus(List myMenus) { @@ -218,8 +218,8 @@ public class GeneralPreferences extends JavaScriptObject { return urlAliases; } - private final native String urlAliasToken(String m) /*-{ return this.url_aliases[m]; }-*/; - private final native NativeMap _urlAliases() /*-{ return this.url_aliases; }-*/; + private native String urlAliasToken(String m) /*-{ return this.url_aliases[m]; }-*/; + private native NativeMap _urlAliases() /*-{ return this.url_aliases; }-*/; public final void setUrlAliases(Map urlAliases) { initUrlAliases(); @@ -227,8 +227,8 @@ public class GeneralPreferences extends JavaScriptObject { putUrlAlias(e.getKey(), e.getValue()); } } - private final native void putUrlAlias(String m, String t) /*-{ this.url_aliases[m] = t; }-*/; - private final native void initUrlAliases() /*-{ this.url_aliases = {}; }-*/; + private native void putUrlAlias(String m, String t) /*-{ this.url_aliases[m] = t; }-*/; + private native void initUrlAliases() /*-{ this.url_aliases = {}; }-*/; protected GeneralPreferences() { } diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GpgKeyInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GpgKeyInfo.java index f7477a1d73..7955347871 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GpgKeyInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/GpgKeyInfo.java @@ -27,7 +27,7 @@ public class GpgKeyInfo extends JavaScriptObject { public final native JsArrayString userIds() /*-{ return this.user_ids; }-*/; public final native String key() /*-{ return this.key; }-*/; - private final native String statusRaw() /*-{ return this.status; }-*/; + private native String statusRaw() /*-{ return this.status; }-*/; public final Status status() { String s = statusRaw(); if (s == null) { diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java index b0e52fa9c2..b0af73dcf6 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/info/ServerInfo.java @@ -43,7 +43,7 @@ public class ServerInfo extends JavaScriptObject { } public final native String urlAliasToken(String n) /*-{ return this.url_aliases[n]; }-*/; - private final native NativeMap _urlAliases() /*-{ return this.url_aliases; }-*/; + private native NativeMap _urlAliases() /*-{ return this.url_aliases; }-*/; public final boolean hasSshd() { diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java index 0e16dc038c..c5884e6374 100644 --- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/rpc/NativeString.java @@ -22,7 +22,7 @@ public final class NativeString extends JavaScriptObject { public static final JavaScriptObject TYPE = init(); // Used from core and plugins - private static final native JavaScriptObject init() /*-{ + private static native JavaScriptObject init() /*-{ if ($wnd.Gerrit === undefined || $wnd.Gerrit.JsonString === undefined) { return function(s){this.s=s}; } else { @@ -34,7 +34,7 @@ public final class NativeString extends JavaScriptObject { return wrap0(TYPE, s); } - private static final native NativeString wrap0(JavaScriptObject T, String s) + private static native NativeString wrap0(JavaScriptObject T, String s) /*-{ return new T(s) }-*/; public final native String asString() /*-{ return this.s; }-*/; @@ -58,7 +58,7 @@ public final class NativeString extends JavaScriptObject { return is(TYPE, o); } - private static final native boolean is(JavaScriptObject T, JavaScriptObject o) + private static native boolean is(JavaScriptObject T, JavaScriptObject o) /*-{ return o instanceof T }-*/; protected NativeString() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java index 7d543d86bd..e65d637c64 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/DiffPreferences.java @@ -158,11 +158,11 @@ public class DiffPreferences extends JavaScriptObject { public final native boolean skipDeleted() /*-{ return this.skip_deleted || false }-*/; public final native boolean matchBrackets() /*-{ return this.match_brackets || false }-*/; - private final native void setThemeRaw(String i) /*-{ this.theme = i }-*/; - private final native void setIgnoreWhitespaceRaw(String i) /*-{ this.ignore_whitespace = i }-*/; - private final native String ignoreWhitespaceRaw() /*-{ return this.ignore_whitespace }-*/; - private final native String themeRaw() /*-{ return this.theme }-*/; - private final native int get(String n, int d) /*-{ return this.hasOwnProperty(n) ? this[n] : d }-*/; + private native void setThemeRaw(String i) /*-{ this.theme = i }-*/; + private native void setIgnoreWhitespaceRaw(String i) /*-{ this.ignore_whitespace = i }-*/; + private native String ignoreWhitespaceRaw() /*-{ return this.ignore_whitespace }-*/; + private native String themeRaw() /*-{ return this.theme }-*/; + private native int get(String n, int d) /*-{ return this.hasOwnProperty(n) ? this[n] : d }-*/; protected DiffPreferences() { } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/EditPreferences.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/EditPreferences.java index d37ddd5574..de686524ed 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/EditPreferences.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/account/EditPreferences.java @@ -56,12 +56,12 @@ public class EditPreferences extends JavaScriptObject { public final void theme(Theme i) { setThemeRaw(i != null ? i.toString() : Theme.DEFAULT.toString()); } - private final native void setThemeRaw(String i) /*-{ this.theme = i }-*/; + private native void setThemeRaw(String i) /*-{ this.theme = i }-*/; public final void keyMapType(KeyMapType i) { setkeyMapTypeRaw(i != null ? i.toString() : KeyMapType.DEFAULT.toString()); } - private final native void setkeyMapTypeRaw(String i) /*-{ this.key_map_type = i }-*/; + private native void setkeyMapTypeRaw(String i) /*-{ this.key_map_type = i }-*/; public final native void tabSize(int t) /*-{ this.tab_size = t }-*/; public final native void lineLength(int c) /*-{ this.line_length = c }-*/; @@ -78,13 +78,13 @@ public class EditPreferences extends JavaScriptObject { String s = themeRaw(); return s != null ? Theme.valueOf(s) : Theme.DEFAULT; } - private final native String themeRaw() /*-{ return this.theme }-*/; + private native String themeRaw() /*-{ return this.theme }-*/; public final KeyMapType keyMapType() { String s = keyMapTypeRaw(); return s != null ? KeyMapType.valueOf(s) : KeyMapType.DEFAULT; } - private final native String keyMapTypeRaw() /*-{ return this.key_map_type }-*/; + private native String keyMapTypeRaw() /*-{ return this.key_map_type }-*/; public final int tabSize() { return get("tab_size", 8); @@ -105,7 +105,7 @@ public class EditPreferences extends JavaScriptObject { public final native boolean hideLineNumbers() /*-{ return this.hide_line_numbers || false }-*/; public final native boolean matchBrackets() /*-{ return this.match_brackets || false }-*/; public final native boolean autoCloseBrackets() /*-{ return this.auto_close_brackets || false }-*/; - private final native int get(String n, int d) /*-{ return this.hasOwnProperty(n) ? this[n] : d }-*/; + private native int get(String n, int d) /*-{ return this.hasOwnProperty(n) ? this[n] : d }-*/; protected EditPreferences() { } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java index 90ae162c90..688a59fa3f 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java @@ -19,7 +19,7 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; public interface AdminResources extends ClientBundle { - public static final AdminResources I = GWT.create(AdminResources.class); + AdminResources I = GWT.create(AdminResources.class); @Source("admin.css") AdminCss css(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ChangeGlue.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ChangeGlue.java index 82b6810592..1e77773063 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ChangeGlue.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ChangeGlue.java @@ -55,11 +55,11 @@ public class ChangeGlue { } } - private static final native JavaScriptObject get(String id) /*-{ + private static native JavaScriptObject get(String id) /*-{ return $wnd.Gerrit.change_actions[id]; }-*/; - private static final native boolean invoke(JavaScriptObject h, + private static native boolean invoke(JavaScriptObject h, ChangeInfo a, RevisionInfo r) /*-{ return h(a,r) }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/EditGlue.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/EditGlue.java index 49b150aa60..b7e3df33a2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/EditGlue.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/EditGlue.java @@ -45,7 +45,7 @@ public class EditGlue { } } - private static final native JavaScriptObject get(String id) /*-{ + private static native JavaScriptObject get(String id) /*-{ return $wnd.Gerrit.edit_actions[id]; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java index 0702cba7c4..e20c577c15 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionPanel.java @@ -130,14 +130,14 @@ public class ExtensionPanel extends FlowPanel { final native void putBoolean(String k, boolean v) /*-{ this.p[k] = v; }-*/; final native void putObject(String k, JavaScriptObject v) /*-{ this.p[k] = v; }-*/; - private static final native Context create( + private static native Context create( JavaScriptObject T, Definition d, Element e) /*-{ return new T(d,e) }-*/; private static final JavaScriptObject TYPE = init(); - private static final native JavaScriptObject init() /*-{ + private static native JavaScriptObject init() /*-{ var T = function(d,e) { this._d = d; this._u = []; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionScreen.java index 98b06bbcbc..19dbe06c48 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionScreen.java @@ -109,7 +109,7 @@ public class ExtensionScreen extends Screen { final native void onLoad() /*-{ this._d.onLoad(this) }-*/; final native JsArray unload() /*-{ return this._u }-*/; - private static final native Context create( + private static native Context create( JavaScriptObject T, Definition d, ExtensionScreen s, @@ -118,7 +118,7 @@ public class ExtensionScreen extends Screen { /*-{ return new T(d,s,e,m) }-*/; private static final JavaScriptObject TYPE = init(); - private static final native JavaScriptObject init() /*-{ + private static native JavaScriptObject init() /*-{ var T = function(d,s,e,m) { this._d = d; this._s = s; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionSettingsScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionSettingsScreen.java index c351bbfb43..1d7259b9dc 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionSettingsScreen.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ExtensionSettingsScreen.java @@ -91,7 +91,7 @@ public class ExtensionSettingsScreen extends SettingsScreen { return Natives.keys(settingsScreens()); } - private static final native NativeMap settingsScreens() + private static native NativeMap settingsScreens() /*-{ return $wnd.Gerrit.settingsScreens; }-*/; public final native String getPath() /*-{ return this.path; }-*/; @@ -114,7 +114,7 @@ public class ExtensionSettingsScreen extends SettingsScreen { final native void onLoad() /*-{ this._d.onLoad(this) }-*/; final native JsArray unload() /*-{ return this._u }-*/; - private static final native Context create( + private static native Context create( JavaScriptObject T, Definition d, ExtensionSettingsScreen s, @@ -122,7 +122,7 @@ public class ExtensionSettingsScreen extends SettingsScreen { /*-{ return new T(d,s,e) }-*/; private static final JavaScriptObject TYPE = init(); - private static final native JavaScriptObject init() /*-{ + private static native JavaScriptObject init() /*-{ var T = function(d,s,e) { this._d = d; this._s = s; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginName.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginName.java index a560711cdc..330ec15a65 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginName.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/PluginName.java @@ -76,7 +76,7 @@ class PluginName { protected static final native JavaScriptException makeException() /*-{ try { null.a() } catch (e) { return e } }-*/; - private static final native boolean hasStack(JavaScriptException e) + private static native boolean hasStack(JavaScriptException e) /*-{ return !!e.stack }-*/; /** Extracts URL from the stack frame. */ @@ -103,7 +103,7 @@ class PluginName { return UNKNOWN; } - private static final native JsArrayString getStack(JavaScriptException e) + private static native JsArrayString getStack(JavaScriptException e) /*-{ return e.stack ? e.stack.split('\n') : [] }-*/; } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ProjectGlue.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ProjectGlue.java index 69887e7363..f9084d9147 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ProjectGlue.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/ProjectGlue.java @@ -61,11 +61,11 @@ public class ProjectGlue { } } - private static final native JavaScriptObject projectAction(String id) /*-{ + private static native JavaScriptObject projectAction(String id) /*-{ return $wnd.Gerrit.project_actions[id]; }-*/; - private static final native JavaScriptObject branchAction(String id) /*-{ + private static native JavaScriptObject branchAction(String id) /*-{ return $wnd.Gerrit.branch_actions[id]; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/RevisionGlue.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/RevisionGlue.java index 914ef85917..50ebce7a03 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/RevisionGlue.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/api/RevisionGlue.java @@ -46,7 +46,7 @@ public class RevisionGlue { } } - private static final native JavaScriptObject get(String id) /*-{ + private static native JavaScriptObject get(String id) /*-{ return $wnd.Gerrit.revision_actions[id]; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java index 41f0f21303..46702ec94c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/FileTable.java @@ -115,7 +115,7 @@ public class FileTable extends FlowPanel { init(DELETE, RESTORE, REVIEWED, OPEN); } - private static final native void init(String d, String t, String r, String o) /*-{ + private static native void init(String d, String t, String r, String o) /*-{ $wnd[d] = $entry(function(e,i) { @com.google.gerrit.client.change.FileTable::onDelete(Lcom/google/gwt/dom/client/NativeEvent;I)(e,i) }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java index 594550dd3f..1dc99b48f1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java @@ -62,7 +62,7 @@ public class Hashtags extends Composite { init(REMOVE); } - private static final native void init(String r) /*-{ + private static native void init(String r) /*-{ $wnd[r] = $entry(function(e) { @com.google.gerrit.client.change.Hashtags::onRemove(Lcom/google/gwt/dom/client/NativeEvent;)(e) }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java index 827362ee30..89550c6ec2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java @@ -59,7 +59,7 @@ class Labels extends Grid { init(REMOVE_REVIEWER, REMOVE_VOTE); } - private static final native void init(String r, String v) /*-{ + private static native void init(String r, String v) /*-{ $wnd[r] = $entry(function(e) { @com.google.gerrit.client.change.Labels::onRemoveReviewer(Lcom/google/gwt/dom/client/NativeEvent;)(e) }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PatchSetsBox.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PatchSetsBox.java index 1d7661237e..1753c7b962 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PatchSetsBox.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/PatchSetsBox.java @@ -63,7 +63,7 @@ class PatchSetsBox extends Composite { init(OPEN); } - private static final native void init(String o) /*-{ + private static native void init(String o) /*-{ $wnd[o] = $entry(function(e,i) { return @com.google.gerrit.client.change.PatchSetsBox::onOpen(Lcom/google/gwt/dom/client/NativeEvent;I)(e,i); }); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java index 527e5907f2..d22294212d 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChanges.java @@ -385,7 +385,7 @@ public class RelatedChanges extends TabPanel { String s = statusRaw(); return s != null ? Change.Status.valueOf(s) : null; } - private final native String statusRaw() /*-{ return this.status; }-*/; + private native String statusRaw() /*-{ return this.status; }-*/; final native void setId(String i) /*-{ if(i)this.change_id=i; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java index cc34df294f..788b4b09d1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/RelatedChangesTab.java @@ -67,7 +67,7 @@ class RelatedChangesTab implements IsWidget { private static final SafeHtml POINTER_HTML = AbstractImagePrototype.create(Gerrit.RESOURCES.arrowRight()).getSafeHtml(); - private static final native String init(String o) /*-{ + private static native String init(String o) /*-{ $wnd[o] = $entry(@com.google.gerrit.client.change.RelatedChangesTab::onOpen( Lcom/google/gwt/dom/client/NativeEvent;Lcom/google/gwt/dom/client/Element;)); return o + '(event,this)'; @@ -599,7 +599,7 @@ class RelatedChangesTab implements IsWidget { } } - private static final native Node createDocumentFragment() /*-{ + private static native Node createDocumentFragment() /*-{ return $doc.createDocumentFragment(); }-*/; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java index 9abeadd31d..fdfaf6167e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java @@ -19,9 +19,9 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; public interface Resources extends ClientBundle { - public static final Resources I = GWT.create(Resources.class); - final ChangeConstants C = GWT.create(ChangeConstants.class); - final ChangeMessages M = GWT.create(ChangeMessages.class); + Resources I = GWT.create(Resources.class); + ChangeConstants C = GWT.create(ChangeConstants.class); + ChangeMessages M = GWT.create(ChangeMessages.class); @Source("common.css") Style style(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java index 71942cedf0..b69d1c0384 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Reviewers.java @@ -293,7 +293,7 @@ public class Reviewers extends Composite { return Natives.keys(_approvals()); } final native String approval(String l) /*-{ return this.approvals[l]; }-*/; - private final native NativeMap _approvals() /*-{ return this.approvals; }-*/; + private native NativeMap _approvals() /*-{ return this.approvals; }-*/; protected ReviewerInfo() { } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommentInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommentInfo.java index 9088c1c5ce..8e73f733d1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommentInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/CommentInfo.java @@ -77,7 +77,7 @@ public class CommentInfo extends JavaScriptObject { public final void side(Side side) { sideRaw(side.toString()); } - private final native void sideRaw(String s) /*-{ this.side = s }-*/; + private native void sideRaw(String s) /*-{ this.side = s }-*/; public final native String path() /*-{ return this.path }-*/; public final native String id() /*-{ return this.id }-*/; @@ -90,7 +90,7 @@ public class CommentInfo extends JavaScriptObject { ? Side.valueOf(s) : Side.REVISION; } - private final native String sideRaw() /*-{ return this.side }-*/; + private native String sideRaw() /*-{ return this.side }-*/; public final Timestamp updated() { Timestamp r = updatedTimestamp(); @@ -103,9 +103,9 @@ public class CommentInfo extends JavaScriptObject { } return r; } - private final native String updatedRaw() /*-{ return this.updated }-*/; - private final native Timestamp updatedTimestamp() /*-{ return this._ts }-*/; - private final native void updatedTimestamp(Timestamp t) /*-{ this._ts = t }-*/; + private native String updatedRaw() /*-{ return this.updated }-*/; + private native Timestamp updatedTimestamp() /*-{ return this._ts }-*/; + private native void updatedTimestamp(Timestamp t) /*-{ this._ts = t }-*/; public final native AccountInfo author() /*-{ return this.author }-*/; public final native int line() /*-{ return this.line || 0 }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java index 0f22a237d7..a127e7f389 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ReviewInput.java @@ -42,14 +42,14 @@ public class ReviewInput extends JavaScriptObject { public final void notify(NotifyHandling e) { _notify(e.name()); } - private final native void _notify(String n) /*-{ this.notify=n; }-*/; + private native void _notify(String n) /*-{ this.notify=n; }-*/; public final void drafts(DraftHandling e) { _drafts(e.name()); } - private final native void _drafts(String n) /*-{ this.drafts=n; }-*/; + private native void _drafts(String n) /*-{ this.drafts=n; }-*/; - private final native void init() /*-{ + private native void init() /*-{ this.labels = {}; this.strict_labels = true; }-*/; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitInfo.java index 6d8bc308db..7a24774263 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/SubmitInfo.java @@ -22,7 +22,7 @@ public class SubmitInfo extends JavaScriptObject { return Change.Status.valueOf(statusRaw()); } - private final native String statusRaw() /*-{ return this.status; }-*/; + private native String statusRaw() /*-{ return this.status; }-*/; protected SubmitInfo() { } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentRange.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentRange.java index 9f46e9b6fb..cd791aebd2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentRange.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentRange.java @@ -43,7 +43,7 @@ public class CommentRange extends JavaScriptObject { public final native int endLine() /*-{ return this.end_line; }-*/; public final native int endCharacter() /*-{ return this.end_character; }-*/; - private final native void set(int sl, int sc, int el, int ec) /*-{ + private native void set(int sl, int sc, int el, int ec) /*-{ this.start_line = sl; this.start_character = sc; this.end_line = el; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffInfo.java index 82dad3f908..6812418a4b 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/DiffInfo.java @@ -66,7 +66,7 @@ public class DiffInfo extends JavaScriptObject { public final ChangeType changeType() { return ChangeType.valueOf(changeTypeRaw()); } - private final native String changeTypeRaw() + private native String changeTypeRaw() /*-{ return this.change_type }-*/; public final IntraLineStatus intralineStatus() { @@ -75,7 +75,7 @@ public class DiffInfo extends JavaScriptObject { ? IntraLineStatus.valueOf(s) : IntraLineStatus.OFF; } - private final native String intralineStatusRaw() + private native String intralineStatusRaw() /*-{ return this.intraline_status }-*/; public final boolean hasSkip() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java index fbe025607b..2723374750 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java @@ -20,7 +20,7 @@ import com.google.gwt.resources.client.ImageResource; /** Resources used by diff. */ interface Resources extends ClientBundle { - final Resources I = GWT.create(Resources.class); + Resources I = GWT.create(Resources.class); @Source("CommentBox.css") CommentBox.Style style(); @Source("Scrollbar.css") Scrollbar.Style scrollbarStyle(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java index dcbcb6737a..cbbafada24 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/SideBySideChunkManager.java @@ -45,7 +45,7 @@ class SideBySideChunkManager extends ChunkManager { private static double guessedLineHeightPx = 15; private static final JavaScriptObject focusA = initOnClick(A); private static final JavaScriptObject focusB = initOnClick(B); - private static final native JavaScriptObject initOnClick(DisplaySide s) /*-{ + private static native JavaScriptObject initOnClick(DisplaySide s) /*-{ return $entry(function(e){ @com.google.gerrit.client.diff.SideBySideChunkManager::focus( Lcom/google/gwt/dom/client/NativeEvent; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java index 866f0f7af6..c7eca0b232 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/UnifiedChunkManager.java @@ -38,7 +38,7 @@ import java.util.List; /** Colors modified regions for {@link Unified}. */ class UnifiedChunkManager extends ChunkManager { private static final JavaScriptObject focus = initOnClick(); - private static final native JavaScriptObject initOnClick() /*-{ + private static native JavaScriptObject initOnClick() /*-{ return $entry(function(e){ @com.google.gerrit.client.diff.UnifiedChunkManager::focus( Lcom/google/gwt/dom/client/NativeEvent;)(e) diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditConstants.java index 461e2d61ac..8dc4137517 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editor/EditConstants.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Constants; interface EditConstants extends Constants { - final EditConstants I = GWT.create(EditConstants.class); + EditConstants I = GWT.create(EditConstants.class); String closeUnsavedChanges(); String cancelUnsavedChanges(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupAuditEventInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupAuditEventInfo.java index f62ae229a0..ed41b650f7 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupAuditEventInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupAuditEventInfo.java @@ -37,8 +37,8 @@ public class GroupAuditEventInfo extends JavaScriptObject { public final native AccountInfo memberAsUser() /*-{ return this.member; }-*/; public final native GroupInfo memberAsGroup() /*-{ return this.member; }-*/; - private final native String dateRaw() /*-{ return this.date; }-*/; - private final native String typeRaw() /*-{ return this.type; }-*/; + private native String dateRaw() /*-{ return this.date; }-*/; + private native String typeRaw() /*-{ return this.type; }-*/; protected GroupAuditEventInfo() { } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupInfo.java index 6142e5b701..c3fd4ed7de 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/groups/GroupInfo.java @@ -33,9 +33,9 @@ public class GroupInfo extends GroupBaseInfo { public final native JsArray members() /*-{ return this.members; }-*/; public final native JsArray includes() /*-{ return this.includes; }-*/; - private final native int group_id() /*-{ return this.group_id; }-*/; - private final native String owner_id() /*-{ return this.owner_id; }-*/; - private final native void owner_id(String o) /*-{ if(o)this.owner_id=o; }-*/; + private native int group_id() /*-{ return this.group_id; }-*/; + private native String owner_id() /*-{ return this.owner_id; }-*/; + private native void owner_id(String o) /*-{ if(o)this.owner_id=o; }-*/; public final AccountGroup.UUID getOwnerUUID() { String owner = owner_id(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfo.java index 322a354553..96b25c5ce3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ConfigInfo.java @@ -69,7 +69,7 @@ public class ConfigInfo extends JavaScriptObject { public final native NativeMap actions() /*-{ return this.actions; }-*/; - private final native String submitTypeRaw() + private native String submitTypeRaw() /*-{ return this.submit_type }-*/; public final ProjectState state() { @@ -78,13 +78,13 @@ public class ConfigInfo extends JavaScriptObject { } return ProjectState.valueOf(stateRaw()); } - private final native String stateRaw() + private native String stateRaw() /*-{ return this.state }-*/; public final native MaxObjectSizeLimitInfo maxObjectSizeLimit() /*-{ return this.max_object_size_limit; }-*/; - private final native NativeMap commentlinks0() + private native NativeMap commentlinks0() /*-{ return this.commentlinks; }-*/; final List commentlinks() { JsArray cls = commentlinks0().values(); @@ -143,7 +143,7 @@ public class ConfigInfo extends JavaScriptObject { public final InheritableBoolean configuredValue() { return InheritableBoolean.valueOf(configuredValueRaw()); } - private final native String configuredValueRaw() + private native String configuredValueRaw() /*-{ return this.configured_value }-*/; public final void setConfiguredValue(InheritableBoolean v) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java index fffdd3f208..8e29e4cefa 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java @@ -228,43 +228,43 @@ public class ProjectApi { final void setUseContributorAgreements(InheritableBoolean v) { setUseContributorAgreementsRaw(v.name()); } - private final native void setUseContributorAgreementsRaw(String v) + private native void setUseContributorAgreementsRaw(String v) /*-{ if(v)this.use_contributor_agreements=v; }-*/; final void setUseContentMerge(InheritableBoolean v) { setUseContentMergeRaw(v.name()); } - private final native void setUseContentMergeRaw(String v) + private native void setUseContentMergeRaw(String v) /*-{ if(v)this.use_content_merge=v; }-*/; final void setUseSignedOffBy(InheritableBoolean v) { setUseSignedOffByRaw(v.name()); } - private final native void setUseSignedOffByRaw(String v) + private native void setUseSignedOffByRaw(String v) /*-{ if(v)this.use_signed_off_by=v; }-*/; final void setRequireChangeId(InheritableBoolean v) { setRequireChangeIdRaw(v.name()); } - private final native void setRequireChangeIdRaw(String v) + private native void setRequireChangeIdRaw(String v) /*-{ if(v)this.require_change_id=v; }-*/; final void setCreateNewChangeForAllNotInTarget(InheritableBoolean v) { setCreateNewChangeForAllNotInTargetRaw(v.name()); } - private final native void setCreateNewChangeForAllNotInTargetRaw(String v) + private native void setCreateNewChangeForAllNotInTargetRaw(String v) /*-{ if(v)this.create_new_change_for_all_not_in_target=v; }-*/; final void setEnableSignedPush(InheritableBoolean v) { setEnableSignedPushRaw(v.name()); } - private final native void setEnableSignedPushRaw(String v) + private native void setEnableSignedPushRaw(String v) /*-{ if(v)this.enable_signed_push=v; }-*/; final void setRequireSignedPush(InheritableBoolean v) { setRequireSignedPushRaw(v.name()); } - private final native void setRequireSignedPushRaw(String v) + private native void setRequireSignedPushRaw(String v) /*-{ if(v)this.require_signed_push=v; }-*/; final native void setMaxObjectSizeLimit(String l) @@ -273,13 +273,13 @@ public class ProjectApi { final void setSubmitType(SubmitType t) { setSubmitTypeRaw(t.name()); } - private final native void setSubmitTypeRaw(String t) + private native void setSubmitTypeRaw(String t) /*-{ if(t)this.submit_type=t; }-*/; final void setState(ProjectState s) { setStateRaw(s.name()); } - private final native void setStateRaw(String s) + private native void setStateRaw(String s) /*-{ if(s)this.state=s; }-*/; final void setPluginConfigValues(Map> pluginConfigValues) { @@ -295,7 +295,7 @@ public class ProjectApi { setPluginConfigValuesRaw(configValues); } } - private final native void setPluginConfigValuesRaw(NativeMap v) + private native void setPluginConfigValuesRaw(NativeMap v) /*-{ this.plugin_config_values=v; }-*/; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectInfo.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectInfo.java index 00a403484a..eed9d1dc29 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectInfo.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectInfo.java @@ -36,7 +36,7 @@ public class ProjectInfo return ProjectState.valueOf(getStringState()); } - private final native String getStringState() /*-{ return this.state; }-*/; + private native String getStringState() /*-{ return this.state; }-*/; @Override public final String getDisplayString() { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java index 89e9367674..620133dd52 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/rpc/RpcConstants.java @@ -18,7 +18,7 @@ import com.google.gwt.core.client.GWT; import com.google.gwt.i18n.client.Constants; public interface RpcConstants extends Constants { - public static final RpcConstants C = GWT.create(RpcConstants.class); + RpcConstants C = GWT.create(RpcConstants.class); String errorServerUnavailable(); String errorRemoteJsonException(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java index 88ee29306a..e77bc10456 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTable.java @@ -222,9 +222,9 @@ public abstract class FancyFlexTable extends Composite { protected static class MyFlexTable extends FlexTable { } - private static final native void setRowItem(Element td, ItemType c) + private static native void setRowItem(Element td, ItemType c) /*-{ td['__gerritRowItem'] = c; }-*/; - private static final native ItemType getRowItem(Element td) + private static native ItemType getRowItem(Element td) /*-{ return td['__gerritRowItem']; }-*/; } diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java index ee4c05031e..eccde6f442 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/CodeMirror.java @@ -138,7 +138,7 @@ public class CodeMirror extends JavaScriptObject { addLineClassNative(line, where.value(), className); } - private final native void addLineClassNative(int line, String where, + private native void addLineClassNative(int line, String where, String lineClass) /*-{ this.addLineClass(line, where, lineClass) }-*/; @@ -148,7 +148,7 @@ public class CodeMirror extends JavaScriptObject { addLineClassNative(line, where.value(), className); } - private final native void addLineClassNative(LineHandle line, String where, + private native void addLineClassNative(LineHandle line, String where, String lineClass) /*-{ this.addLineClass(line, where, lineClass) }-*/; @@ -158,7 +158,7 @@ public class CodeMirror extends JavaScriptObject { removeLineClassNative(line, where.value(), className); } - private final native void removeLineClassNative(int line, String where, + private native void removeLineClassNative(int line, String where, String lineClass) /*-{ this.removeLineClass(line, where, lineClass) }-*/; @@ -168,7 +168,7 @@ public class CodeMirror extends JavaScriptObject { removeLineClassNative(line, where.value(), className); } - private final native void removeLineClassNative(LineHandle line, String where, + private native void removeLineClassNative(LineHandle line, String where, String lineClass) /*-{ this.removeLineClass(line, where, lineClass) }-*/; diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Extras.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Extras.java index 13186d19a2..f2fc074198 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Extras.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Extras.java @@ -30,7 +30,7 @@ import java.util.Objects; /** Additional features added to CodeMirror by Gerrit Code Review. */ public class Extras { static final native Extras get(CodeMirror c) /*-{ return c.gerritExtras }-*/; - private static final native void set(CodeMirror c, Extras e) + private static native void set(CodeMirror c, Extras e) /*-{ c.gerritExtras = e }-*/; static void attach(CodeMirror c) { diff --git a/gerrit-gwtui/src/main/java/net/codemirror/lib/Lib.java b/gerrit-gwtui/src/main/java/net/codemirror/lib/Lib.java index adf4fe4cb8..f205ef9854 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/lib/Lib.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/lib/Lib.java @@ -21,7 +21,7 @@ import com.google.gwt.resources.client.DataResource.DoNotEmbed; import com.google.gwt.resources.client.ExternalTextResource; interface Lib extends ClientBundle { - final Lib I = GWT.create(Lib.class); + Lib I = GWT.create(Lib.class); @Source("cm.css") ExternalTextResource css(); diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java index 9c82c0659e..697f4e1fdf 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/ModeInfo.java @@ -258,7 +258,7 @@ public class ModeInfo extends JavaScriptObject { public final native JsArrayString mimes() /*-{ return this.mimes || [this.mime] }-*/; - private final native JsArrayString ext() + private native JsArrayString ext() /*-{ return this.ext || [] }-*/; protected ModeInfo() { diff --git a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java index 593dc294b9..3f7c62970d 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/mode/Modes.java @@ -20,7 +20,7 @@ import com.google.gwt.resources.client.DataResource; import com.google.gwt.resources.client.DataResource.DoNotEmbed; public interface Modes extends ClientBundle { - public static final Modes I = GWT.create(Modes.class); + Modes I = GWT.create(Modes.class); @Source("apl.js") @DoNotEmbed DataResource apl(); @Source("asciiarmor.js") @DoNotEmbed DataResource asciiarmor(); diff --git a/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java b/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java index ed0ffcac24..3a66480934 100644 --- a/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java +++ b/gerrit-gwtui/src/main/java/net/codemirror/theme/Themes.java @@ -19,7 +19,7 @@ import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ExternalTextResource; public interface Themes extends ClientBundle { - public static final Themes I = GWT.create(Themes.class); + Themes I = GWT.create(Themes.class); @Source("eclipse.css") ExternalTextResource eclipse(); @Source("elegant.css") ExternalTextResource elegant(); diff --git a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java index f4f427be1e..8f38fac675 100644 --- a/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java +++ b/gerrit-plugin-gwtui/src/main/java/com/google/gerrit/plugin/client/Plugin.java @@ -94,7 +94,7 @@ public final class Plugin extends JavaScriptObject { screen(token, wrap(entry)); } - private final native void screen(String t, JavaScriptObject e) + private native void screen(String t, JavaScriptObject e) /*-{ this.screen(t, e) }-*/; /** @@ -109,7 +109,7 @@ public final class Plugin extends JavaScriptObject { screenRegex(regex, wrap(entry)); } - private final native void screenRegex(String p, JavaScriptObject e) + private native void screenRegex(String p, JavaScriptObject e) /*-{ this.screen(new $wnd.RegExp(p), e) }-*/; /** @@ -122,7 +122,7 @@ public final class Plugin extends JavaScriptObject { settingsScreen(token, menu, wrap(entry)); } - private final native void settingsScreen(String t, String m, JavaScriptObject e) + private native void settingsScreen(String t, String m, JavaScriptObject e) /*-{ this.settingsScreen(t, m, e) }-*/; /** @@ -136,7 +136,7 @@ public final class Plugin extends JavaScriptObject { panel(extensionPoint.name(), wrap(entry)); } - private final native void panel(String i, JavaScriptObject e) + private native void panel(String i, JavaScriptObject e) /*-{ this.panel(i, e) }-*/; protected Plugin() { @@ -144,17 +144,17 @@ public final class Plugin extends JavaScriptObject { native void _initialized() /*-{ this._success = true }-*/; native void _loaded() /*-{ this._loadedGwt() }-*/; - private static final native Plugin install(String u) + private static native Plugin install(String u) /*-{ return $wnd.Gerrit.installGwt(u) }-*/; - private static final native JavaScriptObject wrap(Screen.EntryPoint b) /*-{ + private static native JavaScriptObject wrap(Screen.EntryPoint b) /*-{ return $entry(function(c){ b.@com.google.gerrit.plugin.client.screen.Screen.EntryPoint::onLoad(Lcom/google/gerrit/plugin/client/screen/Screen;)( @com.google.gerrit.plugin.client.screen.Screen::new(Lcom/google/gerrit/plugin/client/screen/Screen$Context;)(c)); }); }-*/; - private static final native JavaScriptObject wrap(Panel.EntryPoint b) /*-{ + private static native JavaScriptObject wrap(Panel.EntryPoint b) /*-{ return $entry(function(c){ b.@com.google.gerrit.plugin.client.extension.Panel.EntryPoint::onLoad(Lcom/google/gerrit/plugin/client/extension/Panel;)( @com.google.gerrit.plugin.client.extension.Panel::new(Lcom/google/gerrit/plugin/client/extension/Panel$Context;)(c)); diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java index 166f97e29e..75408c89bb 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/EmailExpander.java @@ -23,7 +23,7 @@ public interface EmailExpander { String expand(String user); - public static class None implements EmailExpander { + class None implements EmailExpander { public static final None INSTANCE = new None(); public static boolean canHandle(final String fmt) { @@ -44,7 +44,7 @@ public interface EmailExpander { } } - public static class Simple implements EmailExpander { + class Simple implements EmailExpander { private static final String PLACEHOLDER = "{0}"; public static boolean canHandle(final String fmt) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java index d7a97fb671..8612d74dc7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GroupMembership.java @@ -24,7 +24,7 @@ import java.util.Set; * the presence of a user in a particular group. */ public interface GroupMembership { - public static final GroupMembership EMPTY = + GroupMembership EMPTY = new ListGroupMembership(Collections.emptySet()); /** diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java index 9c500b279d..a0b9b4e02f 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/api/accounts/AccountExternalIdCreator.java @@ -32,6 +32,6 @@ public interface AccountExternalIdCreator { * * @return a list of external identifiers, or an empty list. */ - public List create(Account.Id id, String username, + List create(Account.Id id, String username, String email); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java index 62623ea50f..60c806b045 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/cache/PersistentCache.java @@ -18,7 +18,7 @@ public interface PersistentCache { DiskStats diskStats(); - public static class DiskStats { + class DiskStats { private final long size; private final long space; private final long hitCount; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java index e83b53982d..93c4ac3f7c 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/MergeabilityCache.java @@ -23,7 +23,7 @@ import org.eclipse.jgit.lib.Repository; /** Cache for mergeability of commits into destination branches. */ public interface MergeabilityCache { - public static class NotImplemented implements MergeabilityCache { + class NotImplemented implements MergeabilityCache { @Override public boolean get(ObjectId commit, Ref intoRef, SubmitType submitType, String mergeStrategy, Branch.NameKey dest, Repository repo) { diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java index cd37c9e546..06b87f2a81 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/QueueProvider.java @@ -15,7 +15,7 @@ package com.google.gerrit.server.git; public interface QueueProvider { - public static enum QueueType { + enum QueueType { INTERACTIVE, BATCH } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java index b6fb006d98..41e1e2c7b4 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailTokenVerifier.java @@ -39,7 +39,7 @@ public interface EmailTokenVerifier { ParsedToken decode(String tokenString) throws InvalidTokenException; /** Exception thrown when a token does not parse correctly. */ - public static class InvalidTokenException extends Exception { + class InvalidTokenException extends Exception { private static final long serialVersionUID = 1L; public InvalidTokenException() { @@ -52,7 +52,7 @@ public interface EmailTokenVerifier { } /** Pair returned from decode to provide the data used during encode. */ - public static class ParsedToken { + class ParsedToken { private final Account.Id accountId; private final String emailAddress; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java index 1d9cd0e5c8..15bb92f645 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginContentScanner.java @@ -74,7 +74,7 @@ public interface PluginContentScanner { * provided by a plugin to extend an existing * extension point in Gerrit. */ - public static class ExtensionMetaData { + class ExtensionMetaData { public final String className; public final String annotationValue; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java index bc2432bc3e..068d73c003 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ServerPluginProvider.java @@ -37,7 +37,7 @@ public interface ServerPluginProvider { /** * Descriptor of the Plugin that ServerPluginProvider has to load. */ - public class PluginDescription { + class PluginDescription { public final PluginUser user; public final String canonicalUrl; public final Path dataDir; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java index 398a30361d..b2899c1631 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/validators/OutgoingEmailValidationListener.java @@ -29,7 +29,7 @@ public interface OutgoingEmailValidationListener { /** * Arguments supplied to validateOutgoingEmail. */ - public static class Args { + class Args { // in arguments public String messageClass; diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java index 7fb9226be6..5b8f5fac40 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/CommandMetaData.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE}) @Retention(RUNTIME) public @interface CommandMetaData { - public enum Mode { + enum Mode { MASTER, MASTER_OR_SLAVE; public boolean isSupported(boolean slaveMode) { return this == MASTER_OR_SLAVE || !slaveMode; diff --git a/tools/checkstyle.xml b/tools/checkstyle.xml index 1bb40f7298..0e7fd47968 100644 --- a/tools/checkstyle.xml +++ b/tools/checkstyle.xml @@ -93,6 +93,8 @@ edited to remove noisy warnings. + +