eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-23 00:24:11 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor bugfixes

Browse Source
This commit is contained in:
konsoletyper 2015-01-22 21:04:17 +04:00
parent da4e548d38
commit 871667cacb
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
teavm-core/src/main/java/org/teavm/vm/TeaVM.java
View File

@ -459,7 +459,11 @@ public class TeaVM implements TeaVMHost, ServiceRepository {
} }
int index = 0; int index = 0;
for (String className : dependency.getAchievableClasses()) { for (String className : dependency.getAchievableClasses()) {
ClassHolder cls = ModelUtils.copyClass(dependency.getClassSource().get(className)); ClassReader clsReader = dependency.getClassSource().get(className);
if (clsReader == null) {
continue;
}
ClassHolder cls = ModelUtils.copyClass(clsReader);
cutClasses.putClassHolder(cls); cutClasses.putClassHolder(cls);
missingItemsProcessor.processClass(cls); missingItemsProcessor.processClass(cls);
linker.link(dependency, cls); linker.link(dependency, cls);

2
teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java
View File

@ -92,7 +92,6 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
if ((kind == AUTO_BUILD || kind == INCREMENTAL_BUILD) && !shouldBuild(profile)) { if ((kind == AUTO_BUILD || kind == INCREMENTAL_BUILD) && !shouldBuild(profile)) {
return; return;
} }
removeMarkers(profile);
IStringVariableManager varManager = VariablesPlugin.getDefault().getStringVariableManager(); IStringVariableManager varManager = VariablesPlugin.getDefault().getStringVariableManager();
TeaVMTool tool = new TeaVMTool(); TeaVMTool tool = new TeaVMTool();
tool.setClassLoader(classLoader); tool.setClassLoader(classLoader);
@ -127,6 +126,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder {
monitor.beginTask("Running TeaVM", 10000); monitor.beginTask("Running TeaVM", 10000);
tool.generate(); tool.generate();
if (!tool.wasCancelled()) { if (!tool.wasCancelled()) {
removeMarkers(profile);
putMarkers(tool.getDependencyInfo().getCallGraph(), tool.getProblemProvider().getProblems(), putMarkers(tool.getDependencyInfo().getCallGraph(), tool.getProblemProvider().getProblems(),
profile); profile);
setClasses(profile, classesToResources(tool.getClasses())); setClasses(profile, classesToResources(tool.getClasses()));