Changeset 3848 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

Timestamp:

2011-02-02T23:03:00+01:00 (13 years ago)

Author:

bastiK

Message:

Experimental mapcss support. All *.java files in the gui/mappaint/mapcss/parser folder are generated from the javacc source file MapCSSParser.jj in the same folder. The generated code sums up to 2700 lines, there is no further build dependency.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.Point;
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -22 +21 @@
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
+import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
@@ -29 +29 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.SideButton;
-import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.MapPaintStyleLoader;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
@@ -151 +151 @@
                 model.fireTableDataChanged();
             }
-            ElemStyles.cacheIdx++;
+            MapPaintStyles.getStyles().clearCached();
             Main.map.mapView.preferenceChanged(null);
             Main.map.mapView.repaint();
@@ -207 +207 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            int[] pos = tblStyles.getSelectedRows();
-            for (int p : pos) {
-                StyleSource s = model.data.get(p);
-                s.loadStyleSource();
-            }
-            ElemStyles.cacheIdx++;
-            Main.map.mapView.preferenceChanged(null);
-            Main.map.mapView.repaint();
-        }
-    }
-
+
+            final int[] rows = tblStyles.getSelectedRows();
+            List<StyleSource> sources = new ArrayList<StyleSource>();
+            for (int p : rows) {
+                sources.add(model.data.get(p));
+            }
+            Main.worker.submit(new MapPaintStyleLoader(sources));
+            Main.worker.submit(new Runnable() {
+                @Override
+                public void run() {
+                    SwingUtilities.invokeLater(new Runnable() {
+                        @Override
+                        public void run() {
+                            if (rows.length == 1) {
+                                model.fireTableCellUpdated(rows[0], 1);
+                            } else {
+                                model.fireTableDataChanged();
+                            }
+                            MapPaintStyles.getStyles().clearCached();
+                            Main.map.mapView.preferenceChanged(null);
+                            Main.map.mapView.repaint();
+                        }
+                    });
+                }
+            });
+        }
+    }
+    
     class PopupMenuHandler extends PopupMenuLauncher {
         @Override