Changeset 25685 in osm for applications

Timestamp:

2011-03-24T12:22:27+01:00 (13 years ago)

Author:

zverik

Message:

button images (relcontext plugin)

Location:

applications/editors/josm/plugins/relcontext

Files:

• TODO (added)
• images/relcontext/add.png (modified) ( previous)
• images/relcontext/addremove.png (modified) ( previous)
• images/relcontext/clear.png (modified) ( previous)
• images/relcontext/download.png (modified) ( previous)
• images/relcontext/find.png (modified) ( previous)
• images/relcontext/remove.png (modified) ( previous)
• src/relcontext/ChosenRelationComponent.java (modified) (2 diffs)
• src/relcontext/RelContextDialog.java (modified) (1 diff)

applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelationComponent.java

@@ -26 +26 @@
     }
     
-    private final static String[] typeKeys = new String[] {
-        "natural", "landuse", "place", "waterway", "leisure", "amenity"
+    private final static String[] TYPE_KEYS = new String[] {
+        "natural", "landuse", "place", "waterway", "leisure", "amenity", "restriction", "public_transport"
+    };
+
+    private final static String[] NAMING_TAGS = new String[] {
+        "name", "place_name", "ref", "note"
     };
 
@@ -39 +43 @@
 
         String tag = null;
-        for( int i = 0; i < typeKeys.length && tag == null; i++ )
-            if( rel.hasKey(typeKeys[i]))
-                tag = typeKeys[i];
+        for( int i = 0; i < TYPE_KEYS.length && tag == null; i++ )
+            if( rel.hasKey(TYPE_KEYS[i]))
+                tag = TYPE_KEYS[i];
         if( tag != null )
             tag = tag.substring(0, 2) + "=" + rel.get(tag);
 
-        String name = rel.get("name");
-        if( name == null && rel.hasKey("place_name") )
-            name = rel.get("place_name");
+        String name = null;
+        for( int i = 0; i < NAMING_TAGS.length && name == null; i++ )
+            if( rel.hasKey(NAMING_TAGS[i]) )
+                name = rel.get(NAMING_TAGS[i]);
 
         StringBuilder sb = new StringBuilder();

applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java

@@ -114 +114 @@
         topLine.add(chosenRelationComponent, GBC.std().fill().insets(5, 0, 5, 0));
         final Action sortAndFixAction = new SortAndFixAction(chosenRelation);
-        final JButton sortAndFixButton = new JButton(sortAndFixAction);
+        final JButton sortAndFixButton = (JButton) sizeButton(new JButton(sortAndFixAction), 32, 24);
         topLine.add(sortAndFixButton, GBC.std());
         final Action downloadChosenRelationAction = new DownloadChosenRelationAction(chosenRelation);
-        final JButton downloadButton = new JButton(downloadChosenRelationAction);
+        final JButton downloadButton = (JButton) sizeButton(new JButton(downloadChosenRelationAction), 32, 24);
         topLine.add(downloadButton, GBC.std());
-        topLine.add(new JButton(new EditChosenRelationAction(chosenRelation)), GBC.eol());
+        topLine.add(new JButton(new EditChosenRelationAction(chosenRelation)), GBC.eol().fill(GBC.VERTICAL));
 
         chosenRelationPanel.add(topLine, BorderLayout.CENTER);