Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2013-07-17T00:01:49+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (28 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -64 +64 @@
         void zoomChanged();
     }
-    
+
     /**
      * Interface to notify listeners of the change of the system of measurement.
@@ -77 +77 @@
         void systemOfMeasurementChanged(String oldSoM, String newSoM);
     }
-    
+
     /**
      * Simple data class that keeps map center and scale in one object.
@@ -150 +150 @@
     /**
      * Removes a SoM change listener
-     * 
+     *
      * @param listener the listener. Ignored if null or already absent
      * @since 6056
@@ -160 +160 @@
     /**
      * Adds a SoM change listener
-     * 
+     *
      * @param listener the listener. Ignored if null or already registered.
      * @since 6056
@@ -169 +169 @@
         }
     }
-    
+
     protected static void fireSoMChanged(String oldSoM, String newSoM) {
         for (SoMChangeListener l : somChangeListeners) {
@@ -190 +190 @@
     private Rectangle paintRect = null;
     private Polygon paintPoly = null;
-    
+
     public NavigatableComponent() {
         setLayout(null);
@@ -728 +728 @@
         return getNearestNode(p, predicate, use_selected, null);
     }
-    
+
     /**
      * The *result* depends on the current map selection state IF use_selected is true
@@ -734 +734 @@
      * If more than one node within node.snap-distance pixels is found,
      * the nearest node selected is returned IF use_selected is true.
-     * 
+     *
      * If there are no selected nodes near that point, the node that is related to some of the preferredRefs
      *
@@ -755 +755 @@
     public final Node getNearestNode(Point p, Predicate<OsmPrimitive> predicate,
             boolean use_selected, Collection<OsmPrimitive> preferredRefs) {
-        
+
         Map<Double, List<Node>> nlists = getNearestNodesImpl(p, predicate);
         if (nlists.isEmpty()) return null;
-        
+
         if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
         Node ntsel = null, ntnew = null, ntref = null;
@@ -793 +793 @@
 
         // take nearest selected, nearest new or true nearest node to p, in that order
-        if (ntsel != null && useNtsel) 
+        if (ntsel != null && useNtsel)
             return ntsel;
-        if (ntref != null) 
+        if (ntref != null)
             return ntref;
-        if (ntnew != null) 
+        if (ntnew != null)
             return ntnew;
         return nlists.values().iterator().next().get(0);
@@ -956 +956 @@
         return (ntsel != null && use_selected) ? ntsel : wayseg;
     }
-    
+
      /**
      * The *result* depends on the current map selection state IF use_selected is true.
@@ -974 +974 @@
         WaySegment wayseg = null, ntsel = null, ntref = null;
         if (preferredRefs != null && preferredRefs.isEmpty()) preferredRefs = null;
-        
+
         searchLoop: for (List<WaySegment> wslist : getNearestWaySegmentsImpl(p, predicate).values()) {
             for (WaySegment ws : wslist) {
@@ -1003 +1003 @@
             }
         }
-        if (ntsel != null && use_selected) 
+        if (ntsel != null && use_selected)
             return ntsel;
         if (ntref != null)
@@ -1180 +1180 @@
      */
     public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean use_selected) {
-        Collection<OsmPrimitive> sel = 
+        Collection<OsmPrimitive> sel =
                 use_selected ? getCurrentDataSet().getSelected() : null;
         OsmPrimitive osm = getNearestNode(p, predicate, use_selected, sel);
@@ -1295 +1295 @@
             }
         }
-        
+
         // add nearby nodes
         for (List<Node> nlist : getNearestNodesImpl(p, predicate).values()) {
             nearestList.addAll(nlist);
         }
-        
+
         // add parent relations of nearby nodes and ways
         Set<OsmPrimitive> parentRelations = new HashSet<OsmPrimitive>();
@@ -1311 +1311 @@
         }
         nearestList.addAll(parentRelations);
-        
+
         if (ignore != null) {
             nearestList.removeAll(ignore);
@@ -1392 +1392 @@
      */
     public static class SystemOfMeasurement {
-        
+
         /** First value, in meters, used to translate unit according to above formula. */
         public final double aValue;
@@ -1404 +1404 @@
          *  @since 5870 */
         public final double areaCustomValue;
-        /** Specific optional area unit. Set to {@code null} if not used. 
+        /** Specific optional area unit. Set to {@code null} if not used.
          *  @since 5870 */
         public final String areaCustomName;
@@ -1413 +1413 @@
          * If a quantity x is given in m (x_m) and in unit a (x_a) then it translates as
          * x_a == x_m / aValue
-         * 
+         *
          * @param aValue First value, in meters, used to translate unit according to above formula.
          * @param aName First unit used to format text.
@@ -1422 +1422 @@
             this(aValue, aName, bValue, bName, -1, null);
         }
-        
+
         /**
          * System of measurement. Currently covers only length (and area) units.
@@ -1428 +1428 @@
          * If a quantity x is given in m (x_m) and in unit a (x_a) then it translates as
          * x_a == x_m / aValue
-         * 
+         *
          * @param aValue First value, in meters, used to translate unit according to above formula.
          * @param aName First unit used to format text.
          * @param bValue Second value, in meters, used to translate unit according to above formula.
          * @param bName Second unit used to format text.
-         * @param areaCustomValue Specific optional area value, in squared meters, between {@code aValue*aValue} and {@code bValue*bValue}. 
+         * @param areaCustomValue Specific optional area value, in squared meters, between {@code aValue*aValue} and {@code bValue*bValue}.
          *                        Set to {@code -1} if not used.
          * @param areaCustomName Specific optional area unit. Set to {@code null} if not used.
-         * 
+         *
          * @since 5870
          */
@@ -1482 +1482 @@
                 return formatText(a, aName+"\u00b2");
         }
-        
+
         private static String formatText(double v, String unit) {
             return String.format(Locale.US, "%." + (v<9.999999 ? 2 : 1) + "f %s", v, unit);
@@ -1493 +1493 @@
      */
     public static final SystemOfMeasurement METRIC_SOM = new SystemOfMeasurement(1, "m", 1000, "km", 10000, "ha");
-    
+
     /**
      * Chinese system.
@@ -1499 +1499 @@
      */
     public static final SystemOfMeasurement CHINESE_SOM = new SystemOfMeasurement(1.0/3.0, "\u5e02\u5c3a" /* chi */, 500, "\u5e02\u91cc" /* li */);
-    
+
     /**
      * Imperial system (British Commonwealth and former British Empire).
@@ -1505 +1505 @@
      */
     public static final SystemOfMeasurement IMPERIAL_SOM = new SystemOfMeasurement(0.3048, "ft", 1609.344, "mi", 4046.86, "ac");
-    
+
     /**
      * Nautical mile system (navigation, polar exploration).
@@ -1579 +1579 @@
         Cursors = c;
     }
-    
+
     @Override
     public void paint(Graphics g) {
@@ -1613 +1613 @@
         }
     }
-    
+
     /**
      * Requests to paint the given {@code Polygon} as a polyline (unclosed polygon).
@@ -1628 +1628 @@
         }
     }
-    
+
     /**
      * Requests to clear the rectangled previously drawn.