Changeset 2308 in josm

Timestamp:

2009-10-25T12:05:31+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3762: Deleted relation still referenced when deleting former member
Clean up of Delete command. New: only one confirmation dialog for all parent relations of deleted objects, see help.
Improved infrastructure for context-sensitive help, improved internal help browser.

Location:

trunk

Files:

• images/help/home.png (modified) ( previous)
• images/help/internet.png (modified) ( previous)
• images/help/next.png (modified) ( previous)
• images/help/previous.png (modified) ( previous)
• src/org/openstreetmap/josm/actions/AboutAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/HelpAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/actions/OpenLocationAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/command/Command.java (modified) (2 diffs)
• src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (17 diffs)
• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/GettingStarted.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/actionsupport (added)
• src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (added)
• src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/help/HelpApplication.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/help/HelpBrowser.java (modified) (15 diffs)
• src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/help/HelpContentReader.java (added)
• src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java (added)
• src/org/openstreetmap/josm/gui/help/HelpUtil.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java (added)
• src/org/openstreetmap/josm/gui/help/help-browser.css (modified) (1 diff)
• src/org/openstreetmap/josm/gui/io/UploadDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/LanguageInfo.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/WikiReader.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/AboutAction.java

@@ -93 +93 @@
     static public void setUserAgent() {
         Properties sysProp = System.getProperties();
-        sysProp.put("http.agent", "JOSM/1.5 ("+(version.equals(tr("UNKNOWN"))?"UNKNOWN":version)+" "+LanguageInfo.getLanguageCode()+")");
+        sysProp.put("http.agent", "JOSM/1.5 ("+(version.equals(tr("UNKNOWN"))?"UNKNOWN":version)+" "+LanguageInfo.getJOSMLocaleCode()+")");
         System.setProperties(sysProp);
     }

trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java

@@ -107 +107 @@
         TagCollection wayTags = TagCollection.unionOfAllPrimitives(ways);
 
-
         // try to build a new way which includes all the combined
         // ways

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -9 +9 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.JComponent;
-import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.help.HelpBrowserProxy;
-import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -23 +19 @@
  * Open a help browser and displays lightweight online help.
  *
- * @author imi
  */
 public class HelpAction extends AbstractAction {
-
-
-    private String pathhelp = Main.pref.get("help.pathhelp", "Help/");
-    private String pathmenu = Main.pref.get("help.pathmenu", "Menu/");
 
     public HelpAction() {
@@ -43 +34 @@
                 if (mouse != null) {
                     c = SwingUtilities.getDeepestComponentAt(c, mouse.x, mouse.y);
-                    topic = contextSensitiveHelp(c);
+                    topic = HelpUtil.getContextSpecificHelpTopic(c);
                 } else {
                     topic = null;
@@ -49 +40 @@
             } else {
                 Point mouse = Main.parent.getMousePosition();
-                topic = contextSensitiveHelp(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y));
+                topic = HelpUtil.getContextSpecificHelpTopic(SwingUtilities.getDeepestComponentAt(Main.parent, mouse.x, mouse.y));
             }
             if (topic == null) {
-                HelpBrowserProxy.getInstance().setUrlForHelpTopic("Help");
+                HelpBrowserProxy.getInstance().setUrlForHelpTopic("/");
             } else {
-                help(topic);
+                HelpBrowserProxy.getInstance().setUrlForHelpTopic(topic);
             }
         } else {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic("Help");
+            HelpBrowserProxy.getInstance().setUrlForHelpTopic("/");
         }
     }
-
-    /**
-     * @return The topic of the help. <code>null</code> for "don't know"
-     */
-    private String contextSensitiveHelp(Object c) {
-        if (c == null)
-            return null;
-        if (c instanceof Helpful)
-            return ((Helpful)c).helpTopic();
-        if (c instanceof JMenu) {
-            JMenu b = (JMenu)c;
-            if (b.getClientProperty("help") != null)
-                return (String)b.getClientProperty("help");
-            return pathmenu+b.getText();
-        }
-        if (c instanceof AbstractButton) {
-            AbstractButton b = (AbstractButton)c;
-            if (b.getClientProperty("help") != null)
-                return (String)b.getClientProperty("help");
-            return contextSensitiveHelp(((AbstractButton)c).getAction());
-        }
-        if (c instanceof Action)
-            return (String)((Action)c).getValue("help");
-        if (c instanceof JComponent && ((JComponent)c).getClientProperty("help") != null)
-            return (String)((JComponent)c).getClientProperty("help");
-        if (c instanceof Component)
-            return contextSensitiveHelp(((Component)c).getParent());
-        return null;
-    }
-
-    /**
-     * Displays the help (or browse on the already open help) on the online page
-     * with the given help topic. Use this for larger help descriptions.
-     */
-    public void help(String topic) {
-        HelpBrowserProxy.getInstance().setUrlForHelpTopic(pathhelp + topic);
-    }
 }

trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

@@ -91 +91 @@
                 tr("Close dialog and cancel downloading")
         });
-        dialog.configureContextsensitiveHelp("Help/Action/OpenLocation", true /* show help button */);
+        dialog.configureContextsensitiveHelp("/Action/OpenLocation", true /* show help button */);
         dialog.showDialog();
         if (dialog.getValue() != 1) return;

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -142 +142 @@
             c = DeleteCommand.deleteWithReferences(getEditLayer(),getCurrentDataSet().getSelected());
         } else {
-            c = DeleteCommand.delete(getEditLayer(),getCurrentDataSet().getSelected(), !alt);
+            c = DeleteCommand.delete(getEditLayer(),getCurrentDataSet().getSelected(), !alt /* also delete nodes in way */);
         }
         if (c != null) {
@@ -309 +309 @@
      * @param e MouseEvent from which modifiers and position are taken
      * @param int modifiers For explanation: @see updateCursor
-     * @param Simulate Set to true if the user should be bugged with additional
+     * @param silet Set to true if the user should not be bugged with additional
      *        dialogs
      * @return
      */
-    private Command buildDeleteCommands(MouseEvent e, int modifiers, boolean simulate) {
+    private Command buildDeleteCommands(MouseEvent e, int modifiers, boolean silent) {
         // Note: CTRL is the only modifier that is checked in MouseMove, don't
         // forget updating it there
@@ -330 +330 @@
                     c = DeleteCommand.deleteWithReferences(getEditLayer(),Collections.singleton((OsmPrimitive)ws.way),true);
                 } else {
-                    c = DeleteCommand.delete(getEditLayer(),Collections.singleton((OsmPrimitive)ws.way), !alt, simulate);
+                    c = DeleteCommand.delete(getEditLayer(),Collections.singleton((OsmPrimitive)ws.way), !alt, silent);
                 }
             }
@@ -336 +336 @@
             c = DeleteCommand.deleteWithReferences(getEditLayer(),Collections.singleton(sel));
         } else {
-            c = DeleteCommand.delete(getEditLayer(),Collections.singleton(sel), !alt, simulate);
+            c = DeleteCommand.delete(getEditLayer(),Collections.singleton(sel), !alt, silent);
         }
 

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -3 +3 @@
 
 import java.util.Collection;
+import static org.openstreetmap.josm.tools.I18n.tr;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -58 +59 @@
      * Creates a new command in the context of a specific data layer
      *
-     * @param layer the data layer
+     * @param layer the data layer. Must not be null.
+     * @throws IllegalArgumentException thrown if layer is null
      */
-    public Command(OsmDataLayer layer) {
+    public Command(OsmDataLayer layer) throws IllegalArgumentException {
+        if (layer == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "layer"));
         this.layer = layer;
     }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -10 +10 @@
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -24 +23 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.BackreferencedDataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
+import org.openstreetmap.josm.data.osm.BackreferencedDataSet.RelationToChildReference;
 import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.actionsupport.DeleteFromRelationConfirmationDialog;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
