summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Nieder <jrn@google.com>2015-03-12 16:19:15 -0700
committerDavid Pursehouse <david.pursehouse@sonymobile.com>2015-03-13 01:11:44 +0000
commitb3cd6906f8bbe93c36a589a500191fb13334d63b (patch)
tree1c7a8c91ae0c26aa029893fee4c322a7eb47fcec
parent1aea8305494418a1bc999564e37c493467bad62d (diff)
Rename getPathSetWebLink to getPatchSetWebLink
Typo introduced in v2.11-rc0~655 (I23716673713db3955d9f1743dee95a87a9db2978, 2014-09-24). Change-Id: I9cfd2e14ea4ccfbbb7ffa1f50b5ee2ea48aafb0c
-rw-r--r--Documentation/dev-plugins.txt2
-rw-r--r--gerrit-extension-api/src/main/java/com/google/gerrit/extensions/webui/PatchSetWebLink.java2
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java4
m---------plugins/cookbook-plugin0
4 files changed, 4 insertions, 4 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
-Subproject 133d0a22f4116ebf11c283fd0a9c3bbdcd9e8d8
+Subproject bb209927b3cfc3073ce5af81c4a8436068be9e0