Changeset 32167 in osm for applications/editors/josm

Timestamp:

2016-05-11T23:57:23+02:00 (8 years ago)

Author:

donvip

Message:

fix NPE, add SonarLint configuration, cleanup

Location:

applications/editors/josm/plugins/print

Files:

• .project (modified) (1 diff)
• .settings/org.sonarlint.eclipse.core.prefs (added)
• src/org/openstreetmap/josm/plugins/print/PrintPreview.java (modified) (10 diffs)

applications/editors/josm/plugins/print/.project

@@ -11 +11 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>org.sonarlint.eclipse.core.sonarlintBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>

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

@@ -40 +40 @@
 import javax.swing.JPanel;
 import javax.swing.RepaintManager;
+
+import org.openstreetmap.josm.Main;
 
 /**
@@ -58 +60 @@
      * The PageFormat chosen for printing (and preview)
      */
-    protected PageFormat format = null;
+    protected transient PageFormat format = null;
     
     /**
@@ -79 +81 @@
      * the printable object for rendering preview contents
      */
-    protected Printable printable = null;
+    protected transient Printable printable = null;
     
     /**
@@ -134 +136 @@
      */
     public void zoomIn() {
-        double zoom = getZoom();
-        if (zoom < 5.0) {
-            setZoom(2.0 * zoom);
+        double z = getZoom();
+        if (z < 5.0) {
+            setZoom(2.0 * z);
         }
     }
@@ -146 +148 @@
      */
     public void zoomOut() {
-        double zoom = getZoom();
-        if (zoom > 0.1) {
-            setZoom(0.5 * zoom);
+        double z = getZoom();
+        if (z > 0.1) {
+            setZoom(0.5 * z);
         }
     }
@@ -216 +218 @@
      */
     public double getZoom() {
-        if (zoomToPage || zoom < 0.01) {
+        if (format != null && (zoomToPage || zoom < 0.01)) {
             // actually this is zoom-to-page 
             Dimension dim = getParent().getSize();
@@ -234 +236 @@
     public Dimension getZoomedPageDimension() {
         int resolution = Toolkit.getDefaultToolkit().getScreenResolution();
-        double zoom = getZoom();
-        int width = (int)(zoom * resolution * format.getWidth() / 72.0);
-        int height = (int)(zoom * resolution * format.getHeight() / 72.0);
+        double z = getZoom();
+        int width = (int)(z * resolution * format.getWidth() / 72.0);
+        int height = (int)(z * resolution * format.getHeight() / 72.0);
         return new Dimension(width, height);
     }
@@ -248 +250 @@
     @Override
     public Dimension getPreferredSize() {
-        if (format == null || zoomToPage == true || zoom < 0.01) {
+        if (format == null || zoomToPage || zoom < 0.01) {
             return new Dimension(0,0);
         }
@@ -295 +297 @@
             catch (PrinterException e) {
                 // should never happen since we are not printing
+                Main.error(e);
             }
         }
@@ -304 +307 @@
         g2d.setTransform(at);
     }
-
 }