From 5dcbb11f41ea146bcdd41db8bbaf480916f3dcdc Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 12:21:23 -0600 Subject: [PATCH 1/6] missing close html tokens --- swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 452a617dc..3878ad53e 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -75,7 +75,8 @@ public class AboutDialog extends JDialog { "OpenRocket gratefully acknowledges our use of the following databases:
" + "
" + "Rocket Motor Data (" + href("https://www.thrustcurve.org/") + ")
" + - "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/") + ")
"; + "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/") + ")" + + ""; private String href(String url) { return "" + url + ""; From 653618e83e26b722c4a5e12a5eb0491b57155425 Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 12:24:10 -0600 Subject: [PATCH 2/6] consistent url formatting --- .../openrocket/gui/dialogs/AboutDialog.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 3878ad53e..945e35dd5 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -58,28 +58,28 @@ public class AboutDialog extends JDialog { "Sibo Van Gool (Dutch)
" + "
" + "See all contributors at
" + - href("https://github.com/openrocket/openrocket/graphs/contributors") + "
" + + href("https://github.com/openrocket/openrocket/graphs/contributors", false) + "
" + "
" + "OpenRocket utilizes the following libraries:
" + "
" + - "MiG Layout (" + href("http://www.miglayout.com/") + ")
" + - "JFreeChart (" + href("http://www.jfree.org/jfreechart/") + ")
" + - "iText (" + href("http://www.itextpdf.com/") + ")
" + - "exp4j (" + href("http://projects.congrace.de/exp4j/index.html") + ")
" + - "JOGL (" + href("http://jogamp.org/jogl/www/") + ")
" + - "Guava (" + href("https://github.com/google/guava") + ")
" + - "Opencsv (" + href("http://opencsv.sourceforge.net/") + ")
" + - "Simple Logging Facade for Java (" + href("http://www.slf4j.org/") + ")
" + - "Java library for parsing and rendering CommonMark (" + href("https://github.com/commonmark/commonmark-java") + ")
" + + "MiG Layout " + href("http://www.miglayout.com/", true) + "
" + + "JFreeChart " + href("http://www.jfree.org/jfreechart/", true) + "
" + + "iText " + href("http://www.itextpdf.com/", true) + "
" + + "exp4j " + href("http://projects.congrace.de/exp4j/index.html", true) + "
" + + "JOGL " + href("http://jogamp.org/jogl/www/", true) + "
" + + "Guava " + href("https://github.com/google/guava", true) + "
" + + "Opencsv " + href("http://opencsv.sourceforge.net/", true) + "
" + + "Simple Logging Facade for Java " + href("http://www.slf4j.org/", true) + "
" + + "Java library for parsing and rendering CommonMark " + href("https://github.com/commonmark/commonmark-java", true) + "
" + "
" + "OpenRocket gratefully acknowledges our use of the following databases:
" + "
" + - "Rocket Motor Data (" + href("https://www.thrustcurve.org/") + ")
" + - "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/") + ")" + - ""; + "Rocket Motor Data " + href("https://www.thrustcurve.org/", true) + "
" + + "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/", true) + + ""; - private String href(String url) { - return "" + url + ""; + private String href(String url, boolean delimiters) { + return (delimiters ? "(" : "") + "" + url + "" + (delimiters ? ")" : ""); } public AboutDialog(JFrame parent) { From fa9c33deb258633a59c40d20e18eed30c3ced0c2 Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 12:28:22 -0600 Subject: [PATCH 3/6] code formatting cleanup --- .../openrocket/gui/dialogs/AboutDialog.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 945e35dd5..1371bf645 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -57,25 +57,24 @@ public class AboutDialog extends JDialog { "Polish Rocketry Society / \u0141ukasz & Alex Kazanski (Polish)
" + "Sibo Van Gool (Dutch)
" + "
" + - "See all contributors at
" + - href("https://github.com/openrocket/openrocket/graphs/contributors", false) + "
" + + "See all contributors at
" + href("https://github.com/openrocket/openrocket/graphs/contributors", false) + "
" + "
" + "OpenRocket utilizes the following libraries:
" + "
" + - "MiG Layout " + href("http://www.miglayout.com/", true) + "
" + - "JFreeChart " + href("http://www.jfree.org/jfreechart/", true) + "
" + - "iText " + href("http://www.itextpdf.com/", true) + "
" + - "exp4j " + href("http://projects.congrace.de/exp4j/index.html", true) + "
" + - "JOGL " + href("http://jogamp.org/jogl/www/", true) + "
" + - "Guava " + href("https://github.com/google/guava", true) + "
" + - "Opencsv " + href("http://opencsv.sourceforge.net/", true) + "
" + - "Simple Logging Facade for Java " + href("http://www.slf4j.org/", true) + "
" + + "MiG Layout " + href("http://www.miglayout.com", true) + "
" + + "JFreeChart " + href("http://www.jfree.org/jfreechart", true) + "
" + + "iText " + href("http://www.itextpdf.com", true) + "
" + + "exp4j " + href("http://projects.congrace.de/exp4j/index.html", true) + "
" + + "JOGL " + href("http://jogamp.org/jogl/www", true) + "
" + + "Guava " + href("https://github.com/google/guava", true) + "
" + + "Opencsv " + href("http://opencsv.sourceforge.net", true) + "
" + + "Simple Logging Facade for Java " + href("http://www.slf4j.org/", true) + "
" + "Java library for parsing and rendering CommonMark " + href("https://github.com/commonmark/commonmark-java", true) + "
" + "
" + "OpenRocket gratefully acknowledges our use of the following databases:
" + "
" + - "Rocket Motor Data " + href("https://www.thrustcurve.org/", true) + "
" + - "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database/", true) + + "Rocket Motor Data " + href("https://www.thrustcurve.org", true) + "
" + + "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database", true) + ""; private String href(String url, boolean delimiters) { From a2ac3c778468de164808de3468dfc6b10fddb7e8 Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 17:45:24 -0600 Subject: [PATCH 4/6] url formatting --- swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 1371bf645..b81869135 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -68,7 +68,7 @@ public class AboutDialog extends JDialog { "JOGL " + href("http://jogamp.org/jogl/www", true) + "
" + "Guava " + href("https://github.com/google/guava", true) + "
" + "Opencsv " + href("http://opencsv.sourceforge.net", true) + "
" + - "Simple Logging Facade for Java " + href("http://www.slf4j.org/", true) + "
" + + "Simple Logging Facade for Java " + href("http://www.slf4j.org", true) + "
" + "Java library for parsing and rendering CommonMark " + href("https://github.com/commonmark/commonmark-java", true) + "
" + "
" + "OpenRocket gratefully acknowledges our use of the following databases:
" + From 7b8176956f9800f1be34dc0f0967ecdb1bb1af7d Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 17:46:57 -0600 Subject: [PATCH 5/6] missing opensource dependencies --- swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index b81869135..2c5f99927 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -70,6 +70,8 @@ public class AboutDialog extends JDialog { "Opencsv " + href("http://opencsv.sourceforge.net", true) + "
" + "Simple Logging Facade for Java " + href("http://www.slf4j.org", true) + "
" + "Java library for parsing and rendering CommonMark " + href("https://github.com/commonmark/commonmark-java", true) + "
" + + "RSyntaxTextArea " + href("http://bobbylight.github.io/RSyntaxTextArea", true) + "
" + + "yasson " + href("https://eclipse-ee4j.github.io/yasson", true) + "
" + "
" + "OpenRocket gratefully acknowledges our use of the following databases:
" + "
" + From a38ab015d51a0c7e3808f442d3a8bc70db95dadd Mon Sep 17 00:00:00 2001 From: thzero Date: Thu, 10 Mar 2022 17:49:50 -0600 Subject: [PATCH 6/6] consistent url formatting --- .../openrocket/gui/dialogs/AboutDialog.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java index 2c5f99927..0496d774b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/AboutDialog.java @@ -57,30 +57,30 @@ public class AboutDialog extends JDialog { "Polish Rocketry Society / \u0141ukasz & Alex Kazanski (Polish)
" + "Sibo Van Gool (Dutch)
" + "
" + - "See all contributors at
" + href("https://github.com/openrocket/openrocket/graphs/contributors", false) + "
" + + "See all contributors at
" + href("https://github.com/openrocket/openrocket/graphs/contributors", false, false) + "
" + "
" + "OpenRocket utilizes the following libraries:
" + "
" + - "MiG Layout " + href("http://www.miglayout.com", true) + "
" + - "JFreeChart " + href("http://www.jfree.org/jfreechart", true) + "
" + - "iText " + href("http://www.itextpdf.com", true) + "
" + - "exp4j " + href("http://projects.congrace.de/exp4j/index.html", true) + "
" + - "JOGL " + href("http://jogamp.org/jogl/www", true) + "
" + - "Guava " + href("https://github.com/google/guava", true) + "
" + - "Opencsv " + href("http://opencsv.sourceforge.net", true) + "
" + - "Simple Logging Facade for Java " + href("http://www.slf4j.org", true) + "
" + - "Java library for parsing and rendering CommonMark " + href("https://github.com/commonmark/commonmark-java", true) + "
" + - "RSyntaxTextArea " + href("http://bobbylight.github.io/RSyntaxTextArea", true) + "
" + - "yasson " + href("https://eclipse-ee4j.github.io/yasson", true) + "
" + + "MiG Layout" + href("http://www.miglayout.com", true, true) + "
" + + "JFreeChart" + href("http://www.jfree.org/jfreechart", true, true) + "
" + + "iText" + href("http://www.itextpdf.com", true, true) + "
" + + "exp4j" + href("http://projects.congrace.de/exp4j/index.html", true, true) + "
" + + "JOGL" + href("http://jogamp.org/jogl/www", true, true) + "
" + + "Guava" + href("https://github.com/google/guava", true, true) + "
" + + "Opencsv" + href("http://opencsv.sourceforge.net", true, true) + "
" + + "Simple Logging Facade for Java" + href("http://www.slf4j.org", true, true) + "
" + + "Java library for parsing and rendering CommonMark" + href("https://github.com/commonmark/commonmark-java", true, true) + "
" + + "RSyntaxTextArea" + href("http://bobbylight.github.io/RSyntaxTextArea", true, true) + "
" + + "yasson" + href("https://eclipse-ee4j.github.io/yasson", true, true) + "
" + "
" + "OpenRocket gratefully acknowledges our use of the following databases:
" + "
" + - "Rocket Motor Data " + href("https://www.thrustcurve.org", true) + "
" + - "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database", true) + + "Rocket Motor Data" + href("https://www.thrustcurve.org", true, true) + "
" + + "Enhanced components database for OpenRocket" + href("https://github.com/dbcook/openrocket-database", true, true) + ""; - private String href(String url, boolean delimiters) { - return (delimiters ? "(" : "") + "" + url + "" + (delimiters ? ")" : ""); + private String href(String url, boolean delimiters, boolean leadingSpace) { + return (leadingSpace ? " " : "") + (delimiters ? "(" : "") + "" + url + "" + (delimiters ? ")" : ""); } public AboutDialog(JFrame parent) {