From 8696bff1cdb459c97420484b93ad30e873a3737d Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Thu, 25 Sep 2014 18:22:16 +0400 Subject: [PATCH] Fix minor bugs --- .../src/main/java/org/teavm/dependency/MethodDependency.java | 4 +++- .../src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java | 2 +- .../java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java b/teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java index 32c628003..0a5779a3f 100644 --- a/teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java +++ b/teavm-core/src/main/java/org/teavm/dependency/MethodDependency.java @@ -108,7 +108,9 @@ public class MethodDependency implements MethodDependencyInfo { public void use() { if (!used) { used = true; - dependencyChecker.scheduleMethodAnalysis(this); + if (!isMissing()) { + dependencyChecker.scheduleMethodAnalysis(this); + } } } } diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java b/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java index 7d7922a60..1ebe41e8a 100644 --- a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java +++ b/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/TeaVMProjectBuilder.java @@ -442,7 +442,7 @@ public class TeaVMProjectBuilder extends IncrementalProjectBuilder { } } IContainer srcContainer = (IContainer)workspaceRoot.findMember(entry.getPath()); - if (srcContainer.getProject() == project) { + if (srcContainer != null && srcContainer.getProject() == project) { srcCollector.addContainer(srcContainer); } break; diff --git a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java b/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java index 0681bdd53..acf837852 100644 --- a/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java +++ b/teavm-eclipse/teavm-eclipse-plugin/src/main/java/org/teavm/eclipse/debugger/TeaVMDebugConstants.java @@ -15,6 +15,8 @@ */ package org.teavm.eclipse.debugger; +import org.teavm.eclipse.TeaVMEclipsePlugin; + /** * * @author Alexey Andreev @@ -25,5 +27,5 @@ public final class TeaVMDebugConstants { public static final String JAVA_BREAKPOINT_INSTALL_COUNT = "org.eclipse.jdt.debug.core.installCount"; - public static final String DEBUG_TARGET_ID = "org.teavm.eclipse.debugger"; + public static final String DEBUG_TARGET_ID = TeaVMEclipsePlugin.ID + ".debugger"; }