From c0dc8f25d305d1e5d60c59e27db88bd0b3b362f3 Mon Sep 17 00:00:00 2001 From: konsoletyper Date: Sun, 28 Sep 2014 20:53:45 +0400 Subject: [PATCH] Minor fixes --- .../teavm-eclipse-core-plugin/build.properties | 2 +- .../teavm-eclipse-core-plugin/dep-pom.xml | 5 +++++ .../services/org.teavm.vm.spi.TeaVMPlugin | 1 - .../META-INF/teavm.properties | 15 --------------- .../org/teavm/eclipse/TeaVMProjectBuilder.java | 3 --- 5 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 teavm-eclipse/teavm-eclipse-plugin/META-INF/services/org.teavm.vm.spi.TeaVMPlugin delete mode 100644 teavm-eclipse/teavm-eclipse-plugin/META-INF/teavm.properties diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/build.properties b/teavm-eclipse/teavm-eclipse-core-plugin/build.properties index 9890fee6b..2d584ec29 100644 --- a/teavm-eclipse/teavm-eclipse-core-plugin/build.properties +++ b/teavm-eclipse/teavm-eclipse-core-plugin/build.properties @@ -43,5 +43,5 @@ bin.includes = META-INF/,\ lib/websocket-client-9.2.1.v20140609.jar,\ lib/websocket-common-9.2.1.v20140609.jar,\ lib/websocket-server-9.2.1.v20140609.jar,\ - lib/websocket-servlet-9.2.1.v20140609.jar + lib/websocket-servlet-9.2.1.v20140609.jar, jars.compile.order = . diff --git a/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml b/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml index 27c459c62..f38cf9659 100644 --- a/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml +++ b/teavm-eclipse/teavm-eclipse-core-plugin/dep-pom.xml @@ -44,6 +44,11 @@ javax.transaction-api 1.2 + + javax.annotation + javax.annotation-api + 1.2 + org.apache.aries.spifly org.apache.aries.spifly.dynamic.bundle diff --git a/teavm-eclipse/teavm-eclipse-plugin/META-INF/services/org.teavm.vm.spi.TeaVMPlugin b/teavm-eclipse/teavm-eclipse-plugin/META-INF/services/org.teavm.vm.spi.TeaVMPlugin deleted file mode 100644 index a0af2a920..000000000 --- a/teavm-eclipse/teavm-eclipse-plugin/META-INF/services/org.teavm.vm.spi.TeaVMPlugin +++ /dev/null @@ -1 +0,0 @@ -org.teavm.classlib.impl.JCLPlugin \ No newline at end of file diff --git a/teavm-eclipse/teavm-eclipse-plugin/META-INF/teavm.properties b/teavm-eclipse/teavm-eclipse-plugin/META-INF/teavm.properties deleted file mode 100644 index 4d80f6d1e..000000000 --- a/teavm-eclipse/teavm-eclipse-plugin/META-INF/teavm.properties +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2013 Alexey Andreev. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -packagePrefix.java=org.teavm.classlib -classPrefix.java=T \ No newline at end of file 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 4e40e7168..f711ae3d2 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 @@ -30,9 +30,6 @@ import org.eclipse.core.variables.VariablesPlugin; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.IProgressService; import org.teavm.dependency.*; import org.teavm.model.ClassHolderTransformer; import org.teavm.model.InstructionLocation;