Changeset 7852 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2014-12-20T04:16:30+01:00 (9 years ago)

Author:

Don-vip

Message:

see #10858 - rename NoteDialog to NotesDialog

File:

• trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
-import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.gui.dialogs.NotesDialog;
 import org.openstreetmap.josm.io.NoteExporter;
 import org.openstreetmap.josm.io.XmlWriter;
@@ -99 +99 @@
             ImageIcon icon = null;
             if (note.getId() < 0) {
-                icon = NoteDialog.ICON_NEW_SMALL;
+                icon = NotesDialog.ICON_NEW_SMALL;
             } else if (note.getState() == State.closed) {
-                icon = NoteDialog.ICON_CLOSED_SMALL;
+                icon = NotesDialog.ICON_CLOSED_SMALL;
             } else {
-                icon = NoteDialog.ICON_OPEN_SMALL;
+                icon = NotesDialog.ICON_OPEN_SMALL;
             }
             int width = icon.getIconWidth();
@@ -139 +139 @@
 
             g.setColor(ColorHelper.html2color(Main.pref.get("color.selected")));
-            g.drawRect(p.x - (NoteDialog.ICON_SMALL_SIZE / 2), p.y - NoteDialog.ICON_SMALL_SIZE, NoteDialog.ICON_SMALL_SIZE - 1, NoteDialog.ICON_SMALL_SIZE - 1);
-
-            int tx = p.x + (NoteDialog.ICON_SMALL_SIZE / 2) + 5;
-            int ty = p.y - NoteDialog.ICON_SMALL_SIZE - 1;
+            g.drawRect(p.x - (NotesDialog.ICON_SMALL_SIZE / 2), p.y - NotesDialog.ICON_SMALL_SIZE, NotesDialog.ICON_SMALL_SIZE - 1, NotesDialog.ICON_SMALL_SIZE - 1);
+
+            int tx = p.x + (NotesDialog.ICON_SMALL_SIZE / 2) + 5;
+            int ty = p.y - NotesDialog.ICON_SMALL_SIZE - 1;
             g.translate(tx, ty);
 
@@ -159 +159 @@
     @Override
     public Icon getIcon() {
-        return NoteDialog.ICON_OPEN_SMALL;
+        return NotesDialog.ICON_OPEN_SMALL;
     }
 
@@ -219 +219 @@
             Point notePoint = Main.map.mapView.getPoint(note.getLatLon());
             //move the note point to the center of the icon where users are most likely to click when selecting
-            notePoint.setLocation(notePoint.getX(), notePoint.getY() - NoteDialog.ICON_SMALL_SIZE / 2);
+            notePoint.setLocation(notePoint.getX(), notePoint.getY() - NotesDialog.ICON_SMALL_SIZE / 2);
             double dist = clickPoint.distanceSq(notePoint);
             if (minDistance > dist && clickPoint.distance(notePoint) < snapDistance ) {