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> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.11</version> <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> <configuration>
<propertyExpansion>config_loc=${basedir}/..</propertyExpansion> <propertyExpansion>config_loc=${basedir}/..</propertyExpansion>
<configLocation>../checkstyle.xml</configLocation> <configLocation>../checkstyle.xml</configLocation>

View File

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

View File

@ -1,23 +1,26 @@
/* /*
* Copyright 2015 jarda. * Copyright 2015 Jaroslav Tulach.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.teavm.samples.benchmark.htmljava; package org.teavm.samples.benchmark.htmljava;
import net.java.html.boot.BrowserBuilder; import net.java.html.boot.BrowserBuilder;
public class BenchmarkFX { public final class BenchmarkFX {
private BenchmarkFX() {
}
public static void main(String... args) { public static void main(String... args) {
BrowserBuilder.newBrowser().loadPage("fx.html") BrowserBuilder.newBrowser().loadPage("fx.html")
.loadClass(BenchmarkStarter.class) .loadClass(BenchmarkStarter.class)

View File

@ -1,17 +1,17 @@
/* /*
* Copyright 2015 Jaroslav Tulach. * Copyright 2015 Jaroslav Tulach.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.teavm.samples.benchmark.htmljava; package org.teavm.samples.benchmark.htmljava;
@ -31,7 +31,10 @@ import org.jbox2d.dynamics.Body;
import org.jbox2d.dynamics.Fixture; import org.jbox2d.dynamics.Fixture;
import org.teavm.samples.benchmark.Scene; 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 Timer TIMER = new Timer("Make Step");
private static final Scene scene = new Scene(); private static final Scene scene = new Scene();
private static double startMillisecond; private static double startMillisecond;