Changeset 16252 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

Timestamp:

2020-04-11T08:54:12+02:00 (4 years ago)

Author:

simon04

Message:

fix #18961 - ColorHelper: harmonize color functions

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.java

@@ -18 +18 @@
 import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Utils;
+import org.openstreetmap.josm.tools.ColorHelper;
 
 /**
@@ -140 +140 @@
         Color color = c.get(TEXT_COLOR, defaultTextColor, Color.class);
         float alpha = c.get(TEXT_OPACITY, 1f, Float.class);
-        color = Utils.alphaMultiply(color, alpha);
+        color = ColorHelper.alphaMultiply(color, alpha);
 
         Float haloRadius = c.get(TEXT_HALO_RADIUS, null, Float.class);
@@ -148 +148 @@
         Color haloColor = null;
         if (haloRadius != null) {
-            haloColor = c.get(TEXT_HALO_COLOR, Utils.complement(color), Color.class);
+            haloColor = c.get(TEXT_HALO_COLOR, ColorHelper.complement(color), Color.class);
             float haloAlphaFactor = c.get(TEXT_HALO_OPACITY, 1f, Float.class);
-            haloColor = Utils.alphaMultiply(haloColor, haloAlphaFactor);
+            haloColor = ColorHelper.alphaMultiply(haloColor, haloAlphaFactor);
         }
 
@@ -199 +199 @@
         sb.append("labelCompositionStrategy=").append(labelCompositionStrategy)
           .append(" font=").append(font)
-          .append(" color=").append(Utils.toString(color));
+          .append(" color=").append(ColorHelper.color2html(color));
         if (haloRadius != null) {
             sb.append(" haloRadius=").append(haloRadius)