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
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
|
/*
* Copyright 2000-2014 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 org.jetbrains.idea.svn.conflict;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn.api.BaseNodeDescription;
import org.jetbrains.idea.svn.api.NodeKind;
import org.tmatesoft.svn.core.wc.SVNTreeConflictDescription;
import java.io.File;
/**
* @author Konstantin Kolosovsky.
*/
public class TreeConflictDescription extends BaseNodeDescription {
private final File myPath;
private final ConflictAction myConflictAction;
private final ConflictReason myConflictReason;
private final ConflictOperation myOperation;
private final ConflictVersion mySourceLeftVersion;
private final ConflictVersion mySourceRightVersion;
@Nullable
public static TreeConflictDescription create(@Nullable SVNTreeConflictDescription conflict) {
TreeConflictDescription result = null;
if (conflict != null) {
result =
new TreeConflictDescription(conflict.getPath(), NodeKind.from(conflict.getNodeKind()),
ConflictAction.from(conflict.getConflictAction().getName()),
ConflictReason.from(conflict.getConflictReason().getName()),
ConflictOperation.from(conflict.getOperation().getName()),
ConflictVersion.create(conflict.getSourceLeftVersion()),
ConflictVersion.create(conflict.getSourceRightVersion()));
}
return result;
}
public TreeConflictDescription(File path,
@NotNull NodeKind nodeKind,
ConflictAction conflictAction,
ConflictReason conflictReason,
ConflictOperation operation,
ConflictVersion sourceLeftVersion,
ConflictVersion sourceRightVersion) {
super(nodeKind);
myPath = path;
myConflictAction = conflictAction;
myConflictReason = conflictReason;
myOperation = operation;
mySourceLeftVersion = sourceLeftVersion;
mySourceRightVersion = sourceRightVersion;
}
// TODO: is*Conflict() methods are not really necessary in any logic - remove them
public boolean isTextConflict() {
return false;
}
public boolean isPropertyConflict() {
return false;
}
public boolean isTreeConflict() {
return true;
}
public File getPath() {
return myPath;
}
public ConflictAction getConflictAction() {
return myConflictAction;
}
public ConflictReason getConflictReason() {
return myConflictReason;
}
@NotNull
public NodeKind getNodeKind() {
return myKind;
}
public ConflictOperation getOperation() {
return myOperation;
}
public ConflictVersion getSourceLeftVersion() {
return mySourceLeftVersion;
}
public ConflictVersion getSourceRightVersion() {
return mySourceRightVersion;
}
@NotNull
public String toPresentableString() {
return "local " + getConflictReason() + ", incoming " + getConflictAction() + " upon " + getOperation();
}
}
|
