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

Timestamp:

2009-01-27T19:59:33+01:00 (15 years ago)

Author:

stoecker

Message:

close #2088, #2091, update translations, added tr, patch by xeen and Claudius Henrichs

File:

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

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

@@ -46 +46 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.OpenBrowser;
+import org.openstreetmap.josm.tools.UrlLabel;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -375 +376 @@
         @Override public void addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
             if(locale_text == null)
-                locale_text = text == null ? tr("Open map features in browser") : tr(text);
+                locale_text = text == null ? tr("More information about this feature") : tr(text);
             JButton b = new JButton(locale_text);
             b.addActionListener(new ActionListener(){
@@ -382 +383 @@
                 }
             });
-            p.add(b, GBC.eol().anchor(GBC.EAST));
+            p.add(new UrlLabel(locale_href, locale_text), GBC.eol().anchor(GBC.WEST));
         }
         @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
@@ -567 +568 @@
             return null;
         JPanel p = new JPanel(new GridBagLayout());
+        LinkedList<Item> l = new LinkedList<Item>();
 
         for (Item i : data)
-            i.addToPanel(p, selected);
+        {
+            if(i instanceof Link)
+                l.add(i);
+            else
+                i.addToPanel(p, selected);
+        }
+        for(Item link : l)
+            link.addToPanel(p, selected);
         return p;
     }