Changeset 339 in josm for trunk/src


Ignore:
Timestamp:
2007-10-04T10:32:45+02:00 (14 years ago)
Author:
imi
Message:
  • removed links to old website eigenheimstrasse.de
Location:
trunk/src/org/openstreetmap/josm
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/HelpAction.java

    r298 r339  
    4747
    4848        private JFrame helpBrowser = new JFrame("JOSM Online Help");
    49         private String baseurl = Main.pref.get("help.baseurl", "http://josm.eigenheimstrasse.de");
     49        private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
    5050        private JEditorPane help = new JEditorPane();
    5151        private WikiReader reader = new WikiReader(baseurl);
  • trunk/src/org/openstreetmap/josm/gui/ConflictResolver.java

    r298 r339  
    162162                }
    163163               
    164                 if (this.conflicts.isEmpty()) {
    165                         JOptionPane.showMessageDialog(Main.parent,
    166                                         "The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
    167                                         "Of course, this is a bug.\n"+
    168                                         "The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
    169                                         "If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
    170                                         "files you opened (have them ready?) to display this message again, pretty please\n"+
    171                                         "inform Imi at josm@eigenheimstrasse.de about the details.\n"+
    172                                         "Thanks.");
    173                         //throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
    174                 }
    175164
    176165                // have to initialize the JTables here and not in the declaration, because its constructor
  • trunk/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java

    r298 r339  
    7474                taggingPresetSources.setVisibleRowCount(3);
    7575
    76                 taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.eigenheimstrasse.de/wiki/TaggingPresets for help."));
     76                taggingPresetSources.setToolTipText(tr("The sources (url or filename) of tagging preset definition files. See http://josm.openstreetmap.de/wiki/TaggingPresets for help."));
    7777                addAnno.setToolTipText(tr("Add a new tagging preset source to the list."));
    7878                deleteAnno.setToolTipText(tr("Delete the selected source from the list."));
Note: See TracChangeset for help on using the changeset viewer.