Skip to content

Commit f0ef218

Browse files
VISTALLVISTALL
committed
writing to fix compilation with @NotNull annotations
1 parent 02ecefc commit f0ef218

6 files changed

Lines changed: 1248 additions & 973 deletions

File tree

‎java-compiler-impl/src/com/intellij/compiler/JavaCompilerUtil.java‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
*/
1616
package com.intellij.compiler;
1717

18-
import org.mustbe.consulo.RequiredReadAction;
19-
import org.mustbe.consulo.java.module.extension.JavaModuleExtension;
18+
import java.util.Set;
19+
2020
import org.jetbrains.annotations.NonNls;
2121
import org.jetbrains.annotations.NotNull;
2222
import org.jetbrains.annotations.Nullable;
23+
import org.mustbe.consulo.RequiredReadAction;
24+
import org.mustbe.consulo.java.module.extension.JavaModuleExtension;
2325
import com.intellij.compiler.impl.ModuleChunk;
2426
import com.intellij.compiler.impl.javaCompiler.JavaCompilerConfiguration;
2527
import com.intellij.execution.configurations.ParametersList;
@@ -31,13 +33,14 @@
3133
import com.intellij.openapi.projectRoots.Sdk;
3234
import com.intellij.openapi.util.text.StringUtil;
3335
import com.intellij.openapi.vfs.CharsetToolkit;
36+
import com.intellij.openapi.vfs.VirtualFile;
3437
import com.intellij.pom.java.LanguageLevel;
3538

3639
/**
3740
* @author VISTALL
3841
* @since 0:37/26.05.13
39-
* <p/>
40-
* This class is split part of {com.intellij.compiler.impl.CompilerUtil}
42+
* <p>
43+
* This class is split part of {com.intellij.compiler.impl.CompilerUtil}
4144
*/
4245
public class JavaCompilerUtil
4346
{
@@ -128,8 +131,7 @@ public static void addLocaleOptions(final ParametersList parametersList, final b
128131
{
129132
// need to specify default encoding so that javac outputs messages in 'correct' language
130133
//noinspection HardCodedStringLiteral
131-
parametersList.add((launcherUsed ? "-J" : "") + "-D" + CharsetToolkit.FILE_ENCODING_PROPERTY + "=" + CharsetToolkit.getDefaultSystemCharset()
132-
.name());
134+
parametersList.add((launcherUsed ? "-J" : "") + "-D" + CharsetToolkit.FILE_ENCODING_PROPERTY + "=" + CharsetToolkit.getDefaultSystemCharset().name());
133135
// javac's VM should use the same default locale that IDEA uses in order for javac to print messages in 'correct' language
134136
//noinspection HardCodedStringLiteral
135137
final String lang = System.getProperty("user.language");
@@ -226,9 +228,9 @@ public static Sdk getSdkForCompilation(final ModuleChunk chunk)
226228
}
227229

228230
@Nullable
229-
public static String getCompilationClasspath(@NotNull CompileContext compileContext, final ModuleChunk moduleChunk)
231+
public static Set<VirtualFile> getCompilationClasspath(@NotNull CompileContext compileContext, final ModuleChunk moduleChunk)
230232
{
231-
JavaModuleExtension extension = ModuleUtilCore.getExtension(moduleChunk.getModule(), JavaModuleExtension.class);
233+
JavaModuleExtension<?> extension = ModuleUtilCore.getExtension(moduleChunk.getModule(), JavaModuleExtension.class);
232234
if(extension == null)
233235
{
234236
return null;
@@ -237,9 +239,9 @@ public static String getCompilationClasspath(@NotNull CompileContext compileCont
237239
}
238240

239241
@Nullable
240-
public static String getCompilationBootClasspath(@NotNull CompileContext compileContext, final ModuleChunk moduleChunk)
242+
public static Set<VirtualFile> getCompilationBootClasspath(@NotNull CompileContext compileContext, final ModuleChunk moduleChunk)
241243
{
242-
JavaModuleExtension extension = ModuleUtilCore.getExtension(moduleChunk.getModule(), JavaModuleExtension.class);
244+
JavaModuleExtension<?> extension = ModuleUtilCore.getExtension(moduleChunk.getModule(), JavaModuleExtension.class);
243245
if(extension == null)
244246
{
245247
return null;

‎java-compiler-impl/src/com/intellij/compiler/PsiClassWriter.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2000-2009 JetBrains s.r.o.
2+
* Copyright 2013-2016 must-be.org
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
1515
*/
1616
package com.intellij.compiler;
1717

18+
import org.mustbe.consulo.DeprecationInfo;
1819
import org.mustbe.consulo.java.module.extension.JavaModuleExtension;
1920
import org.jetbrains.annotations.NonNls;
2021
import org.jetbrains.org.objectweb.asm.ClassWriter;
@@ -33,6 +34,8 @@
3334
/**
3435
* @author yole
3536
*/
37+
@Deprecated
38+
@DeprecationInfo("Replaced by #InstrumentationClassFinder. Usage only by PatternValidationCompiler")
3639
public class PsiClassWriter extends ClassWriter
3740
{
3841
private final Project myProject;

0 commit comments

Comments
 (0)