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

[platform] improves JDK version detection (IDEA-159314)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-08-09 11:49:27 +02:00
parent 485b66ed54
commit 6b5a287450
2 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/openapi/src/com/intellij/openapi/roots/libraries/JarVersionDetectionUtil.java
+23 -5
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
* Copyright 2000-2016 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.
@@ -15,8 +15,8 @@
*/
package com.intellij.openapi.roots.libraries;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.projectRoots.JdkUtil;
import com.intellij.openapi.roots.LibraryOrderEntry;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderEntry;
@@ -27,8 +27,12 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.Manifest;
public class JarVersionDetectionUtil {
private JarVersionDetectionUtil() { }
@@ -39,7 +43,7 @@ public class JarVersionDetectionUtil {
if (library instanceof LibraryOrderEntry) {
VirtualFile jar = LibrariesHelper.getInstance().findJarByClass(((LibraryOrderEntry)library).getLibrary(), detectionClass);
if (jar != null && jar.getFileSystem() instanceof JarFileSystem) {
return JdkUtil.getJarMainAttribute(jar, Attributes.Name.IMPLEMENTATION_VERSION);
return getMainAttribute(jar, Attributes.Name.IMPLEMENTATION_VERSION);
}
}
}
@@ -51,7 +55,21 @@ public class JarVersionDetectionUtil {
public static String detectJarVersion(@NotNull String detectionClass, @NotNull List<VirtualFile> files) {
VirtualFile jarRoot = LibrariesHelper.getInstance().findRootByClass(files, detectionClass);
return jarRoot != null && jarRoot.getFileSystem() instanceof JarFileSystem ?
JdkUtil.getJarMainAttribute(jarRoot, Attributes.Name.IMPLEMENTATION_VERSION) : null;
getMainAttribute(jarRoot, Attributes.Name.IMPLEMENTATION_VERSION) : null;
}
private static String getMainAttribute(VirtualFile jarRoot, Attributes.Name attribute) {
VirtualFile manifestFile = jarRoot.findFileByRelativePath(JarFile.MANIFEST_NAME);
if (manifestFile != null) {
try (InputStream stream = manifestFile.getInputStream()) {
return new Manifest(stream).getMainAttributes().getValue(attribute);
}
catch (IOException e) {
Logger.getInstance(JarVersionDetectionUtil.class).debug(e);
}
}
return null;
}
@Nullable
@@ -63,4 +81,4 @@ public class JarVersionDetectionUtil {
public static String getImplementationVersion(@NotNull File jar) {
return JarUtil.getJarAttribute(jar, Attributes.Name.IMPLEMENTATION_VERSION);
}
}
}