Changeset 12734 in josm
- Timestamp:
- 2017-09-05T10:46:58+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
r12630 r12734 15 15 import org.openstreetmap.josm.data.notes.NoteComment; 16 16 import org.openstreetmap.josm.gui.JosmUserIdentityManager; 17 import org.openstreetmap.josm.gui.MainApplication;18 import org.openstreetmap.josm.gui.MapFrame;19 17 import org.openstreetmap.josm.tools.ListenerList; 20 18 import org.openstreetmap.josm.tools.Logging; … … 101 99 public void setSelectedNote(Note note) { 102 100 selectedNote = note; 103 MapFrame map = MainApplication.getMap();104 if (map != null) {105 map.noteDialog.selectionChanged();106 }107 101 listeners.fireEvent(l -> l.selectedNoteChanged(this)); 108 102 } … … 236 230 237 231 private void dataUpdated() { 238 if (MainApplication.isDisplayingMapView()) {239 MainApplication.getMap().noteDialog.setNotes(getSortedNotes());240 }241 232 listeners.fireEvent(l -> l.noteDataUpdated(this)); 242 233 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
r12643 r12734 36 36 import org.openstreetmap.josm.data.notes.NoteComment; 37 37 import org.openstreetmap.josm.data.osm.NoteData; 38 import org.openstreetmap.josm.data.osm.NoteData.NoteDataUpdateListener; 38 39 import org.openstreetmap.josm.gui.MainApplication; 39 40 import org.openstreetmap.josm.gui.MapFrame; … … 55 56 * @since 7608 (creation) 56 57 */ 57 public class NotesDialog extends ToggleDialog implements LayerChangeListener {58 public class NotesDialog extends ToggleDialog implements LayerChangeListener, NoteDataUpdateListener { 58 59 59 60 private NoteTableModel model; … … 155 156 model.setData(noteData.getNotes()); 156 157 setNotes(noteData.getSortedNotes()); 158 noteData.addNoteDataUpdateListener(this); 157 159 } 158 160 } … … 161 163 public void layerRemoving(LayerRemoveEvent e) { 162 164 if (e.getRemovedLayer() instanceof NoteLayer) { 165 noteData.removeNoteDataUpdateListener(this); 163 166 noteData = null; 164 167 model.clearData(); … … 173 176 public void layerOrderChanged(LayerOrderChangeEvent e) { 174 177 // ignored 178 } 179 180 @Override 181 public void noteDataUpdated(NoteData data) { 182 setNotes(data.getSortedNotes()); 183 } 184 185 @Override 186 public void selectedNoteChanged(NoteData noteData) { 187 selectionChanged(); 175 188 } 176 189
Note:
See TracChangeset
for help on using the changeset viewer.