Changeset 26783 in osm for applications/viewer

Timestamp:

2011-10-06T10:12:46+02:00 (13 years ago)

Author:

bastik

Message:

unified redundant attribution code from org.openstreetmap.gui.jmapviewer.JMapViewer and org.openstreetmap.josm.gui.layer.TMSLayer

new: i18n support for the jmapviewer component

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer

Files:

• AttributionSupport.java (added)
• FeatureAdapter.java (added)
• JMapViewer.java (modified) (5 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/JMapViewer.java

@@ -89 +89 @@
     private TileSource tileSource;
 
-    // Attribution
-    private Image attrImage;
-    private String attrTermsUrl;
-    public static final Font ATTR_FONT = new Font("Arial", Font.PLAIN, 10);
-    public static final Font ATTR_LINK_FONT;
-
-    protected Rectangle attrTextBounds = null;
-    protected Rectangle attrToUBounds = null;
-    protected Rectangle attrImageBounds = null;
-
-    static {
-        HashMap<TextAttribute, Integer> aUnderline = new HashMap<TextAttribute, Integer>();
-        aUnderline.put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON);
-        ATTR_LINK_FONT = ATTR_FONT.deriveFont(aUnderline);
-    }
+    protected AttributionSupport attribution = new AttributionSupport();
 
     /**
@@ -584 +570 @@
         }
 
-        paintAttribution(g);
+        attribution.paintAttribution(g, getWidth(), getHeight(), getPosition(0, 0), getPosition(getWidth(), getHeight()), zoom, this);
     }
 
@@ -832 +818 @@
             setZoom(tileSource.getMaxZoom());
         }
-        boolean requireAttr = tileSource.requiresAttribution();
-        if (requireAttr) {
-            attrImage = tileSource.getAttributionImage();
-            attrTermsUrl = tileSource.getTermsOfUseURL();
-        } else {
-            attrImage = null;
-            attrTermsUrl = null;
-        }
+
+        attribution.initialize(tileSource);
         repaint();
     }
@@ -894 +874 @@
     }
 
-    private void paintAttribution(Graphics g) {
-        if (!tileSource.requiresAttribution())
-            return;
-        // Draw attribution
-        Font font = g.getFont();
-        g.setFont(ATTR_LINK_FONT);
-
-        Rectangle2D termsStringBounds = g.getFontMetrics().getStringBounds("Background Terms of Use", g);
-        int textRealHeight = (int) termsStringBounds.getHeight();
-        int textHeight = textRealHeight - 5;
-        int textWidth = (int) termsStringBounds.getWidth();
-        int termsTextY = getHeight() - textHeight;
-        if (attrTermsUrl != null) {
-            int x = 2;
-            int y = getHeight() - textHeight;
-            attrToUBounds = new Rectangle(x, y-textHeight, textWidth, textRealHeight);
-            g.setColor(Color.black);
-            g.drawString("Background Terms of Use", x + 1, y + 1);
-            g.setColor(Color.white);
-            g.drawString("Background Terms of Use", x, y);
-        }
-
-        // Draw attribution logo
-        if (attrImage != null) {
-            int x = 2;
-            int imgWidth = attrImage.getWidth(this);
-            int height = attrImage.getHeight(null);
-            int y = termsTextY - height - textHeight - 5;
-            attrImageBounds = new Rectangle(x, y, imgWidth, height);
-            g.drawImage(attrImage, x, y, null);
-        }
-
-        g.setFont(ATTR_FONT);
-        Coordinate topLeft = getPosition(0, 0);
-        Coordinate bottomRight = getPosition(getWidth(), getHeight());
-        String attributionText = tileSource.getAttributionText(zoom, topLeft, bottomRight);
-        if (attributionText != null) {
-            Rectangle2D stringBounds = g.getFontMetrics().getStringBounds(attributionText, g);
-            int x = getWidth() - (int) stringBounds.getWidth();
-            int y = getHeight() - textHeight;
-            g.setColor(Color.black);
-            g.drawString(attributionText, x + 1, y + 1);
-            g.setColor(Color.white);
-            g.drawString(attributionText, x, y);
-            attrTextBounds = new Rectangle(x, y-textHeight, textWidth, textRealHeight);
-        }
-
-        g.setFont(font);
-    }
-
     protected EventListenerList listenerList = new EventListenerList();
 
@@ -962 +892 @@
     /**
      * Send an update to all objects registered with viewer
-     * 
+     *
      * @param event to dispatch
      */