Changeset 33237 in osm for applications/editors/josm/plugins/print/src/org/openstreetmap

Timestamp:

2017-04-14T22:15:28+02:00 (8 years ago)

Author:

donvip

Message:

update to JOSM 11905

Location:

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print

Files:

• PrintDialog.java (modified) (2 diffs)
• PrintableLayerManager.java (modified) (2 diffs)
• PrintableMapView.java (modified) (2 diffs)

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintDialog.java

@@ -232 +232 @@
                             mapView.setFixedMapScale(scaleModel.getNumber().intValue());
                             printPreview.repaint();
-                        } catch (ParseException pe) {
-                            Main.error(pe);
+                        } catch (ParseException e) {
+                            Main.error(e);
                         }
                     }
@@ -260 +260 @@
                             Main.pref.put("print.resolution.dpi", resolutionModel.getNumber().toString());
                             printPreview.repaint();
-                        } catch (ParseException pe) {
-                            Main.error(pe);
+                        } catch (ParseException e) {
+                            Main.error(e);
                         }
                     }

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java

@@ -105 +105 @@
 
     @Override
-    public synchronized void addLayerChangeListener(LayerChangeListener listener, boolean fireAdd) {
-        layerManager.addLayerChangeListener(listener, fireAdd);
+    public synchronized void addAndFireLayerChangeListener(LayerChangeListener listener) {
+        layerManager.addAndFireLayerChangeListener(listener);
     }
 
@@ -115 +115 @@
 
     @Override
-    public synchronized void removeLayerChangeListener(LayerChangeListener listener,
-            boolean fireRemove) {
-        layerManager.removeLayerChangeListener(listener, fireRemove);
+    public synchronized void removeAndFireLayerChangeListener(LayerChangeListener listener) {
+        layerManager.removeAndFireLayerChangeListener(listener);
     }
 }

applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintableMapView.java

@@ -21 +21 @@
 import java.awt.print.PrinterException;
 
-import javax.swing.JPanel;
-
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
@@ -58 +56 @@
     public PrintableMapView() {
         /* Initialize MapView with a dummy parent */
-        super(new PrintableLayerManager(), new JPanel(), null);
+        super(new PrintableLayerManager(), null);
 
         /* Disable MapView's ComponentLister,