+import sun.swing.BakedArrayList;
+
 /**
  * A command to delete a number of primitives from the dataset.
- * @author imi
+
  */
 public class DeleteCommand extends Command {
@@ -49 +53 @@
 
     /**
-     * Constructor for a collection of data
+     * Constructor. Deletes a collection of primitives in the current edit layer.
+     * 
+     * @param data the primitives to delete
      */
     public DeleteCommand(Collection<? extends OsmPrimitive> data) {
-        super();
+        if (data == null) {
+            data = Collections.emptyList();
+        }
         this.toDelete = data;
+    }
+
+    /**
+     * Constructor. Deletes a single primitive in the current edit layer.
+     * 
+     * @param data  the primitive to delete. Must not be null.
+     * @throws IllegalArgumentException thrown if data is null
+     */
+    public DeleteCommand(OsmPrimitive data) throws IllegalArgumentException {
+        if (data == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "data"));
+        this.toDelete = Collections.singleton(data);
     }
 
@@ -59 +79 @@
      * Constructor for a single data item. Use the collection constructor to delete multiple
      * objects.
-     */
-    public DeleteCommand(OsmPrimitive data) {
-        this.toDelete = Collections.singleton(data);
-    }
-
-    /**
-     * Constructor for a single data item. Use the collection constructor to delete multiple
-     * objects.
-     *
-     * @param layer the layer context for deleting this primitive
-     * @param data the primitive to delete
-     */
-    public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) {
+     *
+     * @param layer the layer context for deleting this primitive. Must not be null.
+     * @param data the primitive to delete. Must not be null.
+     * @throws IllegalArgumentException thrown if data is null
+     * @throws IllegalArgumentException thrown if layer is null
+     */
+    public DeleteCommand(OsmDataLayer layer, OsmPrimitive data) throws IllegalArgumentException {
         super(layer);
+        if (data == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "data"));
         this.toDelete = Collections.singleton(data);
     }
@@ -80 +96 @@
      * a specific layer
      *
-     * @param layer the layer context for deleting these primitives
+     * @param layer the layer context for deleting these primitives. Must not be null.
      * @param data the primitives to delete
-     */
-    public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) {
+     * @throws IllegalArgumentException thrown if layer is null
+     */
+    public DeleteCommand(OsmDataLayer layer, Collection<? extends OsmPrimitive> data) throws IllegalArgumentException{
         super(layer);
+        if (data == null) {
+            data = Collections.emptyList();
+        }
         this.toDelete = data;
+    }
+
+    protected void removeNewNodesFromDeletedWay(Way w) {
+        // #2707: ways to be deleted can include new nodes (with node.id == 0).
+        // Remove them from the way before the way is deleted. Otherwise the
+        // deleted way is saved (or sent to the API) with a dangling reference to a node
+        // Example:
+        // <node id='2' action='delete' visible='true' version='1' ... />
+        // <node id='1' action='delete' visible='true' version='1' ... />
+        // <!-- missing node with id -1 because new deleted nodes are not persisted -->
+        // <way id='3' action='delete' visible='true' version='1'>
+        // <nd ref='1' />
+        // <nd ref='-1' /> <!-- here's the problem -->
+        // <nd ref='2' />
+        // </way>
+        if (w.isNew())
+            return; // process existing ways only
+        List<Node> nodesToKeep = new ArrayList<Node>();
+        // lookup new nodes which have been added to the set of deleted
+        // nodes ...
+        Iterator<Node> it = nodesToKeep.iterator();
+        while(it.hasNext()) {
+            Node n = it.next();
+            if (n.isNew()) {
+                it.remove();
+            }
+        }
+        w.setNodes(nodesToKeep);
     }
 
@@ -93 +141 @@
         for (OsmPrimitive osm : toDelete) {
             osm.setDeleted(true);
+            if (osm instanceof Way) {
+                removeNewNodesFromDeletedWay((Way)osm);
+            }
         }
         return true;
@@ -109 +160 @@
             String msg = "";
             switch(OsmPrimitiveType.from(primitive)) {
-            case NODE: msg = "Delete node {0}"; break;
-            case WAY: msg = "Delete way {0}"; break;
-            case RELATION:msg = "Delete relation {0}"; break;
+                case NODE: msg = "Delete node {0}"; break;
+                case WAY: msg = "Delete way {0}"; break;
+                case RELATION:msg = "Delete relation {0}"; break;
             }
 
@@ -130 +181 @@
             apiname = t.getAPIName();
             switch(t) {
-            case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
-            case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
-            case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
+                case NODE: msg = trn("Delete {0} node", "Delete {0} nodes", toDelete.size(), toDelete.size()); break;
+                case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
+                case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
             }
         }
@@ -156 +207 @@
      * If a way is deleted, only the way and no nodes are deleted.
      *
-     * @param layer
+     * @param layer the {@see OsmDataLayer} in whose context primitives are deleted. Must not be null.
      * @param selection The list of all object to be deleted.
-     * @param simulate  Set to true if the user should not be bugged with additional dialogs
+     * @param silent  Set to true if the user should not be bugged with additional dialogs
      * @return command A command to perform the deletions, or null of there is nothing to delete.
-     */
-    public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection, boolean simulate) {
+     * @throws IllegalArgumentException thrown if layer is null
+     */
+    public static Command deleteWithReferences(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection, boolean silent) throws IllegalArgumentException {
+        if (layer == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "layer"));
+        if (selection == null || selection.isEmpty()) return null;
         CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data);
         v.initialize();
@@ -170 +225 @@
         if (v.getData().isEmpty())
             return null;
-        if (!checkAndConfirmOutlyingDeletes(layer,v.getData()) && !simulate)
+        if (!checkAndConfirmOutlyingDeletes(layer,v.getData()) && !silent)
             return null;
         return new DeleteCommand(layer,v.getData());
@@ -233 +288 @@
      *    <li>it is not referred to by other non-deleted primitives outside of  <code>primitivesToDelete</code></li>
      * <ul>
+     * @param backreferences backreference data structure
      * @param layer  the layer in whose context primitives are deleted
      * @param primitivesToDelete  the primitives to delete
@@ -238 +294 @@
      * can be deleted too
      */
