Changeset 30444 in osm for applications/editors/josm/plugins/gpsblam

Timestamp:

2014-05-12T00:55:10+02:00 (11 years ago)

Author:

donvip

Message:

[josm_gpsblam] fix #josm10006 - robustness against Java bug JDK-8041647

Location:

applications/editors/josm/plugins/gpsblam

Files:

• .classpath (added)
• .project (added)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java (modified) (9 diffs)

applications/editors/josm/plugins/gpsblam/src/org/openstreetmap/josm/plugins/gpsblam/GPSBlamMode.java

@@ -16 +16 @@
 package org.openstreetmap.josm.plugins.gpsblam;
 
-import java.awt.Color;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.AWTEvent;
 import java.awt.BasicStroke;
+import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Graphics2D;
@@ -29 +29 @@
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseWheelEvent;
@@ -46 +45 @@
 public class GPSBlamMode extends MapMode implements LayerChangeListener, MouseWheelListener, AWTEventListener {
 
-        Point pointPressed;
-        MapFrame frame;
-        private Point oldP2;
-        int radius;
-        MouseWheelListener mapViewWheelListeners[];
-        GPSBlamLayer currentBlamLayer;
-           
-        public GPSBlamMode(MapFrame mapFrame, String name, String desc) {
+    Point pointPressed;
+    MapFrame frame;
+    private Point oldP2;
+    int radius;
+    MouseWheelListener mapViewWheelListeners[];
+    GPSBlamLayer currentBlamLayer;
+
+    public GPSBlamMode(MapFrame mapFrame, String name, String desc) {
         super(name, "gpsblam_mode.png", desc, mapFrame, Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
         radius = 10;
-        }
+    }
 
     @Override public void enterMode() { 
@@ -71 +70 @@
 
     public void eventDispatched(AWTEvent e) {
-        if (e instanceof KeyEvent)
-        {
-                KeyEvent ke = (KeyEvent)e;
-                if (ke.getKeyCode()==KeyEvent.VK_UP)
-                        changeRadiusBy(1);
-                else if (ke.getKeyCode()==KeyEvent.VK_DOWN)
-                        changeRadiusBy(-1);
-        }
-    }
-  
-    
+        if (e instanceof KeyEvent) {
+            KeyEvent ke = (KeyEvent)e;
+            if (ke.getKeyCode()==KeyEvent.VK_UP)
+                changeRadiusBy(1);
+            else if (ke.getKeyCode()==KeyEvent.VK_DOWN)
+                changeRadiusBy(-1);
+        }
+    }
+
     @Override public void exitMode() {
         super.exitMode();
@@ -90 +87 @@
     }
 
-
     @Override public void mousePressed(MouseEvent e) {
-        if (e.getButton() == MouseEvent.BUTTON1) {
-                pointPressed = new Point(e.getPoint());
-                // gain exclusive use of mouse wheel for now
-                mapViewWheelListeners = Main.map.mapView.getMouseWheelListeners();
-                for (MouseWheelListener l : mapViewWheelListeners) {
-                        if (l != this)
-                                Main.map.mapView.removeMouseWheelListener(l);
-                }
-                paintBox(pointPressed, radius);
-        }
+        if (e.getButton() == MouseEvent.BUTTON1) {
+            pointPressed = new Point(e.getPoint());
+            // gain exclusive use of mouse wheel for now
+            mapViewWheelListeners = Main.map.mapView.getMouseWheelListeners();
+            for (MouseWheelListener l : mapViewWheelListeners) {
+                if (l != this)
+                    Main.map.mapView.removeMouseWheelListener(l);
+            }
+            paintBox(pointPressed, radius);
+        }
     }
 
     @Override public void mouseDragged(MouseEvent e) {
-        if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) ==  InputEvent.BUTTON1_DOWN_MASK) {
+         if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) ==  InputEvent.BUTTON1_DOWN_MASK) {
             //if button1 is hold, draw the line
             paintBox(e.getPoint(), radius);
@@ -115 +111 @@
             return;
         }
