Changeset 15775 in josm

Timestamp:

2020-01-26T18:26:26+01:00 (4 years ago)

Author:

simon04

Message:

Use (correct) magic constants

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/dialogs/LogShowDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/widgets/UrlLabel.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/preferences/StrokePropertyTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/testutils/FakeGraphics.java (modified) (1 diff)

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

@@ -5 +5 @@
 
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.GridBagLayout;
 
@@ -39 +40 @@
         JLabel lbl = new JLabel(msg);
 
-        lbl.setFont(lbl.getFont().deriveFont(0, 14));
+        lbl.setFont(lbl.getFont().deriveFont(Font.PLAIN, 14));
 
         p.add(lbl, GBC.eol().insets(5, 0, 5, 0));

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

@@ -224 +224 @@
                 1f,
                 BasicStroke.CAP_BUTT,
-                BasicStroke.CAP_BUTT,
+                BasicStroke.JOIN_MITER,
                 5f,
                 new float[] {1f, 2f},

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -10 +10 @@
 import java.awt.Dimension;
 import java.awt.FlowLayout;
+import java.awt.Font;
 import java.awt.GraphicsEnvironment;
 import java.awt.GridBagConstraints;
@@ -994 +995 @@
         statusBar.setBorder(BorderFactory.createLoweredBevelBorder());
         statusBarText = new JLabel(" ");
-        statusBarText.setFont(statusBarText.getFont().deriveFont(8));
+        statusBarText.setFont(statusBarText.getFont().deriveFont(Font.PLAIN, 8));
         statusBar.add(statusBarText);
 

trunk/src/org/openstreetmap/josm/gui/widgets/UrlLabel.java

@@ -5 +5 @@
 
 import java.awt.Cursor;
+import java.awt.Font;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -85 +86 @@
         setDescription(description);
         if (fontPlus != 0) {
-            setFont(getFont().deriveFont(0, (float) getFont().getSize()+fontPlus));
+            setFont(getFont().deriveFont(Font.PLAIN, (float) getFont().getSize()+fontPlus));
         }
         refresh();

trunk/test/unit/org/openstreetmap/josm/data/preferences/StrokePropertyTest.java

@@ -83 +83 @@
         assertEquals(null, bs.getDashArray());
 
-        property.put(new BasicStroke(2, 0, 0, 1, new float[] {0.1f, 1, 10}, 0));
+        property.put(new BasicStroke(2, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 1, new float[] {0.1f, 1, 10}, 0));
         bs = property.get();
         assertWide(bs);

trunk/test/unit/org/openstreetmap/josm/testutils/FakeGraphics.java

@@ -63 +63 @@
     @Override
     public Font getFont() {
-        return new Font(null, 0, 0);
+        return new Font(null, Font.PLAIN, 0);
     }