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

Timestamp:

2016-11-16T00:46:26+01:00 (8 years ago)

Author:

donvip

Message:

checkstyle

Location:

applications/editors/josm/plugins/print

Files:

• .checkstyle (added)
• .project (modified) (1 diff)
• .settings/org.eclipse.jdt.ui.prefs (added)
• src/org/openstreetmap/josm/plugins/print/PrintAction.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (24 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPlugin.java (modified) (9 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPreview.java (modified) (19 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintableLayerManager.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (20 diffs)

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

@@ -16 +16 @@
                         </arguments>
                 </buildCommand>
+                <buildCommand>
+                        <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+                        <arguments>
+                        </arguments>
+                </buildCommand>
         </buildSpec>
         <natures>
                 <nature>org.eclipse.jdt.core.javanature</nature>
+                <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
         </natures>
 </projectDescription>

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

@@ -1 @@
-/*
- *      PrintAction.java
- *
- *      Copyright 2011 Kai Pastor
- *
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *
- *
- */
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 
@@ -37 +16 @@
  * The PrintAction controls basic printing of the MapView
  * and takes care of reasonable temporary adjustments to the preferences.
+ * @author Kai Pastor
  */
 public class PrintAction extends JosmAction implements Runnable {
@@ -44 +24 @@
      */
     public PrintAction() {
-        super(tr("Print..."), (String)null, tr("Print the map"),
+        super(tr("Print..."), (String) null, tr("Print the map"),
                 Shortcut.registerShortcut("system:print", tr("File: {0}", tr("Print...")),
                         KeyEvent.VK_P, Shortcut.CTRL), true, "print/print", true);
@@ -66 +46 @@
      */
     @Override
-    public void run () {
+    public void run() {
         PrintPlugin.adjustPrefs();
         PrintDialog window = new PrintDialog(Main.parent);

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

@@ -1 @@
-/*
- *      PrintDialog.java
- *      
- *      Copyright 2011 Kai Pastor
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *      
- *      
- */
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 
@@ -84 +62 @@
 /**
  * A print dialog with preview
+ * @author Kai Pastor
  */
 public class PrintDialog extends JDialog implements ActionListener {
@@ -91 +70 @@
      */
     protected JTextField printerField;
-    
+
     /**
      * The media format name
      */
     protected JTextField paperField;
-    
+
     /**
      * The media orientation
@@ -106 +85 @@
      */
     protected JCheckBox previewCheckBox;
-    
+
     /**
      * The resolution in dpi for printing/preview
      */
     protected SpinnerNumberModel resolutionModel;
-    
+
     /**
      * The map scale
      */
     protected SpinnerNumberModel scaleModel;
-    
+
     /**
      * The page preview
      */
     protected PrintPreview printPreview;
-    
+
     /**
      * The map view for preview an printing
      */
     protected PrintableMapView mapView;
-    
+
     /**
      * The printer job
      */
     protected transient PrinterJob job;
-    
+
     /**
      * The custom printer job attributes
      */
     transient PrintRequestAttributeSet attrs = new HashPrintRequestAttributeSet();
-    
-    /** 
+
+    /**
      * Create a new print dialog
-     * 
+     *
      * @param parent the parent component
      */
@@ -154 +133 @@
         setMaximumSize(Toolkit.getDefaultToolkit().getScreenSize());
     }
-    
+
     /**
      * Show or hide the dialog
-     * 
+     *
      * Set the dialog size to reasonable values.
-     * 
+     *
      * @param visible a flag indication the visibility of the dialog
      */
@@ -181 +160 @@
         } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
             new WindowGeometry(this).remember(getClass().getName() + ".geometry");
-            Main.pref.put("print.preview.enabled",previewCheckBox.isSelected());
+            Main.pref.put("print.preview.enabled", previewCheckBox.isSelected());
         }
         super.setVisible(visible);
@@ -191 +170 @@
     public void build() {
         setLayout(new GridBagLayout());
-        final GBC std = GBC.std().insets(0,5,5,0);
+        final GBC std = GBC.std().insets(0, 5, 5, 0);
         std.fill = GBC.HORIZONTAL;
-        final GBC twoColumns   = GBC.std().insets(0,5,5,0).span(2);
+        final GBC twoColumns = GBC.std().insets(0, 5, 5, 0).span(2);
         twoColumns.fill = GBC.HORIZONTAL;
-        final GBC threeColumns = GBC.std().insets(0,5,5,0).span(3);
+        final GBC threeColumns = GBC.std().insets(0, 5, 5, 0).span(3);
         threeColumns.fill = GBC.HORIZONTAL;
-        
+
         JLabel caption;
-        
+
         int row = 0;
         caption = new JLabel(tr("Printer")+":");
@@ -228 +207 @@
 
         row++;
-        add(GBC.glue(5,10), GBC.std(1,row).fill(GBC.VERTICAL));
-        
+        add(GBC.glue(5, 10), GBC.std(1, row).fill(GBC.VERTICAL));
+
         row++;
         caption = new JLabel(tr("Scale")+":");
@@ -247 +226 @@
                         try {
                             scaleField.commitEdit();
-                            Main.pref.put("print.map-scale",scaleModel.getNumber().toString());
+                            Main.pref.put("print.map-scale", scaleModel.getNumber().toString());
                             mapView.setFixedMapScale(scaleModel.getNumber().intValue());
                             printPreview.repaint();
@@ -266 +245 @@
         resolutionModel = new SpinnerNumberModel(
           Main.pref.getInteger("print.resolution.dpi", PrintPlugin.DEF_RESOLUTION_DPI),
-          30, 1200, 10 );
+          30, 1200, 10);
         final JSpinner resolutionField = new JSpinner(resolutionModel);
         resolutionField.addChangeListener(new ChangeListener() {
@@ -276 +255 @@
                         try {
                             resolutionField.commitEdit();
-                            Main.pref.put("print.resolution.dpi",resolutionModel.getNumber().toString());
+                            Main.pref.put("print.resolution.dpi", resolutionModel.getNumber().toString());
                             printPreview.repaint();
                         } catch (ParseException pe) {
@@ -286 +265 @@
         });
         add(resolutionField, std.grid(GBC.RELATIVE, row));
-        
+
         row++;
         caption = new JLabel(tr("Map information")+":");
@@ -307 +286 @@
                 });
             }
+
             @Override
             public void removeUpdate(DocumentEvent evt) {
                 this.insertUpdate(evt);
             }
+
             @Override
             public void changedUpdate(DocumentEvent evt) {
@@ -317 +298 @@
         });
         JScrollPane attributionPane = new JScrollPane(attributionText);
-        add(attributionPane, GBC.std().insets(0,5,5,0).span(3).fill(GBC.BOTH).weight(0.0,1.0).grid(2, row));
-
-        row++;
-        add(GBC.glue(5,10), GBC.std(1,row).fill(GBC.VERTICAL));
-        
+        add(attributionPane, GBC.std().insets(0, 5, 5, 0).span(3).fill(GBC.BOTH).weight(0.0, 1.0).grid(2, row));
+
+        row++;
+        add(GBC.glue(5, 10), GBC.std(1, row).fill(GBC.VERTICAL));
+
         row++;
         previewCheckBox = new JCheckBox(tr("Map Preview"));
-        previewCheckBox.setSelected(Main.pref.getBoolean("print.preview.enabled",false));
+        previewCheckBox.setSelected(Main.pref.getBoolean("print.preview.enabled", false));
         previewCheckBox.setActionCommand("toggle-preview");
         previewCheckBox.addActionListener(this);
@@ -340 +321 @@
         zoomOutButton.addActionListener(this);
         add(zoomOutButton, threeColumns.grid(2, row));
-        
+
         row++;
         JButton zoomToPageButton = new JButton(tr("Zoom To Page"));
@@ -346 +327 @@
         zoomToPageButton.addActionListener(this);
         add(zoomToPageButton, threeColumns.grid(2, row));
-        
+
         row++;
         JButton zoomToActualSize = new JButton(tr("Zoom To Actual Size"));
@@ -352 +333 @@
         zoomToActualSize.addActionListener(this);
         add(zoomToActualSize, threeColumns.grid(2, row));
-        
+
         printPreview = new PrintPreview();
         if (previewCheckBox.isSelected()) {
             printPreview.setPrintable(mapView);
         }
-        JScrollPane previewPane = new JScrollPane(printPreview, 
+        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));
-        add(previewPane, GBC.std(0,0).span(1, GBC.RELATIVE).fill().weight(5.0,5.0));
+        previewPane.setPreferredSize(Main.main != null ? Main.map.mapView.getSize() : new Dimension(210, 297));
+        add(previewPane, GBC.std(0, 0).span(1, GBC.RELATIVE).fill().weight(5.0, 5.0));
 
         row++;
@@ -372 +353 @@
         cancelButton.addActionListener(this);
         actionPanel.add(cancelButton);
-        add(actionPanel, GBC.std(0,row).insets(5,5,5,5).span(GBC.REMAINDER).fill(GBC.HORIZONTAL));
-    }
-    
+        add(actionPanel, GBC.std(0, row).insets(5, 5, 5, 5).span(GBC.REMAINDER).fill(GBC.HORIZONTAL));
+    }
+
     /**
      * Update the dialog fields from the underlying model
@@ -386 +367 @@
         } else {
             printerField.setText(service.getName());
-            if (! attrs.containsKey(Media.class)) {
+            if (!attrs.containsKey(Media.class)) {
                 attrs.add((Attribute) service.getDefaultAttributeValue(Media.class));
-            } 
+            }
             if (attrs.containsKey(Media.class)) {
                 paperField.setText(attrs.get(Media.class).toString());
             }
 
-            if (! attrs.containsKey(OrientationRequested.class)) {
+            if (!attrs.containsKey(OrientationRequested.class)) {
                 attrs.add((Attribute) service.getDefaultAttributeValue(OrientationRequested.class));
             }
@@ -400 +381 @@
             }
 
-            if (! attrs.containsKey(MediaPrintableArea.class)) {
+            if (!attrs.containsKey(MediaPrintableArea.class)) {
                 PageFormat pf = job.defaultPage();
                 attrs.add(new MediaPrintableArea(
-                  (float)pf.getImageableX()/72f,
-                  (float)pf.getImageableY()/72f,
-                  (float)pf.getImageableWidth()/72f,
-                  (float)pf.getImageableHeight()/72f,
-                  MediaPrintableArea.INCH) );
-            }
-            
+                  (float) pf.getImageableX()/72f,
+                  (float) pf.getImageableY()/72f,
+                  (float) pf.getImageableWidth()/72f,
+                  (float) pf.getImageableHeight()/72f,
+                  MediaPrintableArea.INCH));
+            }
+
             PageFormat pf = job.getPageFormat(attrs);
             printPreview.setPageFormat(pf);
         }
     }
-    
+
     /**
      * Handle user input
-     * 
+     *
      * @param e an ActionEvent with one of the known commands
      */
@@ -470 +451 @@
 
     protected void savePrintSettings() {
-        // Save only one printer service attribute: printer name 
+        // Save only one printer service attribute: printer name
         PrintService service = job.getPrintService();
         if (service != null) {
@@ -476 +457 @@
             for (Attribute a : service.getAttributes().toArray()) {
                 if ("printer-name".equals(a.getName()) && a instanceof TextSyntax) {
-                    serviceAttributes.add(marshallPrintSetting(a, TextSyntax.class, ((TextSyntax)a).getValue()));
+                    serviceAttributes.add(marshallPrintSetting(a, TextSyntax.class, ((TextSyntax) a).getValue()));
                 }
             }
             Main.pref.putArray("print.settings.service-attributes", serviceAttributes);
         }
-        
+
         // Save all request attributes
         Collection<String> ignoredAttributes = Arrays.asList("media-printable-area");
@@ -488 +469 @@
             Collection<String> setting = null;
             if (a instanceof TextSyntax) {
-                setting = marshallPrintSetting(a, TextSyntax.class, ((TextSyntax)a).getValue());
+                setting = marshallPrintSetting(a, TextSyntax.class, ((TextSyntax) a).getValue());
             } else if (a instanceof EnumSyntax) {
-                setting = marshallPrintSetting(a, EnumSyntax.class, Integer.toString(((EnumSyntax)a).getValue()));
+                setting = marshallPrintSetting(a, EnumSyntax.class, Integer.toString(((EnumSyntax) a).getValue()));
             } else if (a instanceof IntegerSyntax) {
-                setting = marshallPrintSetting(a, IntegerSyntax.class, Integer.toString(((IntegerSyntax)a).getValue()));
+                setting = marshallPrintSetting(a, IntegerSyntax.class, Integer.toString(((IntegerSyntax) a).getValue()));
             } else if (!ignoredAttributes.contains(a.getName())) {
                 // TODO: Add support for DateTimeSyntax, SetOfIntegerSyntax, ResolutionSyntax if needed
@@ -503 +484 @@
         Main.pref.putArray("print.settings.request-attributes", requestAttributes);
     }
-    
+
     protected Collection<String> marshallPrintSetting(Attribute a, Class<?> syntaxClass, String value) {
         return new ArrayList<>(Arrays.asList(a.getCategory().getName(), a.getClass().getName(), syntaxClass.getName(), value));
     }
-    
+
     @SuppressWarnings("unchecked")
-    protected Attribute unmarshallPrintSetting(Collection<String> setting) throws 
+    protected Attribute unmarshallPrintSetting(Collection<String> setting) throws
         ClassNotFoundException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
-        
+
         if (setting == null || setting.size() != 4) {
             throw new IllegalArgumentException("Invalid setting: "+setting);

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

@@ -1 @@
-/*
- *      PrintPlugin.java
- *      
- *      Copyright 2011 Kai Pastor
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *      
- *      
- */
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 
@@ -34 +12 @@
 
 /**
- * The PrintPlugin class implements the interface JOSM needs to 
+ * The PrintPlugin class implements the interface JOSM needs to
  * load extension.
+ * @author Kai Pastor
  */
 public class PrintPlugin extends Plugin {
@@ -84 +63 @@
 
     /**
-     * Enables/disables the print action in the GUI 
+     * Enables/disables the print action in the GUI
      * when a MapFrame gets shown or removed.
      *
@@ -98 +77 @@
     /**
      * Temporary adjust the preferences for map printing
-     * 
-     * This will adjust some preferences such that elements which are 
-     * not useful on paper will not be printed. This includes the 
-     * following markup: downloaded area; node markers for connection, 
+     *
+     * This will adjust some preferences such that elements which are
+     * not useful on paper will not be printed. This includes the
+     * following markup: downloaded area; node markers for connection,
      * selected, unselected, tagged state.
-     * 
+     *
      * Changes will be undone by restorePrefs().
      */
@@ -117 +96 @@
         }
     }
-    
+
     /**
      * Adjust a single preference.
-     * 
+     *
      * Saves the existing value for later restorePref.
-     * 
+     *
      * @param key the preference key
      * @param the temporary new int value
@@ -132 +111 @@
         Main.pref.putInteger(key, value);
     }
-    
+
     /**
      * Adjust a single preference.
-     * 
+     *
      * Saves the existing value for later restorePref.
-     * 
+     *
      * @param key the preference key
      * @param the temporary new boolean value
@@ -147 +126 @@
         Main.pref.put(key, value);
     }
-    
+
     /**
      * Adjust a single preference.
-     * 
+     *
      * Saves the existing value for later restorePref.
-     * 
+     *
      * @param key the preference key
      * @param the temporary new String value
@@ -162 +141 @@
         Main.pref.put(key, value);
     }
-    
+
     /**
      * Undo temporary adjustments to the preferences made by adjustPrefs().
@@ -178 +157 @@
         }
     }
-    
+
     /**
      * Restore a single preference previously saved by adjustPref()
-     * 
+     *
      * @param key the preference key to be restored
      */

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

@@ -1 @@
-/*
- *      PrintPreview.java
- *      
- *      Copyright 2011 Kai Pastor
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *      
- *      
- */
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 
@@ -37 +15 @@
 import java.awt.print.PrinterException;
 
+import javax.swing.JPanel;
 import javax.swing.JViewport;
-import javax.swing.JPanel;
 import javax.swing.RepaintManager;
 
@@ -45 +23 @@
 /**
  * A generic print preview component
- * 
- * Given a Printable, a PageFormat and a zoom factor, this component 
- * will render a scrollable and zoomable print preview. If no Printable 
- * is defined, it will fill the printable area of the page format in 
+ *
+ * Given a Printable, a PageFormat and a zoom factor, this component
+ * will render a scrollable and zoomable print preview. If no Printable
+ * is defined, it will fill the printable area of the page format in
  * plain gray.
- * 
+ *
  * There is a special zoom-to-page condition where the component will
  * automatically adjust the zoom level such that the whole page preview
  * will just fit into the size of the component.
+ * @author Kai Pastor
  */
 class PrintPreview extends JPanel {
-    
+
     /**
      * The PageFormat chosen for printing (and preview)
      */
     protected transient PageFormat format;
-    
+
     /**
      * The current zoom factor for the preview
      */
     protected double zoom = 1.0;
-    
-    /**
-     * If true, the preview is always zoomed such that 
+
+    /**
+     * If true, the preview is always zoomed such that
      * the whole page fits into the preview area.
      */
     protected boolean zoomToPage = true;
-    
+
     /**
      * When this flag is true, no painting operations will be performed.
      */
     protected boolean paintingDisabled;
-    
+
     /**
      * the printable object for rendering preview contents
      */
     protected transient Printable printable;
-    
-    /**
-     * Constructs a new preview component 
-     */
-    public PrintPreview() {
+
+    /**
+     * Constructs a new preview component
+     */
+    PrintPreview() {
         super();
     }
@@ -92 +71 @@
     /**
      * Constructs a new preview component for a printable
-     * 
+     *
      * @param p the printable object for rendering preview contents, or null
      */
-    public PrintPreview(Printable p) {
+    PrintPreview(Printable p) {
         super();
         printable = p;
@@ -102 +81 @@
     /**
      * Sets (and unsets) the printable object
-     * 
+     *
      * @param p a printable object, or null
      */
@@ -109 +88 @@
         repaint();
     }
-    
+
     /**
      * Sets the page format
-     * 
+     *
      * @param format the PageFormat chosen for printing (and preview)
      */
@@ -120 +99 @@
         repaint();
     }
-    
+
     /**
      * Sets the preview zoom relativ to the actual size
      *
-     * @param zoom the zoom factor 
+     * @param zoom the zoom factor
      */
     public void setZoom(double zoom) {
         setZoom(zoom, false);
     }
-    
+
     /**
      * Zoom into the preview
-     * 
+     *
      * Doubles the current zoom factor, if smaller than 5.0.
      */
@@ -141 +120 @@
         }
     }
- 
+
     /**
      * Zoom out of the preview
-     * 
+     *
      * Set the zoom factor to half its current value, if bigger than 0.1.
      */
@@ -156 +135 @@
     /**
      * Zoom to fit the page size
-     * 
+     *
      * Set the zoom factor such that the whole page fits into the preview area.
      */
@@ -178 +157 @@
      * Sets the preview zoom relativ to the actual size
      *
-     * @param zoom the zoom factor 
-     * @param zoomToPage when set to true, the zoom factor will be 
+     * @param zoom the zoom factor
+     * @param zoomToPage when set to true, the zoom factor will be
      *   adjusted on resize operations such that the whole page always
      *   fits to the preview area.
@@ -196 +175 @@
         this.zoomToPage = zoomToPage;
         revalidate(); // Make JScrollPane aware of the change in size
-        RepaintManager.currentManager(this).validateInvalidComponents(); 
+        RepaintManager.currentManager(this).validateInvalidComponents();
 
         Dimension dim = getZoomedPageDimension();
         Rectangle view = getVisibleRect();
 
-        view.x = (int)((0.5*oldView.width+oldView.x)/Math.max(oldView.width,oldDim.width)*Math.max(view.width,dim.width)-0.5*view.width);
-        view.y = (int)((0.5*oldView.height+oldView.y)/Math.max(oldView.height,oldDim.height)*Math.max(view.height,dim.height)-0.5*view.height);
+        view.x = (int) ((0.5*oldView.width+oldView.x) /
+                Math.max(oldView.width, oldDim.width)*Math.max(view.width, dim.width)-0.5*view.width);
+        view.y = (int) ((0.5*oldView.height+oldView.y) /
+                Math.max(oldView.height, oldDim.height)*Math.max(view.height, dim.height)-0.5*view.height);
 
         scrollRectToVisible(view);
@@ -211 +192 @@
     /**
      * Returns the actual current zoom
-     * 
+     *
      * This factor might be different from the last explicitly set factor
      * when zoomToPage is true.
-     * 
-     * @return the zoom factor 
+     *
+     * @return the zoom factor
      */
     public double getZoom() {
         if (format != null && (zoomToPage || zoom < 0.01)) {
-            // actually this is zoom-to-page 
+            // actually this is zoom-to-page
             Dimension dim = getParent().getSize();
             int resolution = Toolkit.getDefaultToolkit().getScreenResolution();
@@ -228 +209 @@
         return zoom;
     }
-        
+
     /**
      * Get the current dimension of the page preview
-     * 
+     *
      * @return dimension in pixels
      */
@@ -237 +218 @@
         int resolution = Toolkit.getDefaultToolkit().getScreenResolution();
         double z = getZoom();
-        int width = (int)(z * resolution * format.getWidth() / 72.0);
-        int height = (int)(z * resolution * format.getHeight() / 72.0);
+        int width = (int) (z * resolution * format.getWidth() / 72.0);
+        int height = (int) (z * resolution * format.getHeight() / 72.0);
         return new Dimension(width, height);
     }
@@ -244 +225 @@
     /**
      * Get the current preferred size of the component
-     * 
-     * @return indicates a zero size when zoomToPage is active, 
+     *
+     * @return indicates a zero size when zoomToPage is active,
      *   the zoomed page dimension otherwise
      */
@@ -251 +232 @@
     public Dimension getPreferredSize() {
         if (format == null || zoomToPage || zoom < 0.01) {
-            return new Dimension(0,0);
+            return new Dimension(0, 0);
         }
         return getZoomedPageDimension();
@@ -258 +239 @@
     /**
      * Paints the component
-     * 
-     * This will do nothing, not even call super.paintComponent(g), if 
+     *
+     * This will do nothing, not even call super.paintComponent(g), if
      * painting is disabled in this component.
-     * 
+     *
      * @param g a Graphics to draw to
      */
@@ -279 +260 @@
         Dimension out = getZoomedPageDimension();
         double scale = Math.min(
-          out.getHeight()/format.getHeight() , out.getWidth()/format.getWidth() );
-        double left = 0.5 * ((double)getWidth() - scale * format.getWidth());
-        double top  = 0.5 * ((double)getHeight() - scale * format.getHeight());
-        
+          out.getHeight()/format.getHeight(), out.getWidth()/format.getWidth());
+        double left = 0.5 * (getWidth() - scale * format.getWidth());
+        double top = 0.5 * (getHeight() - scale * format.getHeight());
+
         g2d.translate(left, top);
         g2d.setColor(Color.black);
@@ -304 +285 @@
         } else {
             g2d.setColor(Color.gray);
-            g2d.fillRect(0, 0, (int)format.getWidth(), (int)format.getHeight());
+            g2d.fillRect(0, 0, (int) format.getWidth(), (int) format.getHeight());
         }
 

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

@@ +1 @@
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 

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

@@ -1 @@
-/*
- *      PrintableMapView.java
- *      
- *      Copyright 2011 Kai Pastor
- *      
- *      This program is free software; you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation; either version 2 of the License, or
- *      (at your option) any later version.
- *      
- *      This program is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *      
- *      You should have received a copy of the GNU General Public License
- *      along with this program; if not, write to the Free Software
- *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- *      MA 02110-1301, USA.
- *      
- *      
- */
-
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.print;
 
@@ -55 +33 @@
  * The PrintableMapView class implements a "Printable" perspective on
  * the main MapView.
- * 
+ * @author Kai Pastor
  */
 public class PrintableMapView extends MapView implements Printable {
-    
+
     /**
      * A fixed map scale if greater than zero.
      */
     protected int fixedMapScale = 0;
-    
+
     /**
      * The factor for scaling the printing graphics to the desired
@@ -69 +47 @@
      */
     protected double g2dFactor;
-    
+
     /**
      * The font size for text added by PrintableMapView
@@ -81 +59 @@
         /* Initialize MapView with a dummy parent */
         super(new PrintableLayerManager(), new JPanel(), null);
-        
-        /* Disable MapView's ComponentLister, 
+
+        /* Disable MapView's ComponentLister,
          * as it will interfere with the main MapView. */
-        ComponentListener listeners[] = getComponentListeners();
-        for (int i=0; i<listeners.length; i++) {
+        ComponentListener[] listeners = getComponentListeners();
+        for (int i = 0; i < listeners.length; i++) {
             removeComponentListener(listeners[i]);
         }
@@ -92 +70 @@
     /**
      * Set a fixed map scale 1 : "scale"
-     * 
+     *
      * @param scale the fixed map scale
      */
@@ -102 +80 @@
     /**
      * Unset the fixed map scale
-     * 
+     *
      * The map scaling will be chosen automatically such that the
      * main windows map view fits on the page format.
@@ -111 +89 @@
     }
 
-    /** 
+    /**
      * Get the map scale that will be used for rendering
-     */     
+     */
     public int getMapScale() {
         if (fixedMapScale > 0 || g2dFactor == 0.0) {
@@ -127 +105 @@
      * Initialize the PrintableMapView for a particular combination of
      * main MapView, PageFormat and target resolution
-     * 
+     *
      * @param pageformat the size and orientation of the page being drawn
      */
@@ -133 +111 @@
         int resolution = Main.pref.getInteger("print.resolution.dpi", PrintPlugin.DEF_RESOLUTION_DPI);
         g2dFactor = 72.0/resolution;
-        setSize((int)(pageFormat.getImageableWidth()/g2dFactor),(int)(pageFormat.getImageableHeight()/g2dFactor));
-    }
-    
-    /**
-     * Resizes this component. 
+        setSize((int) (pageFormat.getImageableWidth()/g2dFactor), (int) (pageFormat.getImageableHeight()/g2dFactor));
+    }
+
+    /**
+     * Resizes this component.
      */
     @Override
@@ -148 +126 @@
         }
     }
-            
-    /**
-     * Resizes this component. 
+
+    /**
+     * Resizes this component.
      */
     @Override
@@ -176 +154 @@
     /**
      * Render a page for the printer
-     * 
+     *
      * Implements java.awt.print.Printable.
      *
      * @param g the context into which the page is drawn
      * @param pageFormat the size and orientation of the page being drawn
-     * @param page the zero based index of the page to be drawn 
-     * 
+     * @param page the zero based index of the page to be drawn
+     *
      * @return PAGE_EXISTS for page==0 or NO_SUCH_PAGE for page>0
-     * 
+     *
      * @throws PrinterException thrown when the print job is terminated
-     * 
+     *
      */
     @Override
@@ -197 +175 @@
         initialize(pageFormat);
 
-        Graphics2D g2d = (Graphics2D)g;
+        Graphics2D g2d = (Graphics2D) g;
         g2d.translate(pageFormat.getImageableX(), pageFormat.getImageableY());
         paintMap(g2d, pageFormat);
@@ -204 +182 @@
         return PAGE_EXISTS;
     }
-    
-    /** 
+
+    /**
      * Paint the map
-     * 
+     *
      * This implementation is derived from MapView's paint and
      * from other JOSM core components.
-     * 
+     *
      * @param g2d the graphics context to use for painting
      * @param pageFormat the size and orientation of the page being drawn
@@ -217 +195 @@
         AffineTransform at = g2d.getTransform();
         g2d.scale(g2dFactor, g2dFactor);
-        
+
         Bounds box = getRealBounds();
         for (Layer l : getLayerManager().getVisibleLayersInZOrder()) {
             if (l.getOpacity() < 1) {
-                g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,(float)l.getOpacity()));
+                g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, (float) l.getOpacity()));
             }
             l.paint(g2d, this, box);
@@ -230 +208 @@
     }
 
-    /** 
+    /**
      * Paint a linear scale and a lexical scale
-     * 
-     * This implementation is derived from JOSM's MapScaler, 
+     *
+     * This implementation is derived from JOSM's MapScaler,
      * NavigatableComponent and SystemOfMeasurement.
      *
@@ -253 +231 @@
         if (distMantissa <= 2.5) {
             distScale = 2.5 / distMantissa;
-        }
-        else if (distMantissa <= 4.0) {
+        } else if (distMantissa <= 4.0) {
             distScale = 5.0 / distMantissa;
-        }
-        else {
+        } else {
             distScale = 10.0 / distMantissa;
         }
@@ -269 +245 @@
         /* offset from the left paper border to the left end of the bar */
         Rectangle2D bound = g2d.getFontMetrics().getStringBounds("0", g2d);
-        int xLeft = (int)(bound.getWidth()/2);
-        
+        int xLeft = (int) (bound.getWidth()/2);
+
         /* offset from the left paper border to the right label */
         String rightLabel = som.getDistText(dist100px * distScale);
         bound = g2d.getFontMetrics().getStringBounds(rightLabel, g2d);
         int xRight = xLeft+(int) Math.max(0.95*x, x-bound.getWidth()/2);
-        
+
+        // CHECKSTYLE.OFF: SingleSpaceSeparator
         int h        = FONT_SIZE / 2; // raster, height of the bar
         int yLexical = 3 * h;         // baseline of the lexical scale
         int yBar     = 4 * h;         // top of the bar
         int yLabel   = 8 * h;         // baseline of the labels
-        int w  = (int)(distScale * 100.0);  // length of the bar
-        int ws = (int)(distScale * 20.0);   // length of a segment
-        
+        int w  = (int) (distScale * 100.0);  // length of the bar
+        int ws = (int) (distScale * 20.0);   // length of a segment
+        // CHECKSTYLE.ON: SingleSpaceSeparator
+
         /* white background */
         g2d.setColor(Color.WHITE);
         g2d.fillRect(xLeft-1, yBar-1, w+2, h+2);
-        
+
         /* black foreground */
         g2d.setColor(Color.BLACK);
         g2d.drawRect(xLeft, yBar, w, h);
         g2d.fillRect(xLeft, yBar, ws, h);
-        g2d.fillRect(xLeft+(int)(distScale * 40.0), yBar, ws, h);
+        g2d.fillRect(xLeft+(int) (distScale * 40.0), yBar, ws, h);
         g2d.fillRect(xLeft+w-ws, yBar, ws, h);
         g2d.setFont(labelFont);
         paintText(g2d, "0", 0, yLabel);
         paintText(g2d, rightLabel, xRight, yLabel);
-        
+
         /* lexical scale */
         int mapScale = getMapScale();
@@ -304 +282 @@
         g2d.setFont(scaleFront);
         bound = g2d.getFontMetrics().getStringBounds(lexicalScale, g2d);
-        int xLexical = Math.max(0, xLeft + (w - (int)bound.getWidth()) / 2);
+        int xLexical = Math.max(0, xLeft + (w - (int) bound.getWidth()) / 2);
         paintText(g2d, lexicalScale, xLexical, yLexical);
     }
