Changeset 33579 in osm for applications/editors/josm/plugins/print

Timestamp:

2017-08-27T22:22:31+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12678

Location:

applications/editors/josm/plugins/print

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPlugin.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPreview.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (3 diffs)

applications/editors/josm/plugins/print/build.xml

@@ -5 +5 @@
     <property name="commit.message" value="Added a field to specify the map scale."/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="11905"/>
+    <property name="plugin.main.version" value="12678"/>
 
     <property name="plugin.author" value="Kai Pastor"/>

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

@@ -59 +59 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractOsmTileSource;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.util.WindowGeometry;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
-import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -233 +235 @@
                             printPreview.repaint();
                         } catch (ParseException e) {
-                            Main.error(e);
+                            Logging.error(e);
                         }
                     }
@@ -261 +263 @@
                             printPreview.repaint();
                         } catch (ParseException e) {
-                            Main.error(e);
+                            Logging.error(e);
                         }
                     }
@@ -343 +345 @@
         JScrollPane previewPane = new JScrollPane(printPreview,
                 JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        previewPane.setPreferredSize(Main.main != null ? Main.map.mapView.getSize() : new Dimension(210, 297));
+        previewPane.setPreferredSize(MainApplication.getMap() != null ? MainApplication.getMap().mapView.getSize() : new Dimension(210, 297));
         add(previewPane, GBC.std(0, 0).span(1, GBC.RELATIVE).fill().weight(5.0, 5.0));
 
@@ -479 +481 @@
             } else if (!ignoredAttributes.contains(a.getName())) {
                 // TODO: Add support for DateTimeSyntax, SetOfIntegerSyntax, ResolutionSyntax if needed
-                Main.warn("Print request attribute not supported: "+a.getName() +": "+a.getCategory()+" - "+a.toString());
+                Logging.warn("Print request attribute not supported: "+a.getName() +": "+a.getCategory()+" - "+a.toString());
             }
             if (setting != null) {
@@ -531 +533 @@
             return realClass.getConstructor(int.class).newInstance(Integer.parseInt(value));
         } else {
-            Main.warn("Attribute syntax not supported: "+syntax);
+            Logging.warn("Attribute syntax not supported: "+syntax);
         }
         return null;
@@ -544 +546 @@
                 }
             } catch (PrinterException | ReflectiveOperationException e) {
-                Main.warn(e.getClass().getSimpleName()+": "+e.getMessage());
+                Logging.warn(e.getClass().getSimpleName()+": "+e.getMessage());
             }
         }
@@ -551 +553 @@
                 attrs.add(unmarshallPrintSetting(setting));
             } catch (ReflectiveOperationException e) {
-                Main.warn(e.getClass().getSimpleName()+": "+e.getMessage());
+                Logging.warn(e.getClass().getSimpleName()+": "+e.getMessage());
             }
         }

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

@@ -7 +7 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
@@ -41 +42 @@
         super(info);
 
-        JMenu fileMenu = Main.main.menu.fileMenu;
+        JMenu fileMenu = MainApplication.getMenu().fileMenu;
         int pos = fileMenu.getItemCount();
         do {

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

@@ -19 +19 @@
 import javax.swing.RepaintManager;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -281 +281 @@
             } catch (PrinterException e) {
                 // should never happen since we are not printing
-                Main.error(e);
+                Logging.error(e);
             }
         } else {

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

@@ -7 +7 @@
 import java.util.List;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MainLayerManager;
@@ -15 +15 @@
 public class PrintableLayerManager extends MainLayerManager {
 
-    private static final MainLayerManager layerManager = Main.getLayerManager();
+    private static final MainLayerManager layerManager = MainApplication.getLayerManager();
 
     @Override

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

@@ -25 +25 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.SystemOfMeasurement;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -122 +123 @@
         if (dim.width != width || dim.height != height) {
             super.setSize(width, height);
-            zoomTo(Main.map.mapView.getRealBounds());
+            zoomTo(MainApplication.getMap().mapView.getRealBounds());
             rezoomToFixedScale();
         }
@@ -135 +136 @@
         if (dim.width != newSize.width || dim.height != newSize.height) {
             super.setSize(newSize);
-            zoomTo(Main.map.mapView.getRealBounds());
+            zoomTo(MainApplication.getMap().mapView.getRealBounds());
             rezoomToFixedScale();
         }