Merging changes from the HotSpotBenchmark branch

This commit is contained in:
Jaroslav Tulach 2015-02-27 09:50:52 +01:00
commit e2bf973ac3
4 changed files with 44 additions and 23 deletions

15
pom.xml
View File

@ -219,6 +219,21 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.11</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
</configuration>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<propertyExpansion>config_loc=${basedir}/..</propertyExpansion>
<configLocation>../checkstyle.xml</configLocation>

View File

@ -74,7 +74,7 @@
<dependency>
<groupId>com.dukescript.canvas</groupId>
<artifactId>html5-canvas</artifactId>
<version>0.7.1</version>
<version>0.7.2</version>
</dependency>
<dependency>
<groupId>org.netbeans.html</groupId>

View File

@ -1,5 +1,5 @@
/*
* Copyright 2015 jarda.
* Copyright 2015 Jaroslav Tulach.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -17,7 +17,10 @@ package org.teavm.samples.benchmark.htmljava;
import net.java.html.boot.BrowserBuilder;
public class BenchmarkFX {
public final class BenchmarkFX {
private BenchmarkFX() {
}
public static void main(String... args) {
BrowserBuilder.newBrowser().loadPage("fx.html")
.loadClass(BenchmarkStarter.class)

View File

@ -31,7 +31,10 @@ import org.jbox2d.dynamics.Body;
import org.jbox2d.dynamics.Fixture;
import org.teavm.samples.benchmark.Scene;
public class BenchmarkStarter {
public final class BenchmarkStarter {
private BenchmarkStarter() {
}
private static final Timer TIMER = new Timer("Make Step");
private static final Scene scene = new Scene();
private static double startMillisecond;