-    
-    /** 
+
+    /**
      * Paint an attribution text
-     * 
+     *
      * @param g2d the graphics context to use for painting
      * @param pageFormat the size and orientation of the page being drawn
@@ -316 +294 @@
     public void paintMapAttribution(Graphics2D g2d, PageFormat pageFormat) {
         String text = Main.pref.get("print.attribution", AbstractOsmTileSource.DEFAULT_OSM_ATTRIBUTION);
-        
+
         if (text == null) {
             return;
         }
-            
+
         Font attributionFont = new Font("Arial", Font.PLAIN, FONT_SIZE * 8 / 10);
         g2d.setFont(attributionFont);
@@ -327 +305 @@
         int y = FONT_SIZE * 3 / 2;
         int from = 0;
-        int to = text.indexOf("\n", from);
+        int to = text.indexOf('\n', from);
         while (to >= from) {
             String line = text.substring(from, to);
 
             Rectangle2D bound = g2d.getFontMetrics().getStringBounds(line, g2d);
-            int x = (int)((pageFormat.getImageableWidth() - bound.getWidth()) - FONT_SIZE/2);
-            
+            int x = (int) ((pageFormat.getImageableWidth() - bound.getWidth()) - FONT_SIZE/2);
+
             paintText(g2d, line, x, y);
 
-            y   += FONT_SIZE * 5 / 4;
+            y += FONT_SIZE * 5 / 4;
             from = to + 1;
-            to   = text.indexOf("\n", from);
-        }
-    }
-    
+            to = text.indexOf('\n', from);
+        }
+    }
+
     /**
      * Paint a text.
-     * 
+     *
      * This method will not only draw the letters but also a background which improves redability.
-     * 
+     *
      * @param g2d the graphics context to use for painting
      * @param text the text to be drawn