blob: ce8d56044f961eca722812da48e706d00028341c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
/*
* Copyright 2000-2009 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.openapi.diff;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
/**
* A request for a merge operation.
*
* @see DiffRequestFactory#createMergeRequest
*/
public abstract class MergeRequest extends DiffRequest {
protected MergeRequest(@Nullable Project project) {
super(project);
}
/**
* Sets the titles of panes in the merge dialog.
*
* @param versionTitles Array of 3 strings. First string specifies left pane title, second string specifies middle pane (merged content)
* title, third string specifies right pane.
*/
public abstract void setVersionTitles(String[] versionTitles);
/**
* Sets the title of the merge dialog.
*
* @param windowTitle The dialog title.
*/
public abstract void setWindowTitle(String windowTitle);
/**
* Specifies the ID of the help topic which is shown when the Help button is pressed. If null, the Help button is not shown.
*
* @param helpId the ID of the help topic for the merge operation.
*/
public abstract void setHelpId(@Nullable @NonNls String helpId);
/**
* After the merge operation is completed, returns the exit code of the merge dialog.
*
* @return {@link com.intellij.openapi.ui.DialogWrapper#OK_EXIT_CODE} if the user accepted the merge, or a different value if the merge
* operation was cancelled.
*/
public abstract int getResult();
/**
* After the merge operation is completed, returns the merged text.
*
* @return the merged text.
*/
@Nullable
public abstract DiffContent getResultContent();
public abstract void restoreOriginalContent();
}
|
