Index: src/org/openstreetmap/josm/gui/layer/NoteLayer.java
===================================================================
--- src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(revision 0)
+++ src/org/openstreetmap/josm/gui/layer/NoteLayer.java	(working copy)
@@ -0,0 +1,151 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.notes.Note;
+import org.openstreetmap.josm.data.notes.Note.State;
+import org.openstreetmap.josm.data.notes.NoteComment;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
+import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.tools.ImageProvider;
+
+/**
+ * A layer to hold Note objects
+ */
+public class NoteLayer extends AbstractModifiableLayer {
+
+    private List<Note> notes;
+
+    /**
+     * Create a new note layer with a set of notes
+     * @param notes A list of notes to show in this layer
+     * @param name The name of the layer. Typically "Notes"
+     */
+    public NoteLayer(List<Note> notes, String name) {
+        super(name);
+        this.notes = notes;
+    }
+
+    @Override
+    public boolean isModified() {
+        for(Note note : notes) {
+            if(note.getId() < 0) { //notes with negative IDs are new
+                return true;
+            }
+            for(NoteComment comment : note.getComments()) {
+                if(comment.getIsNew()) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean requiresUploadToServer() {
+        return isModified();
+    }
+
+    @Override
+    public void paint(Graphics2D g, MapView mv, Bounds box) {
+        for(Note note : notes) {
+            Point p = mv.getPoint(note.getLatLon());
+
+            ImageIcon icon = null;
+            if(note.getId() < 0) {
+                icon = ImageProvider.get("notes", "note_new_16x16.png");
+            } else if(note.getState() == State.closed) {
+                icon = ImageProvider.get("notes", "note_closed_16x16.png");
+            } else {
+                icon = ImageProvider.get("notes", "note_open_16x16.png");
+            }
+            int width = icon.getIconWidth();
+            int height = icon.getIconHeight();
+            g.drawImage(icon.getImage(), p.x - (width / 2), p.y - height, Main.map.mapView);
+        }
+    }
+
+    @Override
+    public Icon getIcon() {
+        return ImageProvider.get("notes", "note_open_16x16.png");
+    }
+
+    @Override
+    public String getToolTipText() {
+        return notes.size() + " " + tr("Notes");
+    }
+
+    @Override
+    public void mergeFrom(Layer from) {
+        throw new UnsupportedOperationException("Notes layer does not support merging yet");
+    }
+
+    @Override
+    public boolean isMergable(Layer other) {
+        return false;
+    }
+
+    @Override
+    public void visitBoundingBox(BoundingXYVisitor v) {
+    }
+
+    @Override
+    public Object getInfoComponent() {
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(tr("Notes layer"));
+        buffer.append("\n");
+        buffer.append(tr("Total notes:"));
+        buffer.append(" ");
+        buffer.append(notes.size());
+        buffer.append("\n");
+        buffer.append(tr("Changes need uploading?"));
+        buffer.append(" ");
+        buffer.append(isModified());
+        return buffer.toString();
+    }
+
+    @Override
+    public Action[] getMenuEntries() {
+        List<Action> actions = new ArrayList<>();
+        actions.add(LayerListDialog.getInstance().createShowHideLayerAction());
+        actions.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        actions.add(new LayerListPopup.InfoAction(this));
+        return actions.toArray(new Action[actions.size()]);
+    }
+
+    /**
+     * Returns the notes stored in this layer
+     * @return List of Note objects
+     */
+    public List<Note> getNotes() {
+        return notes;
+    }
+
+    /**
+     * Add notes to the layer. It only adds a note if the ID is not already present
+     * @param newNotes A list of notes to add
+     */
+    public void addNotes(List<Note> newNotes) {
+        for(Note newNote : newNotes) {
+            if(!notes.contains(newNote)) {
+                notes.add(newNote);
+            }
+        }
+        Main.map.mapView.repaint();
+        Main.debug("notes in layer: " + notes.size());
+    }
+}