Changeset 10001 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

2016-03-17T01:50:12+01:00 (8 years ago)

Author:

Don-vip

Message:

sonar - Local variable and method parameter names should comply with a naming convention

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -418 +418 @@
     abstract static class CopyAction extends AbstractAction implements ListSelectionListener {
 
-        protected CopyAction(String icon_name, String action_name, String short_description) {
-            ImageIcon icon = ImageProvider.get("dialogs/conflict", icon_name);
+        protected CopyAction(String iconName, String actionName, String shortDescription) {
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", iconName);
             putValue(Action.SMALL_ICON, icon);
             if (icon == null) {
-                putValue(Action.NAME, action_name);
+                putValue(Action.NAME, actionName);
             }
-            putValue(Action.SHORT_DESCRIPTION, short_description);
+            putValue(Action.SHORT_DESCRIPTION, shortDescription);
             setEnabled(false);
         }