opendev/gerrit
Code Issues Proposed changes

Merge "Move file web_links into the meta_a, meta_b headers"

Browse Source
This commit is contained in:
Edwin Kempin
2014-10-17 07:50:58 +00:00
committed by Gerrit Code Review
parent ece11b780a b62414c0c3
commit 75bde8c893
6 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gerrit-server/src/main/java/com/google/gerrit/server/WebLinks.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.gerrit.extensions.common.WebLinkInfo;
import com.google.gerrit.extensions.registration.DynamicSet;
@@ -57,14 +58,18 @@ public class WebLinks {
return links;
}
public Iterable<WebLinkInfo> getFileLinks(String project, String revision,
public List<WebLinkInfo> getFileLinks(String project, String revision,
String file) {
List<WebLinkInfo> links = Lists.newArrayList();
List<WebLinkInfo> links = new ArrayList<>(4);
for (FileWebLink webLink : fileLinks) {
links.add(new WebLinkInfo(webLink.getLinkName(),
webLink.getImageUrl(),
webLink.getFileUrl(project, revision, file),
webLink.getTarget()));
String name = webLink.getLinkName();
String url = webLink.getFileUrl(project, revision, file);
if (!Strings.isNullOrEmpty(name) && !Strings.isNullOrEmpty(url)) {
links.add(new WebLinkInfo(name,
webLink.getImageUrl(),
url,
webLink.getTarget()));
}
}
return links;
}

21
gerrit-server/src/main/java/com/google/gerrit/server/change/GetDiff.java
View File

@@ -17,7 +17,6 @@ package com.google.gerrit.server.change;
import static com.google.common.base.Preconditions.checkState;
import com.google.common.base.MoreObjects;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.gerrit.common.data.PatchScript;
@@ -47,6 +46,7 @@ import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectState;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.eclipse.jgit.diff.Edit;
import org.eclipse.jgit.diff.ReplaceEdit;
import org.kohsuke.args4j.CmdLineException;
@@ -59,7 +59,6 @@ import org.kohsuke.args4j.spi.Parameters;
import org.kohsuke.args4j.spi.Setter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -160,7 +159,7 @@ public class GetDiff implements RestReadView<FileResource> {
String rev = basePatchSet != null
? basePatchSet.getRefName()
: resource.getRevision().getPatchSet().getRefName() + "^1";
result.webLinksA =
result.metaA.webLinks =
getFileWebLinks(state.getProject(), rev, result.metaA.name);
}
@@ -169,7 +168,7 @@ public class GetDiff implements RestReadView<FileResource> {
result.metaB.name = ps.getNewName();
setContentType(result.metaB, state, ps.getFileModeB(), ps.getMimeTypeB());
result.metaB.lines = ps.getB().size();
result.webLinksB = getFileWebLinks(state.getProject(),
result.metaB.webLinks = getFileWebLinks(state.getProject(),
resource.getRevision().getPatchSet().getRefName(),
result.metaB.name);
}
@@ -203,14 +202,9 @@ public class GetDiff implements RestReadView<FileResource> {
private List<WebLinkInfo> getFileWebLinks(Project project, String rev,
String file) {
List<WebLinkInfo> fileWebLinks = new ArrayList<>();
for (WebLinkInfo link : webLinks.getFileLinks(project.getName(),
rev, file)) {
if (!Strings.isNullOrEmpty(link.name) && !Strings.isNullOrEmpty(link.url)) {
fileWebLinks.add(link);
}
}
return fileWebLinks;
List<WebLinkInfo> links =
webLinks.getFileLinks(project.getName(), rev, file);
return !links.isEmpty() ? links : null;
}
static class Result {
@@ -220,14 +214,13 @@ public class GetDiff implements RestReadView<FileResource> {
ChangeType changeType;
List<String> diffHeader;
List<ContentEntry> content;
List<WebLinkInfo> webLinksA;
List<WebLinkInfo> webLinksB;
}
static class FileMeta {
String name;
String contentType;
Integer lines;
List<WebLinkInfo> webLinks;
}
private void setContentType(FileMeta meta, ProjectState project,