diff --git a/.idea/artifacts/teavm_samples_async_war.xml b/.idea/artifacts/teavm_samples_async_war.xml new file mode 100644 index 000000000..1e6b4d67d --- /dev/null +++ b/.idea/artifacts/teavm_samples_async_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/async/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_async_war_exploded.xml b/.idea/artifacts/teavm_samples_async_war_exploded.xml new file mode 100644 index 000000000..c890b50c2 --- /dev/null +++ b/.idea/artifacts/teavm_samples_async_war_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/samples/async/target/teavm-samples-async-1.0.0-SNAPSHOT + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_benchmark_war.xml b/.idea/artifacts/teavm_samples_benchmark_war.xml new file mode 100644 index 000000000..481a615ac --- /dev/null +++ b/.idea/artifacts/teavm_samples_benchmark_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/benchmark/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_benchmark_war_exploded.xml b/.idea/artifacts/teavm_samples_benchmark_war_exploded.xml new file mode 100644 index 000000000..17bb430d8 --- /dev/null +++ b/.idea/artifacts/teavm_samples_benchmark_war_exploded.xml @@ -0,0 +1,25 @@ + + + $PROJECT_DIR$/samples/benchmark/target/teavm-samples-benchmark-1.0.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_hello_war.xml b/.idea/artifacts/teavm_samples_hello_war.xml new file mode 100644 index 000000000..659d04392 --- /dev/null +++ b/.idea/artifacts/teavm_samples_hello_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/hello/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_hello_war_exploded.xml b/.idea/artifacts/teavm_samples_hello_war_exploded.xml new file mode 100644 index 000000000..31fd821aa --- /dev/null +++ b/.idea/artifacts/teavm_samples_hello_war_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/samples/hello/target/teavm-samples-hello-1.0.0-SNAPSHOT + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_kotlin_war.xml b/.idea/artifacts/teavm_samples_kotlin_war.xml new file mode 100644 index 000000000..7dc8d39c0 --- /dev/null +++ b/.idea/artifacts/teavm_samples_kotlin_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/kotlin/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_kotlin_war_exploded.xml b/.idea/artifacts/teavm_samples_kotlin_war_exploded.xml new file mode 100644 index 000000000..8f037cf51 --- /dev/null +++ b/.idea/artifacts/teavm_samples_kotlin_war_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/samples/kotlin/target/teavm-samples-kotlin-1.0.0-SNAPSHOT + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_scala_war.xml b/.idea/artifacts/teavm_samples_scala_war.xml new file mode 100644 index 000000000..35b7c64f1 --- /dev/null +++ b/.idea/artifacts/teavm_samples_scala_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/scala/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_scala_war_exploded.xml b/.idea/artifacts/teavm_samples_scala_war_exploded.xml new file mode 100644 index 000000000..dc64f7dca --- /dev/null +++ b/.idea/artifacts/teavm_samples_scala_war_exploded.xml @@ -0,0 +1,22 @@ + + + $PROJECT_DIR$/samples/scala/target/teavm-samples-scala-1.0.0-SNAPSHOT + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_storage_war.xml b/.idea/artifacts/teavm_samples_storage_war.xml new file mode 100644 index 000000000..2245661be --- /dev/null +++ b/.idea/artifacts/teavm_samples_storage_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/storage/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_storage_war_exploded.xml b/.idea/artifacts/teavm_samples_storage_war_exploded.xml new file mode 100644 index 000000000..6dd585c7c --- /dev/null +++ b/.idea/artifacts/teavm_samples_storage_war_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/samples/storage/target/teavm-samples-storage-1.0.0-SNAPSHOT + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_video_war.xml b/.idea/artifacts/teavm_samples_video_war.xml new file mode 100644 index 000000000..c255576a3 --- /dev/null +++ b/.idea/artifacts/teavm_samples_video_war.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/samples/video/target + + + + + \ No newline at end of file diff --git a/.idea/artifacts/teavm_samples_video_war_exploded.xml b/.idea/artifacts/teavm_samples_video_war_exploded.xml new file mode 100644 index 000000000..7d9528f27 --- /dev/null +++ b/.idea/artifacts/teavm_samples_video_war_exploded.xml @@ -0,0 +1,16 @@ + + + $PROJECT_DIR$/samples/video/target/teavm-samples-video-1.0.0-SNAPSHOT + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/checkstyle-idea.xml b/.idea/checkstyle-idea.xml new file mode 100644 index 000000000..6995d8f56 --- /dev/null +++ b/.idea/checkstyle-idea.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 000000000..1172874a3 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,263 @@ + + + + + + \ No newline at end of file diff --git a/.idea/copyright/Apache_2_0.xml b/.idea/copyright/Apache_2_0.xml new file mode 100644 index 000000000..f2bf267aa --- /dev/null +++ b/.idea/copyright/Apache_2_0.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/dictionaries/Alexey_Andreev.xml b/.idea/dictionaries/Alexey_Andreev.xml new file mode 100644 index 000000000..3fb8eccc0 --- /dev/null +++ b/.idea/dictionaries/Alexey_Andreev.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..176a491da --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 000000000..7f7428a5d --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,158 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 000000000..3b312839b --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml new file mode 100644 index 000000000..30ff5cb79 --- /dev/null +++ b/.idea/libraries/Maven__aopalliance_aopalliance_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml b/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml new file mode 100644 index 000000000..55692b94d --- /dev/null +++ b/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_beust_jcommander_1_12.xml b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml new file mode 100644 index 000000000..2b9ea1726 --- /dev/null +++ b/.idea/libraries/Maven__com_beust_jcommander_1_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_1.xml b/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_1.xml new file mode 100644 index 000000000..8d003d222 --- /dev/null +++ b/.idea/libraries/Maven__com_carrotsearch_hppc_0_6_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_0_7_2.xml b/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_0_7_2.xml new file mode 100644 index 000000000..dda402cc5 --- /dev/null +++ b/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_0_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_bck2brwsr_0_7_2.xml b/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_bck2brwsr_0_7_2.xml new file mode 100644 index 000000000..43dde1452 --- /dev/null +++ b/.idea/libraries/Maven__com_dukescript_canvas_canvas_api_bck2brwsr_0_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_dukescript_canvas_html5_canvas_0_7_2.xml b/.idea/libraries/Maven__com_dukescript_canvas_html5_canvas_0_7_2.xml new file mode 100644 index 000000000..e71a14646 --- /dev/null +++ b/.idea/libraries/Maven__com_dukescript_canvas_html5_canvas_0_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_2.xml new file mode 100644 index 000000000..17eb800fc --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_2.xml new file mode 100644 index 000000000..b46defa98 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_2.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_2.xml new file mode 100644 index 000000000..2c3db3ea0 --- /dev/null +++ b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_6_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml new file mode 100644 index 000000000..4533c1ba7 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 000000000..d7b503804 --- /dev/null +++ b/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_18_0.xml b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml new file mode 100644 index 000000000..bbd71d77e --- /dev/null +++ b/.idea/libraries/Maven__com_google_guava_guava_18_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_gwt_gwt_user_2_7_0.xml b/.idea/libraries/Maven__com_google_gwt_gwt_user_2_7_0.xml new file mode 100644 index 000000000..172244141 --- /dev/null +++ b/.idea/libraries/Maven__com_google_gwt_gwt_user_2_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml b/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml new file mode 100644 index 000000000..897f365a3 --- /dev/null +++ b/.idea/libraries/Maven__com_jcraft_jzlib_1_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml new file mode 100644 index 000000000..cec24931e --- /dev/null +++ b/.idea/libraries/Maven__commons_cli_commons_cli_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml new file mode 100644 index 000000000..27424a179 --- /dev/null +++ b/.idea/libraries/Maven__commons_codec_commons_codec_1_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml new file mode 100644 index 000000000..3caee7e54 --- /dev/null +++ b/.idea/libraries/Maven__commons_collections_commons_collections_3_2_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_4.xml b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml new file mode 100644 index 000000000..bc2aad0ed --- /dev/null +++ b/.idea/libraries/Maven__commons_io_commons_io_2_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml new file mode 100644 index 000000000..eab40b329 --- /dev/null +++ b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__io_netty_netty_3_5_2_Final.xml b/.idea/libraries/Maven__io_netty_netty_3_5_2_Final.xml new file mode 100644 index 000000000..7de2ea925 --- /dev/null +++ b/.idea/libraries/Maven__io_netty_netty_3_5_2_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml new file mode 100644 index 000000000..e35b93695 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_jsr250_api_1_0.xml b/.idea/libraries/Maven__javax_annotation_jsr250_api_1_0.xml new file mode 100644 index 000000000..e36795881 --- /dev/null +++ b/.idea/libraries/Maven__javax_annotation_jsr250_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_enterprise_cdi_api_1_0.xml b/.idea/libraries/Maven__javax_enterprise_cdi_api_1_0.xml new file mode 100644 index 000000000..e0d795e78 --- /dev/null +++ b/.idea/libraries/Maven__javax_enterprise_cdi_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_inject_javax_inject_1.xml b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml new file mode 100644 index 000000000..93cf65aba --- /dev/null +++ b/.idea/libraries/Maven__javax_inject_javax_inject_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml new file mode 100644 index 000000000..c24f7e308 --- /dev/null +++ b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml new file mode 100644 index 000000000..4b644e911 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_1_0_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_sources_1_0_0_GA.xml b/.idea/libraries/Maven__javax_validation_validation_api_sources_1_0_0_GA.xml new file mode 100644 index 000000000..fce285213 --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_sources_1_0_0_GA.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml b/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml new file mode 100644 index 000000000..cf43cc9db --- /dev/null +++ b/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__joda_time_joda_time_2_7.xml b/.idea/libraries/Maven__joda_time_joda_time_2_7.xml new file mode 100644 index 000000000..1259ecab6 --- /dev/null +++ b/.idea/libraries/Maven__joda_time_joda_time_2_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_11.xml b/.idea/libraries/Maven__junit_junit_4_11.xml new file mode 100644 index 000000000..f33320d8e --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_11.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml new file mode 100644 index 000000000..7ee934a00 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml new file mode 100644 index 000000000..148c52a21 --- /dev/null +++ b/.idea/libraries/Maven__net_java_dev_jna_jna_platform_4_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_16.xml b/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_16.xml new file mode 100644 index 000000000..a2916de0a --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_cssparser_cssparser_0_9_16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_18.xml b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_18.xml new file mode 100644 index 000000000..5a5dbed3f --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_2_18.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_17.xml b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_17.xml new file mode 100644 index 000000000..bf353a72d --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_htmlunit_htmlunit_core_js_2_17.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml b/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml new file mode 100644 index 000000000..413274cb1 --- /dev/null +++ b/.idea/libraries/Maven__net_sourceforge_nekohtml_nekohtml_1_9_22.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml b/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml new file mode 100644 index 000000000..e064a8225 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_exec_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml new file mode 100644 index 000000000..78cfcd37a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml new file mode 100644 index 000000000..bfee5185a --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml new file mode 100644 index 000000000..24a6857d2 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5.xml new file mode 100644 index 000000000..b47fa2bae --- /dev/null +++ b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_3_3.xml new file mode 100644 index 000000000..9a56c7a0f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_aether_provider_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_3_3.xml new file mode 100644 index 000000000..5ffe33f84 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_artifact_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_builder_support_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_builder_support_3_3_3.xml new file mode 100644 index 000000000..8caa496be --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_builder_support_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_core_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_core_3_3_3.xml new file mode 100644 index 000000000..8723930b3 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_core_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_3_3_3.xml new file mode 100644 index 000000000..01dc6fb3c --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_model_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_3_3.xml new file mode 100644 index 000000000..3e0826694 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_model_builder_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_3_3.xml new file mode 100644 index 000000000..f9ee56a17 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_plugin_api_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_3_3.xml new file mode 100644 index 000000000..d366b4f13 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_repository_metadata_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_3_3.xml new file mode 100644 index 000000000..5969e3c8f --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_settings_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_3_3.xml b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_3_3.xml new file mode 100644 index 000000000..ca2309d02 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_maven_settings_builder_3_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_3.xml b/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_3.xml new file mode 100644 index 000000000..7e6143409 --- /dev/null +++ b/.idea/libraries/Maven__org_apache_maven_plugin_tools_maven_plugin_annotations_3_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apidesign_bck2brwsr_emul_rt_0_14.xml b/.idea/libraries/Maven__org_apidesign_bck2brwsr_emul_rt_0_14.xml new file mode 100644 index 000000000..d932b284a --- /dev/null +++ b/.idea/libraries/Maven__org_apidesign_bck2brwsr_emul_rt_0_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apidesign_bck2brwsr_ko_bck2brwsr_bck2brwsr_0_14.xml b/.idea/libraries/Maven__org_apidesign_bck2brwsr_ko_bck2brwsr_bck2brwsr_0_14.xml new file mode 100644 index 000000000..84f9bd477 --- /dev/null +++ b/.idea/libraries/Maven__org_apidesign_bck2brwsr_ko_bck2brwsr_bck2brwsr_0_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml new file mode 100644 index 000000000..98eb54999 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_core_asl_1_9_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml new file mode 100644 index 000000000..77f3bad57 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_jackson_jackson_mapper_asl_1_9_13.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml new file mode 100644 index 000000000..ff6091fb9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_classworlds_2_5_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml new file mode 100644 index 000000000..929231793 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_component_annotations_1_5_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_21.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_21.xml new file mode 100644 index 000000000..ca3bd808a --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_interpolation_1_21.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_20.xml b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_20.xml new file mode 100644 index 000000000..25c79cbb9 --- /dev/null +++ b/.idea/libraries/Maven__org_codehaus_plexus_plexus_utils_3_0_20.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_0_2_v20150114.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_0_2_v20150114.xml new file mode 100644 index 000000000..e5b7122b2 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_aether_aether_api_1_0_2_v20150114.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_impl_1_0_2_v20150114.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_impl_1_0_2_v20150114.xml new file mode 100644 index 000000000..8c89b60b1 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_aether_aether_impl_1_0_2_v20150114.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_spi_1_0_2_v20150114.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_spi_1_0_2_v20150114.xml new file mode 100644 index 000000000..06598d189 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_aether_aether_spi_1_0_2_v20150114.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_aether_aether_util_1_0_2_v20150114.xml b/.idea/libraries/Maven__org_eclipse_aether_aether_util_1_0_2_v20150114.xml new file mode 100644 index 000000000..563b2bf00 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_aether_aether_util_1_0_2_v20150114.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_2_1_v20140609.xml new file mode 100644 index 000000000..9721644f2 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_annotations_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_1_v20140609.xml new file mode 100644 index 000000000..7b2de9ef7 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_12_v20150709.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_12_v20150709.xml new file mode 100644 index 000000000..5daa4dbbe --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_12_v20150709.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_1_v20140609.xml new file mode 100644 index 000000000..5aa94f9ac --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_jndi_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jndi_9_2_1_v20140609.xml new file mode 100644 index 000000000..6d76bfaeb --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_jndi_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_2_1_v20140609.xml new file mode 100644 index 000000000..8c9e49fd5 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_plus_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_1_v20140609.xml new file mode 100644 index 000000000..16deaac68 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_security_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_1_v20140609.xml new file mode 100644 index 000000000..a6d49a1c7 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_server_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_1_v20140609.xml new file mode 100644 index 000000000..e9611f2ef --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_servlet_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_12_v20150709.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_12_v20150709.xml new file mode 100644 index 000000000..bd171bb44 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_12_v20150709.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_1_v20140609.xml new file mode 100644 index 000000000..423f36849 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_1_v20140609.xml new file mode 100644 index 000000000..9964e3ffe --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_webapp_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_1_v20140609.xml new file mode 100644 index 000000000..1883b4a1e --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_jetty_xml_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_2_1_v20140609.xml new file mode 100644 index 000000000..b4a86aa82 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_client_impl_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_2_1_v20140609.xml new file mode 100644 index 000000000..7c0872d61 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_javax_websocket_server_impl_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_12_v20150709.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_12_v20150709.xml new file mode 100644 index 000000000..54f8a2bcd --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_12_v20150709.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_1_v20140609.xml new file mode 100644 index 000000000..75f3080c9 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_api_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_12_v20150709.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_12_v20150709.xml new file mode 100644 index 000000000..8b2faa3d1 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_12_v20150709.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_1_v20140609.xml new file mode 100644 index 000000000..604e15b65 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_client_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_12_v20150709.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_12_v20150709.xml new file mode 100644 index 000000000..f92d5bf12 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_12_v20150709.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_1_v20140609.xml new file mode 100644 index 000000000..586dc450f --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_common_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_2_1_v20140609.xml new file mode 100644 index 000000000..b0a693de7 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_server_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_2_1_v20140609.xml b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_2_1_v20140609.xml new file mode 100644 index 000000000..eb177a241 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_jetty_websocket_websocket_servlet_9_2_1_v20140609.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_inject_0_3_0.xml b/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_inject_0_3_0.xml new file mode 100644 index 000000000..fcb087350 --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_inject_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_plexus_0_3_0.xml b/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_plexus_0_3_0.xml new file mode 100644 index 000000000..6ceefbc9f --- /dev/null +++ b/.idea/libraries/Maven__org_eclipse_sisu_org_eclipse_sisu_plexus_0_3_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 000000000..f58bbc112 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jbox2d_jbox2d_library_2_2_1_1.xml b/.idea/libraries/Maven__org_jbox2d_jbox2d_library_2_2_1_1.xml new file mode 100644 index 000000000..1959742ce --- /dev/null +++ b/.idea/libraries/Maven__org_jbox2d_jbox2d_library_2_2_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jbox2d_jbox2d_library_sources_2_2_1_1.xml b/.idea/libraries/Maven__org_jbox2d_jbox2d_library_sources_2_2_1_1.xml new file mode 100644 index 000000000..28c7c055e --- /dev/null +++ b/.idea/libraries/Maven__org_jbox2d_jbox2d_library_sources_2_2_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_0_11_91_1.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_0_11_91_1.xml new file mode 100644 index 000000000..03ce744e0 --- /dev/null +++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_runtime_0_11_91_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_0_11_91_1.xml b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_0_11_91_1.xml new file mode 100644 index 000000000..07fe1a2d2 --- /dev/null +++ b/.idea/libraries/Maven__org_jetbrains_kotlin_kotlin_stdlib_0_11_91_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_mozilla_rhino_1_7_7.xml b/.idea/libraries/Maven__org_mozilla_rhino_1_7_7.xml new file mode 100644 index 000000000..482ba52fc --- /dev/null +++ b/.idea/libraries/Maven__org_mozilla_rhino_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_ko4j_1_2_3.xml b/.idea/libraries/Maven__org_netbeans_html_ko4j_1_2_3.xml new file mode 100644 index 000000000..a08565ab4 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_ko4j_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_1_2_3.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_1_2_3.xml new file mode 100644 index 000000000..3daeb3df5 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_boot_1_2_3.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_boot_1_2_3.xml new file mode 100644 index 000000000..e7886402d --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_boot_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_geo_1_1.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_geo_1_1.xml new file mode 100644 index 000000000..bb3b6f579 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_geo_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_1.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_1.xml new file mode 100644 index 000000000..e8e218925 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_2_3.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_2_3.xml new file mode 100644 index 000000000..4a1bb1a97 --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_tck_1_2_3.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_tck_1_2_3.xml new file mode 100644 index 000000000..aa44171bf --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_json_tck_1_2_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_netbeans_html_net_java_html_sound_1_1.xml b/.idea/libraries/Maven__org_netbeans_html_net_java_html_sound_1_1.xml new file mode 100644 index 000000000..190e7c2df --- /dev/null +++ b/.idea/libraries/Maven__org_netbeans_html_net_java_html_sound_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_5_0_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_1.xml new file mode 100644 index 000000000..67edd7882 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_5_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_1.xml new file mode 100644 index 000000000..34d47f04f --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_commons_5_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_debug_all_5_0_4.xml b/.idea/libraries/Maven__org_ow2_asm_asm_debug_all_5_0_4.xml new file mode 100644 index 000000000..aeb76fe5e --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_debug_all_5_0_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_1.xml new file mode 100644 index 000000000..c68005897 --- /dev/null +++ b/.idea/libraries/Maven__org_ow2_asm_asm_tree_5_0_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_7.xml b/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_7.xml new file mode 100644 index 000000000..30df404b8 --- /dev/null +++ b/.idea/libraries/Maven__org_scala_lang_scala_library_2_11_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_api_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_api_2_47_2.xml new file mode 100644 index 000000000..d43a1077a --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_api_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_chrome_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_chrome_driver_2_47_2.xml new file mode 100644 index 000000000..353b56896 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_chrome_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_firefox_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_firefox_driver_2_47_2.xml new file mode 100644 index 000000000..25e22ea77 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_firefox_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_htmlunit_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_htmlunit_driver_2_47_2.xml new file mode 100644 index 000000000..157ebabb7 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_htmlunit_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_ie_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_ie_driver_2_47_2.xml new file mode 100644 index 000000000..a792cb34b --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_ie_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_java_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_java_2_47_2.xml new file mode 100644 index 000000000..01bc88e63 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_java_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_leg_rc_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_leg_rc_2_47_2.xml new file mode 100644 index 000000000..3dab98170 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_leg_rc_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_remote_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_remote_driver_2_47_2.xml new file mode 100644 index 000000000..7f7273965 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_remote_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_safari_driver_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_safari_driver_2_47_2.xml new file mode 100644 index 000000000..2fec8d091 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_safari_driver_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_support_2_47_2.xml b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_support_2_47_2.xml new file mode 100644 index 000000000..584fd9bf8 --- /dev/null +++ b/.idea/libraries/Maven__org_seleniumhq_selenium_selenium_support_2_47_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 000000000..1e672600f --- /dev/null +++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml new file mode 100644 index 000000000..7316193d5 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_plexus_plexus_cipher_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml b/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml new file mode 100644 index 000000000..bb61d0e61 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_plexus_plexus_sec_dispatcher_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_no_aop_3_2_5.xml b/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_no_aop_3_2_5.xml new file mode 100644 index 000000000..c450885b5 --- /dev/null +++ b/.idea/libraries/Maven__org_sonatype_sisu_sisu_guice_no_aop_3_2_5.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_testng_testng_6_7.xml b/.idea/libraries/Maven__org_testng_testng_6_7.xml new file mode 100644 index 000000000..264ea062f --- /dev/null +++ b/.idea/libraries/Maven__org_testng_testng_6_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml b/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml new file mode 100644 index 000000000..af3d41461 --- /dev/null +++ b/.idea/libraries/Maven__org_w3c_css_sac_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_webbitserver_webbit_0_4_14.xml b/.idea/libraries/Maven__org_webbitserver_webbit_0_4_14.xml new file mode 100644 index 000000000..1af445796 --- /dev/null +++ b/.idea/libraries/Maven__org_webbitserver_webbit_0_4_14.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml new file mode 100644 index 000000000..0f8bd1980 --- /dev/null +++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_6.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xalan_serializer_2_7_2.xml b/.idea/libraries/Maven__xalan_serializer_2_7_2.xml new file mode 100644 index 000000000..8fd4cc955 --- /dev/null +++ b/.idea/libraries/Maven__xalan_serializer_2_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xalan_xalan_2_7_2.xml b/.idea/libraries/Maven__xalan_xalan_2_7_2.xml new file mode 100644 index 000000000..c806972a1 --- /dev/null +++ b/.idea/libraries/Maven__xalan_xalan_2_7_2.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml new file mode 100644 index 000000000..285d5e893 --- /dev/null +++ b/.idea/libraries/Maven__xerces_xercesImpl_2_11_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml new file mode 100644 index 000000000..9aadd291d --- /dev/null +++ b/.idea/libraries/Maven__xml_apis_xml_apis_1_4_01.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..380ea5aba --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 000000000..e96534fb2 --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..94a25f7f4 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/checkstyle.xml b/checkstyle.xml index 52f882855..e37c43d11 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -43,7 +43,9 @@ - + + + diff --git a/classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java b/classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java index dd4d11195..9865ec171 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/ServiceLoaderSupport.java @@ -30,9 +30,7 @@ import java.util.Set; import org.teavm.codegen.SourceWriter; import org.teavm.dependency.AbstractDependencyListener; import org.teavm.dependency.DependencyAgent; -import org.teavm.dependency.DependencyConsumer; import org.teavm.dependency.DependencyNode; -import org.teavm.dependency.DependencyType; import org.teavm.dependency.MethodDependency; import org.teavm.javascript.spi.Generator; import org.teavm.javascript.spi.GeneratorContext; @@ -139,11 +137,7 @@ public class ServiceLoaderSupport extends AbstractDependencyListener implements if (ref.getClassName().equals("java.util.ServiceLoader") && ref.getName().equals("loadServices")) { method.getResult().propagate(agent.getType("[java.lang.Object")); allClassesNode.connect(method.getResult().getArrayItem()); - method.getResult().getArrayItem().addConsumer(new DependencyConsumer() { - @Override public void consume(DependencyType type) { - initConstructor(agent, type.getName(), location); - } - }); + method.getResult().getArrayItem().addConsumer(type -> initConstructor(agent, type.getName(), location)); } } diff --git a/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java index 38e78a6f0..dccf67591 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/report/JCLComparisonBuilder.java @@ -147,17 +147,9 @@ public class JCLComparisonBuilder { } private void processModel(List packages) { - Collections.sort(packages, new Comparator() { - @Override public int compare(JCLPackage o1, JCLPackage o2) { - return o1.name.compareTo(o2.name); - } - }); + Collections.sort(packages, (o1, o2) -> o1.name.compareTo(o2.name)); for (JCLPackage pkg : packages) { - Collections.sort(pkg.classes, new Comparator() { - @Override public int compare(JCLClass o1, JCLClass o2) { - return o1.name.compareTo(o2.name); - } - }); + Collections.sort(pkg.classes, (o1, o2) -> o1.name.compareTo(o2.name)); } } diff --git a/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java index 0fcd6dfd7..aa4abeedc 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZone.java @@ -51,17 +51,6 @@ package org.teavm.classlib.impl.tz; * However, the factory that accepts a TimeZone will attempt to convert from * the old short id to a suitable long id. *