-        // give mapView back its mouse wheel
-        for (MouseWheelListener l : mapViewWheelListeners) {
-             if (l != this)
-                 Main.map.mapView.addMouseWheelListener(l);
-        }
+        // give mapView back its mouse wheel
+        for (MouseWheelListener l : mapViewWheelListeners) {
+             if (l != this)
+                 Main.map.mapView.addMouseWheelListener(l);
+        }
 
         xorDrawBox(pointPressed, oldP2, radius); // clear box
-        
-       // Collection <CachedLatLon> selectedCLLs = getSelectedGPXCLLs(pointPressed, e.getPoint());
+
+        // Collection <CachedLatLon> selectedCLLs = getSelectedGPXCLLs(pointPressed, e.getPoint());
         GPSBlamInputData inputData = new GPSBlamInputData(pointPressed, e.getPoint(), radius);
-        if (!inputData.isEmpty())
-        {
+        if (!inputData.isEmpty()) {
             if(currentBlamLayer == null) {
                 currentBlamLayer = new GPSBlamLayer(tr("GPSBlam"));
                 Main.main.addLayer(currentBlamLayer);           
             }
-                currentBlamLayer.addBlamMarker(new GPSBlamMarker(inputData));
+             currentBlamLayer.addBlamMarker(new GPSBlamMarker(inputData));
             Main.map.mapView.repaint();
         }
- 
+
         pointPressed = oldP2 = null;
     }
