From cd22f19f3e23a072248d0c92a1fcf5e2434ac291 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 1 Sep 2009 19:07:35 +0400 Subject: [PATCH] leftover stuff --- .../impl/javaCompiler/ModuleChunk.java | 5 ++-- .../impl/rmiCompiler/RmicCompiler.java | 3 +- .../openapi/compiler/ex/CompilerPathsEx.java | 30 ------------------- 3 files changed, 3 insertions(+), 35 deletions(-) rename {source => java/compiler/openapi/src}/com/intellij/openapi/compiler/ex/CompilerPathsEx.java (77%) diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java index 9f5c866d9a86..e005aac66f14 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/ModuleChunk.java @@ -8,7 +8,6 @@ import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.ex.CompileContextEx; -import com.intellij.openapi.compiler.ex.CompilerPathsEx; import com.intellij.openapi.module.LanguageLevelUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; @@ -174,7 +173,7 @@ public class ModuleChunk extends Chunk { final OrderedSet cpFiles = new OrderedSet(TObjectHashingStrategy.CANONICAL); for (final Module module : modules) { - final OrderEntry[] orderEntries = CompilerPathsEx.getOrderEntries(module); + final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries(); boolean skip = true; for (OrderEntry orderEntry : orderEntries) { if (orderEntry instanceof JdkOrderEntry) { @@ -201,7 +200,7 @@ public class ModuleChunk extends Chunk { final OrderedSet cpFiles = new OrderedSet(TObjectHashingStrategy.CANONICAL); final OrderedSet jdkFiles = new OrderedSet(TObjectHashingStrategy.CANONICAL); for (final Module module : modules) { - final OrderEntry[] orderEntries = CompilerPathsEx.getOrderEntries(module); + final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries(); for (OrderEntry orderEntry : orderEntries) { if (orderEntry instanceof JdkOrderEntry) { jdkFiles.addAll(Arrays.asList(orderEntry.getFiles(OrderRootType.CLASSES))); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java index 30cf8b0ed24b..b1272a3d6a07 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/rmiCompiler/RmicCompiler.java @@ -12,7 +12,6 @@ import com.intellij.compiler.make.MakeUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.compiler.*; import com.intellij.openapi.compiler.ex.CompileContextEx; -import com.intellij.openapi.compiler.ex.CompilerPathsEx; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.progress.ProgressIndicator; @@ -369,7 +368,7 @@ public class RmicCompiler implements ClassPostProcessingCompiler{ private static String getCompilationClasspath(Module module) { final StringBuilder classpathBuffer = StringBuilderSpinAllocator.alloc(); try { - final OrderEntry[] orderEntries = CompilerPathsEx.getOrderEntries(module); + final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries(); final Set processedFiles = new HashSet(); for (final OrderEntry orderEntry : orderEntries) { if (orderEntry instanceof JdkOrderEntry) { diff --git a/source/com/intellij/openapi/compiler/ex/CompilerPathsEx.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/ex/CompilerPathsEx.java similarity index 77% rename from source/com/intellij/openapi/compiler/ex/CompilerPathsEx.java rename to java/compiler/openapi/src/com/intellij/openapi/compiler/ex/CompilerPathsEx.java index a61248340dea..2f09975e0586 100644 --- a/source/com/intellij/openapi/compiler/ex/CompilerPathsEx.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/ex/CompilerPathsEx.java @@ -6,8 +6,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.CompilerModuleExtension; -import com.intellij.openapi.roots.ModuleRootManager; -import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.util.ArrayUtil; @@ -72,34 +70,6 @@ public class CompilerPathsEx extends CompilerPaths { } } - public static OrderEntry[] getOrderEntries(Module module) { - return ModuleRootManager.getInstance(module).getOrderEntries(); - // TODO: this is a patch for SCR 36800, After J2EE Compiler copying mechanizm is fixed, - // TODO: remove all the code below and uncomment the line above - /* - final OrderEntry[] orderEntries = ModuleRootManager.getInstance(module).getOrderEntries(); - final List result = new ArrayList(); - final List moduleOrderEntries = new ArrayList(); - int insertIndex = 0; - for (int idx = 0; idx < orderEntries.length; idx++) { - OrderEntry orderEntry = orderEntries[idx]; - if (orderEntry instanceof ModuleOrderEntry) { - moduleOrderEntries.add(orderEntry); - } - else { - result.add(orderEntry); - if (orderEntry instanceof ModuleSourceOrderEntry) { - insertIndex = result.size() - 1; - } - } - } - if (moduleOrderEntries.size() > 0) { - result.addAll(insertIndex, moduleOrderEntries); - } - return result.toArray(new OrderEntry[result.size()]); - */ - } - public static String[] getOutputPaths(Module[] modules) { final Set outputPaths = new OrderedSet((TObjectHashingStrategy)TObjectHashingStrategy.CANONICAL); for (Module module : modules) {