Changeset 2903 in josm

Timestamp:

Jan 28, 2010 7:55:32 PM (3 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)

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -1342 +1342 @@
                                 <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" delete_if_empty="true" />
                                 <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane 91" text="Octane 91" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane 95" text="Octane 95" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane 98" text="Octane 98" default="off" delete_if_empty="true" />
-                                <check key="fuel:octane 100" text="Octane 100" default="off" delete_if_empty="true" />
+                                <check key="fuel:octane_91" text="Octane 91" default="off" delete_if_empty="true" />
+                                <check key="fuel:octane_95" text="Octane 95" default="off" delete_if_empty="true" />
+                                <check key="fuel:octane_98" text="Octane 98" default="off" delete_if_empty="true" />
+                                <check key="fuel:octane_100" text="Octane 100" default="off" delete_if_empty="true" />
                                 <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" delete_if_empty="true" />
                                 <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" delete_if_empty="true" />

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

@@ -554 +554 @@
         }
 
+        // FIXME: incline=\"-*\" search pattern does not work.
         String reversedDirectionDefault = "oneway=\"-1\" | incline=down | incline=\"-*\"";
-        String directionDefault = "oneway? | incline=* | aerialway=* | waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | \"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" ";
+        
+        String directionDefault = "oneway? | incline=* | aerialway=* | "+
+                                  "waterway=stream | waterway=river | waterway=canal | waterway=drain | waterway=rapids | "+
+                                  "\"piste:type\"=downhill | \"piste:type\"=sled | man_made=\"piste:halfpipe\" | "+
+                                  "junction=roundabout";
 
         try {

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

@@ -258 +258 @@
             list.setElementAt(osm, i++);
         }
-        if (selectionHistory != null && newSelection.size() > 0 && !newSelection.equals(historyIgnoreSelection)) {
-            historyIgnoreSelection = null;
-            try {
-                // Check if the newSelection has already been added to the history
-                Collection<? extends OsmPrimitive> first = selectionHistory.getFirst();
-                if (first.equals(newSelection))
-                    return;
-            } catch (NoSuchElementException e) {
-            }
-            selectionHistory.addFirst(newSelection);
-            while (selectionHistory.size() > SELECTION_HISTORY_SIZE) {
-                selectionHistory.removeLast();
-            }
-        }
 
         int ways = 0;
@@ -290 +276 @@
         } else {
             setTitle(tr("Selection"));
+        }
+        
+        if (selectionHistory != null && newSelection.size() > 0 && !newSelection.equals(historyIgnoreSelection)) {
+            historyIgnoreSelection = null;
+            try {
+                // Check if the newSelection has already been added to the history
+                Collection<? extends OsmPrimitive> first = selectionHistory.getFirst();
+                if (first.equals(newSelection))
+                    return;
+            } catch (NoSuchElementException e) {
+            }
+            selectionHistory.addFirst(newSelection);
+            while (selectionHistory.size() > SELECTION_HISTORY_SIZE) {
+                selectionHistory.removeLast();
+            }
         }
     }

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);
+            }
+        }
     }