From edce9835d029398e9a026e7bcf7a566e88ecc614 Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 23 Mar 2020 00:01:02 +0100 Subject: [PATCH] minor change --- .../src/org/diylc/components/AbstractLeadedComponent.java | 6 +++--- diylc/diylc-swing/build.xml | 3 +-- diylc/diylc-swing/src/org/diylc/DIYLCStarter.java | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java index 236b2747..1c88092b 100644 --- a/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java +++ b/diylc/diylc-library/src/org/diylc/components/AbstractLeadedComponent.java @@ -308,11 +308,11 @@ public abstract class AbstractLeadedComponent extends AbstractTransparentComp g2d.setColor(finalLabelColor); FontMetrics fontMetrics = g2d.getFontMetrics(); String label = ""; - label = display == Display.NAME ? getName() : (getValue() == null ? "" : getValue().toString()); - if (display == Display.NONE) { + label = getDisplay() == Display.NAME ? getName() : (getValue() == null ? "" : getValue().toString()); + if (getDisplay() == Display.NONE) { label = ""; } - if (display == Display.BOTH) { + if (getDisplay() == Display.BOTH) { label = getName() + " " + (getValue() == null ? "" : getValue().toString()); } Rectangle2D textRect = fontMetrics.getStringBounds(label, g2d); diff --git a/diylc/diylc-swing/build.xml b/diylc/diylc-swing/build.xml index 18236b7b..bc21ae62 100644 --- a/diylc/diylc-swing/build.xml +++ b/diylc/diylc-swing/build.xml @@ -103,7 +103,7 @@ jvmrequired="1.8" copyright="Branislav Stojkovic, a.k.a. bancika" displayname="DIY Layout Creator" - identifier="org.diylc.App" + identifier="org.diylc.Desktop" shortversion="${diylc.version}" applicationCategory="public.app-category.graphics-design" icon="diylc.icns" @@ -112,7 +112,6 @@ -