Changeset 655 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2008-06-15T12:28:42+02:00 (17 years ago)

Author:

ramack

Message:

patch by bruce89, closes #812; thanks bruce

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (2 diffs)
• MapStatus.java (modified) (2 diffs)
• NavigatableComponent.java (modified) (3 diffs)
• SelectionManager.java (modified) (2 diffs)
• dialogs/PropertiesDialog.java (modified) (1 diff)
• layer/Layer.java (modified) (1 diff)
• layer/OsmDataLayer.java (modified) (1 diff)
• layer/markerlayer/Marker.java (modified) (1 diff)
• layer/markerlayer/MarkerProducers.java (modified) (1 diff)

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

@@ -58 +58 @@
                 // (By the eager loaded plugins)
                 //
-                // These strings cannot be translated. That's live. Really. Sorry.
+                // These strings cannot be translated. That's life. Really. Sorry.
                 //
                 //                                                                 Imi.
@@ -83 +83 @@
                 // get the preferences.
                 final File prefDir = new File(Main.pref.getPreferencesDir());
-
                 // check if preferences directory has moved (TODO: Update code. Remove this after some time)
                 File oldPrefDir = new File(System.getProperty("user.home")+"/.josm");

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

@@ -111 +111 @@
                 Collection<OsmPrimitive> osmStatus;
                 /**
-                 * The old modifiers, that was pressed the last time this collector ran.
+                 * The old modifiers that was pressed the last time this collector ran.
                  */
                 private int oldModifiers;
@@ -251 +251 @@
         /**
          * Construct a new MapStatus and attach it to the map view.
-         * @param mv The MapView the status line is part of.
+         * @param mapFrame The MapFrame the status line is part of.
          */
         public MapStatus(final MapFrame mapFrame) {

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

@@ -105 +105 @@
         /**
          * Return the point on the screen where this Coordinate would be.
-         * @param point The point, where this geopoint would be drawn.
+         * @param p The point, where this geopoint would be drawn.
          * @return The point on screen where "point" would be drawn, relative
          *              to the own top/left.
@@ -117 +117 @@
         /**
          * Zoom to the given coordinate.
-         * @param centerX The center x-value (easting) to zoom to.
-         * @param centerY The center y-value (northing) to zoom to.
+         * @param newCenter The center x-value (easting) to zoom to.
          * @param scale The scale to use.
          */
@@ -235 +234 @@
          *
          * @param p                              The point on screen.
-         * @return      The primitive, that is nearest to the point p.
+         * @return      The primitive that is nearest to the point p.
          */
         public OsmPrimitive getNearest(Point p) {

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

@@ -62 +62 @@
                 /**
                  * Called, when the left mouse button was released.
-                 * @param r The rectangle, that is currently the selection.
+                 * @param r The rectangle that is currently the selection.
                  * @param alt Whether the alt key was pressed
                  * @param shift Whether the shift key was pressed
@@ -107 +107 @@
          * Create a new SelectionManager.
          *
-         * @param actionListener The action listener that receives the event when
+         * @param selectionEndedListener The action listener that receives the event when
          *              the left button is released.
          * @param aspectRatio If true, the selection window must obtain the aspect

trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -242 +242 @@
 
         /**
-     * @param row
      * @param key
      * @param allData

trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

@@ -98 +98 @@
          */
         abstract public boolean isMergable(Layer other);
-        
-        /**
-         * @return The bounding rectangle this layer occupies on screen when looking
-         *              at x/y values or <code>null</code>, if infinite area or unknown
-         *              area is occupied.
-         */
+
         abstract public void visitBoundingBox(BoundingXYVisitor v);
 

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -224 +224 @@
          * after a successfull upload.
          * 
-         * @param processed A list of all objects, that were actually uploaded. 
+         * @param processed A list of all objects that were actually uploaded. 
          *              May be <code>null</code>, which means nothing has been uploaded but 
          *              saved to disk instead. Note that an empty collection for "processed"

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

@@ -177 +177 @@
          * created from the parameters given.
          *
-         * @param ll lat/lon for marker
-         * @param data hash containing keys and values from the GPX waypoint structure
+         * @param wpt waypoint data for marker
          * @param relativePath An path to use for constructing relative URLs or 
          *        <code>null</code> for no relative URLs

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java

@@ -19 +19 @@
          * given input data, or <code>null</code> otherwise.
          * 
-         * @param ll lat/lon for the marker position
-         * @param data A map of all tags found in the <wpt> node of the gpx file. 
+         * @param wp waypoint data 
          * @param relativePath An path to use for constructing relative URLs or 
          *        <code>null</code> for no relative URLs