summaryrefslogtreecommitdiff
path: root/platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java
diff options
context:
space:
mode:
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java')
-rw-r--r--platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java b/platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java
index 742a405f350e..143df9617310 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/DiffApplication.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.fileTypes.UnknownFileType;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.vfs.VirtualFile;
+import org.jetbrains.annotations.Nullable;
/**
* @author max
@@ -37,11 +38,11 @@ public class DiffApplication extends ApplicationStarterBase {
return DiffBundle.message("diff.application.usage.parameters.and.description", scriptName);
}
- public void processCommand(String[] args) throws OperationFailedException {
+ public void processCommand(String[] args, @Nullable String currentDirectory) throws OperationFailedException {
final String path1 = args[1];
final String path2 = args[2];
- final VirtualFile file1 = findFile(path1);
- final VirtualFile file2 = findFile(path2);
+ final VirtualFile file1 = findFile(path1, currentDirectory);
+ final VirtualFile file2 = findFile(path2, currentDirectory);
final boolean areDirs = areDirs(file1, file2);
final boolean areJars = areJars(file1, file2);
if (areDirs || areJars) {