Changeset 2903 in josm for trunk/src/org/openstreetmap/josm/gui/tagging

Timestamp:

2010-01-28T19:55:32+01:00 (14 years ago)

Author:

bastiK

Message:

a few minor issues:

• fixed #2316 - Improve Inactive Presets handling
• fixed #4075 - Selection panels title doesn't stay when selecting an object by clicking
• fixed #4359 - Treat junction=roundabout as oneway=yes
• close #4427 - JOSM typos (patch by andre68)

File:

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

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

@@ -8 +8 @@
 
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.GridBagLayout;
 import java.awt.Image;
@@ -702 +703 @@
         }
 
+        JPanel items = new JPanel(new GridBagLayout());
         for (Item i : data){
             if(i instanceof Link) {
                 l.add(i);
             } else {
-                if(i.addToPanel(p, selected)) {
+                if(i.addToPanel(items, selected)) {
                     p.hasElements = true;
                 }
             }
         }
+        p.add(items, GBC.eol().fill());
+        if (selected.size() == 0) {
+            setEnabledRec(items, false);
+        }
+
         for(Item link : l) {
             link.addToPanel(p, selected);
         }
+
         return p;
+    }
+
+    /**
+     * setEnabled() does not propagate to child elements, so we need this workaround.
+     */
+    static void setEnabledRec(Container root, boolean enabled) {
+        root.setEnabled(enabled);
+        Component children[] = root.getComponents();
+        for(int i = 0; i < children.length; i++) {
+            if(children[i] instanceof Container) {
+                setEnabledRec((Container)children[i], enabled);
+            } else {
+                children[i].setEnabled(enabled);
+            }
+        }
     }