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 all archives

Browse Source
This commit is contained in:
Konstantin Bulenkov
2012-02-21 16:42:23 +01:00
parent 8f32196621
commit d4eae08cc6
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareJarsAction.java
+8 -9
View File
@@ -19,6 +19,7 @@ import com.intellij.featureStatistics.FeatureUsageTracker;
import com.intellij.ide.diff.DirDiffSettings;
import com.intellij.ide.diff.JarFileDiffElement;
import com.intellij.ide.diff.VirtualFileDiffElement;
import com.intellij.ide.highlighter.ArchiveFileType;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -26,7 +27,6 @@ import com.intellij.openapi.diff.DirDiffManager;
import com.intellij.openapi.fileChooser.FileChooserDescriptor;
import com.intellij.openapi.fileChooser.FileChooserFactory;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.JarFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
/**
@@ -42,21 +42,21 @@ public class CompareJarsAction extends AnAction {
if (project != null && files != null) {
VirtualFileDiffElement src = null;
VirtualFileDiffElement trg = null;
if (files.length == 2 && isJarOrZip(files[0]) && isJarOrZip(files[1])) {
if (files.length == 2 && isArchive(files[0]) && isArchive(files[1])) {
src = new JarFileDiffElement(files[0]);
trg = new JarFileDiffElement(files[1]);
} else if (files.length == 1 && isJarOrZip(files[0])) {
} else if (files.length == 1 && isArchive(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() && isJarOrZip(file));
|| (!file.isDirectory() && isArchive(file));
}
};
final VirtualFile[] result = FileChooserFactory.getInstance()
.createFileChooser(descriptor, project).choose(project.getBaseDir(), project);
if (result.length == 1 && result[0] != null && isJarOrZip(result[0])) {
if (result.length == 1 && result[0] != null && isArchive(result[0])) {
trg = new JarFileDiffElement(result[0]);
}
}
@@ -71,7 +71,7 @@ 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 (isJarOrZip(files[0]) && (files.length == 1 || isJarOrZip(files[1]))) {
if (isArchive(files[0]) && (files.length == 1 || isArchive(files[1]))) {
e.getPresentation().setEnabled(true);
e.getPresentation().setVisible(true);
e.getPresentation().setText(files.length == 1 ? "Compare Archive File with..." : "Compare Archives");
@@ -83,8 +83,7 @@ public class CompareJarsAction extends AnAction {
e.getPresentation().setVisible(false);
}
private static boolean isJarOrZip(VirtualFile file) {
final String ext = file.getExtension();
return JarFileSystem.PROTOCOL.equalsIgnoreCase(ext) || "zip".equalsIgnoreCase(ext);
private static boolean isArchive(VirtualFile file) {
return file.getFileType() instanceof ArchiveFileType;
}
}