diff --git a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
index 535bab300..5ce88cc1b 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/LicenseDialog.java
@@ -54,23 +54,23 @@ public class LicenseDialog extends JDialog {
/*****************************************************************************************************************************/
/* GPL: overall project */
/*****************************************************************************************************************************/
- final String gplInternalHref = "here";
final String orLicense = "GNU GENERAL PUBLIC LICENSE" + "
" +
"
" +
"OpenRocket - A model rocket simulator
" +
"Copyright " + Chars.COPY + " 2007-" + copyrightYear + "Sampo Niskanen and others
" +
"Project page: https://openrocket.info/
" +
"
" +
- "This program is free software: you can redistribute it and/or modify it under the terms " +
- "of the GNU General Public License as published by the Free Software Foundation, either " +
- "version 3 of the License, or any later version.
" +
- "
" +
+ "This program is free software: you can redistribute it and/or modify it under the terms of the " +
+ "GNU General Public License as published by the Free Software Foundation, either version 3 " +
+ "of the License, or any later version.
" +
+ "The license may be viewed " +
+ "here.
" +
+ "
" +
"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; " +
"without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. " +
- "See the GNU General Public License " + gplInternalHref + " for more details.
" +
- "
" +
- "A copy of the GNU General Public License may be viewed " + gplInternalHref + ". " +
- "You may also obtain a copy of the License at:
" +
+ "See the GNU General Public License for more details.
" +
+ "
" +
+ "You should have received a copy of the GNU Public License along with this program. If not, see
" +
"
" +
"https://www.gnu.org/licenses/gpl-3.0.html
" +
"
" +
@@ -83,83 +83,64 @@ public class LicenseDialog extends JDialog {
/*****************************************************************************************************************************/
/* APACHE: components library */
/*****************************************************************************************************************************/
- final String apacheInternalHref = "here";
final String componentsLicense =
"APACHE LICENSE
" +
"
" +
- "Enhanced components database for OpenRocket
" +
+ "OpenRocket features the enhanced components database created by David B. Cook
" +
"Copyright " + Chars.COPY + " 2015-" + copyrightYear + " David B. Cook
" +
"Project page: https://github.com/dbcook/openrocket-database
" +
"
" +
"Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this work except in compliance with the License. " +
- " A copy of the Apache License may be viewed " + apacheInternalHref + ". You may also obtain a copy of the License at:
" +
+ " A copy of the Apache License may be viewed " +
+ "here.
" +
+ "You may also 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 " +
- apacheInternalHref + " for the specific language governing permissions and limitations under the License.
" +
+ "
" +
+ "OpenRocket uses the Work or Derivative Works of Ant, a product which includes software developed by the Apache " +
+ "Software Foundation
" +
+ "
" +
+ "Ant product also includes software developed by:
" +
+ "
" +
+ "The names \"Ant\" and \"Apache Software Foundation\" must not be used to endorse or " +
+ "promote products derived from this software without prior written permission. For written permission, "+
+ "please contact apache@apache.org.
" +
"
";
-
/*****************************************************************************************************************************/
/* BITSTREAM VERA: Deja Vu font */
/*****************************************************************************************************************************/
- final String dejaLicenseUrl = jarUrl + "!/dejavu-font/LICENSE";
final String fontLicense =
"Bitstream Vera Font License
" +
"
" +
- "DejaVu Serif Font
" +
- "Fonts are Copyright " + Chars.COPY + " 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a trademark of Bitstream, Inc.
" +
+ "OpenRocket makes use of the DejaVu Serif Font
" +
+ "Fonts are Copyright " + Chars.COPY + " 2003 by Bitstream, Inc. All Rights Reserved. " +
+ "Bitstream Vera is a trademark of Bitstream, Inc.
" +
"DejaVu changes are in the public domain
" +
"Glyphs imported from Arev Fonts Copyright " + Chars.COPY + " 2006 by Tavmjong Bah. All Rights Reserved.
" +
"
" +
- "Licensed according to the Bitstream Vera Font License which may be found here." +
+ "Licensed according to the Bitstream Vera Font License which may be found " +
+ "here." +
"
" +
- "THE FONT SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS " +
- "OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY " +
- "FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, " +
- "TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME " +
- "FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING " +
- "ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, " +
- "WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF " +
- "THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE " +
- "FONT SOFTWARE.
" +
- "
" +
- "See the License for the specific language" +
- "governing permissions and limitations under the License.
" +
+ "The license is also available at " +
+ "https://github.com/dejavu-fonts/dejavu-fonts/blob/master/LICENSE
" +
"
";
-
-
+
/*****************************************************************************************************************************/
/* BSD 2-Clause: commonmark-java library */
/*****************************************************************************************************************************/
final String commonmarkLicense =
"BSD 2-Clause License
" +
"
" +
- "Commonmark-Java Library
" +
+ "OpenRocket makes use of the Commonmark-Java Library
" +
"Copyright " + Chars.COPY + " 2015-2016 Atlassian Pty Ltd
" +
"All rights reserved.
" +
"
" +
- "Redistribution and use in source and binary forms, with or without" +
- "modification, are permitted provided that the following conditions are met:
" +
- "" +
- "- Redistributions of source code must retain the above copyright notice, this " +
- "list of conditions and the following disclaimer.
" +
- "- Redistributions in binary form must reproduce the above copyright notice, " +
- "this list of conditions and the following disclaimer in the documentation " +
- "and/or other materials provided with the distribution.
" +
- "
" +
- "THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" " +
- "AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED " +
- "WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. " +
- "IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, " +
- "INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, " +
- "BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, " +
- "DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF " +
- "LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE " +
- "OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED " +
- "OF THE POSSIBILITY OF SUCH DAMAGE.
" +
+ "See https://github.com/commonmark/commonmark-java/blob/main/LICENSE.txt " +
+ "for full terms of use" +
"
";
/*****************************************************************************************************************************/