Index: trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java (revision 10134) @@ -159,5 +159,5 @@ } - public static void launch(Component parent, KeyStroke keystroke) { + protected static void launch(Component parent, KeyStroke keystroke) { Rectangle r = parent.getBounds(); new RecentRelationsPopupMenu(getRecentRelationsOnActiveLayer(), keystroke).show(parent, r.x, r.y + r.height); Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (revision 10134) @@ -89,5 +89,5 @@ Note newNote; switch (comment.getNoteAction()) { - case opened: + case OPENED: if (Main.isDebugEnabled()) { Main.debug("opening new note"); @@ -95,5 +95,5 @@ newNote = api.createNote(note.getLatLon(), comment.getText(), monitor); break; - case closed: + case CLOSED: if (Main.isDebugEnabled()) { Main.debug("closing note " + note.getId()); @@ -101,5 +101,5 @@ newNote = api.closeNote(note, comment.getText(), monitor); break; - case commented: + case COMMENTED: if (Main.isDebugEnabled()) { Main.debug("adding comment to note " + note.getId()); @@ -107,5 +107,5 @@ newNote = api.addCommentToNote(note, comment.getText(), monitor); break; - case reopened: + case REOPENED: if (Main.isDebugEnabled()) { Main.debug("reopening note " + note.getId()); Index: trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java (revision 10134) @@ -2,4 +2,8 @@ package org.openstreetmap.josm.data.cache; +/** + * Cache loader listener. + * @since 8168 + */ public interface ICachedLoaderListener { Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10134) @@ -142,4 +142,5 @@ } + @Override public V get() { ensureCacheElement(); Index: trunk/src/org/openstreetmap/josm/data/notes/Note.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/notes/Note.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/notes/Note.java (revision 10134) @@ -12,10 +12,16 @@ /** - * A map note. It always has at least one comment since a comment is required - * to create a note on osm.org + * A map note. It always has at least one comment since a comment is required to create a note on osm.org. + * @since 7451 */ public class Note { - public enum State { open, closed } + /** Note state */ + public enum State { + /** Note is open */ + OPEN, + /** Note is closed */ + CLOSED + } private long id; @@ -39,4 +45,8 @@ } + /** + * Sets note id. + * @param id OSM ID of this note + */ public void setId(long id) { this.id = id; @@ -53,4 +63,8 @@ } + /** + * Sets date at which this note has been created. + * @param createdAt date at which this note has been created + */ public void setCreatedAt(Date createdAt) { this.createdAt = createdAt; @@ -62,4 +76,8 @@ } + /** + * Sets date at which this note has been closed. + * @param closedAt date at which this note has been closed + */ public void setClosedAt(Date closedAt) { this.closedAt = closedAt; @@ -71,4 +89,8 @@ } + /** + * Sets the note state. + * @param state note state (open or closed) + */ public void setState(State state) { this.state = state; @@ -80,4 +102,8 @@ } + /** + * Adds a comment. + * @param comment note comment + */ public void addComment(NoteComment comment) { comments.add(comment); @@ -112,6 +138,8 @@ @Override public boolean equals(Object obj) { - if (this == obj) return true; - if (obj == null || getClass() != obj.getClass()) return false; + if (this == obj) + return true; + if (obj == null || getClass() != obj.getClass()) + return false; Note note = (Note) obj; return id == note.id; Index: trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java (revision 10134) @@ -9,4 +9,5 @@ * Represents a comment made on a note. All notes have at least on comment * which is the comment the note was opened with. Comments are immutable. + * @since 7451 */ public class NoteComment { @@ -25,9 +26,14 @@ */ public enum Action { - opened, - closed, - reopened, - commented, - hidden + /** note has been opened */ + OPENED, + /** note has been closed */ + CLOSED, + /** note has been reopened */ + REOPENED, + /** note has been commented */ + COMMENTED, + /** note has been hidden */ + HIDDEN } Index: trunk/src/org/openstreetmap/josm/data/notes/package-info.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/notes/package-info.java (revision 10134) +++ trunk/src/org/openstreetmap/josm/data/notes/package-info.java (revision 10134) @@ -0,0 +1,6 @@ +// License: GPL. For details, see LICENSE file. + +/** + * Provides the classes for OSM notes. See Notes. + */ +package org.openstreetmap.josm.data.notes; Index: trunk/src/org/openstreetmap/josm/data/osm/NoteData.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/NoteData.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/osm/NoteData.java (revision 10134) @@ -46,8 +46,8 @@ return -1; } - if (n1.getState() == State.closed && n2.getState() == State.open) { + if (n1.getState() == State.CLOSED && n2.getState() == State.OPEN) { return 1; } - if (n1.getState() == State.open && n2.getState() == State.closed) { + if (n1.getState() == State.OPEN && n2.getState() == State.CLOSED) { return -1; } @@ -200,7 +200,7 @@ Note note = new Note(location); note.setCreatedAt(new Date()); - note.setState(State.open); + note.setState(State.OPEN); note.setId(newNoteId--); - NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.opened, true); + NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.OPENED, true); note.addComment(comment); if (Main.isDebugEnabled()) { @@ -220,5 +220,5 @@ throw new IllegalArgumentException("Note to modify must be in layer"); } - if (note.getState() == State.closed) { + if (note.getState() == State.CLOSED) { throw new IllegalStateException("Cannot add a comment to a closed note"); } @@ -226,5 +226,5 @@ Main.debug("Adding comment to note {0}: {1}", note.getId(), text); } - NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.commented, true); + NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.COMMENTED, true); note.addComment(comment); dataUpdated(); @@ -240,5 +240,5 @@ throw new IllegalArgumentException("Note to close must be in layer"); } - if (note.getState() != State.open) { + if (note.getState() != State.OPEN) { throw new IllegalStateException("Cannot close a note that isn't open"); } @@ -246,7 +246,7 @@ Main.debug("closing note {0} with comment: {1}", note.getId(), text); } - NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.closed, true); + NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.CLOSED, true); note.addComment(comment); - note.setState(State.closed); + note.setState(State.CLOSED); note.setClosedAt(new Date()); dataUpdated(); @@ -262,5 +262,5 @@ throw new IllegalArgumentException("Note to reopen must be in layer"); } - if (note.getState() != State.closed) { + if (note.getState() != State.CLOSED) { throw new IllegalStateException("Cannot reopen a note that isn't closed"); } @@ -268,7 +268,7 @@ Main.debug("reopening note {0} with comment: {1}", note.getId(), text); } - NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.reopened, true); + NoteComment comment = new NoteComment(new Date(), getCurrentUser(), text, NoteComment.Action.REOPENED, true); note.addComment(comment); - note.setState(State.open); + note.setState(State.OPEN); dataUpdated(); } Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (revision 10134) @@ -27,7 +27,6 @@ * incomplete {@link OsmPrimitive}s which are referred to by relations in the original collection. And * it turns {@link OsmPrimitive} referred to by {@link Relation}s in the original collection into - * incomplete {@link OsmPrimitive}s in the "hull", if they are not themselves present in the - * original collection. - * + * incomplete {@link OsmPrimitive}s in the "hull", if they are not themselves present in the original collection. + * @since 1891 */ public class MergeSourceBuildingVisitor extends AbstractVisitor { @@ -103,6 +102,5 @@ List newMembers = new ArrayList<>(); for (RelationMember member: r.getMembers()) { - newMembers.add( - new RelationMemberData(member.getRole(), mappedPrimitives.get(member.getMember()))); + newMembers.add(new RelationMemberData(member.getRole(), mappedPrimitives.get(member.getMember()))); } @@ -134,5 +132,4 @@ public void visit(Way w) { // remember all nodes this way refers to ... - // for (Node n: w.getNodes()) { n.accept(this); @@ -144,12 +141,9 @@ @Override public void visit(Relation r) { - // first, remember all primitives members refer to (only if necessary, see - // below) - // + // first, remember all primitives members refer to (only if necessary, see below) rememberRelationPartial(r); for (RelationMember member: r.getMembers()) { if (isAlreadyRemembered(member.getMember())) { // referred primitive already remembered - // continue; } @@ -186,4 +180,8 @@ } + /** + * Builds and returns the "hull". + * @return the "hull" data set + */ public DataSet build() { for (OsmPrimitive primitive: selectionBase.getAllSelected()) { Index: trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java (revision 10134) @@ -9,41 +9,76 @@ import org.openstreetmap.josm.data.Preferences.ColorKey; +/** + * Conflict color constants. + * @since 4162 + */ public enum ConflictColors implements ColorKey { + /** Conflict background: no conflict */ BGCOLOR_NO_CONFLICT(marktr("Conflict background: no conflict"), new Color(234, 234, 234)), + /** Conflict background: decided */ BGCOLOR_DECIDED(marktr("Conflict background: decided"), new Color(217, 255, 217)), + /** Conflict background: undecided */ BGCOLOR_UNDECIDED(marktr("Conflict background: undecided"), new Color(255, 197, 197)), + /** Conflict background: drop */ BGCOLOR_DROP(marktr("Conflict background: drop"), Color.white), + /** Conflict background: keep */ BGCOLOR_KEEP(marktr("Conflict background: keep"), new Color(217, 255, 217)), + /** Conflict background: combined */ BGCOLOR_COMBINED(marktr("Conflict background: combined"), new Color(217, 255, 217)), + /** Conflict background: selected */ BGCOLOR_SELECTED(marktr("Conflict background: selected"), new Color(143, 170, 255)), + /** Conflict foreground: undecided */ FGCOLOR_UNDECIDED(marktr("Conflict foreground: undecided"), Color.black), + /** Conflict foreground: drop */ FGCOLOR_DROP(marktr("Conflict foreground: drop"), Color.lightGray), + /** Conflict foreground: keep */ FGCOLOR_KEEP(marktr("Conflict foreground: keep"), Color.black), + /** Conflict background: empty row */ BGCOLOR_EMPTY_ROW(marktr("Conflict background: empty row"), new Color(234, 234, 234)), + /** Conflict background: frozen */ BGCOLOR_FROZEN(marktr("Conflict background: frozen"), new Color(234, 234, 234)), + /** Conflict background: in comparison */ BGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict background: in comparison"), Color.black), + /** Conflict foreground: in comparison */ FGCOLOR_PARTICIPATING_IN_COMPARISON(marktr("Conflict foreground: in comparison"), Color.white), + /** Conflict background */ BGCOLOR(marktr("Conflict background"), Color.white), + /** Conflict foreground */ FGCOLOR(marktr("Conflict foreground"), Color.black), + /** Conflict background: not in opposite */ BGCOLOR_NOT_IN_OPPOSITE(marktr("Conflict background: not in opposite"), new Color(255, 197, 197)), + /** Conflict background: in opposite */ BGCOLOR_IN_OPPOSITE(marktr("Conflict background: in opposite"), new Color(255, 234, 213)), + /** Conflict background: same position in opposite */ BGCOLOR_SAME_POSITION_IN_OPPOSITE(marktr("Conflict background: same position in opposite"), new Color(217, 255, 217)), + /** Conflict background: keep one tag */ BGCOLOR_TAG_KEEP_ONE(marktr("Conflict background: keep one tag"), new Color(217, 255, 217)), + /** Conflict foreground: keep one tag */ FGCOLOR_TAG_KEEP_ONE(marktr("Conflict foreground: keep one tag"), Color.black), + /** Conflict background: drop tag */ BGCOLOR_TAG_KEEP_NONE(marktr("Conflict background: drop tag"), Color.lightGray), + /** Conflict foreground: drop tag */ FGCOLOR_TAG_KEEP_NONE(marktr("Conflict foreground: drop tag"), Color.black), + /** Conflict background: keep all tags */ BGCOLOR_TAG_KEEP_ALL(marktr("Conflict background: keep all tags"), new Color(255, 234, 213)), + /** Conflict foreground: keep all tags */ FGCOLOR_TAG_KEEP_ALL(marktr("Conflict foreground: keep all tags"), Color.black), + /** Conflict background: sum all numeric tags */ BGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict background: sum all numeric tags"), new Color(255, 234, 213)), + /** Conflict foreground: sum all numeric tags */ FGCOLOR_TAG_SUM_ALL_NUM(marktr("Conflict foreground: sum all numeric tags"), Color.black), + /** Conflict background: keep member */ BGCOLOR_MEMBER_KEEP(marktr("Conflict background: keep member"), new Color(217, 255, 217)), + /** Conflict foreground: keep member */ FGCOLOR_MEMBER_KEEP(marktr("Conflict foreground: keep member"), Color.black), + /** Conflict background: remove member */ BGCOLOR_MEMBER_REMOVE(marktr("Conflict background: remove member"), Color.lightGray), + /** Conflict foreground: remove member */ FGCOLOR_MEMBER_REMOVE(marktr("Conflict foreground: remove member"), Color.black); Index: trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (revision 10134) @@ -146,5 +146,5 @@ addCommentAction.setEnabled(false); reopenAction.setEnabled(false); - } else if (noteData.getSelectedNote().getState() == State.open) { + } else if (noteData.getSelectedNote().getState() == State.OPEN) { closeAction.setEnabled(true); addCommentAction.setEnabled(true); @@ -249,5 +249,5 @@ if (note.getId() < 0) { icon = ICON_NEW_SMALL; - } else if (note.getState() == State.closed) { + } else if (note.getState() == State.CLOSED) { icon = ICON_CLOSED_SMALL; } else { Index: trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/layer/NoteLayer.java (revision 10134) @@ -113,5 +113,5 @@ if (note.getId() < 0) { icon = NotesDialog.ICON_NEW_SMALL; - } else if (note.getState() == State.closed) { + } else if (note.getState() == State.CLOSED) { icon = NotesDialog.ICON_CLOSED_SMALL; } else { Index: trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (revision 10134) @@ -31,6 +31,9 @@ /** * Language preferences. + * @since 1065 */ public class LanguagePreference implements SubPreferenceSetting { + + private static final String LANGUAGE = "language"; /** @@ -52,5 +55,5 @@ // Selecting the language BEFORE the JComboBox listens to model changes speed up initialization by ~35ms (see #7386) // See https://stackoverflow.com/questions/3194958/fast-replacement-for-jcombobox-basiccomboboxui - model.selectLanguage(Main.pref.get("language")); + model.selectLanguage(Main.pref.get(LANGUAGE)); langCombo = new JosmComboBox<>(model); langCombo.setRenderer(new LanguageCellRenderer()); @@ -70,7 +73,7 @@ public boolean ok() { if (langCombo.getSelectedItem() == null) - return Main.pref.put("language", null); + return Main.pref.put(LANGUAGE, null); else - return Main.pref.put("language", + return Main.pref.put(LANGUAGE, LanguageInfo.getJOSMLocaleCode((Locale) langCombo.getSelectedItem())); } @@ -84,13 +87,13 @@ } - public void selectLanguage(String language) { + private void selectLanguage(String language) { setSelectedItem(null); if (language != null) { - language = LanguageInfo.getJavaLocaleCode(language); + String lang = LanguageInfo.getJavaLocaleCode(language); for (Locale locale: data) { if (locale == null) { continue; } - if (locale.toString().equals(language)) { + if (locale.toString().equals(lang)) { setSelectedItem(locale); return; Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 10134) @@ -878,9 +878,9 @@ } - public OffsetBookmark getRow(int row) { + private OffsetBookmark getRow(int row) { return bookmarks.get(row); } - public void addRow(OffsetBookmark i) { + private void addRow(OffsetBookmark i) { bookmarks.add(i); int p = getRowCount() - 1; Index: trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (revision 10134) @@ -77,4 +77,22 @@ private static Map keyList = setKeyList(); + private final JCheckBox cbAlt = new JCheckBox(); + private final JCheckBox cbCtrl = new JCheckBox(); + private final JCheckBox cbMeta = new JCheckBox(); + private final JCheckBox cbShift = new JCheckBox(); + private final JCheckBox cbDefault = new JCheckBox(); + private final JCheckBox cbDisable = new JCheckBox(); + private final JosmComboBox tfKey = new JosmComboBox<>(); + + private final JTable shortcutTable = new JTable(); + + private final JosmTextField filterField = new JosmTextField(); + + /** Creates new form prefJPanel */ + public PrefJPanel() { + this.model = new ScListModel(); + initComponents(); + } + private static Map setKeyList() { Map list = new LinkedHashMap<>(); @@ -89,5 +107,5 @@ list.put(Integer.valueOf(i), s); } - } catch (Exception e) { + } catch (IllegalArgumentException | IllegalAccessException e) { Main.error(e); } @@ -96,22 +114,4 @@ list.put(Integer.valueOf(-1), ""); return list; - } - - private final JCheckBox cbAlt = new JCheckBox(); - private final JCheckBox cbCtrl = new JCheckBox(); - private final JCheckBox cbMeta = new JCheckBox(); - private final JCheckBox cbShift = new JCheckBox(); - private final JCheckBox cbDefault = new JCheckBox(); - private final JCheckBox cbDisable = new JCheckBox(); - private final JosmComboBox tfKey = new JosmComboBox<>(); - - private final JTable shortcutTable = new JTable(); - - private final JosmTextField filterField = new JosmTextField(); - - /** Creates new form prefJPanel */ - public PrefJPanel() { - this.model = new ScListModel(); - initComponents(); } @@ -169,5 +169,6 @@ int row1 = shortcutTable.convertRowIndexToModel(row); Shortcut sc = (Shortcut) model.getValueAt(row1, -1); - if (sc == null) return null; + if (sc == null) + return null; JLabel label = (JLabel) super.getTableCellRendererComponent( table, name ? sc.getLongText() : sc.getKeyText(), isSelected, hasFocus, row, column); @@ -187,8 +188,4 @@ private void initComponents() { - JPanel listPane = new JPanel(new GridLayout()); - JScrollPane listScrollPane = new JScrollPane(); - JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2)); - CbAction action = new CbAction(this); setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); @@ -197,5 +194,5 @@ // This is the list of shortcuts: shortcutTable.setModel(model); - shortcutTable.getSelectionModel().addListSelectionListener(new CbAction(this)); + shortcutTable.getSelectionModel().addListSelectionListener(action); shortcutTable.setFillsViewportHeight(true); shortcutTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); @@ -204,8 +201,9 @@ mod.getColumn(0).setCellRenderer(new ShortcutTableCellRenderer(true)); mod.getColumn(1).setCellRenderer(new ShortcutTableCellRenderer(false)); + JScrollPane listScrollPane = new JScrollPane(); listScrollPane.setViewportView(shortcutTable); + JPanel listPane = new JPanel(new GridLayout()); listPane.add(listScrollPane); - add(listPane); @@ -227,4 +225,6 @@ cbMeta.setText(META); // see above for why no tr() + JPanel shortcutEditPane = new JPanel(new GridLayout(5, 2)); + shortcutEditPane.add(cbDefault); shortcutEditPane.add(new JLabel()); @@ -266,13 +266,4 @@ } - private void disableAllModifierCheckboxes() { - cbDefault.setEnabled(false); - cbDisable.setEnabled(false); - cbShift.setEnabled(false); - cbCtrl.setEnabled(false); - cbAlt.setEnabled(false); - cbMeta.setEnabled(false); - } - // this allows to edit shortcuts. it: // * sets the edit controls to the selected shortcut @@ -282,10 +273,19 @@ // are playing ping-pong (politically correct: table tennis, I know) and // even have some duplicated code. Feel free to refactor, If you have - // more expirience with GUI coding than I have. - private class CbAction extends AbstractAction implements ListSelectionListener { + // more experience with GUI coding than I have. + private static class CbAction extends AbstractAction implements ListSelectionListener { private final PrefJPanel panel; CbAction(PrefJPanel panel) { this.panel = panel; + } + + private void disableAllModifierCheckboxes() { + panel.cbDefault.setEnabled(false); + panel.cbDisable.setEnabled(false); + panel.cbShift.setEnabled(false); + panel.cbCtrl.setEnabled(false); + panel.cbAlt.setEnabled(false); + panel.cbMeta.setEnabled(false); } @@ -303,7 +303,7 @@ panel.cbMeta.setSelected(sc.getAssignedModifier() != -1 && (sc.getAssignedModifier() & KeyEvent.META_DOWN_MASK) != 0); if (sc.getKeyStroke() != null) { - tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode())); + panel.tfKey.setSelectedItem(keyList.get(sc.getKeyStroke().getKeyCode())); } else { - tfKey.setSelectedItem(keyList.get(-1)); + panel.tfKey.setSelectedItem(keyList.get(-1)); } if (!sc.isChangeable()) { @@ -314,7 +314,7 @@ actionPerformed(null); } - model.fireTableRowsUpdated(row, row); + panel.model.fireTableRowsUpdated(row, row); } else { - panel.disableAllModifierCheckboxes(); + disableAllModifierCheckboxes(); panel.tfKey.setEnabled(false); } @@ -357,5 +357,5 @@ panel.tfKey.setEnabled(state); } else { - panel.disableAllModifierCheckboxes(); + disableAllModifierCheckboxes(); panel.tfKey.setEnabled(false); } @@ -364,5 +364,5 @@ class FilterFieldAdapter implements DocumentListener { - public void filter() { + private void filter() { String expr = filterField.getText().trim(); if (expr.isEmpty()) { Index: trunk/src/org/openstreetmap/josm/io/NoteReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 10133) +++ trunk/src/org/openstreetmap/josm/io/NoteReader.java (revision 10134) @@ -101,7 +101,7 @@ String closedTimeStr = attrs.getValue("closed_at"); if (closedTimeStr == null) { //no closed_at means the note is still open - thisNote.setState(Note.State.open); + thisNote.setState(Note.State.OPEN); } else { - thisNote.setState(Note.State.closed); + thisNote.setState(Note.State.CLOSED); thisNote.setClosedAt(DateUtils.fromString(closedTimeStr)); }