-    protected static Collection<Node> computeNodesToDelete(OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
+    protected static Collection<Node> computeNodesToDelete(BackreferencedDataSet backreferences, OsmDataLayer layer, Collection<OsmPrimitive> primitivesToDelete) {
         Collection<Node> nodesToDelete = new HashSet<Node>();
-        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
-        for (OsmPrimitive osm : primitivesToDelete) {
-            if (! (osm instanceof Way) ) {
-                continue;
-            }
-            for (Node n : ((Way) osm).getNodes()) {
+        //CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
+        for (Way way : OsmPrimitive.getFilteredList(primitivesToDelete, Way.class)) {
+            for (Node n : way.getNodes()) {
                 if (n.isTagged()) {
                     continue;
                 }
-                v.initialize();
-                n.visit(v);
-                Collection<OsmPrimitive> referringPrimitives = v.getData();
+                //v.initialize();
+                //n.visit(v);
+                Collection<OsmPrimitive> referringPrimitives = backreferences.getParents(n);
                 referringPrimitives.removeAll(primitivesToDelete);
                 int count = 0;
@@ -276 +329 @@
      * they are part of a relation, inform the user and do not delete.
      *
-     * @param layer the {@see OsmDataLayer} in whose context a primitive the primitives are deleted
-     * @param selection The objects to delete.
+     * @param layer the {@see OsmDataLayer} in whose context the primitives are deleted
+     * @param selection the objects to delete.
      * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well
-     * @param simulate Set to true if the user should not be bugged with additional questions
      * @return command a command to perform the deletions, or null if there is nothing to delete.
      */
     public static Command delete(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection,
             boolean alsoDeleteNodesInWay) {
-        return delete(layer, selection, alsoDeleteNodesInWay, false);
-    }
-
+        return delete(layer, selection, alsoDeleteNodesInWay, false /* not silent */);
+    }
+
+    /**
+     * Try to delete all given primitives.
+     *
+     * If a node is used by a way, it's removed from that way. If a node or a way is used by a
+     * relation, inform the user and do not delete.
+     *
+     * If this would cause ways with less than 2 nodes to be created, delete these ways instead. If
+     * they are part of a relation, inform the user and do not delete.
+     *
+     * @param layer the {@see OsmDataLayer} in whose context the primitives are deleted
+     * @param selection the objects to delete.
+     * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well
+     * @param silent set to true if the user should not be bugged with additional questions
+     * @return command a command to perform the deletions, or null if there is nothing to delete.
+     */
     public static Command delete(OsmDataLayer layer, Collection<? extends OsmPrimitive> selection,
-            boolean alsoDeleteNodesInWay, boolean simulate) {
-        if (selection.isEmpty())
+            boolean alsoDeleteNodesInWay, boolean silent) {
+        if (selection == null || selection.isEmpty())
             return null;
 
-        Collection<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
+        BackreferencedDataSet backreferences = new BackreferencedDataSet(layer.data);
+        backreferences.build();
+
+        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
         Collection<Way> waysToBeChanged = new HashSet<Way>();
-        HashMap<OsmPrimitive, Collection<OsmPrimitive>> relationsToBeChanged = new HashMap<OsmPrimitive, Collection<OsmPrimitive>>();
 
         if (alsoDeleteNodesInWay) {
             // delete untagged nodes only referenced by primitives in primitivesToDelete,
             // too
-            Collection<Node> nodesToDelete = computeNodesToDelete(layer, primitivesToDelete);
+            Collection<Node> nodesToDelete = computeNodesToDelete(backreferences, layer, primitivesToDelete);
             primitivesToDelete.addAll(nodesToDelete);
         }
 
-        if (!simulate && !checkAndConfirmOutlyingDeletes(layer,primitivesToDelete))
+        if (!silent && !checkAndConfirmOutlyingDeletes(layer,primitivesToDelete))
             return null;
 
-        CollectBackReferencesVisitor v = new CollectBackReferencesVisitor(layer.data, false);
-        for (OsmPrimitive osm : primitivesToDelete) {
-            v.initialize();
-            osm.visit(v);
-            for (OsmPrimitive ref : v.getData()) {
-                if (primitivesToDelete.contains(ref)) {
-                    continue;
-                }
-                if (ref instanceof Way) {
-                    waysToBeChanged.add((Way) ref);
-                } else if (ref instanceof Relation) {
-                    if (testRelation((Relation) ref, osm, simulate) == 1) {
-                        Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref);
-                        if (relset == null) {
-                            relset = new HashSet<OsmPrimitive>();
-                        }
-                        relset.add(osm);
-                        relationsToBeChanged.put(ref, relset);
-                    } else
-                        return null;
-                } else
-                    return null;
-            }
-        }
+        waysToBeChanged.addAll(OsmPrimitive.getFilteredSet(backreferences.getParents(primitivesToDelete), Way.class));
 
         Collection<Command> cmds = new LinkedList<Command>();
@@ -337 +383 @@
             if (wnew.getNodesCount() < 2) {
                 primitivesToDelete.add(w);
-
-                v.initialize();
-                w.visit(v);
-                for (OsmPrimitive ref : v.getData()) {
-                    if (primitivesToDelete.contains(ref)) {
-                        continue;
-                    }
-                    if (ref instanceof Relation) {
-                        Boolean found = false;
-                        Collection<OsmPrimitive> relset = relationsToBeChanged.get(ref);
-                        if (relset == null) {
-                            relset = new HashSet<OsmPrimitive>();
-                        } else {
-                            for (OsmPrimitive m : relset) {
-                                if (m == w) {
-                                    found = true;
-                                    break;
-                                }
-                            }
-                        }
-                        if (!found) {
-                            if (testRelation((Relation) ref, w, simulate) == 1) {
-                                relset.add(w);
-                                relationsToBeChanged.put(ref, relset);
-                            } else
-                                return null;
-                        }
-                    } else
-                        return null;
-                }
             } else {
                 cmds.add(new ChangeCommand(w, wnew));
@@ -372 +388 @@
         }
 
-        Iterator<OsmPrimitive> iterator = relationsToBeChanged.keySet().iterator();
+        // get a confirmation that the objects to delete can be removed from their parent
+        // relations
+        //
+        if (!silent) {
+            Set<RelationToChildReference> references = backreferences.getRelationToChildReferences(primitivesToDelete);
+            Iterator<RelationToChildReference> it = references.iterator();
+            while(it.hasNext()) {
+                RelationToChildReference ref = it.next();
+                if (ref.getParent().isDeleted()) {
+                    it.remove();
+                }
+            }
+            if (!references.isEmpty()) {
+                DeleteFromRelationConfirmationDialog dialog = DeleteFromRelationConfirmationDialog.getInstance();
+                dialog.getModel().populate(references);
+                dialog.setVisible(true);
+                if (dialog.isCanceled())
+                    return null;
+            }
+        }
+
+        // remove the objects from their parent relations
+        //
+        Iterator<Relation> iterator = OsmPrimitive.getFilteredSet(backreferences.getParents(primitivesToDelete), Relation.class).iterator();
         while (iterator.hasNext()) {
-            Relation cur = (Relation) iterator.next();
+            Relation cur = iterator.next();
             Relation rel = new Relation(cur);
-            for (OsmPrimitive osm : relationsToBeChanged.get(cur)) {
-                rel.removeMembersFor(osm);
-            }
+            rel.removeMembersFor(primitivesToDelete);
             cmds.add(new ChangeCommand(cur, rel));
         }
 
-        // #2707: ways to be deleted can include new nodes (with node.id == 0).
-        // Remove them from the way before the way is deleted. Otherwise the
-        // deleted way is saved (or sent to the API) with a dangling reference to a node
-        // Example:
-        // <node id='2' action='delete' visible='true' version='1' ... />
-        // <node id='1' action='delete' visible='true' version='1' ... />
-        // <!-- missing node with id -1 because new deleted nodes are not persisted -->
-        // <way id='3' action='delete' visible='true' version='1'>
-        // <nd ref='1' />
-        // <nd ref='-1' /> <!-- heres the problem -->
-        // <nd ref='2' />
-        // </way>
-        for (OsmPrimitive primitive : primitivesToDelete) {
-            if (!(primitive instanceof Way)) {
-                continue;
-            }
-            Way w = (Way) primitive;
-            if (w.isNew()) { // new ways with id == 0 are fine,
-                continue; // process existing ways only
-            }
-            Way wnew = new Way(w);
-            List<Node> nodesToKeep = new ArrayList<Node>();
-            // lookup new nodes which have been added to the set of deleted
-            // nodes ...
-            for (Node n : wnew.getNodes()) {
-                if (!n.isNew() || !primitivesToDelete.contains(n)) {
-                    nodesToKeep.add(n);
-                }
-            }
-            // .. and remove them from the way
-            //
-            wnew.setNodes(nodesToKeep);
-            if (nodesToKeep.size() < w.getNodesCount()) {
-                cmds.add(new ChangeCommand(w, wnew));
-            }
-        }
-
+        // build the delete command
+        //
         if (!primitivesToDelete.isEmpty()) {
             cmds.add(new DeleteCommand(layer,primitivesToDelete));
@@ -427 +429 @@
 
     public static Command deleteWaySegment(OsmDataLayer layer, WaySegment ws) {
-        if (ws.way.getNodesCount() < 3) {
-            // If the way contains less than three nodes, it can't have more
-            // than one segment, so the way should be deleted.
-
+        if (ws.way.getNodesCount() < 3)
             return new DeleteCommand(layer, Collections.singleton(ws.way));
-        }
 
         if (ws.way.firstNode() == ws.way.lastNode()) {

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

@@ -2 +2 @@
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -170 +171 @@
         for (RelationMemberData member:relationData.getMembers()) {
             switch (member.getMemberType()) {
-            case NODE:
-                nodes.put(member.getMemberId(), nodeMarker);
-                break;
-            case WAY:
-                ways.put(member.getMemberId(), wayMarker);
-                break;
-            case RELATION:
-                relations.put(member.getMemberId(), relationMarker);
-                break;
+                case NODE:
+                    nodes.put(member.getMemberId(), nodeMarker);
+                    break;
+                case WAY:
+                    ways.put(member.getMemberId(), wayMarker);
+                    break;
+                case RELATION:
+                    relations.put(member.getMemberId(), relationMarker);
+                    break;
             }
         }
@@ -202 +203 @@
             OsmPrimitive foundMember = null;
             switch (member.getMemberType()) {
-            case NODE:
-                foundMember = nodes.get(member.getMemberId());
-                if (foundMember == nodeMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
-            case WAY:
-                foundMember = ways.get(member.getMemberId());
-                if (foundMember == wayMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
-            case RELATION:
-                foundMember = relations.get(member.getMemberId());
-                if (foundMember == relationMarker) {
-                    throw new AssertionError("Data consistency problem - relation with missing member detected");
-                }
-                break;
+                case NODE:
+                    foundMember = nodes.get(member.getMemberId());
+                    if (foundMember == nodeMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
+                case WAY:
+                    foundMember = ways.get(member.getMemberId());
+                    if (foundMember == wayMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
+                case RELATION:
+                    foundMember = relations.get(member.getMemberId());
+                    if (foundMember == relationMarker)
+                        throw new AssertionError("Data consistency problem - relation with missing member detected");
+                    break;
             }
             newMembers.add(new RelationMember(member.getRole(), foundMember));
@@ -290 +288 @@
     }
 
+    /**
+     * removes all members with member.member == primitive
+     *
+     * @param primitives the primitives to check for
+     */
+    public void removeMembersFor(Collection<OsmPrimitive> primitives) {
+        if (primitives == null || primitives.isEmpty())
+            return;
+
+        ArrayList<RelationMember> todelete = new ArrayList<RelationMember>();
+        for (RelationMember member: members) {
+            if (primitives.contains(member.getMember())) {
+                todelete.add(member);
+            }
+        }
+        members.removeAll(todelete);
+    }
+
     @Override
     public String getDisplayName(NameFormatter formatter) {

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -1370 +1370 @@
         leftHandTraffic = Main.pref.getBoolean("mappaint.lefthandtraffic",false);
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
-        String[] names = {"name:"+LanguageInfo.getLanguageCode(), "name", "int_name", "ref", "operator", "brand","addr:housenumber"};
+        String[] names = {"name:"+LanguageInfo.getJOSMLocaleCode(), "name", "int_name", "ref", "operator", "brand","addr:housenumber"};
         regionalNameOrder = Main.pref.getCollection("mappaint.nameOrder", Arrays.asList(names));
         minEN = nc.getEastNorth(0,nc.getHeight()-1);

trunk/src/org/openstreetmap/josm/gui/GettingStarted.java

@@ -52 +52 @@
 
         final private int myVersion = AboutAction.getVersionNumber();
-        final private String myLang = LanguageInfo.getLanguageCodeWiki();
+        final private String myLang = LanguageInfo.getWikiLanguagePrefix();
 
         /**

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

@@ -192 +192 @@
 
         public void actionPerformed(ActionEvent arg0) {
-            HelpBrowserProxy.getInstance().setUrlForHelpTopic("/Help/Dialog/ConflictDialog");
+            HelpBrowserProxy.getInstance().setUrlForHelpTopic("/Dialog/ConflictDialog");
         }
     }

trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java

@@ -19 +19 @@
     private String helpTopic;
 
+    /**
+     * 
+     * @param helpTopic
+     */
     public ContextSensitiveHelpAction(String helpTopic) {
         putValue(SHORT_DESCRIPTION, tr("Show help information"));

trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java

@@ -6 +6 @@
 import java.awt.Rectangle;
 import java.awt.Toolkit;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Arrays;
 import java.util.Collection;
@@ -12 +16 @@
 import java.util.List;
 import java.util.Map;
+import java.util.logging.FileHandler;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;
+
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -23 +34 @@
  */
 public class HelpApplication {
+    static private final Logger logger = Logger.getLogger(HelpApplication.class.getName());
     private HelpBrowser browser;
     private HelpBrowserCommandProcessor commandProcessor;
@@ -82 +94 @@
 
         MainApplication.preConstructorInit(args);
+        Thread.setDefaultUncaughtExceptionHandler(
+                new UncaughtExceptionHandler() {
+                    public void uncaughtException(Thread t, Throwable e) {
+                        StringWriter sw = new StringWriter();
+                        e.printStackTrace(new PrintWriter(sw));
+                        logger.log(Level.SEVERE, sw.getBuffer().toString());
+                    }
+                }
+        );
 
         new HelpApplication().start();

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.help;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.buildAbsoluteHelpTopic;
+import static org.openstreetmap.josm.gui.help.HelpUtil.getHelpTopicEditUrl;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.BorderLayout;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -12 +15 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.Locale;
 import java.util.Observable;
 import java.util.Observer;
+import java.util.logging.Logger;
 
 import javax.swing.AbstractAction;
@@ -22 +27 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.JSeparator;
@@ -28 +34 @@
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
+import javax.swing.text.SimpleAttributeSet;
+import javax.swing.text.html.HTMLDocument;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
+import javax.swing.text.html.HTML.Tag;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.LanguageInfo;
 import org.openstreetmap.josm.tools.OpenBrowser;
-import org.openstreetmap.josm.tools.WikiReader;
 
 public class HelpBrowser extends JFrame {
-
+    static private final Logger logger = Logger.getLogger(HelpBrowser.class.getName());
+
+    /** the unique instance */
     private static HelpBrowser instance;
 
@@ -61 +75 @@
     static public void launchBrowser(String helpTopic) {
         HelpBrowser browser = getInstance();
-        browser.setUrlForHelpTopic(helpTopic);
+        browser.openHelpTopic(helpTopic);
         browser.setVisible(true);
         browser.toFront();
@@ -68 +82 @@
     /** the help browser */
     private JEditorPane help;
+    private JScrollPane spHelp;
+
     /** the help browser history */
     private HelpBrowserHistory history;
@@ -74 +90 @@
     private String url;
 
-    private String languageCode = LanguageInfo.getLanguageCodeWiki();
-    private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
-    private String pathbase = Main.pref.get("help.pathbase", "/wiki/");
-    private WikiReader reader = new WikiReader(baseurl);
+    private HelpContentReader reader;
 
     /**
@@ -126 +139 @@
         help.setEditorKit(kit);
         help.setEditable(false);
-        help.addHyperlinkListener(new HyperlinkListener(){
-            public void hyperlinkUpdate(HyperlinkEvent e) {
-                if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED)
-                    return;
-                if (e.getURL() == null) {
-                    help.setText("<html>404 not found</html>");
-                } else if (e.getURL().toString().endsWith("action=edit")) {
-                    OpenBrowser.displayUrl(e.getURL().toString());
-                } else {
-                    url = e.getURL().toString();
-                    setUrl(e.getURL().toString());
-                }
-            }
-        });
+        help.addHyperlinkListener(new HyperlinkHandler());
         help.setContentType("text/html");
-
-
         history = new HelpBrowserHistory(this);
 
@@ -148 +146 @@
         setContentPane(p);
 
-        p.add(new JScrollPane(help), BorderLayout.CENTER);
+        p.add(spHelp = new JScrollPane(help), BorderLayout.CENTER);
 
         addWindowListener(new WindowAdapter(){
@@ -168 +166 @@
 
     public HelpBrowser() {
+        reader = new HelpContentReader(HelpUtil.getWikiBaseUrl());
         build();
     }
 
+    /**
+     * Replies the current URL
+     * 
+     * @return the current URL
+     */
     public String getUrl() {
         return url;
     }
 
-    protected void loadUrl(String url) {
-        String langurl = url;
-        if(url.startsWith(baseurl+pathbase)){
-            int i = pathbase.length()+baseurl.length();
-            String title = url.substring(i);
-            if(languageCode.length() != 0 && !title.startsWith(languageCode)) {
-                title = languageCode + title;
-            }
-            langurl = url.substring(0, i) + title;
-        }
-        boolean loaded = false;
-        if(!langurl.equals(this.url) && !langurl.equals(url)){
-            loaded = loadHelpUrl(url, langurl, true);
-        }
-        if(!loaded) {
-            loaded = loadHelpUrl(url, langurl, false);
-        }
-        if(!loaded) {
-            help.setText(tr("Error while loading page {0}",url));
-        }
-    }
-
-    public void setUrl(String url) {
-        loadUrl(url);
+    /**
+     * Displays a warning page when a help topic doesn't exist yet.
+     * 
+     * @param relativeHelpTopic the help topic
+     */
+    protected void handleMissingHelpContent(String relativeHelpTopic) {
+        String message = tr("<html><p class=\"warning-header\">Help content for help topic missing</p>"
+                + "<p class=\"warning-body\">Help content for the help topic <strong>{0}</strong> is "
+                + "not available yet. It is missing both in your local language ({1}) and in english.<br><br>"
+                + "Please help to improve the JOSM help system and fill in the missing information."
+                + "You can both edit the <a href=\"{2}\">help topic in your local language ({1})</a> and "
+                + "the <a href=\"{3}\">help topic in english</a>."
+                + "</p></html>",
+                relativeHelpTopic,
+                Locale.getDefault().getDisplayName(),
+                getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic)),
+                getHelpTopicEditUrl(buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH))
+        );
+        help.setText(message);
+    }
+
+    /**
+     * Displays a error page if a help topic couldn't be loaded because of network or IO error.
+     * 
+     * @param relativeHelpTopic the help topic
+     * @param e the exception
+     */
+    protected void handleHelpContentReaderException(String relativeHelpTopic, HelpContentReaderException e) {
+        String message = tr("<html><p class=\"error-header\">Error when retrieving help information</p>"
+                + "<p class=\"error-body\">The content for the help topic <strong>{0}</strong> could "
+                + "not be loaded. The error message is (untranslated):<br>"
+                + "<tt>{1}</tt>"
+                + "</p></html>",
+                relativeHelpTopic,
+                e.toString()
+        );
+        help.setText(message);
+    }
+
+    protected void scrollToTop() {
+        JScrollBar sb = spHelp.getVerticalScrollBar();
+        sb.setValue(sb.getMinimum());
+    }
+
+    /**
+     * Loads a help topic given by a relative help topic name (i.e. "/Action/New")
+     * 
+     * First tries to load the language specific help topic. If it is missing, tries to
+     * load the topic in english.
+     * 
+     * @param relativeHelpTopic the relative help topic
+     */
+    protected void loadRelativeHelpTopic(String relativeHelpTopic) {
+        String url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic));
+        String content = null;
+        try {
+            content = reader.fetchHelpTopicContent(url);
+        } catch(MissingHelpContentException e) {
+            url = HelpUtil.getHelpTopicUrl(HelpUtil.buildAbsoluteHelpTopic(relativeHelpTopic, Locale.ENGLISH));
+            try {
+                logger.info("fetching url: " + url);
+                content = reader.fetchHelpTopicContent(url);
+            } catch(MissingHelpContentException e1) {
+                handleMissingHelpContent(relativeHelpTopic);
+                return;
+            } catch(HelpContentReaderException e1) {
+                e1.printStackTrace();
+                handleHelpContentReaderException(relativeHelpTopic,e1);
+                return;
+            }
+        } catch(HelpContentReaderException e) {
+            e.printStackTrace();
+            handleHelpContentReaderException(relativeHelpTopic, e);
+            return;
+        }
+        help.setText(content);
+        history.setCurrentUrl(url);
+        this.url = url;
+        scrollToTop();
+    }
+
+    /**
+     * Loads a help topic given by an absolute help topic name, i.e.
+     * "/De:Help/Action/New"
+     * 
+     * @param absoluteHelpTopic the absolute help topic name
+     */
+    protected void loadAbsoluteHelpTopic(String absoluteHelpTopic) {
+        String url = HelpUtil.getHelpTopicUrl(absoluteHelpTopic);
+        String content = null;
+        try {
+            content = reader.fetchHelpTopicContent(url);
+        } catch(MissingHelpContentException e) {
+            handleMissingHelpContent(absoluteHelpTopic);
+            return;
+        } catch(HelpContentReaderException e) {
+            e.printStackTrace();
+            handleHelpContentReaderException(absoluteHelpTopic, e);
+            return;
+        }
+        help.setText(content);
+        history.setCurrentUrl(url);
+        this.url = url;
+        scrollToTop();
+    }
+
+    /**
+     * Opens an URL and displays the content.
+     * 
+     *  If the URL is the locator of an absolute help topic, help content is loaded from
+     *  the JOSM wiki. Otherwise, the help browser loads the page from the given URL
+     * 
+     * @param url the url
+     */
+    public void openUrl(String url) {
         if (!isVisible()) {
             setVisible(true);
@@ -205 +300 @@
             toFront();
         }
-        history.setCurrentUrl(url);
-    }
-
-    public void setUrlForHelpTopic(String topic) {
-        setUrl(baseurl+pathbase+ topic);
-    }
-
-    protected boolean loadHelpUrl(String url, String localizedUrl, boolean useLocalizedUrl){
-        this.url = useLocalizedUrl ? localizedUrl : url;
-        boolean loaded = false;
-        try {
-            String txt = reader.read(this.url);
-            if(txt.length() == 0){
-                if(useLocalizedUrl)
-                    throw new IOException();
-                if(url.equals(localizedUrl)){
-                    txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">English</A>.",
-                            url+"?action=edit")+"</HTML>");
-                } else{
-                    txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}\">your language</A>.",
-                            url+"?action=edit", localizedUrl+"?action=edit")+"</HTML>");
-                }
-            }
-            help.setText(txt);
-            help.setCaretPosition(0);
-            loaded = true;
-        } catch (IOException ex) {
-        }
-        return loaded;
+        String helpTopic = HelpUtil.extractAbsoluteHelpTopic(url);
+        if (helpTopic == null) {
+            try {
+                this.url = url;
+                help.setPage(url);
+            } catch(IOException e) {
+                HelpAwareOptionPane.showOptionDialog(
+                        Main.parent,
+                        tr(
+                                "<html>Failed to open help page for url {0}.<br>"
+                                + "This is most likely due to a network problem, please check your<br>"
+                                + "your internet connection</html>",
+                                url.toString()
+                        ),
+                        tr("Failed to open URL"),
+                        JOptionPane.ERROR_MESSAGE,
+                        null, /* no icon */
+                        null, /* standard options, just OK button */
+                        null, /* default is standard */
+                        null /* no help context */
+                );
+            }
+            history.setCurrentUrl(url);
+        } else {
+            loadAbsoluteHelpTopic(helpTopic);
+        }
+    }
+
+    /**
+     * Loads and displays the help information for a help topic given
+     * by a relative help topic name, i.e. "/Action/New"
+     * 
+     * @param relativeHelpTopic the relative help topic
+     */
+    public void openHelpTopic(String relativeHelpTopic) {
+        if (!isVisible()) {
+            setVisible(true);
+            toFront();
+        } else {
+            toFront();
+        }
+        loadRelativeHelpTopic(relativeHelpTopic);
     }
 
@@ -256 +364 @@
 
         public void actionPerformed(ActionEvent e) {
-            if (!getUrl().startsWith(baseurl)) {
+            if (!getUrl().startsWith(HelpUtil.getWikiBaseHelpUrl())) {
+                String message = tr(
+                        "<html>The current URL <tt>{0}</tt><br>"
+                        + "is an external URL. Editing is only possible for help topics<br>"
+                        + "on the help server <tt>{1}</tt>.</html>",
+                        getUrl(),
+                        HelpUtil.getWikiBaseUrl()
+                );
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        tr("Can only edit help pages from JOSM Online Help"),
+                        message,
                         tr("Warning"),
                         JOptionPane.WARNING_MESSAGE
@@ -265 +380 @@
                 return;
             }
+            String url = getUrl();
+            url = url.replaceAll("#[^#]*$", "");
             OpenBrowser.displayUrl(url+"?action=edit");
         }
@@ -277 +394 @@
 
         public void actionPerformed(ActionEvent e) {
-            setUrl(url);
+            openUrl(getUrl());
         }
     }
@@ -328 +445 @@
 
         public void actionPerformed(ActionEvent e) {
-            setUrlForHelpTopic("Help");
+            openHelpTopic("/");
+        }
+    }
+
+    class HyperlinkHandler implements HyperlinkListener {
+
+        /**
+         * Scrolls the help browser to the element with id <code>id</code>
+         * 
+         * @param id the id
+         * @return true, if an element with this id was found and scrolling was successful; false, otherwise
+         */
+        protected boolean scrollToElementWithId(String id) {
+            Document d = help.getDocument();
+            if (d instanceof HTMLDocument) {
+                HTMLDocument doc = (HTMLDocument) d;
+                Element element = doc.getElement(id);
+                try {
+                    Rectangle r = help.modelToView(element.getStartOffset());
+                    if (r != null) {
+                        Rectangle vis = help.getVisibleRect();
+                        r.height = vis.height;
+                        help.scrollRectToVisible(r);
+                        return true;
+                    }
+                } catch(BadLocationException e) {
+                    System.err.println(tr("Warning: bad location in HTML document. Exception was: " + e.toString()));
+                    e.printStackTrace();
+                }
+            }
+            return false;
+        }
+
+        /**
+         * Checks whether the hyperlink event originated on a <a ...> element with
+         * a relative href consisting of a URL fragment only, i.e.
+         * <a href="#thisIsALocalFragment">. If so, replies the fragment, i.e.
+         * "thisIsALocalFragment".
+         * 
+         * Otherwise, replies null
+         * 
+         * @param e the hyperlink event
+         * @return the local fragment
+         */
+        protected String getUrlFragment(HyperlinkEvent e) {
+            AttributeSet set = e.getSourceElement().getAttributes();
+            Object value = set.getAttribute(Tag.A);
+            if (value == null || ! (value instanceof SimpleAttributeSet)) return null;
+            SimpleAttributeSet atts = (SimpleAttributeSet)value;
+            value = atts.getAttribute(javax.swing.text.html.HTML.Attribute.HREF);
+            if (value == null) return null;
+            String s = (String)value;
+            if (s.matches("#.*"))
+                return s.substring(1);
+            return null;
+        }
+
+        public void hyperlinkUpdate(HyperlinkEvent e) {
+            if (e.getEventType() != HyperlinkEvent.EventType.ACTIVATED)
+                return;
+            if (e.getURL() == null) {
+                // Probably hyperlink event on a an A-element with a href consisting of
+                // a fragment only, i.e. "#ALocalFragment".
+                //
+                String fragment = getUrlFragment(e);
+                if (fragment != null) {
+                    // first try to scroll to an element with id==fragment. This is the way
+                    // table of contents are built in the JOSM wiki. If this fails, try to
+                    // scroll to a <A name="..."> element.
+                    //
+                    if (!scrollToElementWithId(fragment)) {
+                        help.scrollToReference(fragment);
+                    }
+                } else {
+                    HelpAwareOptionPane.showOptionDialog(
+                            Main.parent,
+                            tr("Failed to open help page. The target URL is empty."),
+                            tr("Failed to open help page"),
+                            JOptionPane.ERROR_MESSAGE,
+                            null, /* no icon */
+                            null, /* standard options, just OK button */
+                            null, /* default is standard */
+                            null /* no help context */
+                    );
+                }
+            } else if (e.getURL().toString().endsWith("action=edit")) {
+                OpenBrowser.displayUrl(e.getURL().toString());
+            } else {
+                url = e.getURL().toString();
+                openUrl(e.getURL().toString());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java

@@ -5 +5 @@
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javax.swing.SwingUtilities;
@@ -16 +18 @@
  */
 public class HelpBrowserCommandProcessor implements Runnable {
+    private static final Logger logger = Logger.getLogger(HelpBrowserCommandProcessor.class.getName());
 
     /** the controlled help browser*/
@@ -31 +34 @@
      * Show the help page for help topic <code>helpTopic</code>.
      * 
-     * @param helpTopics the help topic
+     * @param helpTopic the help topic
      */
-    protected void setUrlForHelpTopics(final String helpTopics) {
+    protected void setUrlForHelpTopic(final String helpTopic) {
         Runnable r = new Runnable() {
             public void run() {
-                browser.setUrlForHelpTopic(helpTopics);
+                browser.openHelpTopic(helpTopic);
                 browser.setVisible(true);
                 browser.toFront();
@@ -65 +68 @@
         while(true) {
             String cmd = null;
+
             try {
                 cmd = reader.readLine();
+                logger.info("got command: " + cmd);
             } catch(IOException e) {
+                logger.log(Level.SEVERE,e.toString());
                 System.out.println(tr("Failed to read command. Exiting help browser. Exception was:" + e.toString()));
                 System.exit(1);
@@ -73 +79 @@
             if (cmd.startsWith("exit")) {
                 exit();
-            } else if (cmd.startsWith("setUrlForHelpTopics ")) {
-                String helpTopics = cmd.substring("setUrlForHelpTopics ".length());
-                setUrlForHelpTopics(helpTopics);
+            } else if (cmd.startsWith("setUrlForHelpTopic ")) {
+                String helpTopic = cmd.substring("setUrlForHelpTopic ".length());
+                setUrlForHelpTopic(helpTopic);
             }
         }

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java

@@ -35 +35 @@
         if (historyPos < 0) return;
         String url = history.get(historyPos);
-        browser.loadUrl(url);
+        browser.openUrl(url);
         setChanged();
         notifyObservers();
@@ -44 +44 @@
         if (historyPos >= history.size()) return;
         String url = history.get(historyPos);
-        browser.loadUrl(url);
+        browser.openUrl(url);
         setChanged();
         notifyObservers();

trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java

@@ -77 +77 @@
     /**
      * Direct the help browser to the help page for help topic
-     * <code>helpTopic</code>
+     * <code>relativeHelpTopic</code>
      * 
-     * @param helpTopic the help topic
+     * @param relativeHelpTopic the help topic
      */
-    public void setUrlForHelpTopic(String helpTopic) {
+    public void setUrlForHelpTopic(String relativeHelpTopic) {
         if (helpBrowserProcess == null) {
             launch();
@@ -95 +95 @@
             return;
         }
-        pw.println("setUrlForHelpTopics " + helpTopic);
+        pw.println("setUrlForHelpTopic " + relativeHelpTopic);
         pw.flush();
     }

trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.help;
 
+import java.awt.Component;
 import java.awt.event.KeyEvent;
-
+import java.util.Locale;
+
+import javax.swing.AbstractButton;
+import javax.swing.Action;
 import javax.swing.JComponent;
+import javax.swing.JMenu;
 import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.LanguageInfo;
 
 public class HelpUtil {
 
     /**
+     * Replies the base wiki URL.
+     * 
+     * @return the base wiki URL
+     */
+    static public String getWikiBaseUrl() {
+        return Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
+    }
+
+    /**
+     * Replies the base wiki URL for help pages
+     * 
+     * @return the base wiki URL for help pages
+     */
+    static public String getWikiBaseHelpUrl() {
+        return getWikiBaseUrl() + "/wiki";
+    }
+
+    /**
+     * Replies the URL on the wiki for an absolute help topic. The URL is encoded in UTF-8.
+     * 
+     * @param absoluteHelpTopic the absolute help topic
+     * @return the url
+     * @see #buildAbsoluteHelpTopic(String)
+     * @see #buildAbsoluteHelpTopic(String, Locale)
+     */
+    static public String getHelpTopicUrl(String absoluteHelpTopic) {
+        String ret = getWikiBaseHelpUrl();
+        ret = ret.replaceAll("\\/+$", "");
+        absoluteHelpTopic  =absoluteHelpTopic.replace(" ", "%20");
+        absoluteHelpTopic = absoluteHelpTopic.replaceAll("^\\/+", "/");
+        return ret + absoluteHelpTopic;
+    }
+
+    /**
+     * Replies the URL to the edit page for the absolute help topic.
+     * 
+     * @param absoluteHelpTopic the absolute help topic
+     * @return the URL to the edit page
+     */
+    static public String getHelpTopicEditUrl(String absoluteHelpTopic) {
+        String topicUrl = getHelpTopicUrl(absoluteHelpTopic);
+        topicUrl = topicUrl.replaceAll("#[^#]*$", ""); // remove optional fragment
+        return topicUrl + "?action=edit";
+    }
+
+    /**
+     * Extracts the relative help topic from an URL. Replies null, if
+     * no relative help topic is found.
+     * 
+     * @param url the url
+     * @return the relative help topic in the URL, i.e. "/Action/New"
+     */
+    static public String extractRelativeHelpTopic(String url) {
+        String topic = extractAbsoluteHelpTopic(url);
+        if (topic == null) return null;
+        String pattern = "/[A-Z][a-z]:" + getHelpTopicPrefix(Locale.ENGLISH).replaceAll("^\\/+", "");
+        if (url.matches(pattern))
+            return topic.substring(pattern.length());
+        return null;
+    }
+
+    /**
+     * Extracts the absolute help topic from an URL. Replies null, if
+     * no absolute help topic is found.
+     * 
+     * @param url the url
+     * @return the absolute help topic in the URL, i.e. "/De:Help/Action/New"
+     */
+    static public String extractAbsoluteHelpTopic(String url) {
+        if (!url.startsWith(getWikiBaseHelpUrl())) return null;
+        url = url.substring(getWikiBaseHelpUrl().length());
+        String prefix = getHelpTopicPrefix(Locale.ENGLISH);
+        if (url.startsWith(prefix))
+            return url;
+
+        String pattern = "/[A-Z][a-z]:" + prefix.replaceAll("^\\/+", "");
+        if (url.matches(pattern))
+            return url;
+
+        return null;
+    }
+
+    /**
+     * Replies the help topic prefix for the current locale. Examples:
+     * <ul>
+     *   <li>/Help if the current locale is a locale with language "en"</li>
+     *   <li>/De:Help if the current locale is a locale with language "de"</li>
+     * </ul>
+     * 
+     * @return the help topic prefix
+     * @see #getHelpTopicPrefix(Locale)
+     */
+    static public String getHelpTopicPrefix() {
+        return getHelpTopicPrefix(Locale.getDefault());
+    }
+
+    /**
+     * Replies the help topic prefix for the given locale. Examples:
+     * <ul>
+     *   <li>/Help if the  locale is a locale with language "en"</li>
+     *   <li>/De:Help if the  locale is a locale with language "de"</li>
+     * </ul>
+     * 
+     * @param locale the locale. {@see Locale#ENGLISH} assumed, if null.
+     * @return the help topic prefix
+     * @see #getHelpTopicPrefix(Locale)
+     */
+    static public String getHelpTopicPrefix(Locale locale) {
+        if (locale == null) {
+            locale = Locale.ENGLISH;
+        }
+        String ret = Main.pref.get("help.pathhelp", "/Help");
+        ret = ret.replaceAll("^\\/+", ""); // remove leading /
+        ret = "/" + LanguageInfo.getWikiLanguagePrefix(locale) + ret;
+        return ret;
+    }
+
+    /**
+     * Replies the absolute, localized help topic for the given topic.
+     * 
+     * Example: for a topic "/Dialog/RelationEditor" and the locale "de", this method
+     * replies "/De:Help/Dialog/RelationEditor"
+     * 
+     * @param topic the relative help topic. Home help topic assumed, if null.
+     * @param locale the locale. {@see Locale#ENGLISH} assumed, if null.
+     * @return the absolute, localized help topic
+     */
+    static public String buildAbsoluteHelpTopic(String topic, Locale locale) {
+        if (locale == null) {
+            locale = Locale.ENGLISH;
+        }
+        if (topic == null || topic.trim().length() == 0 || topic.trim().equals("/"))
+            return getHelpTopicPrefix(locale);
+        String ret = getHelpTopicPrefix(locale);
+        if (topic.startsWith("/")) {
+            ret += topic;
+        } else {
+            ret += "/" + topic;
+        }
+        ret.replaceAll("\\/+", "\\/"); // just in case, collapse sequences of //
+        return ret;
+    }
+
+    /**
+     * Replies the absolute, localized help topic for the given topic and the
+     * current locale.
+     * 
+     * @param topic the relative help topic. Home help topic assumed, if null.
+     * @return the absolute, localized help topic
+     * @see Locale#getDefault()
+     * @see #buildAbsoluteHelpTopic(String, Locale)
+     */
+    static public String buildAbsoluteHelpTopic(String topic) {
+        return buildAbsoluteHelpTopic(topic, Locale.getDefault());
+    }
+
+    /**
+     * Replies the context specific help topic configured for <code>context</code>.
+     * 
+     * @return the help topic. null, if no context specific help topic is found
+     */
+    static public String getContextSpecificHelpTopic(Object context) {
+        if (context == null)
+            return null;
+        if (context instanceof Helpful)
+            return ((Helpful)context).helpTopic();
+        if (context instanceof JMenu) {
+            JMenu b = (JMenu)context;
+            if (b.getClientProperty("help") != null)
+                return (String)b.getClientProperty("help");
+            return null;
+        }
+        if (context instanceof AbstractButton) {
+            AbstractButton b = (AbstractButton)context;
+            if (b.getClientProperty("help") != null)
+                return (String)b.getClientProperty("help");
+            return getContextSpecificHelpTopic(b.getAction());
+        }
+        if (context instanceof Action)
+            return (String)((Action)context).getValue("help");
+        if (context instanceof JComponent && ((JComponent)context).getClientProperty("help") != null)
+            return (String)((JComponent)context).getClientProperty("help");
+        if (context instanceof Component)
+            return getContextSpecificHelpTopic(((Component)context).getParent());
+        return null;
+    }
+
+    /**
      * Makes a component aware of context sensitive help.
      * 
-     * @param component the component
-     * @param topic the help topic
-     */
-    static public void setHelpContext(JComponent component, String topic) {
+     * A relative help topic doesn't start with /Help and doesn't include a locale
+     * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
+     * is not.
+     * 
+     * 
+     * @param component the component  the component
+     * @param topic the help topic. Set to the default help topic if null.
+     */
+    static public void setHelpContext(JComponent component, String relativeHelpTopic) {
+        if (relativeHelpTopic == null) {
+            relativeHelpTopic = "";
+        }
         component.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_F1,0), "help");
         component.getActionMap().put("help", Main.main.menu.help);
-        component.putClientProperty("help", topic);
-    }
-
+        component.putClientProperty("help", relativeHelpTopic);
+    }
+
+    /**
+     * This is a simple marker method for help topic literals. If you declare a help
+     * topic literal in the source you should enclose it in ht(...).
+     * 
+     *  <strong>Example</strong>
+     *  <pre>
+     *     String helpTopic = ht("/Dialog/RelationEditor");
+     *  or
+     *     putValue("help", ht("/Dialog/RelationEditor"));
+     *  </pre>
+     * 
+     * 
+     * @param helpTopic
+     */
+    static public String ht(String helpTopic) {
+        // this is just a marker method
+        return helpTopic;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/help/help-browser.css

@@ -19 +19 @@
 tt {font-family: Courier New}
 pre {font-family: Courier New}
+.warning-header {
+        font-family: Arial, sans-serif; 
+        font-size:24pt; 
+        font-weight:bold
+}
+.warning-body {
+        background-color:rgb(253,255,221);
+        padding: 10pt; 
+        border-color:rgb(128,128,128);
+        border-style: solid; 
+        border-width: 1px;
+}
+
+.error-header {
+        font-family: Arial, sans-serif; 
+        font-size:24pt; 
+        font-weight:bold
+}
+.error-body {
+        background-color:rgb(254,195,190);
+        padding: 10pt; 
+        border-color:rgb(128,128,128);
+        border-style: solid; 
+        border-width: 1px;
+}

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -192 +192 @@
                 JComponent.WHEN_IN_FOCUSED_WINDOW
         );
-
-        pnl.add(new SideButton(new ContextSensitiveHelpAction("/Help/Dialogs/UploadDialog")));
-        HelpUtil.setHelpContext(getRootPane(),"/Help/Dialogs/UploadDialog");
+        pnl.add(new SideButton(new ContextSensitiveHelpAction("/Dialogs/UploadDialog")));
+        HelpUtil.setHelpContext(getRootPane(),"/Dialogs/UploadDialog");
         return pnl;
     }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -376 +376 @@
                         public void actionPerformed(ActionEvent e) {
                             HelpBrowser b = new HelpBrowser();
-                            b.setUrlForHelpTopic("Help/Concepts/Conflict");
+                            b.openHelpTopic("Help/Concepts/Conflict");
                             b.setVisible(true);
                         }
@@ -383 +383 @@
             dialog.setContentPane(pane);
             dialog.pack();
-            HelpUtil.setHelpContext(dialog.getRootPane(), "Concepts/Conflict");
+            HelpUtil.setHelpContext(dialog.getRootPane(), "/Concepts/Conflict");
             WindowGeometry.centerOnScreen(dialog.getSize()).applySafe(dialog);
             dialog.setVisible(true);

trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java

@@ -3 +3 @@
 
 import java.util.Locale;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 public class LanguageInfo {
-    static public String getLanguageCodeWiki()
-    {
-        String languageCode = getLanguageCode();
-        if(languageCode.equals("en"))
+
+    /**
+     * Replies the wiki language prefix for the given locale. The wiki language
+     * prefix has the form 'Xy:' where 'Xy' is a ISO 639 language code in title
+     * case.
+     * 
+     * @param locale  the locale
+     * @return the wiki language prefix
+     */
+    static public String getWikiLanguagePrefix(Locale locale) {
+        String code = getJOSMLocaleCode(locale);
+        if (code.length() == 2) {
+            if (code.equals("en")) return "";
+        } else if (code.matches("[^_]+_[^_]+")) {
+            code = code.substring(0,2);
+        } else {
+            System.err.println(tr("Warning: failed to derive wiki language prefix from JOSM locale code ''{0}''. Using default code ''en''.", code));
             return "";
-        else if(languageCode.equals("pt_BR"))
-            return "Pt:";
-        return languageCode.substring(0,1).toUpperCase() + languageCode.substring(1) + ":";
+        }
+        return code.substring(0,1).toUpperCase() + code.substring(1) + ":";
     }
-    static public String getLanguageCode()
-    {
-        String full = Locale.getDefault().toString();
+
+    /**
+     * Replies the wiki language prefix for the current locale.
+     * 
+     * @return the wiki language prefix
+     * @see Locale#getDefault()
+     * @see #getWikiLanguagePrefix(Locale)
+     */
+    static public String getWikiLanguagePrefix() {
+        return getWikiLanguagePrefix(Locale.getDefault());
+    }
+
+    /**
+     * Replies the JOSM locale code for the default locale.
+     * 
+     * @return the JOSM locale code for the default locale
+     * @see #getJOSMLocaleCode(Locale)
+     */
+    static public String getJOSMLocaleCode() {
+        return getJOSMLocaleCode(Locale.getDefault());
+    }
+
+    /**
+     * Replies the local code used by JOSM for a given locale.
+     * 
+     * In most cases JOSM uses the 2-character ISO 639 language code ({@see Locale#getLanguage()}
+     * to identify the locale of a localized resource, but in some cases it may use the
+     * programmatic name for locales, as replied by {@see Locale#toString()}.
+     * 
+     * @param locale the locale. Replies "en" if null.
+     * @return the JOSM code for the given locale
+     */
+    static public String getJOSMLocaleCode(Locale locale) {
+        if (locale == null) return "en";
+        String full = locale.toString();
         if (full.equals("iw_IL"))
             return "he";
@@ -22 +67 @@
         else if (full.equals("en_GB"))
             return full;
-        return Locale.getDefault().getLanguage();
+
+        return locale.getLanguage();
     }
+
+
     static public String getLanguageCodeXML()
     {
-        return getLanguageCode()+".";
+        return getJOSMLocaleCode()+".";
     }
     static public String getLanguageCodeManifest()
     {
-        return getLanguageCode()+"_";
+        return getJOSMLocaleCode()+"_";
     }
 }

trunk/src/org/openstreetmap/josm/tools/WikiReader.java

@@ -35 +35 @@
      * pathes etc..
      * 
-     * @return Either the string of the content of the wiki page.
+     * @return
      * @throws IOException Throws, if the page could not be loaded.
      */
@@ -46 +46 @@
 
     public String readLang(String text) {
-        String languageCode = LanguageInfo.getLanguageCodeWiki();
+        String languageCode = LanguageInfo.getWikiLanguagePrefix();
         String url = baseurl + "/wiki/" + languageCode + text;
         String res = "";