Changeset 10134 in josm

Timestamp:

2016-04-10T16:57:50+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar, javadoc

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/notes/Note.java (modified) (7 diffs)
• src/org/openstreetmap/josm/data/notes/NoteComment.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/notes/package-info.java (added)
• src/org/openstreetmap/josm/data/osm/NoteData.java (modified) (8 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/conflict/ConflictColors.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/NoteLayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java (modified) (14 diffs)
• src/org/openstreetmap/josm/io/NoteReader.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/io/NoteReaderTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java

@@ -159 +159 @@
         }
 
-        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);

trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

@@ -89 +89 @@
                 Note newNote;
                 switch (comment.getNoteAction()) {
-                case opened:
+                case OPENED:
                     if (Main.isDebugEnabled()) {
                         Main.debug("opening new note");
@@ -95 +95 @@
                     newNote = api.createNote(note.getLatLon(), comment.getText(), monitor);
                     break;
-                case closed:
+                case CLOSED:
                     if (Main.isDebugEnabled()) {
                         Main.debug("closing note " + note.getId());
@@ -101 +101 @@
                     newNote = api.closeNote(note, comment.getText(), monitor);
                     break;
-                case commented:
+                case COMMENTED:
                     if (Main.isDebugEnabled()) {
                         Main.debug("adding comment to note " + note.getId());
@@ -107 +107 @@
                     newNote = api.addCommentToNote(note, comment.getText(), monitor);
                     break;
-                case reopened:
+                case REOPENED:
                     if (Main.isDebugEnabled()) {
                         Main.debug("reopening note " + note.getId());

trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.cache;
 
+/**
+ * Cache loader listener.
+ * @since 8168
+ */
 public interface ICachedLoaderListener {
 

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -142 +142 @@
     }
 
+    @Override
     public V get() {
         ensureCacheElement();

trunk/src/org/openstreetmap/josm/data/notes/Note.java

@@ -12 +12 @@
 
 /**
- * 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 +45 @@
     }
 
+    /**
+     * Sets note id.
+     * @param id OSM ID of this note
+     */
     public void setId(long id) {
         this.id = id;
@@ -53 +63 @@
     }
 
+    /**
+     * 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 +76 @@
     }
 
+    /**
+     * 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 +89 @@
     }
 
+    /**
+     * Sets the note state.
+     * @param state note state (open or closed)
+     */
     public void setState(State state) {
         this.state = state;
@@ -80 +102 @@
     }
 
+    /**
+     * Adds a comment.
+     * @param comment note comment
+     */
     public void addComment(NoteComment comment) {
         comments.add(comment);
@@ -112 +138 @@
     @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;

trunk/src/org/openstreetmap/josm/data/notes/NoteComment.java

@@ -9 +9 @@
  * 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 +26 @@
      */
     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
     }
 

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -46 +46 @@
                 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 +200 @@
         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 +220 @@
             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 +226 @@
             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 +240 @@
             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 +246 @@
             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 +262 @@
             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 +268 @@
             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();
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java

@@ -27 +27 @@
  * 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 +102 @@
         List<RelationMemberData> 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 +132 @@
     public void visit(Way w) {
         // remember all nodes this way refers to ...
-        //
         for (Node n: w.getNodes()) {
             n.accept(this);
@@ -144 +141 @@
     @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 +180 @@
     }
 
+    /**
+     * Builds and returns the "hull".
+     * @return the "hull" data set
+     */
     public DataSet build() {
         for (OsmPrimitive primitive: selectionBase.getAllSelected()) {

trunk/src/org/openstreetmap/josm/gui/conflict/ConflictColors.java

@@ -9 +9 @@
 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);
 

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

@@ -146 +146 @@
             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 +249 @@
                 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 {

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

@@ -113 +113 @@
             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 {

trunk/src/org/openstreetmap/josm/gui/preferences/display/LanguagePreference.java

@@ -31 +31 @@
 /**
  * Language preferences.
+ * @since 1065
  */
 public class LanguagePreference implements SubPreferenceSetting {
+
+    private static final String LANGUAGE = "language";
 
     /**
@@ -52 +55 @@
         // 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 +73 @@
     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 +87 @@
         }
 
-        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;

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -878 +878 @@
             }
 
-            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;

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -77 +77 @@
     private static Map<Integer, String> 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<String> 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<Integer, String> setKeyList() {
         Map<Integer, String> list = new LinkedHashMap<>();
@@ -89 +107 @@
                         list.put(Integer.valueOf(i), s);
                     }
-                } catch (Exception e) {
+                } catch (IllegalArgumentException | IllegalAccessException e) {
                     Main.error(e);
                 }
@@ -96 +114 @@
         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<String> 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 +169 @@
             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 +188 @@
 
     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 +194 @@
         // 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 +201 @@
         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 +225 @@
         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 +266 @@
     }
 
-    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 +273 @@
     // 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 +303 @@
                 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 +314 @@
                     actionPerformed(null);
                 }
-                model.fireTableRowsUpdated(row, row);
+                panel.model.fireTableRowsUpdated(row, row);
             } else {
-                panel.disableAllModifierCheckboxes();
+                disableAllModifierCheckboxes();
                 panel.tfKey.setEnabled(false);
             }
@@ -357 +357 @@
                 panel.tfKey.setEnabled(state);
             } else {
-                panel.disableAllModifierCheckboxes();
+                disableAllModifierCheckboxes();
                 panel.tfKey.setEnabled(false);
             }
@@ -364 +364 @@
 
     class FilterFieldAdapter implements DocumentListener {
-        public void filter() {
+        private void filter() {
             String expr = filterField.getText().trim();
             if (expr.isEmpty()) {

trunk/src/org/openstreetmap/josm/io/NoteReader.java

@@ -101 +101 @@
                 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));
                 }

trunk/test/unit/org/openstreetmap/josm/io/NoteReaderTest.java

@@ -68 +68 @@
         assertEquals(4, n.getId());
         assertEquals(new LatLon(36.7232991, 68.86415), n.getLatLon());
-        assertEquals(State.closed, n.getState());
+        assertEquals(State.CLOSED, n.getState());
         List<NoteComment> comments = n.getComments();
         assertEquals(2, comments.size());
@@ -75 +75 @@
         assertEquals(c1, n.getFirstComment());
         assertEquals(DateUtils.fromString("2013-04-24 08:07:02 UTC"), c1.getCommentTimestamp());
-        assertEquals(Action.opened, c1.getNoteAction());
+        assertEquals(Action.OPENED, c1.getNoteAction());
         assertEquals("test", c1.getText());
         assertEquals(User.createOsmUser(1626, "FredB"), c1.getUser());
 
         NoteComment c2 = comments.get(1);
-        assertEquals(Action.closed, c2.getNoteAction());
+        assertEquals(Action.CLOSED, c2.getNoteAction());
         assertEquals("", c2.getText());
     }