Changeset 3969 in josm for trunk/src/org

Timestamp:

2011-03-09T20:10:10+01:00 (13 years ago)

Author:

bastiK

Message:

MapCSS: fixe related to layers

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/DuplicateAction.java (modified) (2 diffs)
• gui/MainMenu.java (modified) (2 diffs)
• gui/mappaint/MultiCascade.java (modified) (2 diffs)
• gui/mappaint/NodeElemStyle.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

@@ -9 +9 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import org.openstreetmap.josm.Main;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -24 +25 @@
 
     public void actionPerformed(ActionEvent e) {
-        new PasteAction().pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e);
+        Main.main.menu.paste.pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e);
     }
 

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -124 +124 @@
     public final RedoAction redo = new RedoAction();
     public final JosmAction copy = new CopyAction();
-    public final JosmAction paste = new PasteAction();
+    public final PasteAction paste = new PasteAction();
     public final JosmAction pasteTags = new PasteTagsAction();
     public final JosmAction duplicate = new DuplicateAction();
@@ -133 +133 @@
     public final JosmAction selectAll = new SelectAllAction();
     public final JosmAction unselectAll = new UnselectAllAction();
-    /* crashes when loading data, if using JosmAction for search */
     public final JosmAction search = new SearchAction();
     public final JosmAction preferences = new PreferencesAction();

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

@@ -38 +38 @@
                 // Everything that is not on the default layer is assumed to
                 // be a modifier. Can be overridden in style definition.
-                if (!layer.equals("default")) {
+                if (!layer.equals("default") && !layer.equals("*")) {
                     c.put("modifier", true);
                 }
@@ -59 +59 @@
         if (c == null) {
             c = new Cascade();
-            if (!layer.equals("default")) {
+            if (!layer.equals("default") && !layer.equals("*")) {
                 c.put("modifier", true);
             }

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

@@ -126 +126 @@
         MultiCascade mc = new MultiCascade();
         Cascade c = mc.getOrCreateCascade("default");
-        c.put("text", "auto");
+        c.put("text", Keyword.AUTO);
         SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), true);
     }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -160 +160 @@
                             }
                         }
-                    } else {
-                        env.layer = sub;
-                        for (Instruction i : r.declaration) {
-                            i.execute(env);
-                        }
+                    } 
+                    env.layer = sub;
+                    for (Instruction i : r.declaration) {
+                        i.execute(env);
                     }
                 }