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

support for zip files in dir diff

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-02-21 16:17:05 +01:00
parent 8b803d5cfd
commit 8f32196621
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareJarsAction.java
+9 -8
View File
@@ -42,21 +42,21 @@ public class CompareJarsAction extends AnAction {
if (project != null && files != null) {
VirtualFileDiffElement src = null;
VirtualFileDiffElement trg = null;
if (files.length == 2 && isJar(files[0]) && isJar(files[1])) {
if (files.length == 2 && isJarOrZip(files[0]) && isJarOrZip(files[1])) {
src = new JarFileDiffElement(files[0]);
trg = new JarFileDiffElement(files[1]);
} else if (files.length == 1 && isJar(files[0])) {
} else if (files.length == 1 && isJarOrZip(files[0])) {
src = new JarFileDiffElement(files[0]);
final FileChooserDescriptor descriptor = new FileChooserDescriptor(true, false, true, true, false, false) {
@Override
public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
return file.isDirectory()
|| (!file.isDirectory() && JarFileSystem.PROTOCOL.equalsIgnoreCase(file.getExtension()));
|| (!file.isDirectory() && isJarOrZip(file));
}
};
final VirtualFile[] result = FileChooserFactory.getInstance()
.createFileChooser(descriptor, project).choose(project.getBaseDir(), project);
if (result.length == 1 && result[0] != null && isJar(result[0])) {
if (result.length == 1 && result[0] != null && isJarOrZip(result[0])) {
trg = new JarFileDiffElement(result[0]);
}
}
@@ -71,10 +71,10 @@ public class CompareJarsAction extends AnAction {
public void update(AnActionEvent e) {
final VirtualFile[] files = e.getData(PlatformDataKeys.VIRTUAL_FILE_ARRAY);
if (files != null && files.length > 0 && files.length < 3) {
if (isJar(files[0]) && (files.length == 1 || isJar(files[1]))) {
if (isJarOrZip(files[0]) && (files.length == 1 || isJarOrZip(files[1]))) {
e.getPresentation().setEnabled(true);
e.getPresentation().setVisible(true);
e.getPresentation().setText(files.length == 1 ? "Compare Jar File with..." : "Compare Jar Files");
e.getPresentation().setText(files.length == 1 ? "Compare Archive File with..." : "Compare Archives");
return;
}
}
@@ -83,7 +83,8 @@ public class CompareJarsAction extends AnAction {
e.getPresentation().setVisible(false);
}
private static boolean isJar(VirtualFile file) {
return JarFileSystem.PROTOCOL.equalsIgnoreCase(file.getExtension());
private static boolean isJarOrZip(VirtualFile file) {
final String ext = file.getExtension();
return JarFileSystem.PROTOCOL.equalsIgnoreCase(ext) || "zip".equalsIgnoreCase(ext);
}
}