diff options
Diffstat (limited to 'java/compiler/impl')
7 files changed, 14 insertions, 25 deletions
diff --git a/java/compiler/impl/compiler-impl.iml b/java/compiler/impl/compiler-impl.iml index c6e3e4f81eab..552d0dfe0d38 100644 --- a/java/compiler/impl/compiler-impl.iml +++ b/java/compiler/impl/compiler-impl.iml @@ -17,7 +17,6 @@ <orderEntry type="module" module-name="java-runtime" /> <orderEntry type="module" module-name="instrumentation-util" /> <orderEntry type="library" name="asm5" level="project" /> - <orderEntry type="library" name="Eclipse" level="project" /> <orderEntry type="module" module-name="platform-api" /> <orderEntry type="module" module-name="lang-impl" /> <orderEntry type="module" module-name="jsp-openapi" /> diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java index 38f230f92997..542f1331d2d5 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java @@ -110,7 +110,7 @@ public class CompileAction extends CompileActionBase { elementDescription = "'" + file.getName() + "'"; } else { - if (!ActionPlaces.MAIN_MENU.equals(event.getPlace())) { + if (!ActionPlaces.isMainMenuOrActionSearch(event.getPlace())) { // the action should be invisible in popups for non-java files presentation.setEnabled(false); presentation.setVisible(false); diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 669cf92d37da..69bb36054f21 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -73,7 +73,10 @@ import com.intellij.openapi.vfs.newvfs.BulkFileListener; import com.intellij.openapi.vfs.newvfs.events.VFileEvent; import com.intellij.openapi.vfs.newvfs.impl.FileNameCache; import com.intellij.openapi.wm.IdeFrame; -import com.intellij.util.*; +import com.intellij.util.Alarm; +import com.intellij.util.ArrayUtil; +import com.intellij.util.Function; +import com.intellij.util.SmartList; import com.intellij.util.concurrency.Semaphore; import com.intellij.util.concurrency.SequentialTaskExecutor; import com.intellij.util.containers.IntArrayList; @@ -897,9 +900,6 @@ public class BuildManager implements ApplicationComponent{ if (!Registry.is("compiler.process.use.memory.temp.cache")) { cmdLine.addParameter("-D"+ GlobalOptions.USE_MEMORY_TEMP_CACHE_OPTION + "=false"); } - if (Registry.is("compiler.process.use.external.javac")) { - cmdLine.addParameter("-D"+ GlobalOptions.USE_EXTERNAL_JAVAC_OPTION); - } // javac's VM should use the same default locale that IDEA uses in order for javac to print messages in 'correct' language if (mySystemCharset != null) { @@ -907,13 +907,15 @@ public class BuildManager implements ApplicationComponent{ cmdLine.addParameter("-D" + CharsetToolkit.FILE_ENCODING_PROPERTY + "=" + mySystemCharset.name()); } cmdLine.addParameter("-D" + JpsGlobalLoader.FILE_TYPES_COMPONENT_NAME_KEY + "=" + FileTypeManagerImpl.getFileTypeComponentName()); - for (String name : new String[]{"user.language", "user.country", "user.region", PathManager.PROPERTY_HOME_PATH, - PathManager.PROPERTY_CONFIG_PATH, PathManager.PROPERTY_PLUGINS_PATH, PathManager.PROPERTY_PATHS_SELECTOR}) { + for (String name : new String[]{"user.language", "user.country", "user.region", PathManager.PROPERTY_PATHS_SELECTOR}) { final String value = System.getProperty(name); if (value != null) { cmdLine.addParameter("-D" + name + "=" + value); } } + cmdLine.addParameter("-D" + PathManager.PROPERTY_HOME_PATH + "=" + PathManager.getHomePath()); + cmdLine.addParameter("-D" + PathManager.PROPERTY_CONFIG_PATH + "=" + PathManager.getConfigPath()); + cmdLine.addParameter("-D" + PathManager.PROPERTY_PLUGINS_PATH + "=" + PathManager.getPluginsPath()); cmdLine.addParameter("-D" + GlobalOptions.LOG_DIR_OPTION + "=" + FileUtil.toSystemIndependentName(getBuildLogDirectory().getAbsolutePath())); @@ -941,7 +943,6 @@ public class BuildManager implements ApplicationComponent{ cmdLine.addParameter(launcherClass.getName()); final List<String> cp = ClasspathBootstrap.getBuildProcessApplicationClasspath(true); - cp.add(getJpsPluginSystemClassesPath()); cp.addAll(myClasspathManager.getBuildProcessPluginsClasspath(project)); if (isProfilingMode) { cp.add(new File(workDirectory, "yjp-controller-api-redist.jar").getPath()); @@ -967,17 +968,6 @@ public class BuildManager implements ApplicationComponent{ }; } - private static String getJpsPluginSystemClassesPath() { - File classesRoot = new File(PathUtil.getJarPathForClass(BuildManager.class)); - if (classesRoot.isDirectory()) { - //running from sources: load classes from .../out/production/jps-plugin-system - return new File(classesRoot.getParentFile(), "jps-plugin-system").getAbsolutePath(); - } - else { - return new File(classesRoot.getParentFile(), "rt/jps-plugin-system.jar").getAbsolutePath(); - } - } - public File getBuildSystemDirectory() { return new File(mySystemDirectory, SYSTEM_ROOT); } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form index eed2b888d43f..aeffe083cd9e 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.form @@ -67,7 +67,7 @@ <clientProperties> <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/> </clientProperties> - <border type="none" title="Jar files from libraries"/> + <border type="none" title="JAR files from libraries"/> <children> <component id="f9a17" class="javax.swing.JRadioButton" binding="myExtractJarsRadioButton"> <constraints> @@ -75,7 +75,7 @@ </constraints> <properties> <selected value="true"/> - <text value="&extract to the target jar"/> + <text value="&extract to the target JAR"/> </properties> </component> <hspacer id="90c4f"> diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java index 02d9e4228eec..ea2f4a64f622 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java @@ -55,7 +55,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper { public JarArtifactFromModulesDialog(PackagingElementResolvingContext context) { super(context.getProject()); myContext = context; - setTitle("Create Jar from Modules"); + setTitle("Create JAR from Modules"); myMainClassLabel.setLabelFor(myMainClassField.getTextField()); myManifestDirLabel.setLabelFor(myManifestDirField.getTextField()); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java index 2a0af9007963..bd4494c6f4a3 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java @@ -33,7 +33,7 @@ import java.util.List; */ public class JarArtifactType extends ArtifactType { public JarArtifactType() { - super("jar", "Jar"); + super("jar", "JAR"); } public static JarArtifactType getInstance() { diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java index 0d1737b07e42..7e8f6016d591 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/PackagingElementFactoryImpl.java @@ -274,7 +274,7 @@ public class PackagingElementFactoryImpl extends PackagingElementFactory { @NotNull @Override public PackagingElement<?> createExtractedDirectory(@NotNull VirtualFile jarEntry) { - LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from jar but file from " + jarEntry.getFileSystem() + " found"); + LOG.assertTrue(jarEntry.getFileSystem() instanceof JarFileSystem, "Expected file from JAR but file from " + jarEntry.getFileSystem() + " found"); final String fullPath = jarEntry.getPath(); final int jarEnd = fullPath.indexOf(JarFileSystem.JAR_SEPARATOR); return new ExtractedDirectoryPackagingElement(fullPath.substring(0, jarEnd), fullPath.substring(jarEnd + 1)); |