Index: /trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- /trunk/src/org/openstreetmap/josm/Main.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/Main.java (revision 6143) @@ -69,4 +69,5 @@ import org.openstreetmap.josm.gui.NavigatableComponent.ViewportData; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; +import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.gui.io.SaveLayersDialog; import org.openstreetmap.josm.gui.layer.Layer; @@ -101,4 +102,10 @@ abstract public class Main { + /** + * The JOSM website URL. + * @since 6143 + */ + public static final String JOSM_WEBSITE = "http://josm.openstreetmap.de"; + /** * Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if @@ -922,5 +929,5 @@ "
  • use an earlier (Java 5 compatible) version of JOSM.
    • "+ "More Info:", version)+""); - JTextArea link = new JTextArea("http://josm.openstreetmap.de/wiki/Help/SystemRequirements"); + JTextArea link = new JTextArea(HelpUtil.getWikiBaseHelpUrl()+"/Help/SystemRequirements"); link.setEditable(false); link.setBackground(panel.getBackground()); Index: /trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6143) @@ -85,5 +85,5 @@ info.add(GBC.glue(0,10), GBC.eol()); info.add(new JLabel(tr("Homepage")), GBC.std().insets(10,0,10,0)); - info.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eol().fill(GBC.HORIZONTAL)); info.add(GBC.glue(0,5), GBC.eol()); info.add(new JLabel(tr("Bug Reports")), GBC.std().insets(10,0,10,0)); Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6143) @@ -1370,5 +1370,5 @@ */ private final static String[] DEFAULT_PLUGIN_SITE = { - "http://josm.openstreetmap.de/plugin%"}; + Main.JOSM_WEBSITE+"/plugin%"}; /** @@ -1612,8 +1612,8 @@ StringBuilder b = new StringBuilder( "\n" + - "\n"); SettingToXml toXml = new SettingToXml(b, nopass); - Map settings = new TreeMap(); + Map> settings = new TreeMap>(); for (Entry e : properties.entrySet()) { @@ -1629,5 +1629,5 @@ settings.put(e.getKey(), new MapListSetting(e.getValue())); } - for (Entry e : settings.entrySet()) { + for (Entry> e : settings.entrySet()) { toXml.setKey(e.getKey()); e.getValue().visit(toXml); Index: /trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 6143) @@ -4,4 +4,6 @@ import java.util.Arrays; import java.util.List; + +import org.openstreetmap.josm.Main; /** @@ -24,5 +26,5 @@ public static final String META_EXTENSIONS = META_PREFIX + "extensions"; - public static final String JOSM_EXTENSIONS_NAMESPACE_URI = "http://josm.openstreetmap.de/gpx-extensions-1.0"; + public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.JOSM_WEBSITE + "/gpx-extensions-1.0"; public static List WPT_KEYS = Arrays.asList("ele", "time", "magvar", "geoidheight", Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6143) @@ -27,5 +27,5 @@ private final static String[] DEFAULT_LAYER_SITES = { - "http://josm.openstreetmap.de/maps" + Main.JOSM_WEBSITE+"/maps" }; Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6143) @@ -152,5 +152,5 @@ private String fixImageLinks(String s) { - Matcher m = Pattern.compile("src=\"http://josm.openstreetmap.de/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s); + Matcher m = Pattern.compile("src=\""+Main.JOSM_WEBSITE+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s); StringBuffer sb = new StringBuffer(); while (m.find()) { Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 6143) @@ -92,5 +92,5 @@ /** * Displays help on the console - * + * @since 2748 */ public static void showHelp() { @@ -132,16 +132,36 @@ } + /** + * JOSM command line options. + * @see Help/CommandLineOptions + * @since 5279 + */ public enum Option { + /** --help|-h Show this help */ HELP(false), + /** --version Displays the JOSM version and exits */ VERSION(false), + /** --language= Set the language */ LANGUAGE(true), + /** --reset-preferences Reset the preferences to default */ RESET_PREFERENCES(false), + /** --load-preferences= Changes preferences according to the XML file */ LOAD_PREFERENCES(true), + /** --set== Set preference key to value */ SET(true), + /** --geometry=widthxheight(+|-)x(+|-)y Standard unix geometry argument */ GEOMETRY(true), + /** --no-maximize Do not launch in maximized mode */ NO_MAXIMIZE(false), + /** --maximize Launch in maximized mode */ MAXIMIZE(false), + /** --download=minlat,minlon,maxlat,maxlon Download the bounding box
    + * --download= Download the location at the URL (with lat=x&lon=y&zoom=z)
    + * --download= Open a file (any file type that can be opened with File/Open) */ DOWNLOAD(true), + /** --downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw GPS
    + * --downloadgps= Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS */ DOWNLOADGPS(true), + /** --selection= Select with the given search */ SELECTION(true); @@ -154,8 +174,16 @@ } + /** + * Replies the option name + * @return The option name, in lowercase + */ public String getName() { return name; } + /** + * Determines if this option requires an argument. + * @return {@code true} if this option requires an argument, {@code false} otherwise + */ public boolean requiresArgument() { return requiresArgument; Index: /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6143) @@ -24,5 +24,5 @@ */ static public String getWikiBaseUrl() { - return Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); + return Main.pref.get("help.baseurl", Main.JOSM_WEBSITE); } Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6143) @@ -787,5 +787,5 @@ public void actionPerformed(ActionEvent ev) { // Delete small files, because they're probably blank tiles. - // See https://josm.openstreetmap.de/ticket/2307 + // See #2307 cache.cleanSmallFiles(4096); Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6143) @@ -71,5 +71,5 @@ XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this)); parser.startWithValidation(reader, - "http://josm.openstreetmap.de/mappaint-style-1.0", + Main.JOSM_WEBSITE+"/mappaint-style-1.0", "resource://data/mappaint-style.xsd"); while(parser.hasNext()) { Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6143) @@ -89,5 +89,5 @@ public MapPaintSourceEditor() { - super(true, "http://josm.openstreetmap.de/styles", styleSourceProviders); + super(true, Main.JOSM_WEBSITE+"/styles", styleSourceProviders); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6143) @@ -190,5 +190,5 @@ public TaggingPresetSourceEditor() { - super(false, "http://josm.openstreetmap.de/presets", presetSourceProviders); + super(false, Main.JOSM_WEBSITE+"/presets", presetSourceProviders); } Index: /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6143) @@ -75,5 +75,5 @@ if (validate) { - parser.startWithValidation(in, "http://josm.openstreetmap.de/tagging-preset-1.0", "resource://data/tagging-preset.xsd"); + parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd"); } else { parser.start(in); Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java (revision 6143) @@ -24,4 +24,6 @@ import java.util.regex.Pattern; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.gui.help.HelpUtil; import org.openstreetmap.josm.io.remotecontrol.handler.AddNodeHandler; import org.openstreetmap.josm.io.remotecontrol.handler.AddWayHandler; @@ -211,5 +213,5 @@ if (handlerClass == null) { String usage = getUsageAsHtml(); - String websiteDoc = "http://josm.openstreetmap.de/wiki/Help/Preferences/RemoteControl"; + String websiteDoc = HelpUtil.getWikiBaseHelpUrl() +"/Help/Preferences/RemoteControl"; String help = "No command specified! The following commands are available:
      " + usage.toString() Index: /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6143) @@ -53,5 +53,5 @@ @Override public String[] getUsageExamples() { - return new String[] { "/import?urlhttp://josm.openstreetmap.de/browser/josm/trunk/data_nodist/direction-arrows.osm" }; + return new String[] { "/import?url="+Main.JOSM_WEBSITE+"/browser/josm/trunk/data_nodist/direction-arrows.osm" }; } Index: /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6143) @@ -135,5 +135,5 @@ tr("You have encountered an error in JOSM. Before you file a bug report " + "make sure you have updated to the latest version of JOSM here:")), GBC.eol()); - p.add(new UrlLabel("http://josm.openstreetmap.de",2), GBC.eop().insets(8,0,0,0)); + p.add(new UrlLabel(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0)); p.add(new JMultilineLabel( tr("You should also update your plugins. If neither of those help please " + @@ -147,5 +147,5 @@ tr("Alternatively, if that does not work you can manually fill in the information " + "below at this URL:")), GBC.eol()); - p.add(new UrlLabel("http://josm.openstreetmap.de/newticket",2), GBC.eop().insets(8,0,0,0)); + p.add(new UrlLabel(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0)); if (Utils.copyToClipboard(text)) { p.add(new JLabel(tr("(The text has already been copied to your clipboard.)")), GBC.eop()); @@ -196,5 +196,5 @@ Utils.close(gzip); - return new URL("http://josm.openstreetmap.de/josmticket?" + + return new URL(Main.JOSM_WEBSITE+"/josmticket?" + "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true)); } catch (IOException e) { @@ -213,5 +213,5 @@ URL url = getBugReportUrl(debugText); if (url != null) { - return new UrlLabel(url.toString(), "http://josm.openstreetmap.de/josmticket?...", 2); + return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2); } return null; Index: /trunk/src/org/openstreetmap/josm/tools/WikiReader.java =================================================================== --- /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 6142) +++ /trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 6143) @@ -23,5 +23,5 @@ public WikiReader() { - this.baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de"); + this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE); }