From 505b8e10eb46053e486f9e5c1969106eb044b543 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Thu, 27 Sep 2018 20:21:21 +0200 Subject: [PATCH] Changed license --- LICENSE | 222 +++++++++- flow/.classpath | 59 ++- .../warppi/flow/IntervalsManager.java | 4 +- .../warppi/flow/ObservableInterval.java | 1 - .../java/it/cavallium/warppi/flow/Utils.java | 21 + pom.xml | 378 +++++++++--------- teavm/.classpath | 2 +- teavm/.settings/org.eclipse.jdt.core.prefs | 6 +- teavm/pom.xml | 4 +- .../gui/graphicengine/html/HtmlEngine.java | 2 +- 10 files changed, 447 insertions(+), 252 deletions(-) create mode 100644 flow/src/main/java/it/cavallium/warppi/flow/Utils.java diff --git a/LICENSE b/LICENSE index 3c6be520..753842b6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,21 +1,201 @@ -The MIT License (MIT) - -Copyright (c) 2016 Andrea Cavalli - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/flow/.classpath b/flow/.classpath index a5d95095..e1938397 100644 --- a/flow/.classpath +++ b/flow/.classpath @@ -1,32 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flow/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java b/flow/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java index 6e8d6a64..2756651e 100644 --- a/flow/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java +++ b/flow/src/main/java/it/cavallium/warppi/flow/IntervalsManager.java @@ -1,5 +1,6 @@ package it.cavallium.warppi.flow; +import java.lang.reflect.InvocationTargetException; import java.util.LinkedList; import java.util.List; @@ -35,8 +36,7 @@ public class IntervalsManager { e.printStackTrace(); } }); - t.setDaemon(true); - t.setName("Intervals Manager"); + Utils.setThreadDaemon(t, true); t.start(); } } diff --git a/flow/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java b/flow/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java index ccfa387b..1c7077c5 100644 --- a/flow/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java +++ b/flow/src/main/java/it/cavallium/warppi/flow/ObservableInterval.java @@ -46,7 +46,6 @@ public class ObservableInterval extends Observable { } catch (final InterruptedException e) {} timeThread = null; }); - timeThread.setName("ObservableTimer"); timeThread.start(); running = true; } diff --git a/flow/src/main/java/it/cavallium/warppi/flow/Utils.java b/flow/src/main/java/it/cavallium/warppi/flow/Utils.java new file mode 100644 index 00000000..00f23657 --- /dev/null +++ b/flow/src/main/java/it/cavallium/warppi/flow/Utils.java @@ -0,0 +1,21 @@ +package it.cavallium.warppi.flow; + +import java.lang.reflect.InvocationTargetException; + +class Utils { + + /** + * Compatibility method for TeaVM + * @param t + * @param b + */ + public static void setThreadDaemon(Thread t, boolean b) { + // Compatibility + try { + t.getClass().getMethod("setDaemon", Boolean.class).invoke(t, true); + } catch (NoSuchMethodException | SecurityException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) { + e.printStackTrace(); + } + } + +} diff --git a/pom.xml b/pom.xml index 9f3ab623..b9120721 100755 --- a/pom.xml +++ b/pom.xml @@ -1,189 +1,189 @@ - - 4.0.0 - - it.cavallium - warppi - ${project.version} - pom - - WarpPI Calculator - WarpPI Calculator aggregate project - https://warp.ovh - - - - Cavallium - Andrea Cavalli - andrea@warp.ovh - +1 - - - - - https://github.com/Cavallium/WarpPI - scm:git:git@github.com:Cavallium/WarpPI.git - - - - 0.9.0a0 - UTF-8 - 1.8 - 1.8 - src/main/java - src/main/java - src/main/resources - veryverylongandparticularpath/abcd - - - - core - flow - rules - hardware - desktop - teavm - engine-jogl - - - - - teavm-dev - https://dl.bintray.com/konsoletyper/teavm - - true - - default - - - oss-snapshots-repo - Sonatype OSS Maven Repository - https://oss.sonatype.org/content/groups/public - - true - always - - - - jitpack.io - https://jitpack.io - - - - - - 1_teavm-dev - https://dl.bintray.com/konsoletyper/teavm - - true - - default - - - - - - - junit - junit - 3.8.1 - test - - - it.unimi.dsi - fastutil - 8.2.1 - - - com.google.code.gson - gson - 2.8.5 - - - commons-io - commons-io - 2.6 - - - org.apache.commons - commons-lang3 - 3.8 - - - ar.com.hjg - pngj - 2.1.0 - - - ar.com.hjg - pngj - 2.1.0 - - - - - - WarpPICalculator - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.0 - - - build-javadoc - - jar - - post-integration-test - - - - protected - false - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - post-integration-test - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.21.0 - - - org.apache.felix - maven-bundle-plugin - 2.5.3 - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - - + + 4.0.0 + + it.cavallium + warppi + ${project.version} + pom + + WarpPI Calculator + WarpPI Calculator aggregate project + https://warp.ovh + + + + Cavallium + Andrea Cavalli + andrea@warp.ovh + +1 + + + + + https://github.com/Cavallium/WarpPI + scm:git:git@github.com:Cavallium/WarpPI.git + + + + 0.9.0a0 + UTF-8 + 1.9 + 1.9 + src/main/java + src/main/java + src/main/resources + veryverylongandparticularpath/abcd + + + + core + flow + rules + hardware + desktop + teavm + engine-jogl + + + + + teavm-dev + https://dl.bintray.com/konsoletyper/teavm + + true + + default + + + oss-snapshots-repo + Sonatype OSS Maven Repository + https://oss.sonatype.org/content/groups/public + + true + always + + + + jitpack.io + https://jitpack.io + + + + + + 1_teavm-dev + https://dl.bintray.com/konsoletyper/teavm + + true + + default + + + + + + + junit + junit + 3.8.1 + test + + + it.unimi.dsi + fastutil + 8.2.1 + + + com.google.code.gson + gson + 2.8.5 + + + commons-io + commons-io + 2.6 + + + org.apache.commons + commons-lang3 + 3.8 + + + ar.com.hjg + pngj + 2.1.0 + + + ar.com.hjg + pngj + 2.1.0 + + + + + + WarpPICalculator + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.0.0 + + + build-javadoc + + jar + + post-integration-test + + + + protected + false + + + + org.apache.maven.plugins + maven-source-plugin + 3.0.1 + + + attach-sources + post-integration-test + + jar-no-fork + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.21.0 + + + org.apache.felix + maven-bundle-plugin + 2.5.3 + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + + diff --git a/teavm/.classpath b/teavm/.classpath index e1938397..ee04d99a 100644 --- a/teavm/.classpath +++ b/teavm/.classpath @@ -13,7 +13,7 @@ - + diff --git a/teavm/.settings/org.eclipse.jdt.core.prefs b/teavm/.settings/org.eclipse.jdt.core.prefs index f494d1de..e029c71e 100644 --- a/teavm/.settings/org.eclipse.jdt.core.prefs +++ b/teavm/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=1.5 diff --git a/teavm/pom.xml b/teavm/pom.xml index af6003ed..fc136472 100644 --- a/teavm/pom.xml +++ b/teavm/pom.xml @@ -27,7 +27,7 @@ org.teavm teavm-classlib - 0.6.0-dev-559 + 0.6.0-dev-567 @@ -74,7 +74,7 @@ org.teavm teavm-maven-plugin - 0.6.0-dev-559 + 0.6.0-dev-567 diff --git a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java index faf66005..09ba7273 100644 --- a/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java +++ b/teavm/src/main/java/it/cavallium/warppi/gui/graphicengine/html/HtmlEngine.java @@ -205,7 +205,7 @@ public class HtmlEngine implements GraphicEngine { } @JSBody(params = {}, script = "return CSS.supports(\"zoom:2\")") - private native boolean suppportsZoom(); + private static native boolean suppportsZoom(); @Override public int getWidth() {