Ticket #8902: environment.diff

src/org/openstreetmap/josm/gui/mappaint/Environment.java

@@ -77 +77 @@
         return e;
     }
 
+    public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index) {
+        Environment e = new Environment(this);
+        e.parent = parent;
+        e.index = index;
+        e.context = Context.LINK;
+        return e;
+    }
+
     public Environment withChild(OsmPrimitive child) {
         Environment e = new Environment(this);
         e.child = child;
         return e;
     }
 
+
+    public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index) {
+        Environment e = new Environment(this);
+        e.child = child;
+        e.index = index;
+        e.context = Context.LINK;
+        return e;
+    }
+
     public Environment withIndex(int index) {
         Environment e = new Environment(this);
         e.index = index;

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

@@ -166 +166 @@
                     if (sub == null) {
                         sub = "default";
                     }
-
-                    if (sub.equals("*")) {
+                    else if ("*".equals(sub)) {
                         for (Entry<String, Cascade> entry : mc.getLayers()) {
                             env.layer = entry.getKey();
                             if (Utils.equal(env.layer, "*")) {
@@ -176 +175 @@
                             r.execute(env);
                         }
                     }
+
                     env.layer = sub;
                     r.execute(env);
                 }

src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

@@ -107 +107 @@
                 for (int i=0; i<w.getNodesCount(); i++) {
                     Node n = w.getNode(i);
                     if (n.equals(e.osm)) {
-                        if (link.matches(e.withParent(w).withIndex(i).withLinkContext())) {
+                        if (link.matches(e.withParentAndIndexAndLinkContext(w, i))) {
                             e.parent = w;
                             e.index = i;
                             return;
@@ -129 +129 @@
                 for (int i=0; i < r.getMembersCount(); i++) {
                     RelationMember m = r.getMember(i);
                     if (m.getMember().equals(e.osm)) {
-                        if (link.matches(e.withParent(r).withIndex(i).withLinkContext())) {
+                        if (link.matches(e.withParentAndIndexAndLinkContext(r, i))) {
                             e.parent = r;
                             e.index = i;
                             return;
@@ -155 +155 @@
                     for (int i=0; i<wayNodes.size(); i++) {
                         Node n = wayNodes.get(i);
                         if (left.matches(e.withPrimitive(n))) {
-                            if (link.matches(e.withChild(n).withIndex(i).withLinkContext())) {
+                            if (link.matches(e.withChildAndIndexAndLinkContext(n, i))) {
                                 e.child = n;
                                 e.index = i;
                                 return true;
@@ -168 +168 @@
                     for (int i=0; i<members.size(); i++) {
                         OsmPrimitive member = members.get(i).getMember();
                         if (left.matches(e.withPrimitive(member))) {
-                            if (link.matches(e.withChild(member).withIndex(i).withLinkContext())) {
+                            if (link.matches(e.withChildAndIndexAndLinkContext(member, i))) {
                                 e.child = member;
                                 e.index = i;
                                 return true;