Changeset 13810 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.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/ElemStyles.java (modified) (11 diffs)

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

@@ -12 +12 @@
 import java.util.Optional;
 
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
@@ -45 +45 @@
  * There are several steps to derive the list of elements for display:
  * <ol>
- * <li>{@link #generateStyles(OsmPrimitive, double, boolean)} applies the
+ * <li>{@link #generateStyles(IPrimitive, double, boolean)} applies the
  * {@link StyleSource}s one after another to get a key-value map of MapCSS
  * properties. Then a preliminary set of StyleElements is derived from the
  * properties map.</li>
- * <li>{@link #getImpl(OsmPrimitive, double, NavigatableComponent)} handles the
+ * <li>{@link #getImpl(IPrimitive, double, NavigatableComponent)} handles the
  * different forms of multipolygon tagging.</li>
- * <li>{@link #getStyleCacheWithRange(OsmPrimitive, double, NavigatableComponent)}
+ * <li>{@link #getStyleCacheWithRange(IPrimitive, double, NavigatableComponent)}
  * adds a default StyleElement for primitives that would be invisible otherwise.
  * (For example untagged nodes and ways.)</li>
@@ -131 +131 @@
      * @param nc display component
      * @return list of styles
-     */
-    public StyleElementList get(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+     * @since 13810 (signature)
+     */
+    public StyleElementList get(IPrimitive osm, double scale, NavigatableComponent nc) {
         return getStyleCacheWithRange(osm, scale, nc).a;
     }
@@ -145 +146 @@
      * @param nc navigatable component
      * @return pair containing style list and range
-     */
-    public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+     * @since 13810 (signature)
+     */
+    public Pair<StyleElementList, Range> getStyleCacheWithRange(IPrimitive osm, double scale, NavigatableComponent nc) {
         if (!osm.isCachedStyleUpToDate() || scale <= 0) {
             osm.setCachedStyle(StyleCache.EMPTY_STYLECACHE);
@@ -232 +234 @@
      * @return pair containing style list and range
      */
-    private Pair<StyleElementList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+    private Pair<StyleElementList, Range> getImpl(IPrimitive osm, double scale, NavigatableComponent nc) {
         if (osm instanceof Node)
             return generateStyles(osm, scale, false);
@@ -242 +244 @@
 
             // FIXME: Maybe in the future outer way styles apply to outers ignoring the multipolygon?
-            for (OsmPrimitive referrer : osm.getReferrers()) {
+            for (IPrimitive referrer : osm.getReferrers()) {
                 Relation r = (Relation) referrer;
                 if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) {
@@ -310 +312 @@
             if (!isDefaultLines()) return p;
 
-            for (OsmPrimitive referrer : osm.getReferrers()) {
+            for (IPrimitive referrer : osm.getReferrers()) {
                 Relation ref = (Relation) referrer;
                 if (!drawMultipolygon || !ref.isMultipolygon() || !ref.isUsable()) {
@@ -362 +364 @@
      * outer ways of a multipolygon.
      * @return the generated styles and the valid range as a pair
-     */
-    public Pair<StyleElementList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public Pair<StyleElementList, Range> generateStyles(IPrimitive osm, double scale, boolean pretendWayIsClosed) {
 
         List<StyleElement> sl = new ArrayList<>();
@@ -522 +525 @@
      * outer ways of a multipolygon.
      * @return first AreaElement found or {@code null}.
-     */
-    public static AreaElement getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public static AreaElement getAreaElemStyle(IPrimitive p, boolean pretendWayIsClosed) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
@@ -545 +549 @@
      * outer ways of a multipolygon.
      * @return {@code true} if primitive has an AreaElement
-     */
-    public static boolean hasAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+     * @since 13810 (signature)
+     */
+    public static boolean hasAreaElemStyle(IPrimitive p, boolean pretendWayIsClosed) {
         return getAreaElemStyle(p, pretendWayIsClosed) != null;
     }
@@ -558 +563 @@
      * @return {@code true} if primitive has area elements, but no line elements
      * @since 12700
-     */
-    public static boolean hasOnlyAreaElements(OsmPrimitive p) {
+     * @since 13810 (signature)
+     */
+    public static boolean hasOnlyAreaElements(IPrimitive p) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {