Changeset 3969 in josm


Ignore:
Timestamp:
2011-03-09T20:10:10+01:00 (14 years ago)
Author:
bastiK
Message:

MapCSS: fixe related to layers

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

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

    r2323 r3969  
    99import java.awt.event.KeyEvent;
    1010import java.util.Collection;
     11import org.openstreetmap.josm.Main;
    1112
    1213import org.openstreetmap.josm.data.osm.OsmPrimitive;
     
    2425
    2526    public void actionPerformed(ActionEvent e) {
    26         new PasteAction().pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e);
     27        Main.main.menu.paste.pasteData(new PrimitiveDeepCopy(getCurrentDataSet().getSelected()), getEditLayer(), e);
    2728    }
    2829
  • trunk/src/org/openstreetmap/josm/gui/MainMenu.java

    r3954 r3969  
    124124    public final RedoAction redo = new RedoAction();
    125125    public final JosmAction copy = new CopyAction();
    126     public final JosmAction paste = new PasteAction();
     126    public final PasteAction paste = new PasteAction();
    127127    public final JosmAction pasteTags = new PasteTagsAction();
    128128    public final JosmAction duplicate = new DuplicateAction();
     
    133133    public final JosmAction selectAll = new SelectAllAction();
    134134    public final JosmAction unselectAll = new UnselectAllAction();
    135     /* crashes when loading data, if using JosmAction for search */
    136135    public final JosmAction search = new SearchAction();
    137136    public final JosmAction preferences = new PreferencesAction();
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java

    r3893 r3969  
    3838                // Everything that is not on the default layer is assumed to
    3939                // be a modifier. Can be overridden in style definition.
    40                 if (!layer.equals("default")) {
     40                if (!layer.equals("default") && !layer.equals("*")) {
    4141                    c.put("modifier", true);
    4242                }
     
    5959        if (c == null) {
    6060            c = new Cascade();
    61             if (!layer.equals("default")) {
     61            if (!layer.equals("default") && !layer.equals("*")) {
    6262                c.put("modifier", true);
    6363            }
  • trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java

    r3968 r3969  
    126126        MultiCascade mc = new MultiCascade();
    127127        Cascade c = mc.getOrCreateCascade("default");
    128         c.put("text", "auto");
     128        c.put("text", Keyword.AUTO);
    129129        SIMPLE_NODE_ELEMSTYLE = create(new Environment(null, mc, "default", null), true);
    130130    }
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r3902 r3969  
    160160                            }
    161161                        }
    162                     } else {
    163                         env.layer = sub;
    164                         for (Instruction i : r.declaration) {
    165                             i.execute(env);
    166                         }
     162                    }
     163                    env.layer = sub;
     164                    for (Instruction i : r.declaration) {
     165                        i.execute(env);
    167166                    }
    168167                }
Note: See TracChangeset for help on using the changeset viewer.