Changeset 30738 in osm for applications/editors/josm/plugins/routes

Timestamp:

2014-10-19T01:27:04+02:00 (10 years ago)

Author:

donvip

Message:

[josm_plugins] fix java 7 warnings / global usage of try-with-resource

Location:

applications/editors/josm/plugins/routes

Files:

• .settings/org.eclipse.jdt.ui.prefs (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/routes/xml/routes.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/routes/xml/routes.xsd (modified) (1 diff)

applications/editors/josm/plugins/routes/.settings/org.eclipse.jdt.ui.prefs

@@ -1 @@
-#Fri Jan 15 16:11:57 CET 2010
 eclipse.preferences.version=1
 editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
@@ -9 +8 @@
 sp_cleanup.add_missing_nls_tags=false
 sp_cleanup.add_missing_override_annotations=false
+sp_cleanup.add_missing_override_annotations_interface_methods=false
 sp_cleanup.add_serial_version_id=false
 sp_cleanup.always_use_blocks=true
@@ -14 +14 @@
 sp_cleanup.always_use_this_for_non_static_field_access=false
 sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
 sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
 sp_cleanup.format_source_code=false
 sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
 sp_cleanup.make_local_variable_final=false
 sp_cleanup.make_parameters_final=false
@@ -33 +35 @@
 sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
 sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
 sp_cleanup.remove_trailing_whitespaces=true
 sp_cleanup.remove_trailing_whitespaces_all=true
@@ -46 +49 @@
 sp_cleanup.sort_members=false
 sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
 sp_cleanup.use_blocks=false
 sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
 sp_cleanup.use_parentheses_in_expressions=false
 sp_cleanup.use_this_for_non_static_field_access=false
@@ -53 +58 @@
 sp_cleanup.use_this_for_non_static_method_access=false
 sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/RoutesPlugin.java

@@ -19 +19 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -36 +35 @@
         File routesFile = new File(getPluginDir() + File.separator + "routes.xml");
         if (!routesFile.exists()) {
-            System.out.println("File with route definitions doesn't exist, using default");
+            Main.info("File with route definitions doesn't exist, using default");
 
             try {
                 routesFile.getParentFile().mkdir();
-                OutputStream outputStream = new FileOutputStream(routesFile);
-                InputStream inputStream = Routes.class.getResourceAsStream("routes.xml");
-
-                byte[] b = new byte[512];
-                int read;
-                while ((read = inputStream.read(b)) != -1) {
-                    outputStream.write(b, 0, read);
+                try (
+                    OutputStream outputStream = new FileOutputStream(routesFile);
+                    InputStream inputStream = Routes.class.getResourceAsStream("routes.xml");
+                ) {
+                    byte[] b = new byte[512];
+                    int read;
+                    while ((read = inputStream.read(b)) != -1) {
+                        outputStream.write(b, 0, read);
+                    }
                 }
-
-                outputStream.close();
-                inputStream.close();
-
             } catch (IOException e) {
-                e.printStackTrace();
+                Main.error(e);
             }
         }
@@ -62 +59 @@
             Unmarshaller unmarshaller = context.createUnmarshaller();
             Routes routes = (Routes)unmarshaller.unmarshal(
-                new FileInputStream(getPluginDir() + File.separator + "routes.xml"));
+                    new FileInputStream(getPluginDir() + File.separator + "routes.xml"));
             for (RoutesXMLLayer layer:routes.getLayer()) {
                 if (layer.isEnabled()) {
@@ -77 +74 @@
 
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-        // TODO Auto-generated method stub
+        // Do nothing
     }
 
@@ -117 +114 @@
         checkLayers();
     }
-
 }

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/paint/AbstractLinePainter.java

