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

Cleanup (formatting; annotations)

Browse Source
This commit is contained in:
Roman Shevchenko
2014-12-08 11:42:43 +01:00
parent 49d742a4d6
commit b187bf34af
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/util/io/URLUtil.java
+20 -22
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.util.Base64Converter;
import gnu.trove.TIntArrayList;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -50,23 +49,23 @@ public class URLUtil {
private URLUtil() { }
/**
* Opens a url stream. The semantics is the sames as {@link java.net.URL#openStream()}. The
* Opens a url stream. The semantics is the sames as {@link URL#openStream()}. The
* separate method is needed, since jar URLs open jars via JarFactory and thus keep them
* mapped into memory.
*/
@NotNull
public static InputStream openStream(@NotNull URL url) throws IOException {
@NonNls String protocol = url.getProtocol();
String protocol = url.getProtocol();
return protocol.equals(JAR_PROTOCOL) ? openJarStream(url) : url.openStream();
}
@NotNull
public static InputStream openResourceStream(final URL url) throws IOException {
public static InputStream openResourceStream(@NotNull URL url) throws IOException {
try {
return openStream(url);
}
catch(FileNotFoundException ex) {
@NonNls final String protocol = url.getProtocol();
catch (FileNotFoundException ex) {
String protocol = url.getProtocol();
String file = null;
if (protocol.equals(FILE_PROTOCOL)) {
file = url.getFile();
@@ -74,7 +73,7 @@ public class URLUtil {
else if (protocol.equals(JAR_PROTOCOL)) {
int pos = url.getFile().indexOf("!");
if (pos >= 0) {
file = url.getFile().substring(pos+1);
file = url.getFile().substring(pos + 1);
}
}
if (file != null && file.startsWith("/")) {
@@ -100,18 +99,18 @@ public class URLUtil {
}
return new FilterInputStream(zipFile.getInputStream(zipEntry)) {
@Override
public void close() throws IOException {
super.close();
zipFile.close();
}
};
@Override
public void close() throws IOException {
super.close();
zipFile.close();
}
};
}
/**
* Splits .jar URL along a separator and strips "jar" and "file" prefixes if any.
* Returns a pair of path to a .jar file and entry name inside a .jar, or null if the URL does not contain a separator.
*
* <p/>
* E.g. "jar:file:///path/to/jar.jar!/resource.xml" is converted into ["/path/to/jar.jar", "resource.xml"].
*/
@Nullable
@@ -180,13 +179,10 @@ public class URLUtil {
}
private static int decode(char c) {
if ((c >= '0') && (c <= '9'))
return c - '0';
if ((c >= 'a') && (c <= 'f'))
return c - 'a' + 10;
if ((c >= 'A') && (c <= 'F'))
return c - 'A' + 10;
return -1;
if ((c >= '0') && (c <= '9')) return c - '0';
if ((c >= 'a') && (c <= 'f')) return c - 'a' + 10;
if ((c >= 'A') && (c <= 'F')) return c - 'A' + 10;
return -1;
}
public static boolean containsScheme(@NotNull String url) {
@@ -210,7 +206,9 @@ public class URLUtil {
if (matcher.matches()) {
try {
String content = matcher.group(4);
return ";base64".equalsIgnoreCase(matcher.group(3)) ? Base64Converter.decode(content.getBytes(CharsetToolkit.UTF8_CHARSET)) : content.getBytes(CharsetToolkit.UTF8_CHARSET);
return ";base64".equalsIgnoreCase(matcher.group(3))
? Base64Converter.decode(content.getBytes(CharsetToolkit.UTF8_CHARSET))
: content.getBytes(CharsetToolkit.UTF8_CHARSET);
}
catch (IllegalArgumentException e) {
return null;