Changeset 11343 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

Timestamp:

2016-11-29T02:22:12+01:00 (9 years ago)

Author:

Don-vip

Message:

findbugs - disable SE_TRANSIENT_FIELD_NOT_RESTORED, fix some SIC_INNER_SHOULD_BE_STATIC_ANON

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

@@ -264 +264 @@
                 }
             });
-            list.setCellRenderer(new DefaultListCellRenderer() {
-                @Override
-                public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
-                    final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-                    final String name = DefaultNameFormatter.getInstance().format((Way) value);
-                    // get rid of id from DefaultNameFormatter.decorateNameWithId()
-                    final String nameWithoutId = name
-                            .replace(tr(" [id: {0}]", ((Way) value).getId()), "")
-                            .replace(tr(" [id: {0}]", ((Way) value).getUniqueId()), "");
-                    ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, nameWithoutId));
-                    return c;
-                }
-            });
+            list.setCellRenderer(new SegmentListCellRenderer());
         }
 
@@ -306 +294 @@
                 Main.getLayerManager().getEditDataSet().setSelected(result.getNewSelection());
             }
+        }
+    }
+
+    static class SegmentListCellRenderer extends DefaultListCellRenderer {
+        @Override
+        public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+            final Component c = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+            final String name = DefaultNameFormatter.getInstance().format((Way) value);
+            // get rid of id from DefaultNameFormatter.decorateNameWithId()
+            final String nameWithoutId = name
+                    .replace(tr(" [id: {0}]", ((Way) value).getId()), "")
+                    .replace(tr(" [id: {0}]", ((Way) value).getUniqueId()), "");
+            ((JLabel) c).setText(tr("Segment {0}: {1}", index + 1, nameWithoutId));
+            return c;
         }
     }