Changeset 7852 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

see #10858 - rename NoteDialog to NotesDialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/AddNoteAction.java (modified) (2 diffs)
• gui/MapFrame.java (modified) (3 diffs)
• gui/dialogs/NotesDialog.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/dialogs/NoteDialog.java ) (5 diffs)
• gui/layer/NoteLayer.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java

@@ -14 +14 @@
 import org.openstreetmap.josm.gui.NoteInputDialog;
 import org.openstreetmap.josm.gui.Notification;
-import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.gui.dialogs.NotesDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -63 +63 @@
 
         NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
-        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), NoteDialog.ICON_NEW);
+        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), NotesDialog.ICON_NEW);
 
         if (dialog.getValue() != 1) {

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -66 +66 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.MapPaintDialog;
-import org.openstreetmap.josm.gui.dialogs.NoteDialog;
+import org.openstreetmap.josm.gui.dialogs.NotesDialog;
 import org.openstreetmap.josm.gui.dialogs.RelationListDialog;
 import org.openstreetmap.josm.gui.dialogs.SelectionListDialog;
@@ -133 +133 @@
     public SelectionListDialog selectionListDialog;
     public PropertiesDialog propertiesDialog;
-    public NoteDialog noteDialog;
+    public NotesDialog noteDialog;
 
     // Map modes
@@ -245 +245 @@
         //TODO: remove this if statement once note support is complete
         if(Main.pref.getBoolean("osm.notes.enableDownload", false)) {
-            addToggleDialog(noteDialog = new NoteDialog());
+            addToggleDialog(noteDialog = new NotesDialog());
         }
         toolBarToggle.setFloatable(false);

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

@@ -43 +43 @@
 
 /**
- * Dialog to display and manipulate notes
+ * Dialog to display and manipulate notes.
+ * @since 7852 (renaming)
+ * @since 7608 (creation)
  */
-public class NoteDialog extends ToggleDialog implements LayerChangeListener {
-
+public class NotesDialog extends ToggleDialog implements LayerChangeListener {
 
     /** Small icon size for use in graphics calculations */
@@ -82 +83 @@
 
     /** Creates a new toggle dialog for notes */
-    public NoteDialog() {
+    public NotesDialog() {
         super("Notes", "notes/note_open.png", "List of notes", null, 150);
-        if (Main.isDebugEnabled()) {
-            Main.debug("constructed note dialog");
-        }
-
         addCommentAction = new AddCommentAction();
         closeAction = new CloseAction();
@@ -298 +295 @@
             }
             NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Comment on note"), tr("Add comment"));
-            dialog.showNoteDialog(tr("Add comment to note:"), NoteDialog.ICON_COMMENT);
+            dialog.showNoteDialog(tr("Add comment to note:"), NotesDialog.ICON_COMMENT);
             if (dialog.getValue() != 1) {
                 Main.debug("User aborted note reopening");
@@ -318 +315 @@
         public void actionPerformed(ActionEvent e) {
             NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Close note"), tr("Close note"));
-            dialog.showNoteDialog(tr("Close note with message:"), NoteDialog.ICON_CLOSED);
+            dialog.showNoteDialog(tr("Close note with message:"), NotesDialog.ICON_CLOSED);
             if (dialog.getValue() != 1) {
                 Main.debug("User aborted note closing");
@@ -356 +353 @@
         public void actionPerformed(ActionEvent e) {
             NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Reopen note"), tr("Reopen note"));
-            dialog.showNoteDialog(tr("Reopen note with message:"), NoteDialog.ICON_OPEN);
+            dialog.showNoteDialog(tr("Reopen note with message:"), NotesDialog.ICON_OPEN);
             if (dialog.getValue() != 1) {
                 Main.debug("User aborted note reopening");

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 ) {