Changeset 7330 in josm for trunk/src


Ignore:
Timestamp:
2014-07-25T18:37:16+02:00 (6 years ago)
Author:
Don-vip
Message:

remove XML version of default map style. Moved to wiki for reference: https://josm.openstreetmap.de/wiki/Styles/LegacyStandard

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r7111 r7330  
    104104    /**
    105105     * If the primitive is annotated with a tag such as note, fixme, etc.
    106      * Match the "work in progress" tags in default elemstyles.xml.
     106     * Match the "work in progress" tags in default map style.
    107107     */
    108108    protected static final int FLAG_ANNOTATED = 1 << 12;
  • trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

    r7139 r7330  
    269269                }
    270270            }
    271            
     271
    272272            /* Migration code can be removed ~ Nov. 2014 */
    273273            if (!Main.pref.getBoolean("mappaint.style.migration.switchedToMapCSS", false)) {
     
    299299        @Override
    300300        public Collection<ExtendedSourceEntry> getDefault() {
    301             ExtendedSourceEntry defJosmXml = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
    302             defJosmXml.active = false;
    303             defJosmXml.name = "standard";
    304             defJosmXml.title = tr("JOSM default (XML; old version)");
    305             defJosmXml.description = tr("Internal style to be used as base for runtime switchable overlay styles");
    306301            ExtendedSourceEntry defJosmMapcss = new ExtendedSourceEntry("elemstyles.mapcss", "resource://styles/standard/elemstyles.mapcss");
    307302            defJosmMapcss.active = true;
     
    315310            defPL2.description = tr("the main Potlatch 2 style");
    316311
    317             return Arrays.asList(new ExtendedSourceEntry[] { defJosmXml, defJosmMapcss, defPL2 });
     312            return Arrays.asList(new ExtendedSourceEntry[] { defJosmMapcss, defPL2 });
    318313        }
    319314
Note: See TracChangeset for help on using the changeset viewer.