commit 936e709212e5e3a6b4f4bb17df38434918875182
author Shawn O. Pearce <sop@google.com> Mon Nov 15 12:21:31 2010 -0800
committer Shawn O. Pearce <sop@google.com> Mon Nov 15 12:21:31 2010 -0800
tree 91d5a98dfeb7ae19b007a35fcfde2c18aa73f678
parent 0365b824a22934e78b99bd7e813b976e2b59b0e4

Cleanup the PatchListCache API

Change-Id: I946366b7e0fe98465ce9d347bd7c634d469f342c
Signed-off-by: Shawn O. Pearce <sop@google.com>

gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java

diff --git a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java
index 30d7716..2604d92 100644
--- a/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java
+++ b/gerrit-httpd/src/main/java/com/google/gerrit/httpd/rpc/patch/PatchScriptBuilder.java
@@ -139,7 +139,8 @@
 
     if (intralineDifference) {
       if (isModify(content)) {
-        IntraLineDiff d = patchListCache.get(a.id, a.src, b.id, b.src, edits);
+        IntraLineDiff d =
+            patchListCache.getIntraLineDiff(a.id, a.src, b.id, b.src, edits);
         if (d != null) {
           edits = new ArrayList<Edit>(d.getEdits());
         } else {

gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java
index c679f4a..c7bb08b 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCache.java
@@ -16,7 +16,6 @@
 
 import com.google.gerrit.reviewdb.Change;
 import com.google.gerrit.reviewdb.PatchSet;
-import com.google.gerrit.reviewdb.AccountDiffPreference.Whitespace;
 
 import org.eclipse.jgit.diff.Edit;
 import org.eclipse.jgit.lib.ObjectId;
@@ -29,8 +28,6 @@
 
   public PatchList get(Change change, PatchSet patchSet);
 
-  public PatchList get(Change change, PatchSet patchSet, Whitespace whitespace);
-
-  public IntraLineDiff get(ObjectId aId, Text aText, ObjectId bId, Text bText,
-      List<Edit> edits);
+  public IntraLineDiff getIntraLineDiff(ObjectId aId, Text aText, ObjectId bId,
+      Text bText, List<Edit> edits);
 }

gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
index 29b5799..285420c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListCacheImpl.java
@@ -90,20 +90,16 @@
   }
 
   public PatchList get(final Change change, final PatchSet patchSet) {
-    return get(change, patchSet, Whitespace.IGNORE_NONE);
-  }
-
-  public PatchList get(final Change change, final PatchSet patchSet,
-      final Whitespace whitespace) {
     final Project.NameKey projectKey = change.getProject();
     final ObjectId a = null;
     final ObjectId b = ObjectId.fromString(patchSet.getRevision().get());
-    return get(new PatchListKey(projectKey, a, b, whitespace));
+    final Whitespace ws = Whitespace.IGNORE_NONE;
+    return get(new PatchListKey(projectKey, a, b, ws));
   }
 
   @Override
-  public IntraLineDiff get(ObjectId aId, Text aText, ObjectId bId, Text bText,
-      List<Edit> edits) {
+  public IntraLineDiff getIntraLineDiff(ObjectId aId, Text aText, ObjectId bId,
+      Text bText, List<Edit> edits) {
     if (computeIntraline) {
       IntraLineDiffKey key =
           new IntraLineDiffKey(aId, aText, bId, bText, edits);