MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] notnull, reformat

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-10-11 17:35:13 +04:00
parent 77a8647e71
commit 8edc81a2bb
1 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/commands/GitMessageWithFilesDetector.java
+36 -34
View File
@@ -39,53 +39,25 @@ public class GitMessageWithFilesDetector implements GitLineHandlerListener {
private final Event myEvent;
private final VirtualFile myRoot;
public enum Event {
LOCAL_CHANGES_OVERWRITTEN_BY_MERGE(
"Your local changes to the following files would be overwritten by merge",
"commit your changes or stash them before"),
LOCAL_CHANGES_OVERWRITTEN_BY_CHECKOUT(
"Your local changes to the following files would be overwritten by checkout",
"commit your changes or stash them before"),
UNTRACKED_FILES_OVERWRITTEN_BY(
"The following untracked working tree files would be overwritten by",
"Please move or remove them before"
)
;
private final String myMessageStartMarker;
private final String myMessageEndMarker;
Event(String messageStartMarker, String messageEndMarker) {
myMessageStartMarker = messageStartMarker;
myMessageEndMarker = messageEndMarker;
}
public String getMessageStartMarker() {
return myMessageStartMarker;
}
public String getMessageEndMarker() {
return myMessageEndMarker;
}
}
private final Set<String> myAffectedFiles = new HashSet<String>();
private boolean myMessageDetected;
private boolean myFilesAreDisplayed;
public GitMessageWithFilesDetector(Event event, VirtualFile root) {
public GitMessageWithFilesDetector(@NotNull Event event, @NotNull VirtualFile root) {
myEvent = event;
myRoot = root;
}
@Override
public void onLineAvailable(String line, Key outputType) {
public void onLineAvailable(@NotNull String line, @NotNull Key outputType) {
if (line.contains(myEvent.getMessageStartMarker())) {
myMessageDetected = true;
myFilesAreDisplayed = true;
} else if (line.contains(myEvent.getMessageEndMarker())) {
}
else if (line.contains(myEvent.getMessageEndMarker())) {
myFilesAreDisplayed = false;
} else if (myFilesAreDisplayed) {
}
else if (myFilesAreDisplayed) {
myAffectedFiles.add(line.trim());
}
}
@@ -125,4 +97,34 @@ public class GitMessageWithFilesDetector implements GitLineHandlerListener {
return files;
}
public enum Event {
LOCAL_CHANGES_OVERWRITTEN_BY_MERGE(
"Your local changes to the following files would be overwritten by merge",
"commit your changes or stash them before"),
LOCAL_CHANGES_OVERWRITTEN_BY_CHECKOUT(
"Your local changes to the following files would be overwritten by checkout",
"commit your changes or stash them before"),
UNTRACKED_FILES_OVERWRITTEN_BY(
"The following untracked working tree files would be overwritten by",
"Please move or remove them before"
)
;
private final String myMessageStartMarker;
private final String myMessageEndMarker;
Event(String messageStartMarker, String messageEndMarker) {
myMessageStartMarker = messageStartMarker;
myMessageEndMarker = messageEndMarker;
}
public String getMessageStartMarker() {
return myMessageStartMarker;
}
public String getMessageEndMarker() {
return myMessageEndMarker;
}
}
}