Changeset 5219 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2012-05-07T15:05:27+02:00 (12 years ago)

Author:

bastiK

Message:

mapstyles: add automatic reloading of local styles when they have been edited in an extenal editor (based on mtime)

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• LineTextElemStyle.java (modified) (1 diff)
• MapPaintStyles.java (modified) (3 diffs)
• StyleSource.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java

@@ -50 +50 @@
         return text.hashCode();
     }
+
+    @Override
+    public String toString() {
+        return "LineTextElemStyle{" + super.toString() + "text=" + text + "}";
+    }
+
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21 +22 @@
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
+import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.preferences.map.MapPaintPreference.MapPaintPrefHelper;
-import org.openstreetmap.josm.gui.preferences.SourceEntry;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -165 +166 @@
         for (StyleSource source : styles.getStyleSources()) {
             source.loadStyleSource();
-        }
-
+            if (Main.pref.getBoolean("mappaint.auto_reload_local_styles", true)) {
+                if (source.isLocal()) {
+                    File f = new File(source.url);
+                    source.setLastMTime(f.lastModified());
+                }
+            }
+        }
         fireMapPaintSylesUpdated();
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

@@ -26 +26 @@
 
     private ImageIcon imageIcon;
+    private long lastMTime = 0l;
 
     /******
@@ -31 +32 @@
      * of the source file.
      */
-    
+
     public String icon;
 
@@ -104 +105 @@
         return null;
     }
+
+    public long getLastMTime() {
+        return lastMTime;
+    }
+
+    public void setLastMTime(long lastMTime) {
+        this.lastMTime = lastMTime;
+    }
+
+
 }