Changeset 3864 in josm

Timestamp:

2011-02-07T10:34:07+01:00 (14 years ago)

Author:

bastiK

Message:

change in build: do not copy elemstyles.xml to data folder, but distribute the entire styles folder like it is done with 'images' and 'data' (toplevel) folders

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java (modified) (1 diff)
• styles/maxspeed (deleted)
• styles_nodist (added)
• styles_nodist/maxspeed (added)
• styles_nodist/maxspeed/elemstyles.xml (copied) (copied from trunk/styles/maxspeed/elemstyles.xml )
• styles_nodist/standard (added)
• styles_nodist/standard/README.txt (moved) (moved from trunk/styles/standard/README.txt )
• styles_nodist/standard/elemstyles_gb.xml (moved) (moved from trunk/styles/standard/elemstyles_gb.xml )
• styles_nodist/standard/makefile (moved) (moved from trunk/styles/standard/makefile )
• styles_nodist/standard/overview.osm (moved) (moved from trunk/styles/standard/overview.osm )
• styles_nodist/standard/overview.xsl (moved) (moved from trunk/styles/standard/overview.xsl )

trunk/build.xml

@@ -83 +83 @@
                 <copy file="LICENSE" todir="build"/>
 
-                <!-- styles -->
-                <copy file="styles/standard/elemstyles.xml" todir="build/data"/>
-
                 <!-- create josm-custom.jar -->
                 <delete file="dist/josm-custom.jar"/>
@@ -97 +94 @@
                         <zipfileset dir="images" prefix="images" />
                         <zipfileset dir="data" prefix="data" />
+                        <zipfileset dir="styles" prefix="styles" />
                         <zipfileset dir="src/org/openstreetmap/gui/jmapviewer/images" prefix="org/openstreetmap/gui/jmapviewer/images" />
 

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

@@ -173 +173 @@
 
         @Override
+        public List<SourceEntry> get() {
+            List<SourceEntry> ls = super.get();
+            if (adapt_elemstyles_xml(ls)) {
+                put(ls);
+            }
+            return ls;
+        }
+
+        /**
+         * The internal path of elemstyles.xml has changed, this
+         * can be removed when a few months have passed.
+         */
+        private boolean adapt_elemstyles_xml(List<SourceEntry> ls) {
+            boolean changed = false;
+            for (SourceEntry se : ls) {
+                if (se.url.equals("resource://data/elemstyles.xml")) {
+                    se.url = "resource://styles/standard/elemstyles.xml";
+                    changed = true;
+                }
+            }
+            return changed;
+        }
+
+        @Override
         public Collection<ExtendedSourceEntry> getDefault() {
-            ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://data/elemstyles.xml");
+            ExtendedSourceEntry i = new ExtendedSourceEntry("elemstyles.xml", "resource://styles/standard/elemstyles.xml");
             i.name = "standard";
             i.shortdescription = tr("Internal Style");