opendev/gerrit
Code Issues Proposed changes

Fix warnings due to method signature drift

Browse Source 
Change-Id: Ic641f4d66524ecb52c60d0229c146ed5434d042e
This commit is contained in:
Dave Borowitz
2015-01-05 08:56:07 -08:00
parent bd70bdbd5c
commit b9378a4009
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-gwtui/src/main/java/net/codemirror/lib/Configuration.java vendored
View File

@@ -20,7 +20,7 @@ import com.google.gwt.core.client.JavaScriptObject;
* Simple map-like structure to pass configuration to CodeMirror.
*
* @see <a href="http://codemirror.net/doc/manual.html#config">CodeMirror config</a>
* @see CodeMirror#create(com.google.gerrit.client.diff.DisplaySide, com.google.gwt.dom.client.Element, Configuration)
* @see CodeMirror#create(com.google.gwt.dom.client.Element, Configuration)
*/
public class Configuration extends JavaScriptObject {
public static Configuration create() {

3
gerrit-server/src/main/java/com/google/gerrit/server/patch/PatchListLoader.java
View File

@@ -326,7 +326,8 @@ public class PatchListLoader extends CacheLoader<PatchListKey, PatchList> {
Map<String, ObjectId> resolved = new HashMap<>();
for (Map.Entry<String, MergeResult<? extends Sequence>> entry : r.entrySet()) {
MergeResult<? extends Sequence> p = entry.getValue();
TemporaryBuffer buf = new TemporaryBuffer.LocalFile(10 * 1024 * 1024);
TemporaryBuffer buf =
new TemporaryBuffer.LocalFile(null, 10 * 1024 * 1024);
try {
fmt.formatMerge(buf, p, "BASE", oursName, theirsName, "UTF-8");
buf.close();