- * There are four approaches to loading time-zone data, which are tried in this order: - *

    - *
  1. load the specific {@link Provider} specified by the system property - * {@code org.joda.time.DateTimeZone.Provider}. - *
  2. load {@link ZoneInfoProvider} using the data in the filing system folder - * pointed to by system property {@code org.joda.time.DateTimeZone.Folder}. - *
  3. load {@link ZoneInfoProvider} using the data in the classpath location - * {@code org/joda/time/tz/data}. - *
  4. load {@link UTCProvider} - *
- *

* Unless you override the standard behaviour, the default if the third approach. *

* DateTimeZone is thread-safe and immutable, and all subclasses must be as @@ -271,7 +260,6 @@ public abstract class DateTimeZone { * @param strict whether the conversion should reject non-existent local times * @return the UTC instant with the same local time, * @throws ArithmeticException if the result overflows a long - * @throws IllegalInstantException if the zone has no equivalent local time * @since 1.5 */ public long convertLocalToUTC(long instantLocal, boolean strict) { diff --git a/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java index 1f9b29ae8..459a4edb2 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/tz/DateTimeZoneBuilder.java @@ -61,7 +61,6 @@ import org.teavm.classlib.impl.CharFlow; * * @author Brian S O'Neill * @see ZoneInfoCompiler - * @see ZoneInfoProvider * @since 1.0 */ public class DateTimeZoneBuilder { @@ -131,7 +130,6 @@ public class DateTimeZoneBuilder { /** * Add a recurring daylight saving time rule. * - * @param nameKey the name key of new rule * @param saveMillis the milliseconds to add to standard offset * @param fromYear the first year that rule is in effect, MIN_VALUE indicates * beginning of time @@ -930,10 +928,7 @@ public class DateTimeZoneBuilder { // Overflowed. start = instant; } - } catch (IllegalArgumentException e) { - // Overflowed. - start = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. start = instant; } @@ -944,10 +939,7 @@ public class DateTimeZoneBuilder { // Overflowed. end = instant; } - } catch (IllegalArgumentException e) { - // Overflowed. - end = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. end = instant; } @@ -974,10 +966,7 @@ public class DateTimeZoneBuilder { // Overflowed. start = instant; } - } catch (IllegalArgumentException e) { - // Overflowed. - start = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. start = instant; } @@ -988,10 +977,7 @@ public class DateTimeZoneBuilder { // Overflowed. end = instant; } - } catch (IllegalArgumentException e) { - // Overflowed. - end = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. end = instant; } @@ -1009,20 +995,14 @@ public class DateTimeZoneBuilder { try { start = startRecurrence.next(instant, standardOffset, endRecurrence.getSaveMillis()); - } catch (IllegalArgumentException e) { - // Overflowed. - start = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. start = instant; } try { end = endRecurrence.next(instant, standardOffset, startRecurrence.getSaveMillis()); - } catch (IllegalArgumentException e) { - // Overflowed. - end = instant; - } catch (ArithmeticException e) { + } catch (IllegalArgumentException | ArithmeticException e) { // Overflowed. end = instant; } diff --git a/classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java b/classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java index 5030a58d5..f5a1276c8 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/tz/ZoneInfoCompiler.java @@ -34,22 +34,6 @@ import org.joda.time.chrono.LenientChronology; import org.joda.time.format.DateTimeFormatter; import org.joda.time.format.ISODateTimeFormat; -/** - * Compiles IANA ZoneInfo database files into binary files for each time zone - * in the database. {@link DateTimeZoneBuilder} is used to construct and encode - * compiled data files. {@link ZoneInfoProvider} loads the encoded files and - * converts them back into {@link DateTimeZone} objects. - *

- * Although this tool is similar to zic, the binary formats are not - * compatible. The latest IANA time zone database files may be obtained - * here. - *

- * ZoneInfoCompiler is mutable and not thread-safe, although the main method - * may be safely invoked by multiple threads. - * - * @author Brian S O'Neill - * @since 1.0 - */ public class ZoneInfoCompiler { static DateTimeOfYear cStartOfYear; @@ -71,12 +55,15 @@ public class ZoneInfoCompiler { static int parseYear(String str, int def) { str = str.toLowerCase(); - if (str.equals("minimum") || str.equals("min")) { - return Integer.MIN_VALUE; - } else if (str.equals("maximum") || str.equals("max")) { - return Integer.MAX_VALUE; - } else if (str.equals("only")) { - return def; + switch (str) { + case "minimum": + case "min": + return Integer.MIN_VALUE; + case "maximum": + case "max": + return Integer.MAX_VALUE; + case "only": + return def; } return Integer.parseInt(str); } diff --git a/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java index a73c6a90d..4ca90aee7 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/unicode/DateFormatMetadataGenerator.java @@ -28,23 +28,11 @@ public class DateFormatMetadataGenerator implements MetadataGenerator { public Resource generateMetadata(MetadataGeneratorContext context, MethodReference method) { switch (method.getName()) { case "getDateFormatMap": - return getDateFormatMap(context, new FormatExtractor() { - @Override public CLDRDateFormats extract(CLDRLocale locale) { - return locale.getDateFormats(); - } - }); + return getDateFormatMap(context, locale -> locale.getDateFormats()); case "getTimeFormatMap": - return getDateFormatMap(context, new FormatExtractor() { - @Override public CLDRDateFormats extract(CLDRLocale locale) { - return locale.getTimeFormats(); - } - }); + return getDateFormatMap(context, locale -> locale.getTimeFormats()); case "getDateTimeFormatMap": - return getDateFormatMap(context, new FormatExtractor() { - @Override public CLDRDateFormats extract(CLDRLocale locale) { - return locale.getDateTimeFormats(); - } - }); + return getDateFormatMap(context, locale -> locale.getDateTimeFormats()); default: throw new IllegalArgumentException("Method is not supported: " + method); } diff --git a/classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java b/classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java index 5c757bfc6..eed768925 100644 --- a/classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java +++ b/classlib/src/main/java/org/teavm/classlib/impl/unicode/NumberFormatMetadataGenerator.java @@ -35,25 +35,13 @@ public class NumberFormatMetadataGenerator implements MetadataGenerator { FormatAccessor accessor; switch (method.getName()) { case "getNumberFormatMap": - accessor = new FormatAccessor() { - @Override public String getFormat(CLDRLocale locale) { - return locale.numberFormat; - } - }; + accessor = locale -> locale.numberFormat; break; case "getCurrencyFormatMap": - accessor = new FormatAccessor() { - @Override public String getFormat(CLDRLocale locale) { - return locale.currencyFormat; - } - }; + accessor = locale -> locale.currencyFormat; break; case "getPercentFormatMap": - accessor = new FormatAccessor() { - @Override public String getFormat(CLDRLocale locale) { - return locale.percentFormat; - } - }; + accessor = locale -> locale.percentFormat; break; default: throw new AssertionError(); diff --git a/classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java b/classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java index a68ec6881..83184ad8a 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java +++ b/classlib/src/main/java/org/teavm/classlib/java/io/TWriter.java @@ -19,7 +19,7 @@ import org.teavm.classlib.java.lang.TAppendable; import org.teavm.classlib.java.lang.TCharSequence; public abstract class TWriter implements TAppendable, TCloseable, TFlushable { - protected Object lock; + protected final Object lock; protected TWriter() { super(); diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java index e5ed70733..9ba748289 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java +++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TBoolean.java @@ -54,7 +54,7 @@ public class TBoolean extends TObject implements TSerializable, TComparable { @Override public int hashCode() { long h = doubleToLongBits(value); - return (int) (h >>> 32) ^ ((int) h | 0); + return (int) (h >>> 32) ^ (int) h; } public static int compare(double a, double b) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java index c8157b681..1a7f95785 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java +++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java @@ -108,13 +108,11 @@ public class TObject { callback.complete(null); return; } - o.monitor.enteringThreads.add(new PlatformRunnable() { - @Override public void run() { - TThread.setCurrentThread(thread); - o.monitor.owner = thread; - o.monitor.count += count; - callback.complete(null); - } + o.monitor.enteringThreads.add(() -> { + TThread.setCurrentThread(thread); + o.monitor.owner = thread; + o.monitor.count += count; + callback.complete(null); }); } @@ -135,14 +133,12 @@ public class TObject { o.monitor.owner = null; if (!o.monitor.enteringThreads.isEmpty()) { - Platform.postpone(new PlatformRunnable() { - @Override public void run() { - if (o.isEmptyMonitor() || o.monitor.owner != null) { - return; - } - if (!o.monitor.enteringThreads.isEmpty()) { - o.monitor.enteringThreads.remove().run(); - } + Platform.postpone(() -> { + if (o.isEmptyMonitor() || o.monitor.owner != null) { + return; + } + if (!o.monitor.enteringThreads.isEmpty()) { + o.monitor.enteringThreads.remove().run(); } }); } else { @@ -325,11 +321,7 @@ public class TObject { Platform.killSchedule(timerId); timerId = -1; } - Platform.postpone(new PlatformRunnable() { - @Override public void run() { - callback.error(new TInterruptedException()); - } - }); + Platform.postpone(() -> callback.error(new TInterruptedException())); } } diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TString.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TString.java index a65e3babf..dc920c4cb 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/lang/TString.java +++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TString.java @@ -32,11 +32,7 @@ import org.teavm.classlib.java.util.regex.TPattern; * @author Alexey Andreev */ public class TString extends TObject implements TSerializable, TComparable, TCharSequence { - public static final TComparator CASE_INSENSITIVE_ORDER = new TComparator() { - @Override public int compare(TString o1, TString o2) { - return o1.compareToIgnoreCase(o2); - } - }; + public static final TComparator CASE_INSENSITIVE_ORDER = (o1, o2) -> o1.compareToIgnoreCase(o2); private char[] characters; private transient int hashCode; private static TMap pool = new THashMap<>(); diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java index 9904e0304..39ef72d7e 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java +++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TThread.java @@ -59,17 +59,14 @@ public class TThread extends TObject implements TRunnable { } public void start() { - Platform.startThread(new PlatformRunnable() { - @Override - public void run() { - try { - activeCount++; - setCurrentThread(TThread.this); - TThread.this.run(); - } finally { - activeCount--; - setCurrentThread(mainThread); - } + Platform.startThread(() -> { + try { + activeCount++; + setCurrentThread(TThread.this); + TThread.this.run(); + } finally { + activeCount--; + setCurrentThread(mainThread); } }); } @@ -135,11 +132,9 @@ public class TThread extends TObject implements TRunnable { static native void switchContext(TThread thread); private static void switchContext(final TThread thread, final AsyncCallback callback) { - Platform.postpone(new PlatformRunnable() { - @Override public void run() { - setCurrentThread(thread); - callback.complete(null); - } + Platform.postpone(() -> { + setCurrentThread(thread); + callback.complete(null); }); } @@ -201,11 +196,7 @@ public class TThread extends TObject implements TRunnable { thread.interruptedFlag = false; isInterrupted = true; Platform.killSchedule(scheduleId); - Platform.postpone(new PlatformRunnable() { - @Override public void run() { - callback.error(new TInterruptedException()); - } - }); + Platform.postpone(() -> callback.error(new TInterruptedException())); } @Override diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java index c86a6d9e1..647226fba 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java +++ b/classlib/src/main/java/org/teavm/classlib/java/lang/reflect/ArrayNativeGenerator.java @@ -80,12 +80,10 @@ public class ArrayNativeGenerator implements Generator, DependencyPlugin { } private void achieveGetLength(final DependencyAgent agent, final MethodDependency method) { - method.getVariable(1).addConsumer(new DependencyConsumer() { - @Override public void consume(DependencyType type) { - if (!type.getName().startsWith("[")) { - MethodReference cons = new MethodReference(IllegalArgumentException.class, "", void.class); - agent.linkMethod(cons, null).use(); - } + method.getVariable(1).addConsumer(type -> { + if (!type.getName().startsWith("[")) { + MethodReference cons = new MethodReference(IllegalArgumentException.class, "", void.class); + agent.linkMethod(cons, null).use(); } }); } @@ -127,18 +125,16 @@ public class ArrayNativeGenerator implements Generator, DependencyPlugin { private void achieveGet(final DependencyAgent agent, final MethodDependency method) { method.getVariable(1).getArrayItem().connect(method.getResult()); - method.getVariable(1).addConsumer(new DependencyConsumer() { - @Override public void consume(DependencyType type) { - if (type.getName().startsWith("[")) { - String typeName = type.getName().substring(1); - for (int i = 0; i < primitiveTypes.length; ++i) { - if (primitiveTypes[i].toString().equals(typeName)) { - String wrapper = "java.lang." + primitiveWrappers[i]; - MethodReference methodRef = new MethodReference(wrapper, "valueOf", - primitiveTypes[i], ValueType.object(wrapper)); - agent.linkMethod(methodRef, null).use(); - method.getResult().propagate(agent.getType("java.lang." + primitiveWrappers[i])); - } + method.getVariable(1).addConsumer(type -> { + if (type.getName().startsWith("[")) { + String typeName = type.getName().substring(1); + for (int i = 0; i < primitiveTypes.length; ++i) { + if (primitiveTypes[i].toString().equals(typeName)) { + String wrapper = "java.lang." + primitiveWrappers[i]; + MethodReference methodRef = new MethodReference(wrapper, "valueOf", + primitiveTypes[i], ValueType.object(wrapper)); + agent.linkMethod(methodRef, null).use(); + method.getResult().propagate(agent.getType("java.lang." + primitiveWrappers[i])); } } } diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java index e14fccc1e..d5a5aef70 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TBigDecimal.java @@ -2239,8 +2239,8 @@ public class TBigDecimal extends Number implements Comparable, Seri return hashCode; } if (bitLength < 64) { - hashCode = (int) (smallValue & 0xffffffff); - hashCode = 33 * hashCode + (int) ((smallValue >> 32) & 0xffffffff); + hashCode = (int) smallValue; + hashCode = 33 * hashCode + (int) (smallValue >> 32); hashCode = 17 * hashCode + scale; return hashCode; } diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java index 84f560f37..99e676e06 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TBigInteger.java @@ -439,7 +439,7 @@ public class TBigInteger extends Number implements Comparable, Seri return bytes; } - /** @see TBigInteger#BigInteger(String, int) */ + /** @see TBigInteger#TBigInteger(String, int) */ private static void setFromString(TBigInteger bi, String val, int radix) { int sign; int[] digits; @@ -952,7 +952,7 @@ public class TBigInteger extends Number implements Comparable, Seri return hashCode; } for (int i = 0; i < digits.length; i++) { - hashCode = hashCode * 33 + (digits[i] & 0xffffffff); + hashCode = hashCode * 33 + digits[i]; } hashCode = hashCode * sign; return hashCode; diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java b/classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java index 9ede7ebf8..b04b96db7 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TBitLevel.java @@ -306,10 +306,10 @@ class TBitLevel { * Performs a flipBit on the BigInteger, returning a BigInteger with the the * specified bit flipped. * - * @param intCount + * @param val * : the index of the element of the digits array where the * operation will be performed - * @param bitNumber + * @param n * : the bit's position in the intCount element */ static TBigInteger flipBit(TBigInteger val, int n) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java b/classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java index 7acd3472b..3c8325ae9 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TDivision.java @@ -373,9 +373,6 @@ class TDivision { } /** - * @param m - * a positive modulus Return the greatest common divisor of op1 - * and op2, * * @param op1 * must be greater than zero @@ -867,7 +864,6 @@ class TDivision { * The digit modulus'[0]. * @ar.org.fitc.ref "C. K. Koc - Analyzing and Comparing Montgomery * Multiplication Algorithms" - * @see #modPowOdd(TBigInteger, TBigInteger, TBigInteger) */ static TBigInteger monPro(TBigInteger a, TBigInteger b, TBigInteger modulus, int n2) { int modulusLen = modulus.numberLength; @@ -881,9 +877,6 @@ class TDivision { /** * Performs the final reduction of the Montgomery algorithm. - * - * @see #monPro(TBigInteger, TBigInteger, TBigInteger, long) - * @see #monSquare(TBigInteger, TBigInteger, long) */ static TBigInteger finalSubtraction(int[] res, TBigInteger modulus) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java b/classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java index 9794ae51e..12c0c129d 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TMathContext.java @@ -74,7 +74,7 @@ public final class TMathContext implements Serializable { * 'p','r','e','c','i','s','i','o','n','='}. It's used to improve the * methods related to {@code String} conversion. * - * @see #MathContext(String) + * @see #TMathContext(String) * @see #toString() */ private final static char[] chPrecision = { 'p', 'r', 'e', 'c', 'i', 's', @@ -85,7 +85,7 @@ public final class TMathContext implements Serializable { * 'r','o','u','n','d','i','n','g','M','o','d','e','='}. It's used to * improve the methods related to {@code String} conversion. * - * @see #MathContext(String) + * @see #TMathContext(String) * @see #toString() */ private final static char[] chRoundingMode = { 'r', 'o', 'u', 'n', 'd', diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java b/classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java index 83c9faf46..907aaab89 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TMultiplication.java @@ -213,8 +213,8 @@ class TMultiplication { * * * - * @param op1 first factor of the multiplication {@code op1 >= 0} - * @param op2 second factor of the multiplication {@code op2 >= 0} + * @param a first factor of the multiplication {@code op1 >= 0} + * @param b second factor of the multiplication {@code op2 >= 0} * @return a {@code BigInteger} of value {@code op1 * op2} */ static TBigInteger multiplyPAP(TBigInteger a, TBigInteger b) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java b/classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java index 7686119a3..efc90a5be 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java +++ b/classlib/src/main/java/org/teavm/classlib/java/math/TPrimality.java @@ -145,7 +145,7 @@ class TPrimality { /** * A random number is generated until a probable prime number is found. * - * @see TBigInteger#BigInteger(int,int,Random) + * @see TBigInteger#TBigInteger(int,int,Random) * @see TBigInteger#probablePrime(int,Random) * @see #isProbablePrime(TBigInteger, int) */ diff --git a/classlib/src/main/java/org/teavm/classlib/java/net/TURI.java b/classlib/src/main/java/org/teavm/classlib/java/net/TURI.java index 5e39f72fa..e15afbfc3 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/net/TURI.java +++ b/classlib/src/main/java/org/teavm/classlib/java/net/TURI.java @@ -490,7 +490,7 @@ public final class TURI implements TComparable, TSerializable { tempHost = temp; } - if (tempHost.equals("")) { + if (tempHost.equals(TString.wrap(""))) { if (forceServer) { throw new TURISyntaxException(authority, TString.wrap(""), hostindex); } @@ -1304,7 +1304,7 @@ public final class TURI implements TComparable, TSerializable { // determine which segments get included in the normalized path for (int i = 0; i < size; i++) { include[i] = true; - if (seglist[i].equals("..")) { //$NON-NLS-1$ + if (seglist[i].equals(TString.wrap(".."))) { //$NON-NLS-1$ int remove = i - 1; // search back to find a segment to remove, if possible while (remove > -1 && !include[remove]) { @@ -1312,11 +1312,11 @@ public final class TURI implements TComparable, TSerializable { } // if we find a segment to remove, remove it and the ".." // segment - if (remove > -1 && !seglist[remove].equals("..")) { //$NON-NLS-1$ + if (remove > -1 && !seglist[remove].equals(TString.wrap(".."))) { //$NON-NLS-1$ include[remove] = false; include[i] = false; } - } else if (seglist[i].equals(".")) { //$NON-NLS-1$ + } else if (seglist[i].equals(TString.wrap("."))) { //$NON-NLS-1$ include[i] = false; } } @@ -1463,7 +1463,7 @@ public final class TURI implements TComparable, TSerializable { } TURI result; - if (relative.path.equals("") && relative.scheme == null //$NON-NLS-1$ + if (relative.path.equals(TString.wrap("")) && relative.scheme == null //$NON-NLS-1$ && relative.authority == null && relative.query == null && relative.fragment != null) { // if the relative URI only consists of fragment, diff --git a/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java b/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java index aeb1e14f9..f81dbd208 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java +++ b/classlib/src/main/java/org/teavm/classlib/java/text/TAttributedCharacterIterator.java @@ -21,7 +21,7 @@ import org.teavm.classlib.java.util.TSet; public interface TAttributedCharacterIterator extends TCharacterIterator { - public static class Attribute implements TSerializable { + class Attribute implements TSerializable { public static final Attribute INPUT_METHOD_SEGMENT = new Attribute( "input_method_segment"); diff --git a/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java index fc4fbf4c1..90021e75c 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java +++ b/classlib/src/main/java/org/teavm/classlib/java/text/TDateFormatElement.java @@ -18,7 +18,6 @@ package org.teavm.classlib.java.text; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -683,11 +682,7 @@ abstract class TDateFormatElement { builders.add(tmp); tmp = tmp.sibling; } - Collections.sort(builders, new Comparator() { - @Override public int compare(TrieNodeBuilder o1, TrieNodeBuilder o2) { - return Character.compare(o1.ch, o2.ch); - } - }); + Collections.sort(builders, (o1, o2) -> Character.compare(o1.ch, o2.ch)); node.chars = new char[builders.size()]; node.childNodes = new TrieNode[builders.size()]; for (int i = 0; i < node.chars.length; ++i) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java b/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java index 33696f21e..0e4a26053 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java +++ b/classlib/src/main/java/org/teavm/classlib/java/text/TDecimalFormat.java @@ -18,6 +18,8 @@ package org.teavm.classlib.java.text; import java.math.BigDecimal; import java.math.BigInteger; import java.text.DecimalFormatSymbols; +import java.util.Arrays; + import org.teavm.classlib.impl.unicode.CLDRHelper; import org.teavm.classlib.java.lang.TArithmeticException; import org.teavm.classlib.java.lang.TDouble; @@ -172,10 +174,10 @@ public class TDecimalFormat extends TNumberFormat { if (!super.equals(obj)) { return false; } - return positivePrefix.equals(other.positivePrefix) - && positiveSuffix.equals(other.positiveSuffix) - && negativePrefix.equals(other.negativePrefix) - && negativeSuffix.equals(other.negativeSuffix) + return Arrays.equals(positivePrefix, other.positivePrefix) + && Arrays.equals(positiveSuffix, other.positiveSuffix) + && Arrays.equals(negativePrefix, other.negativePrefix) + && Arrays.equals(negativeSuffix, other.negativeSuffix) && multiplier == other.multiplier && groupingSize == other.groupingSize && decimalSeparatorAlwaysShown == other.decimalSeparatorAlwaysShown @@ -186,10 +188,10 @@ public class TDecimalFormat extends TNumberFormat { @Override public int hashCode() { int result = super.hashCode(); - result = result * 31 + positivePrefix.hashCode(); - result = result * 31 + positiveSuffix.hashCode(); - result = result * 31 + negativePrefix.hashCode(); - result = result * 31 + negativeSuffix.hashCode(); + result = result * 31 + Arrays.hashCode(positivePrefix); + result = result * 31 + Arrays.hashCode(positiveSuffix); + result = result * 31 + Arrays.hashCode(negativePrefix); + result = result * 31 + Arrays.hashCode(negativeSuffix); result = result * 31 + multiplier; result = result * 31 + groupingSize; result = result * 31 + (decimalSeparatorAlwaysShown ? 1 : 0); diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java b/classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java index 29f27475b..54ddd7625 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/TCollections.java @@ -164,7 +164,7 @@ public class TCollections extends TObject { } public static TMap singletonMap(final K key, final V value) { - final TSet> entries = singleton((Entry) new TAbstractMap.SimpleImmutableEntry<>(key, value)); + final TSet> entries = singleton(new TAbstractMap.SimpleImmutableEntry<>(key, value)); return new TAbstractMap() { @Override public TSet> entrySet() { return entries; @@ -238,11 +238,9 @@ public class TCollections extends TObject { return binarySearch(list, key, naturalOrder); } - private static TComparator naturalOrder = new TComparator() { - @SuppressWarnings("unchecked") @Override public int compare(Object o1, Object o2) { - return o1 != null ? ((TComparable) o1).compareTo(o2) : -((TComparable) o2).compareTo(o1); - } - }; + private static TComparator naturalOrder = (o1, o2) -> o1 != null + ? ((TComparable) o1).compareTo(o2) + : -((TComparable) o2).compareTo(o1); public static int binarySearch(TList list, T key, TComparator c) { if (!(list instanceof TRandomAccess)) { @@ -549,18 +547,12 @@ public class TCollections extends TObject { return (TComparator) reverseOrder; } - private static TComparator reverseOrder = new TComparator() { - @SuppressWarnings("unchecked") @Override public int compare(Object o1, Object o2) { - return o1 != null ? -((TComparable) o1).compareTo(o2) : ((TComparable) o2).compareTo(o1); - } - }; + private static TComparator reverseOrder = (o1, o2) -> o1 != null + ? -((TComparable) o1).compareTo(o2) + : ((TComparable) o2).compareTo(o1); public static TComparator reverseOrder(final TComparator cmp) { - return new TComparator() { - @Override public int compare(T o1, T o2) { - return -cmp.compare(o1, o2); - } - }; + return (o1, o2) -> -cmp.compare(o1, o2); } public static TEnumeration enumeration(TCollection c) { diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java b/classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java index 308d159cc..49a8dbf4d 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/THashtable.java @@ -339,12 +339,7 @@ public class THashtable extends TDictionary implements TMap, if (elementCount == 0) { return (TEnumeration) EMPTY_ENUMERATION; } - return new HashEnumIterator<>(new TMapEntry.Type() { - @Override - public V get(TMapEntry entry) { - return entry.value; - } - }, true); + return new HashEnumIterator<>(entry -> entry.value, true); } @Override @@ -381,14 +376,7 @@ public class THashtable extends TDictionary implements TMap, @Override public TIterator> iterator() { - return new HashIterator<>( - new TMapEntry.Type, K, V>() { - @Override - public TMap.Entry get( - TMapEntry entry) { - return entry; - } - }); + return new HashIterator<>(entry -> entry); } }; } @@ -475,12 +463,7 @@ public class THashtable extends TDictionary implements TMap, if (elementCount == 0) { return (TEnumeration) EMPTY_ENUMERATION; } - return new HashEnumIterator<>(new TMapEntry.Type() { - @Override - public K get(TMapEntry entry) { - return entry.key; - } - }, true); + return new HashEnumIterator<>(entry -> entry.key, true); } @Override @@ -516,12 +499,7 @@ public class THashtable extends TDictionary implements TMap, if (this.size() == 0) { return (TIterator) EMPTY_ITERATOR; } - return new HashEnumIterator<>(new TMapEntry.Type() { - @Override - public K get(TMapEntry entry) { - return entry.key; - } - }); + return new HashEnumIterator<>(entry -> entry.key); } }; } @@ -765,13 +743,7 @@ public class THashtable extends TDictionary implements TMap, @Override public TIterator iterator() { - return new HashIterator<>( - new TMapEntry.Type() { - @Override - public V get(TMapEntry entry) { - return entry.value; - } - }); + return new HashIterator<>(entry -> entry.value); } }; } diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TMap.java index ed65f8ba9..799db2ca0 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/TMap.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/TMap.java @@ -22,7 +22,7 @@ package org.teavm.classlib.java.util; * @param */ public interface TMap { - public interface Entry { + interface Entry { K1 getKey(); V1 getValue(); diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java b/classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java index c802a3c32..8b6b3b25c 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/TObserver.java @@ -27,9 +27,9 @@ public interface TObserver { * object has been updated. * * @param observable - * the {@link Observable} object. + * the {@link TObservable} object. * @param data - * the data passed to {@link Observable#notifyObservers(Object)}. + * the data passed to {@link TObservable#notifyObservers(Object)}. */ void update(TObservable observable, Object data); } diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java index dcf3b28af..bbc78d9a9 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/TTimeZone.java @@ -66,9 +66,6 @@ import org.teavm.classlib.impl.unicode.CLDRHelper; * and {@code getTimeZone(String)}, is implementation dependent, so it may * introduce serialization incompatibility issues between different * implementations. - * - * @see GregorianCalendar - * @see TSimpleTimeZone */ public abstract class TTimeZone implements Serializable, Cloneable { private static final long serialVersionUID = 3581463369166924961L; diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java b/classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java index 8a834e28e..5c9da29a0 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/TTreeMap.java @@ -120,11 +120,7 @@ public class TTreeMap extends TAbstractMap implements TCloneable, TS @SuppressWarnings("unchecked") Entry[] entries = (Entry[]) new Entry[m.size()]; entries = m.entrySet().toArray(entries); - TArrays.sort(entries, new TComparator>() { - @Override public int compare(Entry o1, Entry o2) { - return comparator.compare(o1.getKey(), o2.getKey()); - } - }); + TArrays.sort(entries, (o1, o2) -> comparator.compare(o1.getKey(), o2.getKey())); fillMap(entries); } @@ -138,11 +134,7 @@ public class TTreeMap extends TAbstractMap implements TCloneable, TS private void ensureRevertedComparator() { if (revertedComparator == null) { - revertedComparator = new TComparator() { - @Override public int compare(K o1, K o2) { - return -originalComparator.compare(o1, o2); - } - }; + revertedComparator = (o1, o2) -> -originalComparator.compare(o1, o2); } } diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java index 7729d3e85..771dddb48 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TCharClass.java @@ -520,7 +520,6 @@ class TCharClass extends TAbstractCharClass { * false otherwise. Note: #setNegative() method changes the * meaning of contains method; * - * @param ch * @return true if character class contains symbol specified; * * TODO: currently character class implementation based diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java index 5b1752ed8..a27a02abc 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TLexer.java @@ -105,7 +105,7 @@ class TLexer { public static final int CHAR_END_OF_LINE = 0x80000000 | 'Z'; - public static final int MODE_PATTERN = 1 << 0; + public static final int MODE_PATTERN = 1; public static final int MODE_RANGE = 1 << 1; @@ -1010,7 +1010,7 @@ class TLexer { * singleDecompTable doesn't contain ch == (hasSingleDecomp == * singleDecompTableSize) */ - return (hasSingleDecomp == singleDecompTableSize) ? false : true; + return hasSingleDecomp != singleDecompTableSize; } /** diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java index 9e4670f28..49b10506e 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TMatcher.java @@ -48,7 +48,7 @@ import java.util.ArrayList; */ public final class TMatcher implements TMatchResult { - static int MODE_FIND = 1 << 0; + static int MODE_FIND = 1; static int MODE_MATCH = 1 << 1; diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java index 9de311030..9a3cd673c 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPattern.java @@ -63,7 +63,7 @@ public final class TPattern implements Serializable { * This constant specifies that a pattern matches Unix line endings ('\n') * only against the '.', '^', and '$' meta characters. */ - public static final int UNIX_LINES = 1 << 0; + public static final int UNIX_LINES = 1; /** * This constant specifies that a {@code Pattern} is matched diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java index 83f36d353..1681a61d4 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosAltGroupQuantifierSet.java @@ -30,7 +30,7 @@ class TPosAltGroupQuantifierSet extends TAltGroupQuantifierSet { public TPosAltGroupQuantifierSet(TAbstractSet innerSet, TAbstractSet next, int type) { super(innerSet, next, type); - ((TJointSet)innerSet).setNext(TFSet.posFSet); + innerSet.setNext(TFSet.posFSet); } @Override diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java index 98d879efc..9c0be3f4e 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TPosPlusGroupQuantifierSet.java @@ -29,7 +29,7 @@ class TPosPlusGroupQuantifierSet extends TGroupQuantifierSet { public TPosPlusGroupQuantifierSet(TAbstractSet innerSet, TAbstractSet next, int type) { super(innerSet, next, type); - ((TJointSet)innerSet).setNext(TFSet.posFSet); + innerSet.setNext(TFSet.posFSet); } @Override diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java index e2fa3142b..f35914797 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TReluctantQuantifierSet.java @@ -23,7 +23,6 @@ package org.teavm.classlib.java.util.regex; /** * This class represents [+*]? constructs over LeafSets. * - * @see java.util.regex.TLeafSet * @author Nikolay A. Kuznetsov */ class TReluctantQuantifierSet extends TLeafQuantifierSet { diff --git a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java index 0cfe69d42..59b9a4ae0 100644 --- a/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java +++ b/classlib/src/main/java/org/teavm/classlib/java/util/regex/TSpecialToken.java @@ -28,7 +28,7 @@ package org.teavm.classlib.java.util.regex; */ abstract class TSpecialToken { - public static final int TOK_CHARCLASS = 1 << 0; + public static final int TOK_CHARCLASS = 1; public static final int TOK_QUANTIFIER = 1 << 1; diff --git a/classlib/teavm-classlib.iml b/classlib/teavm-classlib.iml new file mode 100644 index 000000000..9fe7c13b0 --- /dev/null +++ b/classlib/teavm-classlib.iml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/core/pom.xml b/core/pom.xml index 62ecebaff..92c112da5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -88,11 +88,6 @@ - - org.codehaus.mojo - findbugs-maven-plugin - 2.5.2 - org.apache.maven.plugins maven-javadoc-plugin diff --git a/core/src/main/java/org/teavm/cache/AstIO.java b/core/src/main/java/org/teavm/cache/AstIO.java index 319a624ec..0847d5579 100644 --- a/core/src/main/java/org/teavm/cache/AstIO.java +++ b/core/src/main/java/org/teavm/cache/AstIO.java @@ -798,8 +798,7 @@ public class AstIO { return expr; } case 3: { - ConstantExpr expr = new ConstantExpr(); - return expr; + return new ConstantExpr(); } case 4: { ConstantExpr expr = new ConstantExpr(); diff --git a/core/src/main/java/org/teavm/common/GraphBuilder.java b/core/src/main/java/org/teavm/common/GraphBuilder.java index 7228fc23d..0d639aad5 100644 --- a/core/src/main/java/org/teavm/common/GraphBuilder.java +++ b/core/src/main/java/org/teavm/common/GraphBuilder.java @@ -35,7 +35,7 @@ public class GraphBuilder { } public GraphBuilder(int sz) { - addedEdges.addAll(Collections.nCopies(sz, null)); + addedEdges.addAll(Collections.nCopies(sz, null)); this.sz = sz; } @@ -53,7 +53,7 @@ public class GraphBuilder { if (addedEdges.size() == from) { addedEdges.add(IntOpenHashSet.from(to)); } else if (addedEdges.size() <= from) { - addedEdges.addAll(Collections.nCopies(from - addedEdges.size(), null)); + addedEdges.addAll(Collections.nCopies(from - addedEdges.size(), null)); addedEdges.add(IntOpenHashSet.from(to)); } else { IntSet set = addedEdges.get(from); diff --git a/core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java b/core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java index 3fbf7f2d9..a3e7aadc6 100644 --- a/core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java +++ b/core/src/main/java/org/teavm/common/ThreadPoolFiniteExecutor.java @@ -38,7 +38,7 @@ public class ThreadPoolFiniteExecutor implements FiniteExecutor { public ThreadPoolFiniteExecutor(int numThreads) { for (int i = 0; i < numThreads; ++i) { - Thread thread = new Thread(() -> takeTask()); + Thread thread = new Thread(this::takeTask); threads.add(thread); thread.start(); } diff --git a/core/src/main/java/org/teavm/debugging/Debugger.java b/core/src/main/java/org/teavm/debugging/Debugger.java index 3747f5f7c..fb6393c38 100644 --- a/core/src/main/java/org/teavm/debugging/Debugger.java +++ b/core/src/main/java/org/teavm/debugging/Debugger.java @@ -38,7 +38,7 @@ public class Debugger { private ConcurrentMap> debugInformationFileMap = new ConcurrentHashMap<>(); private ConcurrentMap scriptMap = new ConcurrentHashMap<>(); - ConcurrentMap breakpointMap = new ConcurrentHashMap<>(); + final ConcurrentMap breakpointMap = new ConcurrentHashMap<>(); ConcurrentMap breakpoints = new ConcurrentHashMap<>(); private volatile CallFrame[] callStack; diff --git a/core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java b/core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java index ddc4f937d..4b4c62ed6 100644 --- a/core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java +++ b/core/src/main/java/org/teavm/debugging/information/GeneratedLocation.java @@ -59,7 +59,7 @@ public class GeneratedLocation implements Comparable { if (this == obj) { return true; } - if (obj == null) { + if (!(obj instanceof GeneratedLocation)) { return false; } GeneratedLocation other = (GeneratedLocation) obj; diff --git a/core/src/main/java/org/teavm/dependency/DependencyChecker.java b/core/src/main/java/org/teavm/dependency/DependencyChecker.java index dfd1235f4..f2d04aecc 100644 --- a/core/src/main/java/org/teavm/dependency/DependencyChecker.java +++ b/core/src/main/java/org/teavm/dependency/DependencyChecker.java @@ -107,7 +107,7 @@ public class DependencyChecker implements DependencyInfo { return createFieldNode(preimage, field); }); - classCache = new CachedMapper<>(preimage -> createClassDependency(preimage)); + classCache = new CachedMapper<>(this::createClassDependency); agent = new DependencyAgent(this); } diff --git a/core/src/main/java/org/teavm/dependency/DependencyClassSource.java b/core/src/main/java/org/teavm/dependency/DependencyClassSource.java index 57940d83c..9d55292c6 100644 --- a/core/src/main/java/org/teavm/dependency/DependencyClassSource.java +++ b/core/src/main/java/org/teavm/dependency/DependencyClassSource.java @@ -48,7 +48,7 @@ class DependencyClassSource implements ClassHolderSource { @Override public ClassHolder get(String name) { - return cache.computeIfAbsent(name, n -> findAndTransformClass(n)); + return cache.computeIfAbsent(name, this::findAndTransformClass); } public void submit(ClassHolder cls) { diff --git a/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java b/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java index 5831e35b5..1faa252d3 100644 --- a/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java +++ b/core/src/main/java/org/teavm/dependency/DependencyGraphBuilder.java @@ -610,7 +610,7 @@ class DependencyGraphBuilder { DependencyNode arrayNode = nodes[array.getIndex()]; final DependencyNode receiverNode = nodes[receiver.getIndex()]; if (arrayNode != null && receiverNode != null) { - arrayNode.addConsumer(type -> receiverNode.propagate(type)); + arrayNode.addConsumer(receiverNode::propagate); arrayNode.getArrayItem().connect(receiverNode.getArrayItem()); } } diff --git a/core/src/main/java/org/teavm/dependency/DependencyNode.java b/core/src/main/java/org/teavm/dependency/DependencyNode.java index 184114540..ae2085f99 100644 --- a/core/src/main/java/org/teavm/dependency/DependencyNode.java +++ b/core/src/main/java/org/teavm/dependency/DependencyNode.java @@ -196,7 +196,7 @@ public class DependencyNode implements ValueDependencyInfo { if (DependencyChecker.shouldLog) { arrayItemNode.tag = tag + "["; } - arrayItemNode.addConsumer(type -> propagate(type)); + arrayItemNode.addConsumer(this::propagate); } return arrayItemNode; } diff --git a/core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java b/core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java index 5f2bb9d7b..2bc43b1bc 100644 --- a/core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java +++ b/core/src/main/java/org/teavm/javascript/InMemoryRegularMethodNodeCache.java @@ -41,7 +41,7 @@ public class InMemoryRegularMethodNodeCache implements MethodNodeCache { @Override public AsyncMethodNode getAsync(MethodReference methodReference) { - return null; + return asyncCache.get(methodReference); } @Override diff --git a/core/src/main/java/org/teavm/javascript/Renderer.java b/core/src/main/java/org/teavm/javascript/Renderer.java index fe476c56f..677cb3c3f 100644 --- a/core/src/main/java/org/teavm/javascript/Renderer.java +++ b/core/src/main/java/org/teavm/javascript/Renderer.java @@ -438,10 +438,8 @@ public class Renderer implements ExprVisitor, StatementVisitor, RenderingContext for (MethodNode method : clinitMethods) { renderBody(method, true); } - if (clinit != null) { - writer.appendMethodBody(new MethodReference(cls.getName(), clinit.getDescriptor())) - .append("();").softNewLine(); - } + writer.appendMethodBody(new MethodReference(cls.getName(), clinit.getDescriptor())) + .append("();").softNewLine(); writer.outdent().append("}").newLine(); } if (!cls.getModifiers().contains(NodeModifier.INTERFACE)) { diff --git a/core/src/main/java/org/teavm/javascript/StatementGenerator.java b/core/src/main/java/org/teavm/javascript/StatementGenerator.java index df9f464d9..9ee6f6672 100644 --- a/core/src/main/java/org/teavm/javascript/StatementGenerator.java +++ b/core/src/main/java/org/teavm/javascript/StatementGenerator.java @@ -639,8 +639,8 @@ class StatementGenerator implements InstructionVisitor { Statement consequent = generateJumpStatement(consequentBlock); Statement alternative = generateJumpStatement(alternativeBlock); statements.add(Statement.cond(condition, - consequent != null ? Arrays.asList(consequent) : Collections.emptyList(), - alternative != null ? Arrays.asList(alternative) : Collections.emptyList())); + consequent != null ? Arrays.asList(consequent) : Collections.emptyList(), + alternative != null ? Arrays.asList(alternative) : Collections.emptyList())); } private Expr compare(BinaryOperation op, Variable value) { diff --git a/core/src/main/java/org/teavm/javascript/ast/Statement.java b/core/src/main/java/org/teavm/javascript/ast/Statement.java index 9a43558be..672651c6b 100644 --- a/core/src/main/java/org/teavm/javascript/ast/Statement.java +++ b/core/src/main/java/org/teavm/javascript/ast/Statement.java @@ -57,7 +57,7 @@ public abstract class Statement { } public static Statement cond(Expr predicate, List consequent) { - return cond(predicate, consequent, Collections.emptyList()); + return cond(predicate, consequent, Collections.emptyList()); } public static InitClassStatement initClass(String className) { diff --git a/core/src/main/java/org/teavm/model/BasicBlock.java b/core/src/main/java/org/teavm/model/BasicBlock.java index 737f7963c..08248cfe7 100644 --- a/core/src/main/java/org/teavm/model/BasicBlock.java +++ b/core/src/main/java/org/teavm/model/BasicBlock.java @@ -48,8 +48,8 @@ public class BasicBlock implements BasicBlockReader { this.index = index; } - void setProgram(Program program) { - this.program = program; + void clearProgram() { + this.program = null; } private List safeInstructions = new AbstractList() { diff --git a/core/src/main/java/org/teavm/model/ClassReaderSource.java b/core/src/main/java/org/teavm/model/ClassReaderSource.java index b602a06a4..daec412ff 100644 --- a/core/src/main/java/org/teavm/model/ClassReaderSource.java +++ b/core/src/main/java/org/teavm/model/ClassReaderSource.java @@ -32,65 +32,61 @@ public interface ClassReaderSource { ClassReader get(String name); default Stream getAncestorClasses(String name) { - return StreamSupport.stream(((Iterable) () -> { - return new Iterator() { - ClassReader currentClass = get(name); - @Override public ClassReader next() { - ClassReader result = currentClass; - if (currentClass.getParent() != null && !currentClass.getName().equals(currentClass.getParent())) { - currentClass = get(currentClass.getParent()); - } else { - currentClass = null; - } - return result; + return StreamSupport.stream(((Iterable) () -> new Iterator() { + ClassReader currentClass = get(name); + @Override public ClassReader next() { + ClassReader result = currentClass; + if (currentClass.getParent() != null && !currentClass.getName().equals(currentClass.getParent())) { + currentClass = get(currentClass.getParent()); + } else { + currentClass = null; } - @Override public boolean hasNext() { - return currentClass != null; - } - }; + return result; + } + @Override public boolean hasNext() { + return currentClass != null; + } }).spliterator(), false); } default Stream getAncestors(String name) { - return StreamSupport.stream(((Iterable) () -> { - return new Iterator() { - Deque> state = new ArrayDeque<>(); - private Set visited = new HashSet<>(); - { - state.push(new ArrayDeque<>()); - add(name); - } - @Override public ClassReader next() { - while (!state.isEmpty()) { - Deque level = state.peek(); - if (!level.isEmpty()) { - ClassReader result = level.removeFirst(); - follow(result); - return result; - } - state.pop(); + return StreamSupport.stream(((Iterable) () -> new Iterator() { + Deque> state = new ArrayDeque<>(); + private Set visited = new HashSet<>(); + { + state.push(new ArrayDeque<>()); + add(name); + } + @Override public ClassReader next() { + while (!state.isEmpty()) { + Deque level = state.peek(); + if (!level.isEmpty()) { + ClassReader result = level.removeFirst(); + follow(result); + return result; } - return null; + state.pop(); } - @Override public boolean hasNext() { - return !this.state.stream().allMatch(e -> e.isEmpty()); + return null; + } + @Override public boolean hasNext() { + return !this.state.stream().allMatch(e -> e.isEmpty()); + } + private void follow(ClassReader cls) { + state.push(new ArrayDeque<>()); + if (cls.getParent() != null) { + add(cls.getParent()); } - private void follow(ClassReader cls) { - state.push(new ArrayDeque<>()); - if (cls.getParent() != null) { - add(cls.getParent()); - } - for (String iface : cls.getInterfaces()) { - add(iface); - } + for (String iface : cls.getInterfaces()) { + add(iface); } - private void add(String name) { - ClassReader cls = get(name); - if (cls != null && visited.add(cls)) { - state.peek().addLast(cls); - } + } + private void add(String name) { + ClassReader cls = get(name); + if (cls != null && visited.add(cls)) { + state.peek().addLast(cls); } - }; + } }).spliterator(), false); } diff --git a/core/src/main/java/org/teavm/model/CopyClassHolderSource.java b/core/src/main/java/org/teavm/model/CopyClassHolderSource.java index 378965164..289c2d5b8 100644 --- a/core/src/main/java/org/teavm/model/CopyClassHolderSource.java +++ b/core/src/main/java/org/teavm/model/CopyClassHolderSource.java @@ -24,7 +24,7 @@ import org.teavm.resource.MapperClassHolderSource; */ public class CopyClassHolderSource implements ClassHolderSource { private ClassReaderSource innerSource; - private MapperClassHolderSource mapperSource = new MapperClassHolderSource(preimage -> copyClass(preimage)); + private MapperClassHolderSource mapperSource = new MapperClassHolderSource(this::copyClass); public CopyClassHolderSource(ClassReaderSource innerSource) { this.innerSource = innerSource; diff --git a/core/src/main/java/org/teavm/model/Program.java b/core/src/main/java/org/teavm/model/Program.java index 9c3cab944..da66e3950 100644 --- a/core/src/main/java/org/teavm/model/Program.java +++ b/core/src/main/java/org/teavm/model/Program.java @@ -50,7 +50,7 @@ public class Program implements ProgramReader { } basicBlocks.set(index, null); basicBlock.setIndex(-1); - basicBlock.setProgram(null); + basicBlock.clearProgram(); packed = false; } diff --git a/core/src/main/java/org/teavm/model/util/InstructionStringifier.java b/core/src/main/java/org/teavm/model/util/InstructionStringifier.java index 29e0461ed..382239cf7 100644 --- a/core/src/main/java/org/teavm/model/util/InstructionStringifier.java +++ b/core/src/main/java/org/teavm/model/util/InstructionStringifier.java @@ -353,7 +353,7 @@ public class InstructionStringifier implements InstructionReader { sb.append(arguments.stream().map(arg -> "@" + arg.getIndex()).collect(Collectors.joining(", "))); sb.append(") "); sb.append("[").append(convert(bootstrapMethod)).append('('); - sb.append(bootstrapArguments.stream().map(arg -> convert(arg)).collect(Collectors.joining(", "))); + sb.append(bootstrapArguments.stream().map(this::convert).collect(Collectors.joining(", "))); sb.append(")"); } diff --git a/core/src/main/java/org/teavm/model/util/ProgramUtils.java b/core/src/main/java/org/teavm/model/util/ProgramUtils.java index cfd27f9b2..57ab4b9f1 100644 --- a/core/src/main/java/org/teavm/model/util/ProgramUtils.java +++ b/core/src/main/java/org/teavm/model/util/ProgramUtils.java @@ -486,7 +486,7 @@ public final class ProgramUtils { if (instance != null) { insnCopy.setInstance(copyVar(instance)); } - insnCopy.getArguments().addAll(arguments.stream().map(v -> copyVar(v)).collect(Collectors.toList())); + insnCopy.getArguments().addAll(arguments.stream().map(this::copyVar).collect(Collectors.toList())); insnCopy.setReceiver(receiver != null ? copyVar(receiver) : null); copy = insnCopy; copy.setLocation(location); diff --git a/core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java b/core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java index e8b0c8c82..6a81fff45 100644 --- a/core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java +++ b/core/src/main/java/org/teavm/optimization/ClassSetOptimizer.java @@ -29,7 +29,7 @@ import org.teavm.model.util.ProgramUtils; */ public class ClassSetOptimizer { private List getOptimizations() { - return Arrays.asList(new ArrayUnwrapMotion(), new LoopInvariantMotion(), + return Arrays.asList(new ArrayUnwrapMotion(), new LoopInvariantMotion(), new GlobalValueNumbering(), new UnusedVariableElimination()); } diff --git a/core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java b/core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java index f1c208372..791540f94 100644 --- a/core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java +++ b/core/src/main/java/org/teavm/optimization/GlobalValueNumbering.java @@ -398,7 +398,7 @@ public class GlobalValueNumbering implements MethodOptimization { @Override public void visit(InvokeDynamicInstruction insn) { - Optional.ofNullable(insn.getInstance()).map(mapper).ifPresent(var -> insn.setInstance(var)); + Optional.ofNullable(insn.getInstance()).map(mapper).ifPresent(insn::setInstance); insn.getArguments().replaceAll(mapper); } diff --git a/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java b/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java index b8b0e673c..1d90dd700 100644 --- a/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java +++ b/core/src/main/java/org/teavm/parsing/ClassRefsRenamer.java @@ -103,7 +103,7 @@ public class ClassRefsRenamer implements InstructionVisitor { } private ValueType[] rename(ValueType[] types) { - return Arrays.stream(types).map(e -> rename(e)).toArray(sz -> new ValueType[sz]); + return Arrays.stream(types).map(this::rename).toArray(ValueType[]::new); } private RuntimeConstant rename(RuntimeConstant cst) { diff --git a/core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java b/core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java index 48134ce0e..70181b687 100644 --- a/core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java +++ b/core/src/main/java/org/teavm/parsing/ClasspathResourceMapper.java @@ -125,7 +125,7 @@ public class ClasspathResourceMapper implements Mapper, Cla return name; } - private Mapper classNameMapper = preimage -> renameClass(preimage); + private Mapper classNameMapper = this::renameClass; @Override public Date getModificationDate(String className) { diff --git a/core/src/main/java/org/teavm/parsing/ProgramParser.java b/core/src/main/java/org/teavm/parsing/ProgramParser.java index c6aee1898..1bb5f1e4f 100644 --- a/core/src/main/java/org/teavm/parsing/ProgramParser.java +++ b/core/src/main/java/org/teavm/parsing/ProgramParser.java @@ -193,8 +193,8 @@ public class ProgramParser implements VariableDebugInformation { vars.add(localVar); } targetInstructions = new ArrayList<>(instructions.size()); - targetInstructions.addAll(Collections.>nCopies(instructions.size(), null)); - basicBlocks.addAll(Collections.nCopies(instructions.size(), null)); + targetInstructions.addAll(Collections.nCopies(instructions.size(), null)); + basicBlocks.addAll(Collections.nCopies(instructions.size(), null)); stackBefore = new StackFrame[instructions.size()]; stackAfter = new StackFrame[instructions.size()]; } @@ -287,7 +287,7 @@ public class ProgramParser implements VariableDebugInformation { List localVarNodes = localVariableMap.get(i); if (localVarNodes != null) { if (builtInstructions == null || builtInstructions.isEmpty()) { - builtInstructions = Arrays.asList(new EmptyInstruction()); + builtInstructions = Arrays.asList(new EmptyInstruction()); } Map debugNames = new HashMap<>(); variableDebugNames.put(builtInstructions.get(0), debugNames); diff --git a/core/src/main/java/org/teavm/vm/TeaVM.java b/core/src/main/java/org/teavm/vm/TeaVM.java index 774db97c7..8dfb2e7b0 100644 --- a/core/src/main/java/org/teavm/vm/TeaVM.java +++ b/core/src/main/java/org/teavm/vm/TeaVM.java @@ -652,7 +652,7 @@ public class TeaVM implements TeaVMHost, ServiceRepository { } private List getOptimizations() { - return Arrays.asList(new ArrayUnwrapMotion(), new LoopInvariantMotion(), + return Arrays.asList(new ArrayUnwrapMotion(), new LoopInvariantMotion(), new GlobalValueNumbering(), new UnusedVariableElimination()); } diff --git a/core/src/main/resources/org/teavm/javascript/runtime.js b/core/src/main/resources/org/teavm/javascript/runtime.js index b4e1b0d5e..ef6b592a6 100644 --- a/core/src/main/resources/org/teavm/javascript/runtime.js +++ b/core/src/main/resources/org/teavm/javascript/runtime.js @@ -100,13 +100,13 @@ if (ArrayBuffer) { data[i] = 0; } return arr; - } - $rt_createByteArray = function(sz) { return $rt_createNumericArray($rt_bytecls(), sz); } - $rt_createShortArray = function(sz) { return $rt_createNumericArray($rt_shortcls(), sz); } - $rt_createIntArray = function(sz) { return $rt_createNumericArray($rt_intcls(), sz); } - $rt_createBooleanArray = function(sz) { return $rt_createNumericArray($rt_booleancls(), sz); } - $rt_createFloatArray = function(sz) { return $rt_createNumericArray($rt_floatcls(), sz); } - $rt_createDoubleArray = function(sz) { return $rt_createNumericArray($rt_doublecls(), sz); } + }; + $rt_createByteArray = function(sz) { return $rt_createNumericArray($rt_bytecls(), sz); }; + $rt_createShortArray = function(sz) { return $rt_createNumericArray($rt_shortcls(), sz); }; + $rt_createIntArray = function(sz) { return $rt_createNumericArray($rt_intcls(), sz); }; + $rt_createBooleanArray = function(sz) { return $rt_createNumericArray($rt_booleancls(), sz); }; + $rt_createFloatArray = function(sz) { return $rt_createNumericArray($rt_floatcls(), sz); }; + $rt_createDoubleArray = function(sz) { return $rt_createNumericArray($rt_doublecls(), sz); }; $rt_createCharArray = function(sz) { return $rt_createNumericArray($rt_charcls(), sz); } } function $rt_arraycls(cls) { @@ -127,7 +127,7 @@ function $rt_arraycls(cls) { } str += "]"; return str; - } + }; var name = "[" + cls.$meta.binaryName; arraycls.$meta = { item : cls, supertypes : [$rt_objcls()], primitive : false, superclass : $rt_objcls(), name : name, binaryName : name, enum : false }; @@ -375,7 +375,7 @@ function $rt_metadata(data) { m.supertypes.push(m.superclass); cls.prototype = new m.superclass(); } else { - cls.prototype = new Object(); + cls.prototype = {}; } var flags = data[i + 4]; m.enum = (flags & 1) != 0; @@ -457,22 +457,22 @@ TeaVMThread.prototype.push = function() { this.stack.push(arguments[i]); } return this; -} +}; TeaVMThread.prototype.s = TeaVMThread.prototype.push; TeaVMThread.prototype.pop = function() { return this.stack.pop(); -} +}; TeaVMThread.prototype.l = TeaVMThread.prototype.pop; TeaVMThread.prototype.isResuming = function() { return this.status == 2; -} +}; TeaVMThread.prototype.isSuspending = function() { return this.status == 1; -} +}; TeaVMThread.prototype.suspend = function(callback) { this.suspendCallback = callback; this.status = 1; -} +}; TeaVMThread.prototype.start = function(callback) { if (this.status != 3) { throw new Error("Thread already started"); @@ -487,14 +487,14 @@ TeaVMThread.prototype.start = function(callback) { } }; this.run(); -} +}; TeaVMThread.prototype.resume = function() { if ($rt_currentNativeThread !== null) { throw new Error("Another thread is running"); } this.status = 2; this.run(); -} +}; TeaVMThread.prototype.run = function() { $rt_currentNativeThread = this; var result; @@ -515,7 +515,7 @@ TeaVMThread.prototype.run = function() { } else if (this.status === 0) { this.completeCallback(result); } -} +}; function $rt_suspending() { var thread = $rt_nativeThread(); return thread != null && thread.isSuspending(); @@ -596,7 +596,7 @@ Long.prototype.toString = function() { } while (n.lo != 0 || n.hi != 0); result = result.reverse().join(''); return positive ? result : "-" + result; -} +}; var Long_ZERO = new Long(0, 0); var Long_MAX_NORMAL = 1 << 18; function Long_fromInt(val) { diff --git a/core/teavm-core.iml b/core/teavm-core.iml new file mode 100644 index 000000000..4f8549b6a --- /dev/null +++ b/core/teavm-core.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/extras-slf4j/teavm-extras-slf4j.iml b/extras-slf4j/teavm-extras-slf4j.iml new file mode 100644 index 000000000..ff38459f4 --- /dev/null +++ b/extras-slf4j/teavm-extras-slf4j.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/html4j/src/main/java/org/teavm/html4j/testing/KOTestRunner.java b/html4j/src/main/java/org/teavm/html4j/testing/KOTestRunner.java index 365c39ffe..b1a29c2fb 100644 --- a/html4j/src/main/java/org/teavm/html4j/testing/KOTestRunner.java +++ b/html4j/src/main/java/org/teavm/html4j/testing/KOTestRunner.java @@ -35,8 +35,6 @@ public class KOTestRunner implements TestRunner { throw e; } Thread.sleep(50); - } catch (Throwable e) { - throw e; } } } diff --git a/html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java b/html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java index fa463f57f..5e0d12448 100644 --- a/html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java +++ b/html4j/src/test/java/org/teavm/html4j/test/KnockoutFXTest.java @@ -274,7 +274,7 @@ public final class KnockoutFXTest extends KnockoutTCK implements Transfer, WSTra private static native void removeFunction(String name); @JSFunctor - static interface JSONPCallback extends JSObject { + interface JSONPCallback extends JSObject { void dataReceived(JSObject dataReceived); } diff --git a/html4j/teavm-html4j.iml b/html4j/teavm-html4j.iml new file mode 100644 index 000000000..a900dfb6d --- /dev/null +++ b/html4j/teavm-html4j.iml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jso/apis/teavm-jso-apis.iml b/jso/apis/teavm-jso-apis.iml new file mode 100644 index 000000000..62b52a573 --- /dev/null +++ b/jso/apis/teavm-jso-apis.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jso/core/teavm-jso.iml b/jso/core/teavm-jso.iml new file mode 100644 index 000000000..c68f06c77 --- /dev/null +++ b/jso/core/teavm-jso.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java b/jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java index 2da3c7b6c..bb3b67e71 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/AstWriter.java @@ -52,7 +52,6 @@ import org.mozilla.javascript.ast.LabeledStatement; import org.mozilla.javascript.ast.LetNode; import org.mozilla.javascript.ast.Name; import org.mozilla.javascript.ast.NewExpression; -import org.mozilla.javascript.ast.NodeVisitor; import org.mozilla.javascript.ast.NumberLiteral; import org.mozilla.javascript.ast.ObjectLiteral; import org.mozilla.javascript.ast.ObjectProperty; @@ -137,19 +136,16 @@ public class AstWriter { } public void hoist(AstNode node) { - node.visit(new NodeVisitor() { - @Override - public boolean visit(AstNode node) { - if (node instanceof Scope) { - Scope scope = (Scope) node; - if (scope.getSymbolTable() != null) { - for (String name : scope.getSymbolTable().keySet()) { - declareName(name); - } + node.visit(n -> { + if (n instanceof Scope) { + Scope scope = (Scope) n; + if (scope.getSymbolTable() != null) { + for (String name : scope.getSymbolTable().keySet()) { + declareName(name); } } - return true; } + return true; }); } diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java index b67e0026f..5c70de17c 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSClassProcessor.java @@ -588,7 +588,7 @@ class JSClassProcessor { String script = bodyAnnot.getValue("script").getString(); String[] parameterNames = bodyAnnot.getValue("params").getList().stream() .map(ann -> ann.getString()) - .toArray(sz -> new String[sz]); + .toArray(String[]::new); // Parse JS script TeaVMErrorReporter errorReporter = new TeaVMErrorReporter(diagnostics, diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java b/jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java index f15a09aa8..ebe8c91fd 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/JSTypeHelper.java @@ -65,7 +65,7 @@ class JSTypeHelper { return true; } } - return cls.getInterfaces().stream().anyMatch(iface -> isJavaScriptClass(iface)); + return cls.getInterfaces().stream().anyMatch(this::isJavaScriptClass); } private boolean examineIfJavaScriptImplementation(String className) { @@ -81,7 +81,7 @@ class JSTypeHelper { return true; } } - return cls.getInterfaces().stream().anyMatch(iface -> isJavaScriptClass(iface)); + return cls.getInterfaces().stream().anyMatch(this::isJavaScriptClass); } public boolean isSupportedType(ValueType type) { diff --git a/jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java b/jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java index cb173b960..d5a2e31e9 100644 --- a/jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java +++ b/jso/impl/src/main/java/org/teavm/jso/impl/JavaInvocationProcessor.java @@ -191,10 +191,6 @@ class JavaInvocationProcessor implements NodeVisitor { if (!((Name) propertyGet.getTarget()).getIdentifier().equals("javaMethods")) { return false; } - if (!propertyGet.getProperty().getIdentifier().equals("get")) { - return false; - } - - return true; + return propertyGet.getProperty().getIdentifier().equals("get"); } } diff --git a/jso/impl/teavm-jso-impl.iml b/jso/impl/teavm-jso-impl.iml new file mode 100644 index 000000000..a448936fb --- /dev/null +++ b/jso/impl/teavm-jso-impl.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java index 5cb56e944..b1a3a1082 100644 --- a/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java +++ b/platform/src/main/java/org/teavm/platform/plugin/BuildTimeResourceProxyBuilder.java @@ -28,7 +28,7 @@ import org.teavm.platform.metadata.ResourceMap; */ class BuildTimeResourceProxyBuilder { private Map, BuildTimeResourceProxyFactory> factories = new HashMap<>(); - private static Set> allowedPropertyTypes = new HashSet<>(Arrays.>asList( + private static Set> allowedPropertyTypes = new HashSet<>(Arrays.asList( boolean.class, byte.class, short.class, int.class, float.class, double.class, String.class, ResourceArray.class, ResourceMap.class)); private static Map, Object> defaultValues = new HashMap<>(); diff --git a/platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java b/platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java index 427221d5f..87a2f46ac 100644 --- a/platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java +++ b/platform/src/main/java/org/teavm/platform/plugin/ResourceProgramTransformer.java @@ -77,7 +77,7 @@ class ResourceProgramTransformer { accessInsn.getArguments().add(insn.getInstance()); accessInsn.getArguments().addAll(insn.getArguments()); accessInsn.setReceiver(insn.getReceiver()); - return Arrays.asList(accessInsn); + return Arrays.asList(accessInsn); } ClassReader iface = innerSource.get(method.getClassName()); if (iface == null || !innerSource.isSuperType(Resource.class.getName(), iface.getName()).orElse(false)) { @@ -115,7 +115,7 @@ class ResourceProgramTransformer { transformInsn.getArguments().add(tmp); transformInsn.setReceiver(insn.getReceiver()); - return Arrays.asList(keysInsn, transformInsn); + return Arrays.asList(keysInsn, transformInsn); } private List transformGetterInvocation(InvokeInstruction insn, String property) { diff --git a/platform/teavm-platform.iml b/platform/teavm-platform.iml new file mode 100644 index 000000000..869f418fe --- /dev/null +++ b/platform/teavm-platform.iml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ff08bd0bf..67d6b0c72 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ false 1 - + true @@ -257,7 +257,6 @@ UTF-8 true true - false check @@ -305,11 +304,5 @@ - - enable-samples - - teavm-samples - - diff --git a/samples/async/src/main/webapp/index.html b/samples/async/src/main/webapp/index.html index 309a28a6c..cf0f1bb3f 100644 --- a/samples/async/src/main/webapp/index.html +++ b/samples/async/src/main/webapp/index.html @@ -22,8 +22,8 @@ - - + + - + diff --git a/samples/benchmark/teavm-samples-benchmark.iml b/samples/benchmark/teavm-samples-benchmark.iml new file mode 100644 index 000000000..e636ebb73 --- /dev/null +++ b/samples/benchmark/teavm-samples-benchmark.iml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/hello/teavm-samples-hello.iml b/samples/hello/teavm-samples-hello.iml new file mode 100644 index 000000000..e9ec0ccee --- /dev/null +++ b/samples/hello/teavm-samples-hello.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/kotlin/pom.xml b/samples/kotlin/pom.xml index 1aa3bee3e..ee1774b45 100644 --- a/samples/kotlin/pom.xml +++ b/samples/kotlin/pom.xml @@ -61,7 +61,6 @@ ${project.basedir}/src/main/kotlin - ${project.basedir}/src/test/kotlin diff --git a/samples/kotlin/teavm-samples-kotlin.iml b/samples/kotlin/teavm-samples-kotlin.iml new file mode 100644 index 000000000..7ace2400d --- /dev/null +++ b/samples/kotlin/teavm-samples-kotlin.iml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/scala/pom.xml b/samples/scala/pom.xml index 0fcbd20ab..b3db29c55 100644 --- a/samples/scala/pom.xml +++ b/samples/scala/pom.xml @@ -40,7 +40,6 @@ src/main/scala - src/test/scala diff --git a/samples/scala/teavm-samples-scala.iml b/samples/scala/teavm-samples-scala.iml new file mode 100644 index 000000000..136baffb9 --- /dev/null +++ b/samples/scala/teavm-samples-scala.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/storage/teavm-samples-storage.iml b/samples/storage/teavm-samples-storage.iml new file mode 100644 index 000000000..2479ff0fa --- /dev/null +++ b/samples/storage/teavm-samples-storage.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/teavm-samples.iml b/samples/teavm-samples.iml new file mode 100644 index 000000000..66b3d797e --- /dev/null +++ b/samples/teavm-samples.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/video/src/main/webapp/style.css b/samples/video/src/main/webapp/style.css index d84ba0e5b..8e7cbe664 100644 --- a/samples/video/src/main/webapp/style.css +++ b/samples/video/src/main/webapp/style.css @@ -1,6 +1,6 @@ video { border: 1px solid black; - padding: 0; margin: 0; + padding: 0; width: 427px; height: 240px; background-color: black; diff --git a/samples/video/teavm-samples-video.iml b/samples/video/teavm-samples-video.iml new file mode 100644 index 000000000..2479ff0fa --- /dev/null +++ b/samples/video/teavm-samples-video.iml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/teavm.iml b/teavm.iml new file mode 100644 index 000000000..bebe45005 --- /dev/null +++ b/teavm.iml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java index 219dde718..0aadf5f27 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/ClassTest.java @@ -177,16 +177,16 @@ public class ClassTest { } @Retention(RetentionPolicy.RUNTIME) - static @interface TestAnnot { + @interface TestAnnot { } @Retention(RetentionPolicy.RUNTIME) - static @interface AnnotWithDefaultField { + @interface AnnotWithDefaultField { int x() default 2; } @Retention(RetentionPolicy.RUNTIME) - static @interface AnnotWithVariousFields { + @interface AnnotWithVariousFields { boolean a(); byte b(); diff --git a/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java b/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java index 4855eee1e..953db5208 100644 --- a/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java +++ b/tests/src/test/java/org/teavm/classlib/java/lang/EnumTest.java @@ -23,11 +23,11 @@ import org.junit.Test; * @author Alexey Andreev */ public class EnumTest { - private static enum Foo { + private enum Foo { A, B, C } - private static enum Bar { + private enum Bar { D, E } diff --git a/tests/teavm-tests.iml b/tests/teavm-tests.iml new file mode 100644 index 000000000..5e8336242 --- /dev/null +++ b/tests/teavm-tests.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/chrome-rdp/pom.xml b/tools/chrome-rdp/pom.xml index e5fa6dcc0..d54683a54 100644 --- a/tools/chrome-rdp/pom.xml +++ b/tools/chrome-rdp/pom.xml @@ -52,18 +52,6 @@ javax.websocket javax.websocket-api - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty.websocket - javax-websocket-server-impl - - - org.slf4j - slf4j-api - org.codehaus.jackson jackson-core-asl diff --git a/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java index d6f25a271..dbf789d8c 100644 --- a/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java +++ b/tools/chrome-rdp/src/main/java/org/teavm/chromerdp/ChromeRDPDebugger.java @@ -86,11 +86,7 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC } } - private ChromeRDPExchangeListener exchangeListener = new ChromeRDPExchangeListener() { - @Override public void received(String messageText) throws IOException { - receiveMessage(messageText); - } - }; + private ChromeRDPExchangeListener exchangeListener = messageText -> receiveMessage(messageText); private void receiveMessage(final String messageText) { new Thread() { @@ -332,21 +328,19 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC if (logger.isInfoEnabled()) { logger.info("Setting breakpoint at {}, message id is ", breakpoint.getLocation(), message.getId()); } - ResponseHandler handler = new ResponseHandler() { - @Override public void received(JsonNode node) throws IOException { - if (node != null) { - SetBreakpointResponse response = mapper.reader(SetBreakpointResponse.class).readValue(node); - breakpoint.chromeId = response.getBreakpointId(); - } else { - if (logger.isWarnEnabled()) { - logger.warn("Error setting breakpoint at {}, message id is {}", - breakpoint.getLocation(), message.getId()); - } - breakpoint.chromeId = null; - } - for (JavaScriptDebuggerListener listener : getListeners()) { - listener.breakpointChanged(breakpoint); + ResponseHandler handler = node -> { + if (node != null) { + SetBreakpointResponse response = mapper.reader(SetBreakpointResponse.class).readValue(node); + breakpoint.chromeId = response.getBreakpointId(); + } else { + if (logger.isWarnEnabled()) { + logger.warn("Error setting breakpoint at {}, message id is {}", + breakpoint.getLocation(), message.getId()); } + breakpoint.chromeId = null; + } + for (JavaScriptDebuggerListener listener : getListeners()) { + listener.breakpointChanged(breakpoint); } }; responseHandlers.put(message.getId(), handler); @@ -365,11 +359,9 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC params.setOwnProperties(true); message.setParams(mapper.valueToTree(params)); final BlockingQueue> sync = new LinkedTransferQueue<>(); - responseHandlers.put(message.getId(), new ResponseHandler() { - @Override public void received(JsonNode node) throws IOException { - GetPropertiesResponse response = mapper.reader(GetPropertiesResponse.class).readValue(node); - sync.add(parseProperties(response.getResult())); - } + responseHandlers.put(message.getId(), node -> { + GetPropertiesResponse response = mapper.reader(GetPropertiesResponse.class).readValue(node); + sync.add(parseProperties(response.getResult())); }); sendMessage(message); try { @@ -394,15 +386,13 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC params.setFunctionDeclaration("$dbg_class"); message.setParams(mapper.valueToTree(params)); final BlockingQueue sync = new LinkedTransferQueue<>(); - responseHandlers.put(message.getId(), new ResponseHandler() { - @Override public void received(JsonNode node) throws IOException { - if (node == null) { - sync.add(""); - } else { - CallFunctionResponse response = mapper.reader(CallFunctionResponse.class).readValue(node); - RemoteObjectDTO result = response.getResult(); - sync.add(result.getValue() != null ? result.getValue().getTextValue() : ""); - } + responseHandlers.put(message.getId(), node -> { + if (node == null) { + sync.add(""); + } else { + CallFunctionResponse response = mapper.reader(CallFunctionResponse.class).readValue(node); + RemoteObjectDTO result = response.getResult(); + sync.add(result.getValue() != null ? result.getValue().getTextValue() : ""); } }); sendMessage(message); @@ -429,16 +419,14 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC params.setFunctionDeclaration("$dbg_repr"); message.setParams(mapper.valueToTree(params)); final BlockingQueue sync = new LinkedTransferQueue<>(); - responseHandlers.put(message.getId(), new ResponseHandler() { - @Override public void received(JsonNode node) throws IOException { - if (node == null) { - sync.add(new RepresentationWrapper(null)); - } else { - CallFunctionResponse response = mapper.reader(CallFunctionResponse.class).readValue(node); - RemoteObjectDTO result = response.getResult(); - sync.add(new RepresentationWrapper(result.getValue() != null - ? result.getValue().getTextValue() : null)); - } + responseHandlers.put(message.getId(), node -> { + if (node == null) { + sync.add(new RepresentationWrapper(null)); + } else { + CallFunctionResponse response = mapper.reader(CallFunctionResponse.class).readValue(node); + RemoteObjectDTO result = response.getResult(); + sync.add(new RepresentationWrapper(result.getValue() != null + ? result.getValue().getTextValue() : null)); } }); sendMessage(message); @@ -510,14 +498,18 @@ public class ChromeRDPDebugger implements JavaScriptDebugger, ChromeRDPExchangeC RDPValue thisObject = null; RDPValue closure = null; for (ScopeDTO scope : dto.getScopeChain()) { - if (scope.getType().equals("local")) { - scopeId = scope.getObject().getObjectId(); - } else if (scope.getType().equals("closure")) { - closure = new RDPValue(this, scope.getObject().getDescription(), scope.getObject().getType(), - scope.getObject().getObjectId(), true); - } else if (scope.getType().equals("global")) { - thisObject = new RDPValue(this, scope.getObject().getDescription(), scope.getObject().getType(), - scope.getObject().getObjectId(), true); + switch (scope.getType()) { + case "local": + scopeId = scope.getObject().getObjectId(); + break; + case "closure": + closure = new RDPValue(this, scope.getObject().getDescription(), scope.getObject().getType(), + scope.getObject().getObjectId(), true); + break; + case "global": + thisObject = new RDPValue(this, scope.getObject().getDescription(), scope.getObject().getType(), + scope.getObject().getObjectId(), true); + break; } } return new RDPCallFrame(this, dto.getCallFrameId(), map(dto.getLocation()), new RDPScope(this, scopeId), diff --git a/tools/chrome-rdp/src/main/js/chrome/main.js b/tools/chrome-rdp/src/main/js/chrome/main.js index 2f8500960..1279ba1fa 100644 --- a/tools/chrome-rdp/src/main/js/chrome/main.js +++ b/tools/chrome-rdp/src/main/js/chrome/main.js @@ -14,10 +14,10 @@ function DebuggerAgent(tab) { } DebuggerAgent.MAX_MESSAGE_SIZE = 65534; DebuggerAgent.prototype.attach = function() { - chrome.debugger.attach(this.debuggee, "1.0", (function(callback) { + chrome.debugger.attach(this.debuggee, "1.0", function(callback) { this.attachedToDebugger = true; chrome.debugger.sendCommand(this.debuggee, "Debugger.enable", {}, callback); - }).bind(this, this.connectToServer.bind(this))); + }.bind(this, this.connectToServer.bind(this))); }; DebuggerAgent.prototype.connectToServer = function() { this.connection = new WebSocket("ws://localhost:2357/"); @@ -60,7 +60,7 @@ DebuggerAgent.prototype.sendMessage = function(message) { str = str.substring(DebuggerAgent.MAX_MESSAGE_SIZE); } this.connection.send("." + str); -} +}; DebuggerAgent.prototype.disconnect = function() { if (this.connection) { var conn = this.connection; diff --git a/tools/chrome-rdp/teavm-chrome-rdp.iml b/tools/chrome-rdp/teavm-chrome-rdp.iml new file mode 100644 index 000000000..698c7b466 --- /dev/null +++ b/tools/chrome-rdp/teavm-chrome-rdp.iml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/cli/teavm-cli.iml b/tools/cli/teavm-cli.iml new file mode 100644 index 000000000..f1df25985 --- /dev/null +++ b/tools/cli/teavm-cli.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/core/src/main/java/org/teavm/tooling/TeaVMTool.java b/tools/core/src/main/java/org/teavm/tooling/TeaVMTool.java index 5938e2e83..c619ab206 100644 --- a/tools/core/src/main/java/org/teavm/tooling/TeaVMTool.java +++ b/tools/core/src/main/java/org/teavm/tooling/TeaVMTool.java @@ -227,7 +227,7 @@ public class TeaVMTool implements BaseTeaVMTool { public Collection getUsedResources() { if (vm == null) { - return Collections.emptyList(); + return Collections.emptyList(); } Set resources = new HashSet<>(); diff --git a/tools/core/src/main/java/org/teavm/tooling/testing/TeaVMTestTool.java b/tools/core/src/main/java/org/teavm/tooling/testing/TeaVMTestTool.java index 484397246..2f45a4431 100644 --- a/tools/core/src/main/java/org/teavm/tooling/testing/TeaVMTestTool.java +++ b/tools/core/src/main/java/org/teavm/tooling/testing/TeaVMTestTool.java @@ -249,7 +249,7 @@ public class TeaVMTestTool implements BaseTeaVMTool { if (numThreads != 1) { int threads = numThreads != 0 ? numThreads : Runtime.getRuntime().availableProcessors(); ThreadPoolFiniteExecutor threadedExecutor = new ThreadPoolFiniteExecutor(threads); - finalizer = () -> threadedExecutor.stop(); + finalizer = threadedExecutor::stop; executor = threadedExecutor; } startTime = System.currentTimeMillis(); diff --git a/tools/core/src/main/java/org/teavm/tooling/testing/TestEntryPointTransformer.java b/tools/core/src/main/java/org/teavm/tooling/testing/TestEntryPointTransformer.java index 017456bd6..914c60844 100644 --- a/tools/core/src/main/java/org/teavm/tooling/testing/TestEntryPointTransformer.java +++ b/tools/core/src/main/java/org/teavm/tooling/testing/TestEntryPointTransformer.java @@ -51,14 +51,12 @@ class TestEntryPointTransformer implements ClassHolderTransformer, TeaVMPlugin { public void transformClass(ClassHolder cls, ClassReaderSource innerSource, Diagnostics diagnostics) { if (cls.getName().equals(TestEntryPoint.class.getName())) { for (MethodHolder method : cls.getMethods()) { - if (method.equals(method)) { - if (method.getName().equals("createRunner")) { - method.setProgram(generateRunnerProgram(method, innerSource)); - method.getModifiers().remove(ElementModifier.NATIVE); - } else if (method.getName().equals("launchTest")) { - method.setProgram(generateLaunchProgram(method, innerSource)); - method.getModifiers().remove(ElementModifier.NATIVE); - } + if (method.getName().equals("createRunner")) { + method.setProgram(generateRunnerProgram(method, innerSource)); + method.getModifiers().remove(ElementModifier.NATIVE); + } else if (method.getName().equals("launchTest")) { + method.setProgram(generateLaunchProgram(method, innerSource)); + method.getModifiers().remove(ElementModifier.NATIVE); } } } diff --git a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-client.js b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-client.js index 12a309bd3..f22da3d0c 100644 --- a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-client.js +++ b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-client.js @@ -10,10 +10,10 @@ JUnitClient.run = function() { }); break; } - } + }; window.addEventListener("message", handler); window.parent.postMessage("ready", "*"); -} +}; JUnitClient.runTest = function() { var thread = $rt_nativeThread(); var instance; @@ -42,7 +42,7 @@ JUnitClient.runTest = function() { break loop; }} window.parent.postMessage(message, "*"); -} +}; JUnitClient.makeErrorMessage = function(message, e) { message.status = "exception"; var stack = e.stack; @@ -53,7 +53,7 @@ JUnitClient.makeErrorMessage = function(message, e) { message.stack += exceptionMessage ? $rt_ustr(exceptionMessage) : ""; } message.stack += "\n" + stack; -} +}; JUnitClient.reportError = function(error) { var handler = function() { window.removeEventListener("message", handler); @@ -61,12 +61,12 @@ JUnitClient.reportError = function(error) { window.parent.postMessage(message, "*"); }; window.addEventListener("message", handler); -} +}; JUnitClient.loadScript = function(scriptPath) { var script = document.createElement("script"); script.src = scriptPath; document.body.appendChild(script); -} +}; window.addEventListener("message", function(event) { var data = event.data; switch (data.command) { diff --git a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-support.js b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-support.js index 216fd3529..b6ab86c10 100644 --- a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-support.js +++ b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit-support.js @@ -40,7 +40,7 @@ function JUnitServer() { } }); } -JUnitServer.prototype = new Object(); +JUnitServer.prototype = {}; JUnitServer.prototype.handleEvent = function(message, callback) { if (message.status === "ok") { if (this.expectedExceptions.length > 0) { @@ -66,7 +66,7 @@ JUnitServer.prototype.handleEvent = function(message, callback) { document.body.removeChild(this.frame); self.frame = null; callback(); -} +}; JUnitServer.prototype.isExpectedException = function(ex) { for (var i = 0; i < this.expectedExceptions.length; ++i) { if (this.expectedExceptions[i] === ex) { @@ -74,7 +74,7 @@ JUnitServer.prototype.isExpectedException = function(ex) { } } return false; -} +}; JUnitServer.prototype.loadCode = function(path, additionalScripts, callback) { this.frame = document.createElement("iframe"); this.frame.src = "junit-client.html"; @@ -88,9 +88,9 @@ JUnitServer.prototype.loadCode = function(path, additionalScripts, callback) { var handler = function() { window.removeEventListener("message", handler); self.loadScripts(sequence, callback); - } + }; window.addEventListener("message", handler); -} +}; JUnitServer.prototype.loadScripts = function(scripts, callback) { for (var i = 0; i < scripts.length; ++i) { this.frame.contentWindow.postMessage({ command : "loadScript", "script" : scripts[i] }, "*"); @@ -98,9 +98,9 @@ JUnitServer.prototype.loadScripts = function(scripts, callback) { var handler = function() { window.removeEventListener("message", handler); callback(); - } + }; window.addEventListener("message", handler); -} +}; JUnitServer.prototype.runTest = function(node, callback) { node.indicator.className = "complete-indicator in-progress"; var startTime = new Date().getTime(); @@ -114,7 +114,7 @@ JUnitServer.prototype.runTest = function(node, callback) { var timeSpent = new Date().getTime() - startTime; node.timeIndicator.appendChild(document.createTextNode("(" + (timeSpent / 1000).toFixed(3) + ")")); self.handleEvent(event.data, callback); - }; + } window.addEventListener("message", messageHandler); self.frame.contentWindow.postMessage({ command : "runTest" }, "*"); }); @@ -139,7 +139,7 @@ JUnitServer.prototype.runTest = function(node, callback) { callback(); }); } -} +}; JUnitServer.prototype.readTests = function(tests) { var groups = this.groupTests(tests); var groupNames = []; @@ -169,7 +169,7 @@ JUnitServer.prototype.readTests = function(tests) { } document.getElementById("test-count").appendChild(document.createTextNode(this.testCaseCount)); return this; -} +}; JUnitServer.prototype.createNode = function(parent, className, name) { var elem = document.createElement("div"); elem.className = className; @@ -182,7 +182,7 @@ JUnitServer.prototype.createNode = function(parent, className, name) { node.timeIndicator.className = "time-indicator"; elem.appendChild(node.timeIndicator); return node; -} +}; JUnitServer.prototype.groupTests = function(tests) { var groups = {}; for (var i = 0; i < tests.length; ++i) { @@ -196,7 +196,7 @@ JUnitServer.prototype.groupTests = function(tests) { group.push(test); } return groups; -} +}; JUnitServer.prototype.runAllTests = function(callback) { this.cleanupTests(); var self = this; @@ -208,7 +208,7 @@ JUnitServer.prototype.runAllTests = function(callback) { (totalTime / 1000).toFixed(3) + ")")); callback(); }); -} +}; JUnitServer.prototype.runTestFromList = function(nodes, index, callback) { if (index < nodes.length) { var node = nodes[index]; @@ -219,7 +219,7 @@ JUnitServer.prototype.runTestFromList = function(nodes, index, callback) { } else { callback(); } -} +}; JUnitServer.prototype.cleanupTests = function() { if (this.failedElem.firstChild) { this.failedElem.removeChild(this.failedElem.firstChild); @@ -234,7 +234,7 @@ JUnitServer.prototype.cleanupTests = function() { for (var i = 0; i < nodes.length; ++i) { this.cleanupNode(nodes[i]); } -} +}; JUnitServer.prototype.cleanupNode = function(node) { delete node.error; node.indicator.className = "complete-indicator"; @@ -245,7 +245,7 @@ JUnitServer.prototype.cleanupNode = function(node) { for (var i = 0; i < nodes.length; ++i) { this.cleanupNode(nodes[i]); } -} +}; function Tree(container) { this.container = container; @@ -269,19 +269,19 @@ Tree.prototype.createNode = function(content) { childrenElem.style.display = "none"; elem.appendChild(childrenElem); return new TreeNode(elem, contentElem, buttonElem, childrenElem, this); -} +}; Tree.prototype.add = function(content) { var node = this.createNode(content); this.container.appendChild(node.elem); this.nodes.push(node); return node; -} +}; Tree.prototype.getNodes = function() { return this.nodes; -} +}; Tree.prototype.addSelectionListener = function(listener) { this.selectionListeners.push(listener); -} +}; function TreeNode(elem, content, button, children, tree) { this.elem = elem; this.content = content; @@ -294,7 +294,7 @@ function TreeNode(elem, content, button, children, tree) { var self = this; this.button.onclick = function() { self.toggle(); - } + }; this.content.onclick = function() { self.select(); } @@ -308,10 +308,10 @@ TreeNode.prototype.add = function(content) { node.parent = this; this.nodes.push(node); return node; -} +}; TreeNode.prototype.isOpened = function() { return this.opened; -} +}; TreeNode.prototype.open = function() { if (this.isOpened()) { return; @@ -319,7 +319,7 @@ TreeNode.prototype.open = function() { this.opened = true; this.children.className = "tree-node-children opened"; this.button.className = "tree-node-button opened"; -} +}; TreeNode.prototype.close = function() { if (!this.isOpened()) { return; @@ -327,26 +327,26 @@ TreeNode.prototype.close = function() { this.opened = false; this.children.className = "tree-node-children closed"; this.button.className = "tree-node-button closed"; -} +}; TreeNode.prototype.toggle = function() { if (this.isOpened()) { this.close(); } else { this.open(); } -} +}; TreeNode.prototype.getNodes = function() { return this.nodes; -} +}; TreeNode.prototype.getParent = function() { return this.parent; -} +}; TreeNode.prototype.getTree = function() { return this.tree; -} +}; TreeNode.prototype.isSelected = function() { return this.tree.selectedNode === this; -} +}; TreeNode.prototype.select = function() { if (this.isSelected()) { return; @@ -359,4 +359,4 @@ TreeNode.prototype.select = function() { for (var i = 0; i < this.tree.selectionListeners.length; ++i) { this.tree.selectionListeners[i](this); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit.css b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit.css index b239c4695..28997f74c 100644 --- a/tools/core/src/main/resources/org/teavm/tooling/test/res/junit.css +++ b/tools/core/src/main/resources/org/teavm/tooling/test/res/junit.css @@ -14,30 +14,30 @@ * limitations under the License. */ iframe { - with: 1px; + width: 1px; height: 1px; - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; border-style: none; } * { - font-family: sans; + font-family: sans-serif; font-size: 10pt; } html, body { position: absolute; - left: 0px; - right: 0px; - top: 0px; - bottom: 0px; - padding: 0px; - margin: 0px; + left: 0; + right: 0; + top: 0; + bottom: 0; + padding: 0; + margin: 0; } .test-header { position: absolute; - top: 0px; - right: 0px; - left: 0px; + top: 0; + right: 0; + left: 0; height: 40px; border-bottom-color: gray; border-bottom-width: 1px; @@ -45,11 +45,11 @@ html, body { } .test-count, .failed-test-count { position: absolute; - top: 0px; - bottom: 0px; + top: 0; + bottom: 0; line-height: 40px; - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; vertical-align: middle; } .test-count { @@ -82,16 +82,16 @@ html, body { #progress-bar-content { position: absolute; background-color: green; - left: 0px; - top: 0px; - bottom: 0px; - width: 0%; + left: 0; + top: 0; + bottom: 0; + width: 0; } #test-tree { position: absolute; top: 41px; - bottom: 0px; - left: 0px; + bottom: 0; + left: 0; width: 50%; border-right-color: grey; border-right-width: 1px; @@ -101,9 +101,9 @@ html, body { #test-trace { position: absolute; top: 41px; - bottom: 0px; + bottom: 0; left: 50%; - right: 0px; + right: 0; overflow: auto; } .tree-node { @@ -126,12 +126,12 @@ html, body { .tree-node-button { position: absolute; cursor: pointer; - left: 0px; - top: 0px; + left: 0; + top: 0; width: 16px; height: 16px; background-repeat: no-repeat; - background-position: 0px 0px; + background-position: 0 0; } .tree-node-button.opened { background-image: url(toggle-small.png); @@ -161,7 +161,7 @@ html, body { top: 5px; width: 16px; height: 16px; - background-position: 0px 0px; + background-position: 0 0; background-repeat: no-repeat; display: none; } diff --git a/tools/core/teavm-tooling.iml b/tools/core/teavm-tooling.iml new file mode 100644 index 000000000..fe89ce587 --- /dev/null +++ b/tools/core/teavm-tooling.iml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/maven/plugin/src/main/resources/teavm-htmlunit-adapter.js b/tools/maven/plugin/src/main/resources/teavm-htmlunit-adapter.js index 2e8cce268..c245ef607 100644 --- a/tools/maven/plugin/src/main/resources/teavm-htmlunit-adapter.js +++ b/tools/maven/plugin/src/main/resources/teavm-htmlunit-adapter.js @@ -1,5 +1,5 @@ -function(callback) { - var JUnitClient = {} +function main(callback) { + var JUnitClient = {}; JUnitClient.run = function() { $rt_startThread(function() { var thread = $rt_nativeThread(); @@ -30,7 +30,7 @@ function(callback) { }} callback.complete(JSON.stringify(message)); }) - } + }; JUnitClient.makeErrorMessage = function(message, e) { message.status = "exception"; @@ -42,7 +42,7 @@ function(callback) { message.stack += exceptionMessage ? $rt_ustr(exceptionMessage) : ""; } message.stack += "\n" + stack; - } + }; window.JUnitClient = JUnitClient; } \ No newline at end of file diff --git a/tools/maven/plugin/src/main/resources/teavm-selenium-adapter.js b/tools/maven/plugin/src/main/resources/teavm-selenium-adapter.js index 49990e3b0..5957c22b4 100644 --- a/tools/maven/plugin/src/main/resources/teavm-selenium-adapter.js +++ b/tools/maven/plugin/src/main/resources/teavm-selenium-adapter.js @@ -1,4 +1,4 @@ -var JUnitClient = {} +var JUnitClient = {}; JUnitClient.run = function() { $rt_startThread(function() { var thread = $rt_nativeThread(); @@ -29,7 +29,7 @@ JUnitClient.run = function() { }} window.parent.postMessage(JSON.stringify(message), "*"); }) -} +}; JUnitClient.makeErrorMessage = function(message, e) { message.status = "exception"; @@ -41,4 +41,4 @@ JUnitClient.makeErrorMessage = function(message, e) { message.stack += exceptionMessage ? $rt_ustr(exceptionMessage) : ""; } message.stack += "\n" + stack; -} \ No newline at end of file +}; \ No newline at end of file diff --git a/tools/maven/plugin/src/main/resources/teavm-selenium.js b/tools/maven/plugin/src/main/resources/teavm-selenium.js index bbf451b11..469974bd4 100644 --- a/tools/maven/plugin/src/main/resources/teavm-selenium.js +++ b/tools/maven/plugin/src/main/resources/teavm-selenium.js @@ -1,22 +1,22 @@ -var runtimeSource = arguments[0] -var testSource = arguments[1] -var adapterSource = arguments[2] -var seleniumCallback = arguments[arguments.length - 1] +var runtimeSource = arguments[0]; +var testSource = arguments[1]; +var adapterSource = arguments[2]; +var seleniumCallback = arguments[arguments.length - 1]; -var iframe = document.createElement("iframe") -document.body.appendChild(iframe) -var doc = iframe.contentDocument +var iframe = document.createElement("iframe"); +document.body.appendChild(iframe); +var doc = iframe.contentDocument; -window.jsErrors = [] -window.onerror = reportError -iframe.contentWindow.onerror = reportError +window.jsErrors = []; +window.onerror = reportError; +iframe.contentWindow.onerror = reportError; -loadScripts([ runtimeSource, adapterSource, testSource ]) -window.addEventListener("message", handleMessage) +loadScripts([ runtimeSource, adapterSource, testSource ]); +window.addEventListener("message", handleMessage); function handleMessage(event) { - window.removeEventListener("message", handleMessage) - document.body.removeChild(iframe) + window.removeEventListener("message", handleMessage); + document.body.removeChild(iframe); seleniumCallback(event.data) } @@ -26,9 +26,9 @@ function loadScript(script, callback) { function loadScripts(scripts) { for (var i = 0; i < scripts.length; ++i) { - var elem = doc.createElement("script") - elem.type = "text/javascript" - doc.head.appendChild(elem) + var elem = doc.createElement("script"); + elem.type = "text/javascript"; + doc.head.appendChild(elem); elem.text = scripts[i] } } diff --git a/tools/maven/plugin/teavm-maven-plugin.iml b/tools/maven/plugin/teavm-maven-plugin.iml new file mode 100644 index 000000000..66a1d1672 --- /dev/null +++ b/tools/maven/plugin/teavm-maven-plugin.iml @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/maven/teavm-maven.iml b/tools/maven/teavm-maven.iml new file mode 100644 index 000000000..66b3d797e --- /dev/null +++ b/tools/maven/teavm-maven.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/tools/maven/webapp/teavm-maven-webapp.iml b/tools/maven/webapp/teavm-maven-webapp.iml new file mode 100644 index 000000000..41632c8c2 --- /dev/null +++ b/tools/maven/webapp/teavm-maven-webapp.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file