Changeset 29529 in osm

Timestamp:

2013-04-23T13:12:05+02:00 (11 years ago)

Author:

donvip

Message:

[josm_print] fix unauthorized operations + warnings

Location:

applications/editors/josm/plugins/print

Files:

• .project (modified) (1 diff)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• src/org/openstreetmap/josm/plugins/print/PrintAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintDialog.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/print/PrintPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/print/PrintableMapView.java (modified) (5 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-        <name>print</name>
+        <name>JOSM-print</name>
         <comment></comment>
         <projects>

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

@@ -70 +70 @@
         public void run () {
         PrintPlugin.adjustPrefs();
-        PrintDialog window = new PrintDialog(Main.main.parent);
+        PrintDialog window = new PrintDialog(Main.parent);
         window.setVisible(true);
         PrintPlugin.restorePrefs();

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

@@ -28 +28 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -34 +33 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.print.*;
-
+import java.awt.print.PageFormat;
+import java.awt.print.PrinterAbortException;
+import java.awt.print.PrinterException;
+import java.awt.print.PrinterJob;
 import java.text.ParseException;
 
-import javax.print.*;
-import javax.print.attribute.*;
-import javax.print.attribute.standard.*;
+import javax.print.PrintService;
+import javax.print.PrintServiceLookup;
+import javax.print.attribute.Attribute;
+import javax.print.attribute.HashPrintRequestAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.attribute.standard.Media;
+import javax.print.attribute.standard.MediaPrintableArea;
+import javax.print.attribute.standard.OrientationRequested;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -331 +337 @@
         }
         JScrollPane previewPane = new JScrollPane(printPreview, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        previewPane.setPreferredSize(Main.main != null ? Main.main.map.mapView.getSize() : new Dimension(210,297));
+        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));
 
@@ -394 +400 @@
         String cmd = e.getActionCommand();
         if (cmd.equals("printer-dialog")) {
-            PrintService[] services = PrintServiceLookup.lookupPrintServices(null, null);
-            PrintService svc = PrintServiceLookup.lookupDefaultPrintService();
+            /*PrintService[] services =*/ PrintServiceLookup.lookupPrintServices(null, null);
+            /*PrintService svc =*/ PrintServiceLookup.lookupDefaultPrintService();
             if (job.printDialog(attrs)) {
                 updateFields();
@@ -430 +436 @@
                     msg = tr("Printing has been cancelled.");
                 }
-                JOptionPane.showMessageDialog(Main.main.parent, msg,
+                JOptionPane.showMessageDialog(Main.parent, msg,
                   tr("Printing stopped"),
                   JOptionPane.WARNING_MESSAGE);
@@ -439 +445 @@
                     msg = tr("Printing has failed.");
                 }
-                JOptionPane.showMessageDialog(Main.main.parent, msg,
+                JOptionPane.showMessageDialog(Main.parent, msg,
                   tr("Printing stopped"),
                   JOptionPane.ERROR_MESSAGE);

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

@@ -23 +23 @@
 
 package org.openstreetmap.josm.plugins.print;
-
-import java.awt.Toolkit;
 
 import javax.swing.JMenu;

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

@@ -33 +33 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-import java.awt.Image;
 import java.awt.Shape;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
 import java.awt.font.FontRenderContext;
 import java.awt.font.GlyphVector;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
-import java.awt.print.*;
+import java.awt.print.PageFormat;
+import java.awt.print.Printable;
+import java.awt.print.PrinterException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -52 +51 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.NavigatableComponent.SystemOfMeasurement;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -98 +96 @@
         }
         
-        mapView = Main.main.map.mapView;
+        mapView = Main.map.mapView;
     }
 
@@ -232 +230 @@
         List<Layer> visibleLayers = getVisibleLayersInZOrder();
         for (Layer l : visibleLayers) {
-            try {
-                if (! (l instanceof OsmDataLayer)) {
-                    /* OsmDataLayer does not need this.*/
-                    
-                    /* This manipulations may have all kinds of unwanted side effects
-                     * but many Layer implementations heavily depend on Main.map.mapView. */
-                    Main.map.mapView = this;
-                }
-                if (l.getOpacity() < 1) {
-                    g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,(float)l.getOpacity()));
-                }
-                l.paint(g2d, this, box);
-                g2d.setPaintMode();
+            if (l.getOpacity() < 1) {
+                g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER,(float)l.getOpacity()));
             }
-            finally {
-                Main.map.mapView = mapView;
-            }
+            l.paint(g2d, this, box);
+            g2d.setPaintMode();
         }
 
@@ -267 +253 @@
         double dist100px = getDist100Pixel() / g2dFactor;
         double dist = dist100px / som.aValue;
-        String unit  = som.aName;
+        //String unit  = som.aName;
         if (!Main.pref.getBoolean("system_of_measurement.use_only_lower_unit", false) && dist > som.bValue / som.aValue) {
             dist = dist100px / som.bValue;
-            unit  = som.bName;
+            //unit  = som.bName;
         }
         long distExponent = (long) Math.floor(Math.log(dist) / Math.log(10));