Changeset 339 in josm for trunk/src/org

Timestamp:

2007-10-04T10:32:45+02:00 (17 years ago)

Author:

imi

Message:

• removed links to old website eigenheimstrasse.de

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HelpAction.java (modified) (1 diff)
• gui/ConflictResolver.java (modified) (1 diff)
• gui/preferences/TaggingPresetPreference.java (modified) (1 diff)

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

@@ -47 +47 @@
 
         private JFrame helpBrowser = new JFrame("JOSM Online Help");
-        private String baseurl = Main.pref.get("help.baseurl", "http://josm.eigenheimstrasse.de");
+        private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
         private JEditorPane help = new JEditorPane();
         private WikiReader reader = new WikiReader(baseurl);

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

@@ -162 +162 @@
                 }
                 
-                if (this.conflicts.isEmpty()) {
-                        JOptionPane.showMessageDialog(Main.parent,
-                                        "The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
-                                        "Of course, this is a bug.\n"+
-                                        "The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
-                                        "If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
-                                        "files you opened (have them ready?) to display this message again, pretty please\n"+
-                                        "inform Imi at josm@eigenheimstrasse.de about the details.\n"+
-                                        "Thanks.");
-                        //throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
-                }
 
                 // have to initialize the JTables here and not in the declaration, because its constructor

trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

@@ -74 +74 @@
                 taggingPresetSources.setVisibleRowCount(3);
 
-                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.eigenheimstrasse.de/wiki/TaggingPresets for help."));
+                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.openstreetmap.de/wiki/TaggingPresets for help."));
                 addAnno.setToolTipText(tr("Add a new tagging preset source to the list."));
                 deleteAnno.setToolTipText(tr("Delete the selected source from the list."));