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

assertions and progress

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-10-20 23:05:05 +02:00
parent c99b6c1123
commit e9896186ab
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
+2 -1
View File
@@ -292,8 +292,9 @@ public class JpsServerManager implements ApplicationComponent{
final GeneralCommandLine cmdLine = new GeneralCommandLine();
cmdLine.setExePath(((JavaSdkType)projectJdk.getSdkType()).getVMExecutablePath(projectJdk));
cmdLine.addParameter("-ea");
cmdLine.addParameter("-XX:+HeapDumpOnOutOfMemoryError");
cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008");
cmdLine.addParameter("-Xmx256m"); // todo: get this value from settings
cmdLine.addParameter("-Xmx512m"); // todo: get this value from settings
cmdLine.addParameter("-classpath");
final List<File> cp = ClasspathBootstrap.getApplicationClasspath();
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+6
View File
@@ -53,20 +53,25 @@ public class IncProjectBuilder {
try {
cleanOutputRoots(scope, context);
context.processMessage(new ProgressMessage("Running 'before' tasks"));
runTasks(context, myBuilderRegistry.getBeforeTasks());
context.setCompilingTests(false);
context.processMessage(new ProgressMessage("Building production sources"));
buildChunks(context, myProductionChunks);
context.setCompilingTests(true);
context.processMessage(new ProgressMessage("Building test sources"));
buildChunks(context, myTestChunks);
context.processMessage(new ProgressMessage("Running 'after' tasks"));
runTasks(context, myBuilderRegistry.getAfterTasks());
}
catch (ProjectBuildException e) {
context.processMessage(new ProgressMessage(e.getMessage()));
}
finally {
context.processMessage(new ProgressMessage("Build complete"));
context.getBuildDataManager().close();
final File mappingsDataFile = Paths.getMappingsStorageFile(myProjectName);
try {
@@ -144,6 +149,7 @@ public class IncProjectBuilder {
}
}
if (okToDelete) {
context.processMessage(new ProgressMessage("Cleaning " + outputRoot.getPath()));
FileUtil.delete(outputRoot);
}
else {
jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+22 -4
View File
@@ -3,6 +3,7 @@ package org.jetbrains.ether.dependencyView;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.ether.RW;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.Opcodes;
@@ -93,8 +94,13 @@ public class Mappings implements RW.Writable {
}
}
@Nullable
private ClassRepr getReprByName(final StringCache.S name) {
final Collection<ClassRepr> reprs = sourceFileToClasses.foxyGet(classToSourceFile.get(name));
final StringCache.S source = classToSourceFile.get(name);
assert source != null;
final Collection<ClassRepr> reprs = sourceFileToClasses.foxyGet(source);
if (reprs != null) {
for (ClassRepr repr : reprs) {
@@ -318,7 +324,11 @@ public class Mappings implements RW.Writable {
affectedUsages.add(rootUsage);
for (StringCache.S p : subclasses) {
final Collection<StringCache.S> deps = fileToFileDependency.foxyGet(classToSourceFile.get(p));
final StringCache.S source = classToSourceFile.get(p);
assert source != null;
final Collection<StringCache.S> deps = fileToFileDependency.foxyGet(source);
if (deps != null) {
dependents.addAll(deps);
@@ -336,7 +346,11 @@ public class Mappings implements RW.Writable {
affectedUsages.add(rootUsage);
for (StringCache.S p : subclasses) {
final Collection<StringCache.S> deps = fileToFileDependency.foxyGet(classToSourceFile.get(p));
final StringCache.S source = classToSourceFile.get(p);
assert source != null;
final Collection<StringCache.S> deps = fileToFileDependency.foxyGet(source);
if (deps != null) {
dependents.addAll(deps);
@@ -601,7 +615,11 @@ public class Mappings implements RW.Writable {
}
if (allAbstract && visited) {
affectedFiles.add(classToSourceFile.get(p));
final StringCache.S source = classToSourceFile.get(p);
assert source != null;
affectedFiles.add(source);
}
}
}