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

Preparing to merge into master

Browse Source
This commit is contained in:
konsoletyper 2015-03-12 22:07:24 +03:00
parent 2971efb62b
commit cd0dd134cc
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
teavm-samples/teavm-samples-async/pom.xml
View File

@ -65,12 +65,10 @@
<targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory> <targetDirectory>${project.build.directory}/generated/js/teavm</targetDirectory>
<mainClass>org.teavm.samples.async.AsyncProgram</mainClass> <mainClass>org.teavm.samples.async.AsyncProgram</mainClass>
<runtime>SEPARATE</runtime> <runtime>SEPARATE</runtime>
<minifying>false</minifying> <minifying>true</minifying>
<debugInformationGenerated>true</debugInformationGenerated> <debugInformationGenerated>true</debugInformationGenerated>
<!--
<sourceMapsGenerated>true</sourceMapsGenerated> <sourceMapsGenerated>true</sourceMapsGenerated>
<sourceFilesCopied>true</sourceFilesCopied> <sourceFilesCopied>true</sourceFilesCopied>
-->
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

2
teavm-samples/teavm-samples-async/src/main/java/org/teavm/samples/async/AsyncProgram.java
View File

@ -73,7 +73,7 @@ public final class AsyncProgram {
private static void findPrimes() { private static void findPrimes() {
report("Finding primes"); report("Finding primes");
boolean[] prime = new boolean[1000000]; boolean[] prime = new boolean[1000];
prime[2] = true; prime[2] = true;
prime[3] = true; prime[3] = true;
nextPrime: for (int i = 5; i < prime.length; i += 2) { nextPrime: for (int i = 5; i < prime.length; i += 2) {

2
teavm-tests/src/test/java/org/teavm/classlib/java/lang/ObjectTest.java
View File

@ -73,7 +73,7 @@ public class ObjectTest {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
final Object lock = new Object(); final Object lock = new Object();
synchronized (lock) { synchronized (lock) {
lock.wait(100); lock.wait(110);
} }
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
assertTrue(end - start > 100); assertTrue(end - start > 100);