Changeset 2193 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-09-26T13:53:12+02:00 (15 years ago)

Author:

stoecker

Message:

fix #3523 - Show only interactive presets in properties

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/PropertiesDialog.java (modified) (3 diffs)
• tagging/TaggingPreset.java (modified) (1 diff)

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

@@ -527 +527 @@
         // combine both tables and wrap them in a scrollPane
         JPanel bothTables = new JPanel();
+        boolean top = Main.pref.getBoolean("properties.presets.top", true);
         bothTables.setLayout(new GridBagLayout());
-        bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
+        if(top)
+            bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
         bothTables.add(selectSth, GBC.eol().fill().insets(10, 10, 10, 10));
         bothTables.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
@@ -534 +536 @@
         bothTables.add(membershipTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
         bothTables.add(membershipTable, GBC.eol().fill(GBC.BOTH));
+        if(!top)
+            bothTables.add(presets, GBC.eol().fill(GBC.HORIZONTAL).insets(5, 2, 5, 2));
 
         DblClickWatch dblClickWatch = new DblClickWatch();
@@ -644 +648 @@
 
         for(TaggingPreset t : TaggingPresetPreference.taggingPresets) {
-            if(t.types == null || !((relations > 0 && !t.types.contains("relation")) &&
+            if((t.types == null || !((relations > 0 && !t.types.contains("relation")) &&
                     (nodes > 0 && !t.types.contains("node")) &&
                     (ways+closedways > 0 && !t.types.contains("way")) &&
-                    (closedways > 0 && !t.types.contains("closedway"))))
+                    (closedways > 0 && !t.types.contains("closedway")))) && t.isShowable())
             {
                 int found = 0;

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

@@ -678 +678 @@
     }
 
+    public boolean isShowable()
+    {
+        for(Item i : data)
+        {
+            if(!(i instanceof Optional || i instanceof Space || i instanceof Key))
+                return true;
+        }
+        return false;
+    }
+
     public void actionPerformed(ActionEvent e) {
         if (Main.main == null) return;