Changeset 7090 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2014-05-09T15:47:48+02:00 (10 years ago)

Author:

Don-vip

Message:

code refactoring to avoid classes in methods (cause problems for code analysis tools)

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -126 +126 @@
         return group != null ? group.getRawName() + "/" + name : name;
     }
-    
+
     /**
      * Returns the preset icon.
@@ -254 +254 @@
             link.addToPanel(p, selected, presetInitiallyMatches);
         }
-        
+
         // "Add toolbar button"
         JToggleButton tb = new JToggleButton(new ToolbarButtonAction());
@@ -320 +320 @@
     }
 
-    public int showDialog(Collection<OsmPrimitive> sel, final boolean showNewRelation) {
+    private static class PresetDialog extends ExtendedDialog {
+        public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply, boolean showNewRelation) {
+            super(Main.parent, title,
+                    showNewRelation?
+                            new String[] { tr("Apply Preset"), tr("New relation"), tr("Cancel") }:
+                                new String[] { tr("Apply Preset"), tr("Cancel") },
+                                true);
+            if (icon != null)
+                setIconImage(icon.getImage());
+            contentInsets = new Insets(10,5,0,5);
+            if (showNewRelation) {
+                setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
+            } else {
+                setButtonIcons(new String[] {"ok.png", "cancel.png" });
+            }
+            setContent(content);
+            setDefaultButton(1);
+            setupDialog();
+            buttons.get(0).setEnabled(!disableApply);
+            buttons.get(0).setToolTipText(title);
+            // Prevent dialogs of being too narrow (fix #6261)
+            Dimension d = getSize();
+            if (d.width < 350) {
+                d.width = 350;
+                setSize(d);
+            }
+            showDialog();
+        }
+    }
+
+    public int showDialog(Collection<OsmPrimitive> sel, boolean showNewRelation) {
         PresetPanel p = createPanel(sel);
         if (p == null)
@@ -336 +366 @@
             }
 
-            class PresetDialog extends ExtendedDialog {
-                public PresetDialog(Component content, String title, ImageIcon icon, boolean disableApply) {
-                    super(Main.parent,
-                            title,
-                            showNewRelation?
-                                    new String[] { tr("Apply Preset"), tr("New relation"), tr("Cancel") }:
-                                        new String[] { tr("Apply Preset"), tr("Cancel") },
-                                        true);
-                    if (icon != null)
-                        setIconImage(icon.getImage());
-                    contentInsets = new Insets(10,5,0,5);
-                    if (showNewRelation) {
-                        setButtonIcons(new String[] {"ok.png", "dialogs/addrelation.png", "cancel.png" });
-                    } else {
-                        setButtonIcons(new String[] {"ok.png", "cancel.png" });
-                    }
-                    setContent(content);
-                    setDefaultButton(1);
-                    setupDialog();
-                    buttons.get(0).setEnabled(!disableApply);
-                    buttons.get(0).setToolTipText(title);
-                    // Prevent dialogs of being too narrow (fix #6261)
-                    Dimension d = getSize();
-                    if (d.width < 350) {
-                        d.width = 350;
-                        setSize(d);
-                    }
-                    showDialog();
-                }
-            }
-
-            answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON), sel.isEmpty()).getValue();
+            answer = new PresetDialog(p, title, (ImageIcon) getValue(Action.SMALL_ICON),
+                    sel.isEmpty(), showNewRelation).getValue();
         }
         if (!showNewRelation && answer == 2)
@@ -502 +502 @@
         });
     }
-    
+
     /**
      * Action that adds or removes the button on main toolbar
@@ -522 +522 @@
         }
     }
-    
+
     public String getToolbarString() {
         ToolbarPreferences.ActionDefinition aDef