@@ -17 +17 @@
 public abstract class AbstractLinePainter implements PathPainter {
 
-        // Following two method copied from http://blog.persistent.info/2004/03/java-lineline-intersections.html
-        protected boolean getLineLineIntersection(Line2D.Double l1,
-                        Line2D.Double l2,
-                        Point intersection)
-        {
-                double  x1 = l1.getX1(), y1 = l1.getY1(),
-                x2 = l1.getX2(), y2 = l1.getY2(),
-                x3 = l2.getX1(), y3 = l2.getY1(),
-                x4 = l2.getX2(), y4 = l2.getY2();
-                double dx1 = x2 - x1;
-                double dx2 = x4 - x3;
-                double dy1 = y2 - y1;
-                double dy2 = y4 - y3;
+    // Following two method copied from http://blog.persistent.info/2004/03/java-lineline-intersections.html
+    protected boolean getLineLineIntersection(Line2D.Double l1,
+            Line2D.Double l2,
+            Point intersection)
+    {
+        double  x1 = l1.getX1(), y1 = l1.getY1(),
+        x2 = l1.getX2(), y2 = l1.getY2(),
+        x3 = l2.getX1(), y3 = l2.getY1(),
+        x4 = l2.getX2(), y4 = l2.getY2();
+        double dx1 = x2 - x1;
+        double dx2 = x4 - x3;
+        double dy1 = y2 - y1;
+        double dy2 = y4 - y3;
 
-                double ua = (dx2 * (y1 - y3) - dy2 * (x1 - x3)) / (dy2 * dx1 - dx2 * dy1);
+        double ua = (dx2 * (y1 - y3) - dy2 * (x1 - x3)) / (dy2 * dx1 - dx2 * dy1);
 
-                if (Math.abs(dy2 * dx1 - dx2 * dy1) < 0.0001) {
-                        intersection.x = (int)l1.x2;
-                        intersection.y = (int)l1.y2;
-                        return false;
-                } else {
-                        intersection.x = (int)(x1 + ua * (x2 - x1));
-                        intersection.y = (int)(y1 + ua * (y2 - y1));
-                }
+        if (Math.abs(dy2 * dx1 - dx2 * dy1) < 0.0001) {
+            intersection.x = (int)l1.x2;
+            intersection.y = (int)l1.y2;
+            return false;
+        } else {
+            intersection.x = (int)(x1 + ua * (x2 - x1));
+            intersection.y = (int)(y1 + ua * (y2 - y1));
+        }
 
-                return true;
-        }
+        return true;
+    }
 
-        protected double det(double a, double b, double c, double d)
-        {
-                return a * d - b * c;
-        }
+    protected double det(double a, double b, double c, double d)
+    {
+        return a * d - b * c;
+    }
 
-        protected Point shiftPoint(Point2D p1, Point2D p2, double shift) {
-                double dx = p2.getX() - p1.getX();
-                double dy = p2.getY() - p1.getY();
+    protected Point shiftPoint(Point2D p1, Point2D p2, double shift) {
+        double dx = p2.getX() - p1.getX();
+        double dy = p2.getY() - p1.getY();
 
-                // Perpendicular vector
-                double ndx = -dy;
-                double ndy = dx;
+        // Perpendicular vector
+        double ndx = -dy;
+        double ndy = dx;
 
-                // Normalize
-                double length = Math.sqrt(ndx * ndx + ndy * ndy);
-                ndx = ndx / length;
-                ndy = ndy / length;
+        // Normalize
+        double length = Math.sqrt(ndx * ndx + ndy * ndy);
+        ndx = ndx / length;
+        ndy = ndy / length;
 
-                return new Point((int)(p1.getX() + shift * ndx), (int)(p1.getY() + shift * ndy));
-        }
+        return new Point((int)(p1.getX() + shift * ndx), (int)(p1.getY() + shift * ndy));
+    }
 
-        protected Line2D.Double shiftLine(Point2D p1, Point2D p2, double shift) {
-                double dx = p2.getX() - p1.getX();
-                double dy = p2.getY() - p1.getY();
+    protected Line2D.Double shiftLine(Point2D p1, Point2D p2, double shift) {
+        double dx = p2.getX() - p1.getX();
+        double dy = p2.getY() - p1.getY();
 
-                Point2D point1 = shiftPoint(p1, p2, shift);
-                Point2D point2 = new Point2D.Double(point1.getX() + dx, point1.getY() + dy);
+        Point2D point1 = shiftPoint(p1, p2, shift);
+        Point2D point2 = new Point2D.Double(point1.getX() + dx, point1.getY() + dy);
 
-                return new Line2D.Double(
-                                point1, point2);
-        }
+        return new Line2D.Double(
+                point1, point2);
+    }
 
-        protected GeneralPath getPath(Graphics2D g, MapView mapView, List<Node> nodes, double shift) {
+    protected GeneralPath getPath(Graphics2D g, MapView mapView, List<Node> nodes, double shift) {
 
-                GeneralPath path = new GeneralPath();
+        GeneralPath path = new GeneralPath();
 
-                if (nodes.size() < 2) {
-                        return path;
-                }
+        if (nodes.size() < 2) {
+            return path;
+        }
 
-                Point p1 = null;
-                Point p2 = null;
-                Point p3 = null;
-                Point lastPoint = null;
+        Point p1 = null;
+        Point p2 = null;
+        Point p3 = null;
+        Point lastPoint = null;
 
-                for (Node n: nodes) {
-                        Point p = mapView.getPoint(n);
+        for (Node n: nodes) {
+            Point p = mapView.getPoint(n);
 
-                        if (!p.equals(p3)) {
-                                p1 = p2;
-                                p2 = p3;
-                                p3 = p;
-                        } else {
-                                continue;
-                        }
+            if (!p.equals(p3)) {
+                p1 = p2;
+                p2 = p3;
+                p3 = p;
+            } else {
+                continue;
+            }
 
-                        p = null;
-                        if (p2 != null) {
-                                if (p1 == null) {
-                                        p = shiftPoint(p2, p3, shift);
-                                } else {
-                                        Line2D.Double line1 = shiftLine(p1, p2, shift);
-                                        Line2D.Double line2 = shiftLine(p2, p3, shift);
+            p = null;
+            if (p2 != null) {
+                if (p1 == null) {
+                    p = shiftPoint(p2, p3, shift);
+                } else {
+                    Line2D.Double line1 = shiftLine(p1, p2, shift);
+                    Line2D.Double line2 = shiftLine(p2, p3, shift);
 
-                                        /*path.moveTo((float)line1.x1, (float)line1.y1);
+                    /*path.moveTo((float)line1.x1, (float)line1.y1);
                     path.lineTo((float)line1.x2, (float)line1.y2);
                     path.moveTo((float)line2.x1, (float)line2.y1);
                     path.lineTo((float)line2.x2, (float)line2.y2);*/
 
-                                        p = new Point();
-                                        if (!getLineLineIntersection(line1, line2, p)) {
-                                                p = null;
-                                        } else {
-                                                int dx = p.x - p2.x;
-                                                int dy = p.y - p2.y;
-                                                int distance = (int)Math.sqrt(dx * dx + dy * dy);
-                                                if (distance > 10) {
-                                                        p.x = p2.x + dx / (distance / 10);
-                                                        p.y = p2.y + dy / (distance / 10);
-                                                }
-                                        }
-                                }
-                        }
+                    p = new Point();
+                    if (!getLineLineIntersection(line1, line2, p)) {
+                        p = null;
+                    } else {
+                        int dx = p.x - p2.x;
+                        int dy = p.y - p2.y;
+                        int distance = (int)Math.sqrt(dx * dx + dy * dy);
+                        if (distance > 10) {
+                            p.x = p2.x + dx / (distance / 10);
+                            p.y = p2.y + dy / (distance / 10);
+                        }
+                    }
+                }
+            }
 
-                        if (p != null && lastPoint != null) {
-                                drawSegment(g, mapView, path, lastPoint, p);
-                        }
-                        if (p != null) {
-                                lastPoint = p;
-                        }
-                }
+            if (p != null && lastPoint != null) {
+                drawSegment(g, mapView, path, lastPoint, p);
+            }
+            if (p != null) {
+                lastPoint = p;
+            }
+        }
 
-                if (p2 != null && p3 != null && lastPoint != null) {
-                        p3 = shiftPoint(p3, p2, -shift);
-                        drawSegment(g, mapView, path, lastPoint, p3);
-                }
+        if (p2 != null && p3 != null && lastPoint != null) {
+            p3 = shiftPoint(p3, p2, -shift);
+            drawSegment(g, mapView, path, lastPoint, p3);
+        }
 
-                return path;
-        }
+        return path;
+    }
 
-        private void drawSegment(Graphics2D g, NavigatableComponent nc, GeneralPath path, Point p1, Point p2) {
-                boolean drawIt = false;
-                if (Main.isOpenjdk) {
-                        /**
-                         * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424)
-                         * (It looks like int overflow when clipping.) We do custom clipping.
-                         */
-                        Rectangle bounds = g.getClipBounds();
-                        bounds.grow(100, 100);                  // avoid arrow heads at the border
-                        LineClip clip = new LineClip(p1, p2, bounds);
-                        drawIt = clip.execute();
-                        if (drawIt) {
-                                p1 = clip.getP1();
-                                p2 = clip.getP2();
-                        }
-                } else {
-                        drawIt = isSegmentVisible(nc, p1, p2);
-                }
-                if (drawIt) {
-                        /* draw segment line */
-                        path.moveTo(p1.x, p1.y);
-                        path.lineTo(p2.x, p2.y);
-                }
-        }
+    private void drawSegment(Graphics2D g, NavigatableComponent nc, GeneralPath path, Point p1, Point p2) {
+        boolean drawIt = false;
+        if (Main.isOpenjdk) {
+            /**
+             * Work around openjdk bug. It leads to drawing artefacts when zooming in a lot. (#4289, #4424)
+             * (It looks like int overflow when clipping.) We do custom clipping.
+             */
+            Rectangle bounds = g.getClipBounds();
+            bounds.grow(100, 100);                  // avoid arrow heads at the border
+            LineClip clip = new LineClip(p1, p2, bounds);
+            drawIt = clip.execute();
+            if (drawIt) {
+                p1 = clip.getP1();
+                p2 = clip.getP2();
+            }
+        } else {
+            drawIt = isSegmentVisible(nc, p1, p2);
+        }
+        if (drawIt) {
+            /* draw segment line */
+            path.moveTo(p1.x, p1.y);
+            path.lineTo(p2.x, p2.y);
+        }
+    }
 
-        private boolean isSegmentVisible(NavigatableComponent nc, Point p1, Point p2) {
-                if ((p1.x < 0) && (p2.x < 0)) return false;
-                if ((p1.y < 0) && (p2.y < 0)) return false;
-                if ((p1.x > nc.getWidth()) && (p2.x > nc.getWidth())) return false;
-                if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
-                return true;
-        }
+    private boolean isSegmentVisible(NavigatableComponent nc, Point p1, Point p2) {
+        if ((p1.x < 0) && (p2.x < 0)) return false;
+        if ((p1.y < 0) && (p2.y < 0)) return false;
+        if ((p1.x > nc.getWidth()) && (p2.x > nc.getWidth())) return false;
+        if ((p1.y > nc.getHeight()) && (p2.y > nc.getHeight())) return false;
+        return true;
+    }
 
 

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/routes.xml

@@ -2 +2 @@
 <routes xmlns="http://www.example.org/routes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.example.org/routes routes.xsd ">
 <!-- pattern is the same pattern as used in SearchAction -->
-        <layer name="Czech hiking trails">
-                <route color="#FF0000">
-                        <pattern>
-                        ((type:relation | type:way) kct_red=*) | (color=red type=route route=hiking network="cz:kct")
-                        </pattern>
-                </route>
-                <route color="#FFFF00">
-                        <pattern>
-                        ((type:relation | type:way) kct_yellow=*) | (color=yellow type=route route=hiking network="cz:kct")
-                        </pattern>                      
-                </route>
-                <route color="#0000FF">
-                        <pattern>
-                        ((type:relation | type:way) kct_blue=*) | (color=blue type=route route=hiking network="cz:kct")
-                        </pattern>
-                </route>
-                <route color="#00FF00">
-                        <pattern>
-                        ((type:relation | type:way) kct_green=*) | (color=green type=route route=hiking network="cz:kct")
-                        </pattern>              
-                </route>
-        </layer>
-        <layer name="Cycle routes">
-                <route color="#FF00FF">
-                        <pattern>
-                        (type:way (ncn=* | (lcn=* | rcn=* ))) | (type:relation type=route route=bicycle)
-                        </pattern>
-                </route>
-        </layer>
+    <layer name="Czech hiking trails">
+        <route color="#FF0000">
+            <pattern>
+            ((type:relation | type:way) kct_red=*) | (color=red type=route route=hiking network="cz:kct")
+            </pattern>
+        </route>
+        <route color="#FFFF00">
+            <pattern>
+            ((type:relation | type:way) kct_yellow=*) | (color=yellow type=route route=hiking network="cz:kct")
+            </pattern>            
+        </route>
+        <route color="#0000FF">
+            <pattern>
+            ((type:relation | type:way) kct_blue=*) | (color=blue type=route route=hiking network="cz:kct")
+            </pattern>
+        </route>
+        <route color="#00FF00">
+            <pattern>
+            ((type:relation | type:way) kct_green=*) | (color=green type=route route=hiking network="cz:kct")
+            </pattern>        
+        </route>
+    </layer>
+    <layer name="Cycle routes">
+        <route color="#FF00FF">
+            <pattern>
+            (type:way (ncn=* | (lcn=* | rcn=* ))) | (type:relation type=route route=bicycle)
+            </pattern>
+        </route>
+    </layer>
 </routes>

applications/editors/josm/plugins/routes/src/org/openstreetmap/josm/plugins/routes/xml/routes.xsd

@@ -11 +11 @@
 
 <annotation>
-        <appinfo>
-                <jxb:schemaBindings>    
-                        <jxb:nameXmlTransform>
-                                <jxb:typeName prefix="RoutesXML"/>
-                        </jxb:nameXmlTransform>
-                </jxb:schemaBindings>
-        </appinfo>
+    <appinfo>
+        <jxb:schemaBindings>    
+            <jxb:nameXmlTransform>
+                <jxb:typeName prefix="RoutesXML"/>
+            </jxb:nameXmlTransform>
+        </jxb:schemaBindings>
+    </appinfo>
 </annotation>
 
 <element name="routes">
-        <complexType>
-                <sequence>
-                        <element name="layer" type="tns:layer" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-        </complexType>
+    <complexType>
+        <sequence>
+            <element name="layer" type="tns:layer" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
 </element>
 
 <complexType name="layer">
-        <sequence>
-                <element name="route" type="tns:route" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="string"/>
-        <attribute name="enabled" type="boolean" default="true"/>
+    <sequence>
+        <element name="route" type="tns:route" minOccurs="0" maxOccurs="unbounded"/>
+    </sequence>
+    <attribute name="name" type="string"/>
+    <attribute name="enabled" type="boolean" default="true"/>
 </complexType>
 
 <complexType name="route">
-        <sequence>
-                <element name="pattern" type="string"/>         
-        </sequence>
-        <attribute name="color" type="string"/>
-        <attribute name="enabled" type="boolean" default="true"/>
+    <sequence>
+        <element name="pattern" type="string"/>        
+    </sequence>
+    <attribute name="color" type="string"/>
+    <attribute name="enabled" type="boolean" default="true"/>
 </complexType>