From 0cc135f35c17bb59428a28d3cfee2bc2f65c5528 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 25 Apr 2013 14:20:19 +0200 Subject: Splashscreen now strip commit id from released versions --- .../impls/defaultsplashscreen2012/BasePainter.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'netx/net/sourceforge') diff --git a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java index 8bef868..2b14085 100644 --- a/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java +++ b/netx/net/sourceforge/jnlp/splashscreen/impls/defaultsplashscreen2012/BasePainter.java @@ -371,6 +371,17 @@ public class BasePainter implements Observer { return tt; } + static String stripCommitFromVersion(String version) { + if (version.contains("pre+")) { + return version; + } + int i = version.indexOf("+"); + if (i < 0) { + return version; + } + return version.substring(0, version.indexOf("+")); + } + private final class MovingTextRunner extends Observable implements Runnable { private static final int MAX_ANIMATION_VALUE = 10000; @@ -499,11 +510,12 @@ public class BasePainter implements Observer { g2d.setColor(plainTextColor); FontMetrics fm = g2d.getFontMetrics(); if (version != null) { - int y = master.getSplashWidth() - fm.stringWidth(version + " "); + String niceVersion=stripCommitFromVersion(version); + int y = master.getSplashWidth() - fm.stringWidth(niceVersion + " "); if (y < 0) { y = 0; } - g2d.drawString(version, y, fm.getHeight()); + g2d.drawString(niceVersion, y, fm.getHeight()); } return fm; } -- cgit v1.2.3