Context Navigation

Changeset 32475 in osm for applications/editors/josm/plugins/public_transport_layer/src

Timestamp:

2016-06-30T23:48:10+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

Files:

-              r32142
+              r32475
         for (int i = 0; i < links.size(); i++) {
             final WayConnectionType link = links.get(i);
-            final WayConnectionType.Direction direction = link.direction;
             final List<Node> nodes = routeSegments.get(i).getWay().getNodes();
             switch (link.direction) {
 …
     @Override
     public void actionPerformed(ActionEvent e) {
         if (getCurrentDataSet() == null) {
+        if (getLayerManager().getEditDataSet() == null) {
             return;
+        }
         final StringBuilder sb = new StringBuilder();
         for (Relation relation : getCurrentDataSet().getSelectedRelations()) {
+        for (Relation relation : getLayerManager().getEditDataSet().getSelectedRelations()) {
             if (!isRouteSupported(relation)) {
                 JOptionPane.showMessageDialog(Main.parent, "<html>" + tr("A valid public_transport:version=2 route is required")

-              r31932
+              r32475
     @Override
     public void paint(Graphics2D g, MapView mv, Bounds box) {
         if (mv == null || mv.getEditLayer() == null || mv.getEditLayer().data.selectionEmpty()) {
+        if (mv == null || mv.getLayerManager().getEditLayer() == null || mv.getLayerManager().getEditLayer().data.selectionEmpty()) {
             return;
+        }
         final StyledMapRenderer renderer = new StyledMapRenderer(g, mv, false);
         final Collection<Relation> selectedRelations = mv.getEditLayer().data.getSelectedRelations();
+        final Collection<Relation> selectedRelations = mv.getLayerManager().getEditLayer().data.getSelectedRelations();
         final MultiMap<Pair<Node, Node>, String> segmentRefs = new MultiMap<>();
         for (final Relation relation : selectedRelations) {
 …
         @Override
         public void actionPerformed(ActionEvent e) {
             Main.main.addLayer(new PublicTransportLayer());
+            Main.getLayerManager().addLayer(new PublicTransportLayer());
+        }
+    }

Note: See TracChangeset for help on using the changeset viewer.