From b3cd6906f8bbe93c36a589a500191fb13334d63b Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Thu, 12 Mar 2015 16:19:15 -0700 Subject: Rename getPathSetWebLink to getPatchSetWebLink Typo introduced in v2.11-rc0~655 (I23716673713db3955d9f1743dee95a87a9db2978, 2014-09-24). Change-Id: I9cfd2e14ea4ccfbbb7ffa1f50b5ee2ea48aafb0c --- Documentation/dev-plugins.txt | 2 +- .../main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java | 2 +- gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java | 4 ++-- plugins/cookbook-plugin | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/dev-plugins.txt b/Documentation/dev-plugins.txt index cecb258202..8bfac13b37 100644 --- a/Documentation/dev-plugins.txt +++ b/Documentation/dev-plugins.txt @@ -1795,7 +1795,7 @@ public class MyWeblinkPlugin implements PatchSetWebLink { private String imageUrl = "http://placehold.it/16x16.gif"; @Override - public WebLinkInfo getPathSetWebLink(String projectName, String commit) { + public WebLinkInfo getPatchSetWebLink(String projectName, String commit) { return new WebLinkInfo(name, imageUrl, String.format(placeHolderUrlProjectCommit, project, commit), diff --git a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java index c97bddd098..ad7484974e 100644 --- a/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java +++ b/gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java @@ -34,5 +34,5 @@ public interface PatchSetWebLink extends WebLink{ * @return WebLinkInfo that links to patch set in external service, * null if there should be no link. */ - WebLinkInfo getPathSetWebLink(final String projectName, final String commit); + WebLinkInfo getPatchSetWebLink(final String projectName, final String commit); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java index 173c4bdc9a..1403e60d96 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java @@ -85,7 +85,7 @@ public class WebLinks { @Override public WebLinkInfo apply(WebLink webLink) { - return ((PatchSetWebLink)webLink).getPathSetWebLink(project.get(), commit); + return ((PatchSetWebLink)webLink).getPatchSetWebLink(project.get(), commit); } }); } @@ -174,4 +174,4 @@ public class WebLinks { .transform(transformer) .filter(INVALID_WEBLINK); } -} \ No newline at end of file +} diff --git a/plugins/cookbook-plugin b/plugins/cookbook-plugin index 133d0a22f4..bb209927b3 160000 --- a/plugins/cookbook-plugin +++ b/plugins/cookbook-plugin @@ -1 +1 @@ -Subproject commit 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8a +Subproject commit bb209927b3cfc3073ce5af81c4a8436068be9e0d -- cgit v1.2.3