From 11f4c64d4369253bf9da270ad621f625dbd44fc8 Mon Sep 17 00:00:00 2001 From: Vincent Privat Date: Tue, 5 Jan 2016 13:14:14 +0100 Subject: [PATCH] update to JOSM 9278 --- build.gradle | 4 ++-- src/main/java/org/matsim/contrib/josm/MapRenderer.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index fa30077..76d1acc 100644 --- a/build.gradle +++ b/build.gradle @@ -70,8 +70,8 @@ jar { manifest { attributes( "Plugin-Date": new Date().format("yyyy-MM-dd HH:mm"), - "Plugin-Version": "v0.5.3", - "Plugin-Mainversion": 9060, + "Plugin-Version": "v0.5.4", + "Plugin-Mainversion": 9278, "Created-By": System.getProperty('java.version') + ' (' + System.getProperty('java.vendor') + ')', "Built-With": "gradle-${project.getGradle().getGradleVersion()}, groovy-${GroovySystem.getVersion()}", "Author" : "Nico Kuehnel", diff --git a/src/main/java/org/matsim/contrib/josm/MapRenderer.java b/src/main/java/org/matsim/contrib/josm/MapRenderer.java index 7b729e1..5313803 100644 --- a/src/main/java/org/matsim/contrib/josm/MapRenderer.java +++ b/src/main/java/org/matsim/contrib/josm/MapRenderer.java @@ -11,8 +11,8 @@ import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory; import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer; import org.openstreetmap.josm.gui.NavigatableComponent; -import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy; -import org.openstreetmap.josm.gui.mappaint.TextElement; +import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy; +import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel; import java.awt.*; import java.util.HashMap; @@ -72,7 +72,7 @@ public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, if (way2Links != null && way2Links.containsKey(way) && !way2Links.get(way).isEmpty()) { if (!way.isSelected()) { if (Properties.showIds) { // draw id on path - drawTextOnPath(way, new TextElement(Properties.getInstance(), Properties.FONT, 0, textOffset(way), Properties.MATSIMCOLOR, 0.f, + drawTextOnPath(way, new TextLabel(Properties.getInstance(), Properties.FONT, 0, textOffset(way), Properties.MATSIMCOLOR, 0.f, null)); } if (way.hasTag("modes", TransportMode.pt)) { // draw @@ -95,7 +95,7 @@ public void drawWay(Way way, Color color, BasicStroke line, BasicStroke dashes, } else { if (Properties.showIds) { // draw ids on selected ways // also - drawTextOnPath(way, new TextElement(Properties.getInstance(), Properties.FONT, 0, textOffset(way), selectedColor, 0.f, null)); + drawTextOnPath(way, new TextLabel(Properties.getInstance(), Properties.FONT, 0, textOffset(way), selectedColor, 0.f, null)); } } }