Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 6897) @@ -110,13 +110,13 @@ /** * The JOSM website URL. - * @since 6143 - */ - public static final String JOSM_WEBSITE = "http://josm.openstreetmap.de"; + * @since 6897 (was public from 6143 to 6896) + */ + private static final String JOSM_WEBSITE = "http://josm.openstreetmap.de"; /** * The OSM website URL. - * @since 6453 - */ - public static final String OSM_WEBSITE = "http://www.openstreetmap.org"; + * @since 6897 (was public from 6453 to 6896) + */ + private static final String OSM_WEBSITE = "http://www.openstreetmap.org"; /** @@ -1484,3 +1484,36 @@ return new HashMap(NETWORK_ERRORS); } + + /** + * Returns the JOSM website URL. + * @return the josm website URL + * @since 6897 + */ + public static String getJOSMWebsite() { + if(Main.pref != null) + return Main.pref.get("josm.url", JOSM_WEBSITE); + return JOSM_WEBSITE; + } + + /** + * Returns the JOSM XML URL. + * @return the josm XML URL + * @since 6897 + */ + public static String getXMLBase() { + if(Main.pref != null) + return Main.pref.get("xml.url", JOSM_WEBSITE); + return JOSM_WEBSITE; + } + + /** + * Returns the OSM website URL. + * @return the OSM website URL + * @since 6897 + */ + public static String getOSMWebsite() { + if(Main.pref != null) + return Main.pref.get("osm.url", OSM_WEBSITE); + return OSM_WEBSITE; + } } Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java (revision 6897) @@ -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(Main.JOSM_WEBSITE,2), GBC.eol().fill(GBC.HORIZONTAL)); + info.add(new UrlLabel(Main.getJOSMWebsite(),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/actions/AbstractInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 6897) @@ -48,5 +48,5 @@ if (ret.startsWith("http://api.openstreetmap.org/")) { ret = ret.substring("http://api.openstreetmap.org/".length()); - ret = Main.OSM_WEBSITE + "/" + ret; + ret = Main.getOSMWebsite() + "/" + ret; } return ret; @@ -67,5 +67,5 @@ if (ret.startsWith("http://api.openstreetmap.org/")) { ret = ret.substring("http://api.openstreetmap.org/".length()); - ret = Main.OSM_WEBSITE + "/" + ret; + ret = Main.getOSMWebsite() + "/" + ret; } return ret; Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 6897) @@ -1307,5 +1307,5 @@ * The default plugin site */ - private static final String[] DEFAULT_PLUGIN_SITE = {Main.JOSM_WEBSITE+"/plugin%"}; + private static final String[] DEFAULT_PLUGIN_SITE = {Main.getJOSMWebsite()+"/plugin%"}; /** @@ -1554,5 +1554,5 @@ StringBuilder b = new StringBuilder( "\n" + - "\n"); SettingToXml toXml = new SettingToXml(b, nopass); Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/gpx/GpxConstants.java (revision 6897) @@ -26,5 +26,5 @@ public static final String META_EXTENSIONS = META_PREFIX + "extensions"; - public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.JOSM_WEBSITE + "/gpx-extensions-1.0"; + public static final String JOSM_EXTENSIONS_NAMESPACE_URI = Main.getXMLBase() + "/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 6896) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (revision 6897) @@ -26,5 +26,5 @@ private static final String[] DEFAULT_LAYER_SITES = { - Main.JOSM_WEBSITE+"/maps" + Main.getJOSMWebsite()+"/maps" }; Index: trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/imagery/types/ProjectionType.java (revision 6897) @@ -25,5 +25,5 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="entry" type="{http://josm.openstreetmap.de/wms-cache}entry" maxOccurs="unbounded" minOccurs="0"/> + * <element name="entry" type="{http://josm.openstreetmap.de/wms-cache-1.0}entry" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> Index: trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/imagery/types/WmsCacheType.java (revision 6897) @@ -26,5 +26,5 @@ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="projection" type="{http://josm.openstreetmap.de/wms-cache}projection" maxOccurs="unbounded" minOccurs="0"/> + * <element name="projection" type="{http://josm.openstreetmap.de/wms-cache-1.0}projection" maxOccurs="unbounded" minOccurs="0"/> * </sequence> * <attribute name="tileSize" use="required" type="{http://www.w3.org/2001/XMLSchema}int" /> Index: trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/imagery/types/package-info.java (revision 6897) @@ -6,4 +6,4 @@ // -@javax.xml.bind.annotation.XmlSchema(namespace = "http://josm.openstreetmap.de/wms-cache", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@javax.xml.bind.annotation.XmlSchema(namespace = "http://josm.openstreetmap.de/wms-cache-1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.openstreetmap.josm.data.imagery.types; Index: trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/oauth/OAuthParameters.java (revision 6897) @@ -32,13 +32,13 @@ * The default OSM OAuth request token URL. */ - public static final String DEFAULT_REQUEST_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/request_token"; + public static final String DEFAULT_REQUEST_TOKEN_URL = Main.getOSMWebsite() + "/oauth/request_token"; /** * The default OSM OAuth access token URL. */ - public static final String DEFAULT_ACCESS_TOKEN_URL = Main.OSM_WEBSITE + "/oauth/access_token"; + public static final String DEFAULT_ACCESS_TOKEN_URL = Main.getOSMWebsite() + "/oauth/access_token"; /** * The default OSM OAuth authorize URL. */ - public static final String DEFAULT_AUTHORISE_URL = Main.OSM_WEBSITE + "/oauth/authorize"; + public static final String DEFAULT_AUTHORISE_URL = Main.getOSMWebsite() + "/oauth/authorize"; Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java (revision 6897) @@ -231,5 +231,6 @@ /** - * Determines the {@code index}-th key/value/tag (depending on {@code type}) of the {@link Selector.GeneralSelector}. + * Determines the {@code index}-th key/value/tag (depending on {@code type}) of the + * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector}. */ static String determineArgument(Selector.GeneralSelector matchingSelector, int index, String type) { Index: trunk/src/org/openstreetmap/josm/gui/GettingStarted.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/GettingStarted.java (revision 6897) @@ -160,5 +160,5 @@ private String fixImageLinks(String s) { - Matcher m = Pattern.compile("src=\""+Main.JOSM_WEBSITE+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s); + Matcher m = Pattern.compile("src=\""+Main.getJOSMWebsite()+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s); StringBuffer sb = new StringBuffer(); while (m.find()) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java (revision 6897) @@ -72,5 +72,5 @@ + "

" + tr("Examples") + "

" + "" Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java (revision 6897) @@ -28,5 +28,5 @@ */ public static String getWikiBaseUrl() { - return Main.pref.get("help.baseurl", Main.JOSM_WEBSITE); + return Main.pref.get("help.baseurl", Main.getJOSMWebsite()); } Index: trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (revision 6897) @@ -230,5 +230,5 @@ * @param monitor * @see MemoryTileCache#clear() - * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.OsmFileCacheTileLoader.TileClearController) + * @see OsmFileCacheTileLoader#clearCache(org.openstreetmap.gui.jmapviewer.interfaces.TileSource, org.openstreetmap.gui.jmapviewer.interfaces.TileClearController) */ void clearTileCache(ProgressMonitor monitor) { Index: trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 6897) @@ -679,5 +679,5 @@ * Finds the most suitable resolution for the current zoom level, but prefers * higher resolutions. Snaps to values defined in snapLevels. - * @return + * @return best zoom level */ private static double getBestZoom() { Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java (revision 6897) @@ -43,5 +43,5 @@ JPanel msg = new JPanel(new GridBagLayout()); msg.add(new JLabel(tr("Upload of unprocessed GPS data as map data is considered harmful.
If you want to upload traces, look here:")), GBC.eol()); - msg.add(new UrlLabel(Main.OSM_WEBSITE + "/traces", 2), GBC.eop()); + msg.add(new UrlLabel(Main.getOSMWebsite() + "/traces", 2), GBC.eop()); if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, JOptionPane.OK_OPTION)) { return; Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParser.jj (revision 6897) @@ -30,4 +30,39 @@ import org.openstreetmap.josm.tools.Utils; import org.openstreetmap.josm.Main; + +/************* + * 
+ * Parser definitions
+ *
+ *                       rule
+ *  _______________________|______________________________
+ * |                                                      |
+ *        selector                      declaration
+ *  _________|___________________   _________|____________
+ * |                             | |                      |
+ *
+ * way|z11-12[highway=residential] { color: red; width: 3 }
+ *
+ *    |_____||___________________|   |_________|
+ *       |            |                   |
+ *     zoom       condition          instruction
+ *
+ * more general:
+ *
+ * way|z13-[a=b][c=d]::subpart, way|z-3[u=v]:closed::subpart2 { p1 : val; p2 : val; }
+ *
+ * 'val' can be a literal, or an expression like "prop(width, default) + 0.8".
+ *
+ * {@literal @media} { ... } queries are supported, following http://www.w3.org/TR/css3-mediaqueries/#syntax
+ *
+ *                               media_query
+ *         ___________________________|_______________________________
+ *        |                                                           |
+ * {@literal @media} all and (min-josm-version: 7789) and (max-josm-version: 7790), all and (user-agent: xyz) { ... }
+ *                |______________________|
+ *                          |
+ *                    media_expression
+ *
+ */ public class MapCSSParser { @@ -112,37 +147,4 @@ } -/************* - * Parser definitions - * - * rule - * _______________________|______________________________ - * | | - * selector declaration - * _________|___________________ _________|____________ - * | | | | - * - * way|z11-12[highway=residential] { color: red; width: 3 } - * - * |_____||___________________| |_________| - * | | | - * zoom condition instruction - * - * more general: - * - * way|z13-[a=b][c=d]::subpart, way|z-3[u=v]:closed::subpart2 { p1 : val; p2 : val; } - * - * 'val' can be a literal, or an expression like "prop(width, default) + 0.8". - * - * @media { ... } queries are supported, following http://www.w3.org/TR/css3-mediaqueries/#syntax - * - * media_query - * ___________________________|_______________________________ - * | | - * @media all and (min-josm-version: 7789) and (max-josm-version: 7790), all and (user-agent: xyz) { ... } - * |______________________| - * | - * media_expression - */ - int uint() : { Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (revision 6897) @@ -311,5 +311,6 @@ /** - * Super class of {@link GeneralSelector} and {@link LinkSelector}. + * Super class of {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.GeneralSelector} and + * {@link org.openstreetmap.josm.gui.mappaint.mapcss.Selector.LinkSelector}. * @since 5841 */ Index: trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (revision 6897) @@ -80,5 +80,5 @@ XmlObjectParser parser = new XmlObjectParser(new XmlStyleSourceHandler(this)); parser.startWithValidation(reader, - Main.JOSM_WEBSITE+"/mappaint-style-1.0", + Main.getXMLBase()+"/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 6896) +++ trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6897) @@ -87,5 +87,5 @@ public MapPaintSourceEditor() { - super(SourceType.MAP_PAINT_STYLE, Main.JOSM_WEBSITE+"/styles", styleSourceProviders, true); + super(SourceType.MAP_PAINT_STYLE, Main.getJOSMWebsite()+"/styles", styleSourceProviders, true); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6897) @@ -192,5 +192,5 @@ public TaggingPresetSourceEditor() { - super(SourceType.TAGGING_PRESET, Main.JOSM_WEBSITE+"/presets", presetSourceProviders, true); + super(SourceType.TAGGING_PRESET, Main.getJOSMWebsite()+"/presets", presetSourceProviders, true); } Index: trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/preferences/validator/ValidatorTagCheckerRulesPreference.java (revision 6897) @@ -58,5 +58,5 @@ public TagCheckerRulesSourceEditor() { - super(SourceType.TAGCHECKER_RULE, Main.JOSM_WEBSITE+"/rules", ruleSourceProviders, false); + super(SourceType.TAGCHECKER_RULE, Main.getJOSMWebsite()+"/rules", ruleSourceProviders, false); } Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetReader.java (revision 6897) @@ -105,5 +105,5 @@ if (validate) { - parser.startWithValidation(in, Main.JOSM_WEBSITE+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd"); + parser.startWithValidation(in, Main.getXMLBase()+"/tagging-preset-1.0", "resource://data/tagging-preset.xsd"); } else { parser.start(in); Index: trunk/src/org/openstreetmap/josm/io/MessageNotifier.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MessageNotifier.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/io/MessageNotifier.java (revision 6897) @@ -67,5 +67,5 @@ JPanel panel = new JPanel(new GridBagLayout()); panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)), GBC.eol()); - panel.add(new UrlLabel(Main.OSM_WEBSITE + "/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol()); + panel.add(new UrlLabel(Main.getOSMWebsite() + "/user/"+userInfo.getDisplayName()+"/inbox", tr("Click here to see your inbox.")), GBC.eol()); panel.setOpaque(false); new Notification().setContent(panel) Index: trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/ImportHandler.java (revision 6897) @@ -58,5 +58,5 @@ @Override public String[] getUsageExamples() { - return new String[] { "/import?url="+Main.JOSM_WEBSITE+"/browser/josm/trunk/data_nodist/direction-arrows.osm" }; + return new String[] { "/import?url="+Main.getJOSMWebsite()+"/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 6896) +++ trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java (revision 6897) @@ -162,5 +162,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(Main.JOSM_WEBSITE,2), GBC.eop().insets(8,0,0,0)); + p.add(new UrlLabel(Main.getJOSMWebsite(),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 " + @@ -174,5 +174,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(Main.JOSM_WEBSITE+"/newticket",2), GBC.eop().insets(8,0,0,0)); + p.add(new UrlLabel(Main.getJOSMWebsite()+"/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()); @@ -217,5 +217,5 @@ Utils.close(gzip); - return new URL(Main.JOSM_WEBSITE+"/josmticket?" + + return new URL(Main.getJOSMWebsite()+"/josmticket?" + "gdata="+Base64.encode(ByteBuffer.wrap(out.toByteArray()), true)); } catch (IOException e) { @@ -234,5 +234,5 @@ URL url = getBugReportUrl(debugText); if (url != null) { - return new UrlLabel(url.toString(), Main.JOSM_WEBSITE+"/josmticket?...", 2); + return new UrlLabel(url.toString(), Main.getJOSMWebsite()+"/josmticket?...", 2); } return null; Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java (revision 6897) @@ -304,5 +304,5 @@ double lon = (Math.round(dlon * decimals)); lon /= decimals; - return Main.OSM_WEBSITE + "/#map="+zoom+"/"+lat+"/"+lon; + return Main.getOSMWebsite() + "/#map="+zoom+"/"+lat+"/"+lon; } } Index: trunk/src/org/openstreetmap/josm/tools/WikiReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 6896) +++ trunk/src/org/openstreetmap/josm/tools/WikiReader.java (revision 6897) @@ -30,5 +30,5 @@ */ public WikiReader() { - this.baseurl = Main.pref.get("help.baseurl", Main.JOSM_WEBSITE); + this.baseurl = Main.pref.get("help.baseurl", Main.getJOSMWebsite()); } @@ -114,4 +114,6 @@ String b = ""; String full = ""; + String baseurlus = baseurl.replace("https:","http:"); + String baseurlse = baseurlus.replace("http:","https:"); for (String line = in.readLine(); line != null; line = in.readLine()) { full += line; @@ -136,5 +138,6 @@ b += line.replaceAll(".", "") - .replaceAll("href=\"/", "href=\"" + baseurl + "/") + .replaceAll("href=\"/", "href=\"" + baseurlus + "/") + .replaceAll("href=\"/", "href=\"" + baseurlse + "/") .replaceAll(" />", ">") + "\n";