Changeset 655 in josm


Ignore:
Timestamp:
2008-06-15T12:28:42+02:00 (11 years ago)
Author:
ramack
Message:

patch by bruce89, closes #812; thanks bruce

Location:
trunk
Files:
56 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/Main.java

    r627 r655  
    7171        /**
    7272         * The worker thread slave. This is for executing all long and intensive
    73          * calculations. The executed runnables are guaranteed to be executed seperatly
    74          * and sequenciel.
     73         * calculations. The executed runnables are guaranteed to be executed separately
     74         * and sequential.
    7575         */
    7676        public final static Executor worker = Executors.newSingleThreadExecutor();
     
    286286
    287287        /**
    288          * Add a new layer to the map. If no map exist, create one.
     288         * Add a new layer to the map. If no map exists, create one.
    289289         */
    290290        public final void addLayer(final Layer layer) {
     
    299299        }
    300300        /**
    301          * @return The edit osm layer. If none exist, it will be created.
     301         * @return The edit osm layer. If none exists, it will be created.
    302302         */
    303303        public final OsmDataLayer editLayer() {
  • trunk/src/org/openstreetmap/josm/actions/AboutAction.java

    r627 r655  
    154154
    155155        /**
    156          * Load the specified ressource into an TextArea and return it.
     156         * Load the specified resource into an TextArea and return it.
    157157         * @param resource The resource url to load
    158158         * @return      An read-only text area with the content of "resource"
  • trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

    r627 r655  
    2222
    2323/**
    24  * Aligns all selected nodes within a circle. (Usefull for roundabouts)
     24 * Aligns all selected nodes within a circle. (Useful for roundabouts)
    2525 *
    2626 * @author Matthew Newton
  • trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

    r627 r655  
    1212
    1313/**
    14  * Helper class for all actions, that access the disk
     14 * Helper class for all actions that access the disk
    1515 */
    1616abstract public class DiskAccessAction extends JosmAction {
  • trunk/src/org/openstreetmap/josm/actions/DownloadAction.java

    r627 r655  
    1919
    2020/**
    21  * Action that opens a connection to the osm server and download map data.
     21 * Action that opens a connection to the osm server and downloads map data.
    2222 *
    2323 * An dialog is displayed asking the user to specify a rectangle to grab.
  • trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java

    r627 r655  
    1818    public DuplicateAction() {
    1919        super(tr("Duplicate"), "duplicate",
    20                         tr("Duplicate selection by Copy and immediate Paste."),
     20                        tr("Duplicate selection by copy and immediate paste."),
    2121                        KeyEvent.VK_D, KeyEvent.CTRL_MASK, true);
    2222        setEnabled(false);
  • trunk/src/org/openstreetmap/josm/actions/ExitAction.java

    r627 r655  
    1010
    1111/**
    12  * Exit the application. May ask for permition first (if something has changed).
     12 * Exit the application. May ask for permission first (if something has changed).
    1313 * 
    1414 * @author imi
  • trunk/src/org/openstreetmap/josm/actions/HelpAction.java

    r627 r655  
    149149
    150150        /**
    151          * Displays the help (or browse on the already open help) to the online page
     151         * Displays the help (or browse on the already open help) on the online page
    152152         * with the given help topic. Use this for larger help descriptions.
    153153         */
  • trunk/src/org/openstreetmap/josm/actions/OpenAction.java

    r627 r655  
    2626
    2727/**
    28  * Open a file chooser dialog and select an file to import. Than call the gpx-import
     28 * Open a file chooser dialog and select an file to import. Then call the gpx-import
    2929 * driver. Finally open an internal frame into the main window with the gpx data shown.
    3030 *
  • trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java

    r627 r655  
    7676       
    7777        /**
    78          * determines whether to enable the widget depending on the contents of the paste
     78         * Determines whether to enable the widget depending on the contents of the paste
    7979         * buffer and current selection
    8080         * @param pasteBuffer
  • trunk/src/org/openstreetmap/josm/actions/RedoAction.java

    r627 r655  
    1919
    2020        /**
    21          * Construct the action with "Undo" as label.
     21         * Construct the action with "Redo" as label.
    2222         */
    2323        public RedoAction() {
  • trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java

    r627 r655  
    3030
    3131        /**
    32          * @param file The filen of the original location of this layer.
     32         * @param file The file of the original location of this layer.
    3333         *              If null, no possibility to "rename the file as well" is provided.
    3434         */
  • trunk/src/org/openstreetmap/josm/actions/SaveAction.java

    r627 r655  
    1313
    1414/**
    15  * Export the data  as OSM intern xml file.
     15 * Export the data as an OSM xml file.
    1616 *
    1717 * @author imi
  • trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

    r627 r655  
    5959        /**
    6060         * Checks whether it is ok to launch a save (whether we have data,
    61          * there is no conflict etc...)
    62          * @return <code>true</code>, if it is save to save.
     61         * there is no conflict etc.)
     62         * @return <code>true</code>, if it is safe to save.
    6363         */
    6464        public boolean checkSaveConditions(Layer layer) {
     
    211211        /**
    212212         * Check the data set if it would be empty on save. It is empty, if it contains
    213          * no objects (after all objects that are created and deleted without beeing
     213         * no objects (after all objects that are created and deleted without being
    214214         * transfered to the server have been removed).
    215215         * 
  • trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

    r627 r655  
    169169        /**
    170170         * Split a way into two or more parts, starting at a selected node.
    171          *
    172          * FIXME: what do the following "arguments" refer to?
    173          * @param way the way to split
    174          * @param nodes the node(s) to split the way at; must be part of the way.
    175171         */
    176172        private void splitWay() {
  • trunk/src/org/openstreetmap/josm/actions/UploadAction.java

    r627 r655  
    2626
    2727/**
    28  * Action that opens a connection to the osm server and upload all changes.
     28 * Action that opens a connection to the osm server and uploads all changes.
    2929 *
    3030 * An dialog is displayed asking the user to specify a rectangle to grab.
     
    5252         * if they want to be able to veto an upload.
    5353         *
    54          * Be dafault, the standard upload dialog is the only element in the list.
    55          * Plugins shold normally insert their code before that, so that the upload
     54         * Be default, the standard upload dialog is the only element in the list.
     55         * Plugins should normally insert their code before that, so that the upload
    5656         * dialog is the last thing shown before upload really starts; on occasion
    5757         * however, a plugin might also want to insert something after that.
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r627 r655  
    3131 * An action that enables the user to delete nodes and other objects.
    3232 *
    33  * The user can click on an object, which get deleted if possible. When Ctrl is
     33 * The user can click on an object, which gets deleted if possible. When Ctrl is
    3434 * pressed when releasing the button, the objects and all its references are
    35  * deleted. The exact definition of "all its references" are in 
    36  * @see #deleteWithReferences(OsmPrimitive)
     35 * deleted. The exact definition of "all its references" are in
     36 * {@link #deleteWithReferences deleteWithReferences}.
    3737 *
    3838 * If the user did not press Ctrl and the object has any references, the user
     
    159159         *
    160160         * @param selection The objects to delete.
    161          * @param alsoDeleteNodesInWay true if nodes should be deleted as well
     161         * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well
    162162         * @return command A command to perform the deletions, or null of there is
    163163         * nothing to delete.
  • trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

    r644 r655  
    478478        }
    479479
    480         /*
     480        /**
    481481         * Adjusts the position of a node to lie on a segment (or a segment
    482482         * intersection).
  • trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

    r627 r655  
    5353        private Cursor oldCursor;
    5454        /**
    55          * The curren tposition of the mouse
     55         * The current position of the mouse
    5656         */
    5757        private Point mousePos;
  • trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

    r627 r655  
    2929import org.openstreetmap.josm.tools.ImageProvider;
    3030/**
    31  * Move is an action that can move all kind of OsmPrimitives (except Keys for now).
     31 * Move is an action that can move all kind of OsmPrimitives (except keys for now).
    3232 *
    3333 * If an selected object is under the mouse when dragging, move all selected objects.
  • trunk/src/org/openstreetmap/josm/command/AddCommand.java

    r630 r655  
    2121/**
    2222 * A command that adds an osm primitive to a dataset. Keys cannot be added this
    23  * way. Use ChangeKeyValueCommand instead.
     23 * way.
    2424 *
    25  * See ChangeCommand for comments on relation back references.
     25 * See {@link ChangeCommand ChangeCommand} for comments on relation back references.
    2626 *
    2727 * @author imi
  • trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

    r630 r655  
    2626public class ChangePropertyCommand extends Command {
    2727        /**
    28          * All primitives, that are affected with this command.
     28         * All primitives that are affected with this command.
    2929         */
    3030        private final List<OsmPrimitive> objects;
     
    3535        /**
    3636         * The key value. If it is <code>null</code>, delete all key references with the given
    37          * key. Else, change the properties of all objects to the given value or create keys of
     37         * key. Otherwise, change the properties of all objects to the given value or create keys of
    3838         * those objects that do not have the key yet.
    3939         */
  • trunk/src/org/openstreetmap/josm/command/Command.java

    r630 r655  
    2525 * one atomic action on a specific dataset, such as move or delete.
    2626 *
    27  * Remember, that the command must be executable and undoable, even if the
     27 * Remember that the command must be executable and undoable, even if the
    2828 * Main.ds has changed, so the command must save the dataset it operates on
    2929 * if necessary.
     
    7171   /**
    7272    * Undoes the command.
    73     * It can be assumed, that all objects are in the same state they were before.
     73    * It can be assumed that all objects are in the same state they were before.
    7474    * It can also be assumed that executeCommand was called exactly once before.
    7575    *
     
    8282
    8383   /**
    84     * Called, when a layer has been removed to have the command remove itself from
     84    * Called when a layer has been removed to have the command remove itself from
    8585    * any buffer if it is not longer applicable to the dataset (e.g. it was part of
    8686    * the removed layer)
     
    123123    * Add to the lists, don't clear them.
    124124    *
    125     * @param modified  The modified primitives
    126     * @param deleted   The deleted primitives
    127     * @param added      The added primitives
     125    * @param modified The modified primitives
     126    * @param deleted The deleted primitives
     127    * @param added The added primitives
    128128    */
    129129   abstract public void fillModifiedData(Collection<OsmPrimitive> modified,
  • trunk/src/org/openstreetmap/josm/command/MoveCommand.java

    r630 r655  
    8383         * vector plus this one.
    8484         *
    85          * The move is immediatly executed and any undo will undo both vectors to
     85         * The move is immediately executed and any undo will undo both vectors to
    8686         * the original position the objects had before first moving.
    8787         */
  • trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

    r630 r655  
    1414
    1515/**
    16  * A command consisting of a sequenz of other commands. Executes the other commands
     16 * A command consisting of a sequence of other commands. Executes the other commands
    1717 * and undo them in reverse order.
    1818 * @author imi
     
    3030        /**
    3131         * Create the command by specifying the list of commands to execute.
    32          * @param sequenz The sequenz that should be executed.
     32         * @param sequenz The sequence that should be executed.
    3333         */
    3434        public SequenceCommand(String name, Collection<Command> sequenz) {
     
    3939
    4040        /**
    41          * Convinient constructor, if the commands are known at compile time.
     41         * Convenient constructor, if the commands are known at compile time.
    4242         */
    4343        public SequenceCommand(String name, Command... sequenz) {
  • trunk/src/org/openstreetmap/josm/data/Bounds.java

    r627 r655  
    88 * This is a simple data class for "rectangular" areas of the world, given in
    99 * lat/lon min/max values.
    10  *
    11  * Do not confuse this with "Area", which is an OSM-primitive for a vector of nodes,
    12  * describing some area (like a sea).
    1310 *
    1411 * @author imi
     
    4441         */
    4542        public LatLon center() {
    46                 // not sure, whether this calculation is right.. maybe there is some
     43                // FIXME: not sure whether this calculation is right; maybe there is some
    4744                // more complex calculation needed to get a center of a spherical
    4845                // dimension?
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r627 r655  
    7878
    7979        /**
    80          * @return A list of all existing directories, where resources could be stored.
     80         * @return A list of all existing directories where resources could be stored.
    8181         */
    8282        public Collection<String> getAllPossiblePreferenceDirs() {
  • trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java

    r627 r655  
    88/**
    99 * This is a listener for selection changes through the dataset's data. Whenever
    10  * a selection of any data meber changes, the dataSet gets informed about this
    11  * and fire a selectionChanged event.
     10 * a selection of any data member changes, the dataSet gets informed about this
     11 * and fires a selectionChanged event.
    1212 *
    13  * Note, that these events get not fired immediately but are inserted in the
    14  * Swing-event queue and packed together. So only one selection changed event
    15  * are issued within one message dispatch routine.
     13 * Note that these events are not fired immediately but are inserted in the
     14 * Swing event queue and packed together. So only one selection changed event
     15 * is issued within a one message dispatch routine.
    1616 *
    1717 * @author imi
  • trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java

    r627 r655  
    55
    66/**
    7  * Base class of points of both coordinate system.
     7 * Base class of points of both coordinate systems.
    88 *
    99 * The variables are default package protected to allow routines in the data package
     
    3030         * The x/y values are left uninitialized.
    3131         *
    32          * @param lat Latitude of the point.
    33          * @param lon Longitude of the point.
     32         * @param x X coordinate of the point.
     33         * @param y Y coordinate of the point.
    3434         */
    3535        Coordinate(double x, double y) {
  • trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

    r627 r655  
    33
    44/**
    5  * Northern, Easting of the projected coordinates.
     5 * Northing, Easting of the projected coordinates.
    66 *
    77 * This class is immutable.
  • trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

    r627 r655  
    2828
    2929        /**
    30          * @return <code>true</code>, if the other point has almost the same lat/lon
    31          * values, only differ by no more than 1/Projection.MAX_SERVER_PRECISION.
     30         * @return <code>true</code> if the other point has almost the same lat/lon
     31         * values, only differing by no more than
     32         * 1 / {@link org.openstreetmap.josm.data.projection.Projection#MAX_SERVER_PRECISION MAX_SERVER_PRECISION}.
    3233         */
    3334        public boolean equalsEpsilon(LatLon other) {
  • trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

    r647 r655  
    1212
    1313/**
    14  * objects of this class represent a gpx file with tracks, waypoints and routes
    15  * it uses GPX1.1 see http://www.topografix.com/GPX/1/1/ for details
     14 * Objects of this class represent a gpx file with tracks, waypoints and routes.
     15 * It uses GPX v1.1, see {@link <a href="http://www.topografix.com/GPX/1/1/">the spec</a>}
     16 * for details.
    1617 *
    1718 * @author Raphael Mack <ramack@raphael-mack.de>
  • trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java

    r647 r655  
    3333       
    3434        /**
    35          * convert the time stamp of ther waypoint into seconds from the epoch
    36          * @return seconds
     35         * Convert the time stamp of the waypoint into seconds from the epoch
    3736         */
    3837        public void setTime () {
  • trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

    r627 r655  
    2828       
    2929        /**
    30          * User that created thos changeset, as specified by the server.
     30         * User that created this changeset, as specified by the server.
    3131         * Never changed by JOSM.
    3232         */
  • trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

    r627 r655  
    1616 * saved, (up/down/disk)loaded etc.
    1717 *
    18  * Note, that DataSet is not an osm-primitive and so has no key association
     18 * Note that DataSet is not an osm-primitive and so has no key association
    1919 * but a few members to store some information.
    2020 *
     
    4949        /**
    5050         * A list of listeners to selection changed events. The list is static,
    51          * as listeners register themself for any dataset selection changes that
    52          * occour, regardless of the current active dataset. (However, the
     51         * as listeners register themselves for any dataset selection changes that
     52         * occur, regardless of the current active dataset. (However, the
    5353         * selection does only change in the active layer)
    5454         */
     
    9191        /**
    9292         * Remove the selection of the whole dataset.
    93          * @deprecated Use setSelected() instead.
     93         * @deprecated Use {@link #setSelected(Collection) setSelected}
     94         * instead.
    9495         */
    9596        @Deprecated
  • trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

    r629 r655  
    2222 *
    2323 * Although OsmPrimitive is designed as a base class, it is not to be meant to subclass
    24  * it by any other than from the package org.openstreetmap.josm.data.osm (thus the
    25  * visibility of the constructor). The available primitives are a fixed set that are given
     24 * it by any other than from the package {@link org.openstreetmap.josm.data.osm}. The available primitives are a fixed set that are given
    2625 * by the server environment and not an extendible data stuff.
    2726 *
     
    3635
    3736        /**
    38          * Unique identifier in OSM. This is used to reidentify objects in the server.
     37         * Unique identifier in OSM. This is used to identify objects on the server.
    3938         * An id of 0 means an unknown id. The object has not been uploaded yet to
    4039         * know what id it will get.
     
    4847
    4948        /**
    50          * <code>true</code>, if the object has been modified since it was loaded from
     49         * <code>true</code> if the object has been modified since it was loaded from
    5150         * the server. In this case, on next upload, this object will be updated.
    5251         * Deleted objects are deleted from the server. If the objects are added (id=0),
     
    8382       
    8483        /**
    85          * true if this object has direction dependant tags (e.g. oneway)
     84         * true if this object has direction dependent tags (e.g. oneway)
    8685         */
    8786        public boolean hasDirectionKeys = false;
     
    113112        /**
    114113         * Contains the version number as returned by the API. Needed to
    115          * ensure update consistancy
     114         * ensure update consistency
    116115         */
    117116        public int version = -1;
     
    125124       
    126125        /**
    127          * Contains a list of direction-dependent keys that do not make an object
     126         * Contains a list of direction-dependent keys that make an object
    128127         * direction dependent.
    129128         */
     
    132131       
    133132        /**
    134          * Implementation of the visitor scheme. Subclases have to call the correct
     133         * Implementation of the visitor scheme. Subclasses have to call the correct
    135134         * visitor function.
    136135         * @param visitor The visitor from which the visit() function must be called.
     
    174173
    175174        /**
    176          * Return the id plus the class type encoded as hashcode or supers hashcode if id is 0.
     175         * Return the id plus the class type encoded as hashcode or super's hashcode if id is 0.
    177176         *
    178          * An primitive has the same hashcode as its incomplete counter part.
     177         * An primitive has the same hashcode as its incomplete counterpart.
    179178         */
    180179        @Override public final int hashCode() {
  • trunk/src/org/openstreetmap/josm/data/osm/User.java

    r627 r655  
    77 * A simple class to keep a list of user names.
    88 *
    9  * Instead of storing user names as strings with every OSM primtive, we store
     9 * Instead of storing user names as strings with every OSM primitive, we store
    1010 * a reference to an user object, and make sure that for each username there
    1111 * is only one user object.
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java

    r627 r655  
    88
    99/**
    10  * Visitor, that adds the visited object to the dataset given at constructor.
     10 * Visitor that adds the visited object to the dataset given at constructor.
    1111 *
    1212 * Is not capable of adding keys.
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java

    r627 r655  
    1010
    1111/**
    12  * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the
     12 * Calculates the total bounding rectangle of a series of OsmPrimitives, using the
    1313 * EastNorth values as reference.
    1414 * @author imi
  • trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java

    r627 r655  
    88
    99/**
    10  * Visitor, that adds the visited object to the dataset given at constructor.
     10 * Visitor that adds the visited object to the dataset given at constructor.
    1111 *
    1212 * Is not capable of adding keys.
  • trunk/src/org/openstreetmap/josm/data/projection/Projection.java

    r627 r655  
    66
    77/**
    8  * Classes subclass this are able to convert lat/lon values to
    9  * planear screen coordinates.
     8 * Classes implementing this are able to convert lat/lon values to
     9 * planar screen coordinates.
    1010 *
    1111 * @author imi
     
    1313public interface Projection {
    1414
     15        /**
     16         * Maximum latitude representable.
     17         */
    1518        public static final double MAX_LAT = 85.05112877980659; // Mercator squares the world
     19       
     20        /**
     21         * Maximum longditude representable.
     22         */
    1623        public static final double MAX_LON = 180;
     24
     25        /**
     26         * Minimum difference in location to not be represented as the same position.
     27         */
    1728        public static final double MAX_SERVER_PRECISION = 1e12;
    1829
    1930        /**
    20          * List of all available Projections.
     31         * List of all available projections.
    2132         */
    2233        public static Projection[] allProjections = new Projection[]{
  • trunk/src/org/openstreetmap/josm/gui/MainApplication.java

    r627 r655  
    5858                // (By the eager loaded plugins)
    5959                //
    60                 // These strings cannot be translated. That's live. Really. Sorry.
     60                // These strings cannot be translated. That's life. Really. Sorry.
    6161                //
    6262                //                                                                 Imi.
     
    8383                // get the preferences.
    8484                final File prefDir = new File(Main.pref.getPreferencesDir());
    85 
    8685                // check if preferences directory has moved (TODO: Update code. Remove this after some time)
    8786                File oldPrefDir = new File(System.getProperty("user.home")+"/.josm");
  • trunk/src/org/openstreetmap/josm/gui/MapStatus.java

    r632 r655  
    111111                Collection<OsmPrimitive> osmStatus;
    112112                /**
    113                  * The old modifiers, that was pressed the last time this collector ran.
     113                 * The old modifiers that was pressed the last time this collector ran.
    114114                 */
    115115                private int oldModifiers;
     
    251251        /**
    252252         * Construct a new MapStatus and attach it to the map view.
    253          * @param mv The MapView the status line is part of.
     253         * @param mapFrame The MapFrame the status line is part of.
    254254         */
    255255        public MapStatus(final MapFrame mapFrame) {
  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r627 r655  
    105105        /**
    106106         * Return the point on the screen where this Coordinate would be.
    107          * @param point The point, where this geopoint would be drawn.
     107         * @param p The point, where this geopoint would be drawn.
    108108         * @return The point on screen where "point" would be drawn, relative
    109109         *              to the own top/left.
     
    117117        /**
    118118         * Zoom to the given coordinate.
    119          * @param centerX The center x-value (easting) to zoom to.
    120          * @param centerY The center y-value (northing) to zoom to.
     119         * @param newCenter The center x-value (easting) to zoom to.
    121120         * @param scale The scale to use.
    122121         */
     
    235234         *
    236235         * @param p                              The point on screen.
    237          * @return      The primitive, that is nearest to the point p.
     236         * @return      The primitive that is nearest to the point p.
    238237         */
    239238        public OsmPrimitive getNearest(Point p) {
  • trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

    r627 r655  
    6262                /**
    6363                 * Called, when the left mouse button was released.
    64                  * @param r The rectangle, that is currently the selection.
     64                 * @param r The rectangle that is currently the selection.
    6565                 * @param alt Whether the alt key was pressed
    6666                 * @param shift Whether the shift key was pressed
     
    107107         * Create a new SelectionManager.
    108108         *
    109          * @param actionListener The action listener that receives the event when
     109         * @param selectionEndedListener The action listener that receives the event when
    110110         *              the left button is released.
    111111         * @param aspectRatio If true, the selection window must obtain the aspect
  • trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

    r627 r655  
    242242
    243243        /**
    244      * @param row
    245244     * @param key
    246245     * @param allData
  • trunk/src/org/openstreetmap/josm/gui/layer/Layer.java

    r627 r655  
    9898         */
    9999        abstract public boolean isMergable(Layer other);
    100        
    101         /**
    102          * @return The bounding rectangle this layer occupies on screen when looking
    103          *              at x/y values or <code>null</code>, if infinite area or unknown
    104          *              area is occupied.
    105          */
     100
    106101        abstract public void visitBoundingBox(BoundingXYVisitor v);
    107102
  • trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

    r638 r655  
    224224         * after a successfull upload.
    225225         *
    226          * @param processed A list of all objects, that were actually uploaded.
     226         * @param processed A list of all objects that were actually uploaded.
    227227         *              May be <code>null</code>, which means nothing has been uploaded but
    228228         *              saved to disk instead. Note that an empty collection for "processed"
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java

    r627 r655  
    177177         * created from the parameters given.
    178178         *
    179          * @param ll lat/lon for marker
    180          * @param data hash containing keys and values from the GPX waypoint structure
     179         * @param wpt waypoint data for marker
    181180         * @param relativePath An path to use for constructing relative URLs or
    182181         *        <code>null</code> for no relative URLs
  • trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java

    r627 r655  
    1919         * given input data, or <code>null</code> otherwise.
    2020         *
    21          * @param ll lat/lon for the marker position
    22          * @param data A map of all tags found in the <wpt> node of the gpx file.
     21         * @param wp waypoint data
    2322         * @param relativePath An path to use for constructing relative URLs or
    2423         *        <code>null</code> for no relative URLs
  • trunk/src/org/openstreetmap/josm/io/MyHttpHandler.java

    r627 r655  
    2323            }
    2424            public MyHttpHandler(String proxy, int port) {
    25                 proxy = proxy;
     25                this.proxy = proxy;
    2626                proxyPort = port;
    2727            }
  • trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

    r653 r655  
    1818     
    1919     /**
    20       * Method to download single Objects from OSM server. ways, relations, nodes
    21       * @param id  Object ID
    22       * @param type  way node relation
     20      * Method to download single objects from OSM server. ways, relations, nodes
     21      * @param id Object ID
     22      * @param type way node relation
    2323      * @param full download with or without child objects
    24       * @return
     24      * @return the data requested
    2525      * @throws SAXException
    2626      * @throws IOException
    2727      */
    28      public DataSet parseOsm(long id,String type, boolean full ) throws SAXException, IOException {
     28     public DataSet parseOsm(long id, String type, boolean full) throws SAXException, IOException {
    2929            try {
    3030               
  • trunk/src/org/openstreetmap/josm/io/OsmServerReader.java

    r627 r655  
    2626         * Open a connection to the given url and return a reader on the input stream
    2727         * from that connection. In case of user cancel, return <code>null</code>.
    28          * @param url The exact url to connect to.
     28         * @param urlStr The exact url to connect to.
     29         * @param pleaseWaitDlg
    2930         * @return An reader reading the input stream (servers answer) or <code>null</code>.
    3031         */
  • trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

    r627 r655  
    140140        /**
    141141         * To get the Url of the playing or recently played audio.
    142          * @returns url - could be null
     142         * @return url - could be null
    143143         */
    144144        public static URL url() {
     
    148148        /**
    149149         * Whether or not we are paused.
    150          * @returns boolean whether or not paused
     150         * @return boolean whether or not paused
    151151         */
    152152        public static boolean paused() {
     
    156156        /**
    157157         * Whether or not we are playing.
    158          * @returns boolean whether or not playing
     158         * @return boolean whether or not playing
    159159         */
    160160        public static boolean playing() {
     
    164164        /**
    165165         * How far we are through playing, in seconds.
    166          * @returns double seconds
     166         * @return double seconds
    167167         */
    168168        public static double position() {
     
    172172        /**
    173173         * Speed at which we will play.
    174          * @returns double, speed multiplier
     174         * @return double, speed multiplier
    175175         */
    176176        public static double speed() {
  • trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

    r627 r655  
    3333
    3434/**
    35  * An exception handler, that ask the user to send a bug report.
     35 * An exception handler that asks the user to send a bug report.
    3636 *
    3737 * @author imi
     
    6060                                int answer = JOptionPane.showConfirmDialog(
    6161                                                Main.parent,
    62                                                 tr("An unexpected exception occurred, that may come from in the ''{0}'' plugin.", plugin.info.name)+"\n"+
     62                                                tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)+"\n"+
    6363                                                (plugin.info.author != null ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author) : "")+"\n"+
    6464                                                tr("Should the plugin be disabled?"),
  • trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java

    r626 r655  
    315315
    316316        /**
    317          * The merger should auto-resolve items, that have not changed but are marked as
     317         * The merger should auto-resolve items that have not changed but are marked as
    318318         * changed. In the case where an unmodified newer item is merged over an modified
    319319         * older, the modified-flag should be removed and the newer timestamp is used.
Note: See TracChangeset for help on using the changeset viewer.