Changeset 12389 in josm for trunk/src/org

Timestamp:

2017-06-10T19:26:28+02:00 (7 years ago)

Author:

Don-vip

Message:

see #14929 - extract OSDLabel from FilterTableModel

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/FilterTableModel.java (modified) (4 diffs)
• widgets/OSDLabel.java (added)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.trn;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.util.ArrayList;
@@ -16 +13 @@
 import java.util.List;
 
-import javax.swing.BorderFactory;
-import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.table.AbstractTableModel;
@@ -31 +26 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.gui.widgets.OSDLabel;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -424 +420 @@
 
     /**
-     * On screen display label
-     */
-    private static class OSDLabel extends JLabel {
-        OSDLabel(String text) {
-            super(text);
-            setOpaque(true);
-            setForeground(Color.black);
-            setBackground(new Color(0, 0, 0, 0));
-            setFont(getFont().deriveFont(Font.PLAIN));
-            setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-        }
-
-        @Override
-        public void paintComponent(Graphics g) {
-            g.setColor(new Color(255, 255, 255, 140));
-            g.fillRoundRect(getX(), getY(), getWidth(), getHeight(), 10, 10);
-            super.paintComponent(g);
-        }
-    }
-
-    /**
      * Draws a text on the map display that indicates that filters are active.
      * @param g The graphics to draw that text on.