-    
-    
-    
+
     public void changeRadiusBy(int delta) {
-        if (pointPressed != null)
-        {
-                int new_radius = radius + delta;
-                if (new_radius < 1)
-                        new_radius = 1;
-                paintBox(oldP2, new_radius);
-                radius = new_radius;
-        }
+        if (pointPressed != null) {
+            int new_radius = radius + delta;
+            if (new_radius < 1)
+                new_radius = 1;
+            paintBox(oldP2, new_radius);
+            radius = new_radius;
+        }
     }
     
     @Override public void mouseWheelMoved(MouseWheelEvent e) {
-        if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) ==  InputEvent.BUTTON1_DOWN_MASK) {
-                changeRadiusBy(-e.getWheelRotation());
-
-        }
-    }
-        
+        if ( (e.getModifiersEx() & InputEvent.BUTTON1_DOWN_MASK) ==  InputEvent.BUTTON1_DOWN_MASK) {
+            changeRadiusBy(-e.getWheelRotation());
+        }
+    }
+
     private void xorDrawBox(Point p1, Point p2, int radius){
         if (frame != null) {
-  //          Graphics2D g = (Graphics2D)frame.getGraphics();
-                Graphics2D g = (Graphics2D)Main.map.mapView.getGraphics();
+            Graphics2D g = (Graphics2D)Main.map.mapView.getGraphics();
             g.setXORMode(Color.BLACK);
             g.setColor(Color.WHITE);
             g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);// AA+XOR broken in some versions of Java
             g.setStroke(new BasicStroke(2.0f));
-           if (p2==null)
-                p2 = p1;
+            if (p2==null)
+                p2 = p1;
             double length = Math.sqrt((p2.x-p1.x)*(p2.x-p1.x)+(p2.y-p1.y)*(p2.y-p1.y)); 
-            if (length > 0)
-            {
-                double dir_x = (p2.x-p1.x)/length, dir_y = (p2.y-p1.y)/length; // unit direction vector from p1.x,p1.y to p2.x, p2.y
-                    double perpdir_x = dir_y, perpdir_y = -dir_x; // unit vector 90deg CW from direction vector
-                    double angle = Math.atan2(-perpdir_y, perpdir_x); // polar angle of perpdir 
-                    double ofs_x = radius * perpdir_x, ofs_y = radius * perpdir_y; // radius vector, 90deg CW from dir vector
-
-                    Path2D path = new Path2D.Double();
-                    path.append(new Line2D.Double(p1.x+ofs_x, p1.y+ofs_y,p2.x+ofs_x, p2.y+ofs_y), false);
-                    path.append(new Arc2D.Double(p2.x-radius, p2.y-radius,radius*2, radius*2, 
-                                Math.toDegrees(angle), -180, Arc2D.OPEN), true);
-                    path.append(new Line2D.Double(p2.x-ofs_x, p2.y-ofs_y,p1.x-ofs_x, p1.y-ofs_y), true);
-                    path.append(new Arc2D.Double(p1.x-radius, p1.y-radius,radius*2, radius*2, 
-                                Math.toDegrees(angle)-180, -180, Arc2D.OPEN), true);
-                    path.closePath();
-                    g.draw(path);
-
-            }
-            else
-            {
-                    g.setXORMode(Color.BLACK);
-                    g.setColor(Color.WHITE);
-                    g.drawOval((int)Math.round(p2.x-radius), (int)Math.round(p2.y-radius), 
-                        (int)Math.round(radius*2), (int)Math.round(radius*2));
-            }
-        }
-    }
-
+            if (length > 0) {
+                double dir_x = (p2.x-p1.x)/length, dir_y = (p2.y-p1.y)/length; // unit direction vector from p1.x,p1.y to p2.x, p2.y
+                double perpdir_x = dir_y, perpdir_y = -dir_x; // unit vector 90deg CW from direction vector
+                double angle = Math.atan2(-perpdir_y, perpdir_x); // polar angle of perpdir 
+                double ofs_x = radius * perpdir_x, ofs_y = radius * perpdir_y; // radius vector, 90deg CW from dir vector
+
+                Path2D path = new Path2D.Double();
+                path.append(new Line2D.Double(p1.x+ofs_x, p1.y+ofs_y,p2.x+ofs_x, p2.y+ofs_y), false);
+                path.append(new Arc2D.Double(p2.x-radius, p2.y-radius,radius*2, radius*2, 
+                        Math.toDegrees(angle), -180, Arc2D.OPEN), true);
+                path.append(new Line2D.Double(p2.x-ofs_x, p2.y-ofs_y,p1.x-ofs_x, p1.y-ofs_y), true);
+                path.append(new Arc2D.Double(p1.x-radius, p1.y-radius,radius*2, radius*2, 
+                        Math.toDegrees(angle)-180, -180, Arc2D.OPEN), true);
+                path.closePath();
+                g.draw(path);
+            } else {
+                try {
+                    g.setXORMode(Color.BLACK);
+                    g.setColor(Color.WHITE);
+                    g.drawOval((int)Math.round(p2.x-radius), (int)Math.round(p2.y-radius), 
+                    (int)Math.round(radius*2), (int)Math.round(radius*2));
+                } catch (InternalError e) {
+                    // Robustness against Java bug https://bugs.openjdk.java.net/browse/JDK-8041647
+                    Main.error(e);
+                    Main.error("Java bug JDK-8041647 occured. To avoid this bug, please consult https://bugs.openjdk.java.net/browse/JDK-8041647."
+                            +" If the bug is fixed, please update your Java Runtime Environment.");
+                }
+            }
+        }
+    }
 
     private void paintBox(Point p2, int new_radius) {
-               
         if (frame != null) {
             if (oldP2 != null) {
@@ -208 +199 @@
         }
     }    
-    
+
     public void setFrame(MapFrame mapFrame) {
         frame = mapFrame;
     }
 
-    
-        @Override
-        public void activeLayerChange(Layer arg0, Layer arg1) {
-        }
-
-        @Override
-        public void layerAdded(Layer arg0) {
-        }
-
-        @Override
+    @Override
+    public void activeLayerChange(Layer arg0, Layer arg1) {
+    }
+
+    @Override
+    public void layerAdded(Layer arg0) {
+    }
+
+    @Override
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer instanceof GPSBlamLayer) {
@@ -231 +221 @@
     }
 
-        
     @Override
     public void destroy() {
@@ -237 +226 @@
         MapView.removeLayerChangeListener(this);
     }
-
 }