/hg/icedtea-web: Splash screen aligned with current graphic
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Jun 16 18:52:59 UTC 2017
changeset 963d166232d4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=963d166232d4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Jun 16 21:03:27 2017 +0200
Splash screen aligned with current graphic
diffstat:
ChangeLog | 10 +
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java | 26 +-
netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java | 1613 +++++++++-
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java | 7 +-
tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java | 1 -
tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefsTest.java | 8 +-
6 files changed, 1507 insertions(+), 158 deletions(-)
diffs (truncated from 1774 to 500 lines):
diff -r 1fae9bbd17f5 -r 963d166232d4 ChangeLog
--- a/ChangeLog Thu Jun 15 17:44:26 2017 +0200
+++ b/ChangeLog Fri Jun 16 21:03:27 2017 +0200
@@ -1,3 +1,13 @@
+2017-16-15 Jiri Vanek <jvanek at redhat.com>
+
+ Splash screen aligned with current graphic
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java: leading points of main leaves regenerated
+ from current graphics. Pushed generating algorithm. Cubic splines are no longer used, instead the exact polygon is filled.
+ * netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java: adapted splinesDefs
+ * plugin/icedteanp/java/sun/applet/PluginAppletViewer.java: iffed out NPE in midori
+ * tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainterTest.java: aligned
+ * tests/netx/unit/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefsTest.java: aligned
+
2017-06-15 Jiri Vanek <jvanek at redhat.com>
Tereza Hlavackova <hlavackova.tereza at gmail.com>
diff -r 1fae9bbd17f5 -r 963d166232d4 netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java
--- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Thu Jun 15 17:44:26 2017 +0200
+++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java Fri Jun 16 21:03:27 2017 +0200
@@ -122,13 +122,13 @@
protected TextWithWaterLevel oldTwl;
protected boolean canWave = true;
private Point aboutOfset = new Point();
-
+
private final static float dash1[] = {10.0f};
- private final static BasicStroke dashed =
- new BasicStroke(1.0f,
- BasicStroke.CAP_BUTT,
- BasicStroke.JOIN_MITER,
- 10.0f, dash1, 0.0f);
+ private final static BasicStroke dashed
+ = new BasicStroke(1.0f,
+ BasicStroke.CAP_BUTT,
+ BasicStroke.JOIN_MITER,
+ 10.0f, dash1, 0.0f);
protected void paintNiceTexts(Graphics2D g2d) {
//the only animated stuff
@@ -270,8 +270,6 @@
paintPlainTexts(g2d);
}
-
-
}
public final void adjustForSize(int width, int height) {
@@ -485,17 +483,11 @@
g2d.drawString(tea, scaleX(42) + g2d.getFontMetrics(icedFont).stringWidth(ICED), scaleY(278));
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_OFF);
if (showLeaf) {
- g2d.fillPolygon(SplinesDefs.getMainLeafCurve(getRatioX(), getRatioY()));
- }
- if (showLeaf) {
- g2d.fillPolygon(SplinesDefs.getSecondLeafCurve(getRatioX(), getRatioY()));
+ g2d.fillPolygon(SplinesDefs.getMainLeaf(getRatioX(), getRatioY()));
}
g2d.setColor(teaLeafsStalksColor);
if (showLeaf) {
- g2d.fillPolygon(SplinesDefs.getMainLeafStalkCurve(getRatioX(), getRatioY()));
- }
- if (showLeaf) {
- g2d.fillPolygon(SplinesDefs.getSecondLeafStalkCurve(getRatioX(), getRatioY()));
+ g2d.fillPolygon(SplinesDefs.getSecondLeaf(getRatioX(), getRatioY()));
}
g2d.setFont(pluginFont);
g2d.setColor(pluginColor);
@@ -542,7 +534,7 @@
aboutOfset = new Point(y, fm.getHeight());
Stroke backup = g2d.getStroke();
g2d.setStroke(dashed);
- g2d.drawRect(aboutOfset.x-1,1, master.getSplashWidth()-aboutOfset.x-1, aboutOfset.y+1);
+ g2d.drawRect(aboutOfset.x - 1, 1, master.getSplashWidth() - aboutOfset.x - 1, aboutOfset.y + 1);
g2d.setStroke(backup);
g2d.drawString(niceVersion, y, fm.getHeight());
}
diff -r 1fae9bbd17f5 -r 963d166232d4 netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java
--- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java Thu Jun 15 17:44:26 2017 +0200
+++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/SplinesDefs.java Fri Jun 16 21:03:27 2017 +0200
@@ -36,163 +36,1514 @@
exception statement from your version. */
package net.sourceforge.jnlp.splashscreen.impls.defaultsplashscreen2012;
+import java.awt.Color;
+import java.awt.Graphics2D;
import java.awt.Point;
import java.awt.Polygon;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import javax.imageio.ImageIO;
public class SplinesDefs {
- private final static Point[] mainLeafArray = {
- new Point(268, 307),
- new Point(274, 326),
- new Point(289, 337),
- new Point(317, 349),
- new Point(362, 350),
- new Point(413, 334),
- new Point(428, 326),
- new Point(453, 309),
- new Point(469, 292),
- new Point(496, 264),
- new Point(516, 236),
- new Point(531, 215),
- new Point(550, 185),
- new Point(567, 155),
- new Point(580, 130),
- new Point(571, 139),
- new Point(555, 148),
- new Point(540, 157),
- new Point(521, 167),
- new Point(502, 174),
- new Point(477, 183),
- new Point(443, 193),
- new Point(413, 201),
- new Point(392, 209),
- new Point(376, 218),
- new Point(363, 228),
- new Point(356, 250),
- new Point(372, 231),
- new Point(398, 218),
- new Point(420, 209),
- new Point(446, 200),
- new Point(479, 192),
- new Point(505, 182),
- new Point(547, 168),
- new Point(539, 182),
- new Point(526, 204),
+ private final static Point[] blackLeaf = {
+ new Point(267, 204),
+ new Point(267, 205),
+ new Point(267, 206),
+ new Point(268, 206),
+ new Point(268, 207),
+ new Point(268, 208),
+ new Point(268, 209),
+ new Point(269, 209),
+ new Point(269, 210),
+ new Point(270, 210),
+ new Point(270, 211),
+ new Point(271, 211),
+ new Point(271, 212),
+ new Point(272, 212),
+ new Point(273, 212),
+ new Point(274, 212),
+ new Point(275, 212),
+ new Point(276, 212),
+ new Point(277, 212),
+ new Point(278, 212),
+ new Point(279, 212),
+ new Point(280, 212),
+ new Point(281, 212),
+ new Point(282, 212),
+ new Point(283, 212),
+ new Point(284, 212),
+ new Point(285, 212),
+ new Point(286, 212),
+ new Point(287, 212),
+ new Point(288, 212),
+ new Point(289, 212),
+ new Point(290, 212),
+ new Point(291, 212),
+ new Point(292, 212),
+ new Point(293, 212),
+ new Point(294, 212),
+ new Point(295, 212),
+ new Point(296, 212),
+ new Point(297, 212),
+ new Point(298, 212),
+ new Point(299, 212),
+ new Point(300, 212),
+ new Point(301, 212),
+ new Point(302, 212),
+ new Point(303, 212),
+ new Point(304, 212),
+ new Point(305, 212),
+ new Point(306, 212),
+ new Point(307, 212),
+ new Point(308, 212),
+ new Point(309, 212),
+ new Point(310, 212),
+ new Point(311, 212),
+ new Point(311, 213),
+ new Point(312, 213),
+ new Point(313, 213),
+ new Point(314, 213),
+ new Point(314, 214),
+ new Point(315, 214),
+ new Point(316, 214),
+ new Point(317, 214),
+ new Point(317, 215),
+ new Point(318, 215),
+ new Point(319, 215),
+ new Point(319, 216),
+ new Point(320, 216),
+ new Point(321, 216),
+ new Point(321, 217),
+ new Point(322, 217),
+ new Point(322, 218),
+ new Point(323, 218),
+ new Point(324, 218),
+ new Point(325, 218),
+ new Point(326, 218),
+ new Point(327, 218),
+ new Point(328, 218),
+ new Point(329, 217),
+ new Point(330, 216),
+ new Point(331, 215),
+ new Point(332, 214),
+ new Point(333, 213),
+ new Point(334, 212),
+ new Point(334, 211),
+ new Point(335, 210),
+ new Point(335, 209),
+ new Point(336, 208),
+ new Point(337, 207),
+ new Point(338, 206),
+ new Point(338, 205),
+ new Point(339, 204),
+ new Point(340, 203),
+ new Point(341, 202),
+ new Point(342, 201),
+ new Point(343, 200),
+ new Point(344, 199),
+ new Point(345, 198),
+ new Point(346, 197),
+ new Point(347, 196),
+ new Point(348, 195),
+ new Point(349, 194),
+ new Point(350, 193),
+ new Point(351, 192),
+ new Point(352, 191),
+ new Point(353, 190),
+ new Point(354, 189),
+ new Point(355, 188),
+ new Point(356, 187),
+ new Point(357, 186),
+ new Point(358, 185),
+ new Point(359, 184),
+ new Point(360, 183),
+ new Point(361, 182),
+ new Point(362, 181),
+ new Point(363, 180),
+ new Point(364, 179),
+ new Point(365, 179),
+ new Point(366, 178),
+ new Point(367, 177),
+ new Point(368, 177),
+ new Point(369, 176),
+ new Point(370, 175),
+ new Point(371, 175),
+ new Point(372, 175),
+ new Point(373, 175),
+ new Point(373, 176),
+ new Point(372, 177),
+ new Point(372, 178),
+ new Point(371, 179),
+ new Point(371, 180),
+ new Point(370, 181),
+ new Point(369, 182),
+ new Point(369, 183),
+ new Point(368, 184),
+ new Point(367, 185),
+ new Point(367, 186),
+ new Point(366, 187),
+ new Point(365, 188),
+ new Point(365, 189),
+ new Point(364, 190),
+ new Point(363, 191),
+ new Point(363, 192),
+ new Point(362, 193),
+ new Point(361, 194),
+ new Point(360, 195),
+ new Point(360, 196),
+ new Point(359, 197),
+ new Point(359, 198),
+ new Point(359, 199),
+ new Point(358, 200),
+ new Point(357, 201),
+ new Point(356, 202),
+ new Point(355, 203),
+ new Point(355, 204),
+ new Point(355, 205),
+ new Point(354, 206),
+ new Point(353, 207),
+ new Point(353, 208),
+ new Point(352, 209),
+ new Point(351, 210),
+ new Point(350, 211),
+ new Point(350, 212),
+ new Point(349, 213),
+ new Point(349, 214),
+ new Point(349, 215),
+ new Point(348, 216),
+ new Point(347, 217),
+ new Point(346, 218),
+ new Point(346, 219),
+ new Point(345, 220),
+ new Point(345, 221),
+ new Point(345, 222),
+ new Point(344, 223),
+ new Point(344, 224),
+ new Point(343, 225),
+ new Point(342, 226),
+ new Point(341, 227),
+ new Point(341, 228),
+ new Point(341, 229),
+ new Point(340, 230),
+ new Point(340, 231),
+ new Point(340, 232),
+ new Point(340, 233),
+ new Point(340, 234),
+ new Point(340, 235),
+ new Point(341, 235),
+ new Point(341, 236),
+ new Point(342, 236),
+ new Point(342, 237),
+ new Point(343, 237),
+ new Point(343, 238),
+ new Point(343, 239),
+ new Point(344, 239),
+ new Point(344, 240),
+ new Point(345, 240),
+ new Point(345, 241),
+ new Point(345, 242),
+ new Point(346, 242),
+ new Point(346, 243),
+ new Point(347, 243),
+ new Point(347, 244),
+ new Point(348, 244),
+ new Point(348, 245),
+ new Point(348, 246),
+ new Point(349, 246),
+ new Point(349, 247),
+ new Point(349, 248),
+ new Point(349, 249),
+ new Point(350, 249),
+ new Point(350, 250),
+ new Point(350, 251),
+ new Point(351, 251),
+ new Point(351, 252),
+ new Point(351, 253),
+ new Point(352, 253),
+ new Point(352, 254),
+ new Point(352, 255),
+ new Point(353, 255),
+ new Point(353, 256),
+ new Point(353, 257),
+ new Point(353, 258),
+ new Point(354, 258),
+ new Point(354, 259),
+ new Point(354, 260),
+ new Point(354, 261),
+ new Point(354, 262),
+ new Point(354, 263),
+ new Point(355, 263),
+ new Point(355, 264),
+ new Point(355, 265),
+ new Point(355, 266),
+ new Point(355, 267),
+ new Point(356, 267),
+ new Point(356, 268),
+ new Point(356, 269),
+ new Point(356, 270),
+ new Point(356, 271),
+ new Point(356, 272),
+ new Point(356, 273),
+ new Point(357, 273),
+ new Point(357, 274),
+ new Point(357, 275),
+ new Point(357, 276),
+ new Point(357, 277),
+ new Point(358, 277),
+ new Point(358, 278),
+ new Point(358, 279),
+ new Point(358, 280),
+ new Point(358, 281),
+ new Point(358, 282),
+ new Point(358, 283),
+ new Point(358, 284),
+ new Point(358, 285),
+ new Point(358, 286),
+ new Point(358, 287),
+ new Point(358, 288),
+ new Point(358, 289),
+ new Point(358, 290),
+ new Point(358, 291),
+ new Point(358, 292),
+ new Point(358, 293),
+ new Point(358, 294),
+ new Point(357, 295),
+ new Point(357, 296),
+ new Point(357, 297),
+ new Point(357, 298),
+ new Point(356, 299),
+ new Point(356, 300),
+ new Point(356, 301),
+ new Point(356, 302),
+ new Point(356, 303),
+ new Point(356, 304),
+ new Point(356, 305),
+ new Point(357, 305),
+ new Point(357, 306),
+ new Point(358, 306),
+ new Point(358, 307),
+ new Point(359, 307),
+ new Point(359, 308),
+ new Point(360, 308),
+ new Point(361, 308),
+ new Point(361, 309),
+ new Point(362, 309),
+ new Point(363, 309),
+ new Point(364, 309),
+ new Point(365, 308),
+ new Point(366, 308),
+ new Point(367, 308),
+ new Point(368, 307),
+ new Point(369, 306),
+ new Point(370, 306),
+ new Point(371, 305),
+ new Point(372, 305),
+ new Point(373, 305),
+ new Point(374, 304),
+ new Point(375, 304),
+ new Point(376, 303),
+ new Point(377, 302),
+ new Point(378, 302),
+ new Point(379, 301),
+ new Point(380, 300),
+ new Point(381, 300),
+ new Point(382, 299),
+ new Point(383, 299),
+ new Point(384, 299),
+ new Point(385, 298),
+ new Point(386, 297),
+ new Point(387, 296),
+ new Point(388, 295),
+ new Point(389, 294),
+ new Point(390, 294),
+ new Point(391, 293),
+ new Point(392, 293),
+ new Point(393, 292),
+ new Point(394, 291),
+ new Point(395, 290),
+ new Point(396, 289),
+ new Point(397, 288),
+ new Point(398, 287),
+ new Point(399, 286),
+ new Point(400, 285),
+ new Point(401, 284),
+ new Point(402, 283),
+ new Point(403, 282),
+ new Point(404, 281),
+ new Point(405, 280),
+ new Point(406, 279),
+ new Point(407, 278),
+ new Point(408, 277),
+ new Point(409, 276),
+ new Point(409, 275),
+ new Point(410, 274),
+ new Point(411, 273),
+ new Point(412, 272),
+ new Point(413, 271),
+ new Point(414, 270),
+ new Point(415, 269),
+ new Point(415, 268),
+ new Point(416, 267),
+ new Point(416, 266),
+ new Point(417, 265),
+ new Point(418, 264),
+ new Point(418, 263),
+ new Point(419, 262),
+ new Point(420, 261),
+ new Point(420, 260),
+ new Point(420, 259),
+ new Point(421, 258),
+ new Point(421, 257),
+ new Point(422, 256),
+ new Point(422, 255),
+ new Point(422, 254),
+ new Point(423, 253),
+ new Point(424, 252),
+ new Point(424, 251),
+ new Point(424, 250),
More information about the distro-pkg-dev
mailing list