merge: add binary merge request to API

diff --git a/platform/diff-api/src/com/intellij/diff/merge/BinaryMergeRequest.java b/platform/diff-api/src/com/intellij/diff/merge/BinaryMergeRequest.java
new file mode 100644 (file)
index 0000000..84d9f27
--- /dev/null
+++ b/platform/diff-api/src/com/intellij/diff/merge/BinaryMergeRequest.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2000-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.diff.merge;
+
+import com.intellij.diff.contents.FileContent;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public abstract class BinaryMergeRequest extends ThreesideMergeRequest {
+  @NotNull
+  public abstract List<byte[]> getByteContents();
+
+  @Override
+  @NotNull
+  public abstract FileContent getOutputContent();
+}

diff --git a/platform/diff-impl/src/com/intellij/diff/requests/BinaryMergeRequestImpl.java b/platform/diff-impl/src/com/intellij/diff/requests/BinaryMergeRequestImpl.java
index 97f2e20fa55775807284a160bb74ac3e89680111..dab137d1df731a93ed3b2a3341abe71accd87b08 100644 (file)
--- a/platform/diff-impl/src/com/intellij/diff/requests/BinaryMergeRequestImpl.java
+++ b/platform/diff-impl/src/com/intellij/diff/requests/BinaryMergeRequestImpl.java
@@ -18,7 +18,7 @@ package com.intellij.diff.requests;
 import com.intellij.CommonBundle;
 import com.intellij.diff.contents.DiffContent;
 import com.intellij.diff.contents.FileContent;
-import com.intellij.diff.merge.ThreesideMergeRequest;
+import com.intellij.diff.merge.BinaryMergeRequest;
 import com.intellij.diff.merge.MergeResult;
 import com.intellij.diff.util.ThreeSide;
 import com.intellij.openapi.command.WriteCommandAction;
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
 import java.io.IOException;
 import java.util.List;
 
-public class BinaryMergeRequestImpl extends ThreesideMergeRequest {
+public class BinaryMergeRequestImpl extends BinaryMergeRequest {
   private static final Logger LOG = Logger.getInstance(BinaryMergeRequestImpl.class);
 
   @NotNull private final FileContent myFile;
@@ -80,6 +80,12 @@ public class BinaryMergeRequestImpl extends ThreesideMergeRequest {
     return myContents;
   }
 
+  @NotNull
+  @Override
+  public List<byte[]> getByteContents() {
+    return myByteContents;
+  }
+
   @Nullable
   @Override
   public String getTitle() {