Changeset 885 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

Timestamp:

2008-08-28T22:07:04+02:00 (16 years ago)

Author:

stoecker

Message:

added multi-style mappaint support. Closes #1186

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) (3 diffs)

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

@@ -4 +4 @@
 public class AreaElemStyle extends ElemStyle
 {
-        public Color colour;
+        public Color color;
         public LineElemStyle line = null;
 
-        public AreaElemStyle (Color colour, long maxScale, long minScale) {
-                this.colour = colour;
+        public AreaElemStyle (AreaElemStyle a, long maxScale, long minScale) {
+                this.color = a.color;
+                this.priority = a.priority;
                 this.maxScale = maxScale;
                 this.minScale = minScale;
@@ -15 +16 @@
         public AreaElemStyle(AreaElemStyle a, LineElemStyle l)
         {
-                this.colour = a.colour;
+                this.color = a.color;
+                this.priority = a.priority;
                 this.maxScale = a.maxScale;
                 this.minScale = a.minScale;
@@ -21 +23 @@
         }
 
-        @Override public String toString() {
-                return "AreaElemStyle:   colour=" + colour;
+        public AreaElemStyle() { init(); }
+
+        public void init()
+        {
+                color = null;
+                priority = 0;
         }
 }