Changeset 14102 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-08-07T19:50:47+02:00 (6 years ago)

Author:

Don-vip

Message:

update unit test

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/NoteData.java (modified) (1 diff)
• gui/dialogs/FilterDialog.java (modified) (1 diff)
• gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• gui/layer/NoteLayer.java (modified) (3 diffs)

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

@@ -51 +51 @@
 
     /**
-     * Construct a new note container with a given list of notes
+     * Construct a new note container without notes
      * @since 14101
      */

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

@@ -277 +277 @@
         @Override
         public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-            FilterTableModel model = (FilterTableModel) table.getModel();
             Component cell = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-            cell.setEnabled(model.isCellEnabled(row, column));
+            TableModel model = table.getModel();
+            if (model instanceof FilterTableModel) {
+                cell.setEnabled(((FilterTableModel) model).isCellEnabled(row, column));
+            }
             return cell;
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -813 +813 @@
             if (c instanceof JLabel) {
                 JLabel label = (JLabel) c;
-                label.setText(((MemberInfo) table.getValueAt(row, 1)).getPositionString());
+                MemberInfo member = (MemberInfo) table.getValueAt(row, 1);
+                if (member != null) {
+                    label.setText(member.getPositionString());
+                }
                 if (isDisabledAndHidden) {
                     label.setFont(label.getFont().deriveFont(Font.ITALIC));

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

@@ -19 +19 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -97 +98 @@
      */
     public NoteLayer(Collection<Note> notes, String name) {
-        super(name);
-        noteData = new NoteData(notes);
-        noteData.addNoteDataUpdateListener(this);
+        this(new NoteData(notes), name);
     }
 
@@ -110 +109 @@
     public NoteLayer(NoteData noteData, String name) {
         super(name);
-        this.noteData = noteData;
+        this.noteData = Objects.requireNonNull(noteData);
         this.noteData.addNoteDataUpdateListener(this);
     }