From 1c3a043b31ff76dfdec7970dd2e24fc6554e7789 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Tue, 30 Jul 2013 13:41:37 +0200 Subject: [PATCH] fix reference to a missing method (IDEA-111243 Cannot run main class using InnteliJ 130.1365) --- .../jps/javac/OptimizedFileManager17.java | 9 +++++++-- jps/lib/optimizedFileManager.jar | Bin 20937 -> 21065 bytes 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java index 3b0c1731ba2d..a9f47ec2f6f6 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java +++ b/jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java @@ -219,7 +219,7 @@ class OptimizedFileManager17 extends com.sun.tools.javac.file.JavacFileManager { } private class InputFileObject extends BaseFileObject { - private String name; + private final String name; private final File file; private Reference absFileRef; @@ -256,7 +256,12 @@ class OptimizedFileManager17 extends com.sun.tools.javac.file.JavacFileManager { @Override public JavaFileObject.Kind getKind() { - return getKind(name); + for (Kind kind : Kind.values()) { + if (kind != Kind.OTHER && name.endsWith(kind.extension)) { + return kind; + } + } + return Kind.OTHER; } @Override diff --git a/jps/lib/optimizedFileManager.jar b/jps/lib/optimizedFileManager.jar index ce76aa5dbc8dd3a5050ce84a03b2565cd1a787ce..8a12d502b63b5f7fcb1b6ae59ccb830fa4d6300c 100644 GIT binary patch delta 3793 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