Changeset 13810 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java

Timestamp:

2018-05-21T20:42:27+02:00 (6 years ago)

Author:

Don-vip

Message:

support rendering of IPrimitive

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/Environment.java (modified) (10 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.mappaint;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
@@ -18 +18 @@
      * The primitive that is currently evaluated
      */
-    public OsmPrimitive osm;
+    public IPrimitive osm;
 
     /**
@@ -43 +43 @@
      * is evaluated in a {@link LinkSelector} (within a child selector)
      */
-    public OsmPrimitive parent;
+    public IPrimitive parent;
 
     /**
      * The same for parent selector. Only one of the 2 fields (parent or child) is not null in any environment.
      */
-    public OsmPrimitive child;
+    public IPrimitive child;
 
     /**
@@ -71 +71 @@
      * @param osm OSM primitive
      * @since 8415
-     */
-    public Environment(OsmPrimitive osm) {
+     * @since 13810 (signature)
+     */
+    public Environment(IPrimitive osm) {
         this.osm = osm;
     }
@@ -82 +83 @@
      * @param layer layer
      * @param source style source
-     */
-    public Environment(OsmPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
+     * @since 13810 (signature)
+     */
+    public Environment(IPrimitive osm, MultiCascade mc, String layer, StyleSource source) {
         this.osm = osm;
         this.mc = mc;
@@ -114 +116 @@
      * @return A clone of this environment, with the specified primitive
      * @see #osm
-     */
-    public Environment withPrimitive(OsmPrimitive osm) {
+     * @since 13810 (signature)
+     */
+    public Environment withPrimitive(IPrimitive osm) {
         Environment e = new Environment(this);
         e.osm = osm;
@@ -126 +129 @@
      * @return A clone of this environment, with the specified parent
      * @see #parent
-     */
-    public Environment withParent(OsmPrimitive parent) {
+     * @since 13810 (signature)
+     */
+    public Environment withParent(IPrimitive parent) {
         Environment e = new Environment(this);
         e.parent = parent;
@@ -142 +146 @@
      * @see #index
      * @since 6175
-     */
-    public Environment withParentAndIndexAndLinkContext(OsmPrimitive parent, int index, int count) {
+     * @since 13810 (signature)
+     */
+    public Environment withParentAndIndexAndLinkContext(IPrimitive parent, int index, int count) {
         Environment e = new Environment(this);
         e.parent = parent;
@@ -157 +162 @@
      * @return A clone of this environment, with the specified child
      * @see #child
-     */
-    public Environment withChild(OsmPrimitive child) {
+     * @since 13810 (signature)
+     */
+    public Environment withChild(IPrimitive child) {
         Environment e = new Environment(this);
         e.child = child;
@@ -173 +179 @@
      * @see #index
      * @since 6175
-     */
-    public Environment withChildAndIndexAndLinkContext(OsmPrimitive child, int index, int count) {
+     * @since 13810 (signature)
+     */
+    public Environment withChildAndIndexAndLinkContext(IPrimitive child, int index, int count) {
         Environment e = new Environment(this);
         e.child = child;