Changeset 32169 in osm for applications/editors/josm/plugins/print/src

Timestamp:

2016-05-12T00:08:52+02:00 (9 years ago)

Author:

donvip

Message:

fix NPE, sonar warnings

File:

• applications/editors/josm/plugins/print/src/org/openstreetmap/josm/plugins/print/PrintPreview.java (modified) (4 diffs)

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

@@ -60 +60 @@
      * The PageFormat chosen for printing (and preview)
      */
-    protected transient PageFormat format = null;
+    protected transient PageFormat format;
     
     /**
@@ -76 +76 @@
      * When this flag is true, no painting operations will be performed.
      */
-    protected boolean paintingDisabled = false;
+    protected boolean paintingDisabled;
     
     /**
      * the printable object for rendering preview contents
      */
-    protected transient Printable printable = null;
+    protected transient Printable printable;
     
     /**
@@ -157 +157 @@
      * Zoom to fit the page size
      * 
-     * Set the zoom factor such that the whole page fits into the 
-     * preview area.
+     * Set the zoom factor such that the whole page fits into the preview area.
      */
     public void zoomToPage() {
+        if (format == null)
+            return;
         Container parent = getParent();
         Dimension dim;
         if (parent instanceof JViewport) {
             dim = getParent().getSize(); // could get rid of scrollbars
-        }
-        else {
+        } else {
             dim = getVisibleRect().getSize();
         }
@@ -290 +290 @@
 
         g2d.scale(scale, scale);
-        g2d.clip(new Rectangle2D.Double(format.getImageableX(), format.getImageableY(), format.getImageableWidth(), format.getImageableHeight()));
+        g2d.clip(new Rectangle2D.Double(
+                format.getImageableX(),
+                format.getImageableY(),
+                format.getImageableWidth(),
+                format.getImageableHeight()));
         if (printable != null) {
             try {
                 printable.print(g2d, format, 0);
-            }
-            catch (PrinterException e) {
+            } catch (PrinterException e) {
                 // should never happen since we are not printing
                 Main.error(e);
             }
-        }
-        else {
+        } else {
             g2d.setColor(Color.gray);
             g2d.fillRect(0, 0, (int)format.getWidth(), (int)format.getHeight());