Changeset 1263 in josm for trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

Timestamp:

14.01.2009 23:46:14 (3 years ago)

Author:

ulfl

Message:

from Dirk Stoecker: fix multipolygon display after (my) performance tweaks

from myself: some minor changes like adding a "mappaint.showname" option to be able to globally switch off icon annotations

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -39 +39 @@
     public Map<String, String> keys;
 
-    /**
-     * The key/value list for this primitive.
-     */
+    /* mappaint data */
+    public ElemStyle mappaintStyle = null;
+    public boolean isMappaintArea = false;
+    public Integer mappaintVisibleCode = 0;
+    public Integer mappaintDrawnCode = 0;
+    public Integer mappaintDrawnAreaCode = 0;
     public Collection<String> errors;
+
+    public void putError(String text, Boolean isError)
+    {
+        if(errors == null)
+            errors = new ArrayList<String>();
+        String s = isError ? tr("Error: {0}", text) : tr("Warning: {0}", text);
+        errors.add(s);
+    }
+    public void clearErrors()
+    {
+        errors = null;
+    }
+    /* end of mappaint data */
 
     /**
@@ -140 +156 @@
     private static Collection<String> directionKeys = null;
 
-        
-    /* mappaint style cache */
-    public ElemStyle mappaintStyle = null;
-    public boolean isMappaintArea = false;
-        
     /**
      * Implementation of the visitor scheme. Subclasses have to call the correct
@@ -331 +342 @@
         }
     }
-
-    public void putError(String text, Boolean isError)
-    {
-        if(errors == null)
-            errors = new ArrayList<String>();
-        String s = isError ? tr("Error: {0}", text) : tr("Warning: {0}", text);
-        errors.add(s);
-    }
-    public void clearErrors()
-    {
-        errors = null;
-    }
 }