- Timestamp:
- 2008-06-15T12:28:42+02:00 (16 years ago)
- Location:
- trunk
- Files:
-
- 56 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/Main.java
r627 r655 71 71 /** 72 72 * The worker thread slave. This is for executing all long and intensive 73 * calculations. The executed runnables are guaranteed to be executed sep eratly74 * and sequen ciel.73 * calculations. The executed runnables are guaranteed to be executed separately 74 * and sequential. 75 75 */ 76 76 public final static Executor worker = Executors.newSingleThreadExecutor(); … … 286 286 287 287 /** 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. 289 289 */ 290 290 public final void addLayer(final Layer layer) { … … 299 299 } 300 300 /** 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. 302 302 */ 303 303 public final OsmDataLayer editLayer() { -
trunk/src/org/openstreetmap/josm/actions/AboutAction.java
r627 r655 154 154 155 155 /** 156 * Load the specified res source into an TextArea and return it.156 * Load the specified resource into an TextArea and return it. 157 157 * @param resource The resource url to load 158 158 * @return An read-only text area with the content of "resource" -
trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java
r627 r655 22 22 23 23 /** 24 * Aligns all selected nodes within a circle. (Useful lfor roundabouts)24 * Aligns all selected nodes within a circle. (Useful for roundabouts) 25 25 * 26 26 * @author Matthew Newton -
trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java
r627 r655 12 12 13 13 /** 14 * Helper class for all actions ,that access the disk14 * Helper class for all actions that access the disk 15 15 */ 16 16 abstract public class DiskAccessAction extends JosmAction { -
trunk/src/org/openstreetmap/josm/actions/DownloadAction.java
r627 r655 19 19 20 20 /** 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. 22 22 * 23 23 * An dialog is displayed asking the user to specify a rectangle to grab. -
trunk/src/org/openstreetmap/josm/actions/DuplicateAction.java
r627 r655 18 18 public DuplicateAction() { 19 19 super(tr("Duplicate"), "duplicate", 20 tr("Duplicate selection by Copy and immediate Paste."),20 tr("Duplicate selection by copy and immediate paste."), 21 21 KeyEvent.VK_D, KeyEvent.CTRL_MASK, true); 22 22 setEnabled(false); -
trunk/src/org/openstreetmap/josm/actions/ExitAction.java
r627 r655 10 10 11 11 /** 12 * Exit the application. May ask for permi tion first (if something has changed).12 * Exit the application. May ask for permission first (if something has changed). 13 13 * 14 14 * @author imi -
trunk/src/org/openstreetmap/josm/actions/HelpAction.java
r627 r655 149 149 150 150 /** 151 * Displays the help (or browse on the already open help) tothe online page151 * Displays the help (or browse on the already open help) on the online page 152 152 * with the given help topic. Use this for larger help descriptions. 153 153 */ -
trunk/src/org/openstreetmap/josm/actions/OpenAction.java
r627 r655 26 26 27 27 /** 28 * Open a file chooser dialog and select an file to import. Th an call the gpx-import28 * Open a file chooser dialog and select an file to import. Then call the gpx-import 29 29 * driver. Finally open an internal frame into the main window with the gpx data shown. 30 30 * -
trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java
r627 r655 76 76 77 77 /** 78 * determines whether to enable the widget depending on the contents of the paste78 * Determines whether to enable the widget depending on the contents of the paste 79 79 * buffer and current selection 80 80 * @param pasteBuffer -
trunk/src/org/openstreetmap/josm/actions/RedoAction.java
r627 r655 19 19 20 20 /** 21 * Construct the action with " Undo" as label.21 * Construct the action with "Redo" as label. 22 22 */ 23 23 public RedoAction() { -
trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java
r627 r655 30 30 31 31 /** 32 * @param file The file nof the original location of this layer.32 * @param file The file of the original location of this layer. 33 33 * If null, no possibility to "rename the file as well" is provided. 34 34 */ -
trunk/src/org/openstreetmap/josm/actions/SaveAction.java
r627 r655 13 13 14 14 /** 15 * Export the data as OSM internxml file.15 * Export the data as an OSM xml file. 16 16 * 17 17 * @author imi -
trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
r627 r655 59 59 /** 60 60 * 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 sa ve to save.61 * there is no conflict etc.) 62 * @return <code>true</code>, if it is safe to save. 63 63 */ 64 64 public boolean checkSaveConditions(Layer layer) { … … 211 211 /** 212 212 * 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 be eing213 * no objects (after all objects that are created and deleted without being 214 214 * transfered to the server have been removed). 215 215 * -
trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java
r627 r655 169 169 /** 170 170 * 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 split174 * @param nodes the node(s) to split the way at; must be part of the way.175 171 */ 176 172 private void splitWay() { -
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r627 r655 26 26 27 27 /** 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. 29 29 * 30 30 * An dialog is displayed asking the user to specify a rectangle to grab. … … 52 52 * if they want to be able to veto an upload. 53 53 * 54 * Be d afault, the standard upload dialog is the only element in the list.55 * Plugins sho ld normally insert their code before that, so that the upload54 * 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 56 56 * dialog is the last thing shown before upload really starts; on occasion 57 57 * however, a plugin might also want to insert something after that. -
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r627 r655 31 31 * An action that enables the user to delete nodes and other objects. 32 32 * 33 * The user can click on an object, which get deleted if possible. When Ctrl is33 * The user can click on an object, which gets deleted if possible. When Ctrl is 34 34 * 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}. 37 37 * 38 38 * If the user did not press Ctrl and the object has any references, the user … … 159 159 * 160 160 * @param selection The objects to delete. 161 * @param alsoDeleteNodesInWay trueif nodes should be deleted as well161 * @param alsoDeleteNodesInWay <code>true</code> if nodes should be deleted as well 162 162 * @return command A command to perform the deletions, or null of there is 163 163 * nothing to delete. -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r644 r655 478 478 } 479 479 480 /* 480 /** 481 481 * Adjusts the position of a node to lie on a segment (or a segment 482 482 * intersection). -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r627 r655 53 53 private Cursor oldCursor; 54 54 /** 55 * The curren tposition of the mouse55 * The current position of the mouse 56 56 */ 57 57 private Point mousePos; -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r627 r655 29 29 import org.openstreetmap.josm.tools.ImageProvider; 30 30 /** 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). 32 32 * 33 33 * If an selected object is under the mouse when dragging, move all selected objects. -
trunk/src/org/openstreetmap/josm/command/AddCommand.java
r630 r655 21 21 /** 22 22 * A command that adds an osm primitive to a dataset. Keys cannot be added this 23 * way. Use ChangeKeyValueCommand instead.23 * way. 24 24 * 25 * See ChangeCommandfor comments on relation back references.25 * See {@link ChangeCommand ChangeCommand} for comments on relation back references. 26 26 * 27 27 * @author imi -
trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java
r630 r655 26 26 public class ChangePropertyCommand extends Command { 27 27 /** 28 * All primitives ,that are affected with this command.28 * All primitives that are affected with this command. 29 29 */ 30 30 private final List<OsmPrimitive> objects; … … 35 35 /** 36 36 * 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 of37 * key. Otherwise, change the properties of all objects to the given value or create keys of 38 38 * those objects that do not have the key yet. 39 39 */ -
trunk/src/org/openstreetmap/josm/command/Command.java
r630 r655 25 25 * one atomic action on a specific dataset, such as move or delete. 26 26 * 27 * Remember ,that the command must be executable and undoable, even if the27 * Remember that the command must be executable and undoable, even if the 28 28 * Main.ds has changed, so the command must save the dataset it operates on 29 29 * if necessary. … … 71 71 /** 72 72 * 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. 74 74 * It can also be assumed that executeCommand was called exactly once before. 75 75 * … … 82 82 83 83 /** 84 * Called ,when a layer has been removed to have the command remove itself from84 * Called when a layer has been removed to have the command remove itself from 85 85 * any buffer if it is not longer applicable to the dataset (e.g. it was part of 86 86 * the removed layer) … … 123 123 * Add to the lists, don't clear them. 124 124 * 125 * @param modified 126 * @param deleted 127 * @param added 125 * @param modified The modified primitives 126 * @param deleted The deleted primitives 127 * @param added The added primitives 128 128 */ 129 129 abstract public void fillModifiedData(Collection<OsmPrimitive> modified, -
trunk/src/org/openstreetmap/josm/command/MoveCommand.java
r630 r655 83 83 * vector plus this one. 84 84 * 85 * The move is immediat ly executed and any undo will undo both vectors to85 * The move is immediately executed and any undo will undo both vectors to 86 86 * the original position the objects had before first moving. 87 87 */ -
trunk/src/org/openstreetmap/josm/command/SequenceCommand.java
r630 r655 14 14 15 15 /** 16 * A command consisting of a sequen zof other commands. Executes the other commands16 * A command consisting of a sequence of other commands. Executes the other commands 17 17 * and undo them in reverse order. 18 18 * @author imi … … 30 30 /** 31 31 * Create the command by specifying the list of commands to execute. 32 * @param sequenz The sequen zthat should be executed.32 * @param sequenz The sequence that should be executed. 33 33 */ 34 34 public SequenceCommand(String name, Collection<Command> sequenz) { … … 39 39 40 40 /** 41 * Conv inient constructor, if the commands are known at compile time.41 * Convenient constructor, if the commands are known at compile time. 42 42 */ 43 43 public SequenceCommand(String name, Command... sequenz) { -
trunk/src/org/openstreetmap/josm/data/Bounds.java
r627 r655 8 8 * This is a simple data class for "rectangular" areas of the world, given in 9 9 * 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).13 10 * 14 11 * @author imi … … 44 41 */ 45 42 public LatLon center() { 46 // not sure, whether this calculation is right..maybe there is some43 // FIXME: not sure whether this calculation is right; maybe there is some 47 44 // more complex calculation needed to get a center of a spherical 48 45 // dimension? -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r627 r655 78 78 79 79 /** 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. 81 81 */ 82 82 public Collection<String> getAllPossiblePreferenceDirs() { -
trunk/src/org/openstreetmap/josm/data/SelectionChangedListener.java
r627 r655 8 8 /** 9 9 * This is a listener for selection changes through the dataset's data. Whenever 10 * a selection of any data me ber changes, the dataSet gets informed about this11 * 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. 12 12 * 13 * Note , that these events getnot fired immediately but are inserted in the14 * Swing -event queue and packed together. So only one selection changed event15 * are issued withinone 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. 16 16 * 17 17 * @author imi -
trunk/src/org/openstreetmap/josm/data/coor/Coordinate.java
r627 r655 5 5 6 6 /** 7 * Base class of points of both coordinate system .7 * Base class of points of both coordinate systems. 8 8 * 9 9 * The variables are default package protected to allow routines in the data package … … 30 30 * The x/y values are left uninitialized. 31 31 * 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. 34 34 */ 35 35 Coordinate(double x, double y) { -
trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java
r627 r655 3 3 4 4 /** 5 * North ern, Easting of the projected coordinates.5 * Northing, Easting of the projected coordinates. 6 6 * 7 7 * This class is immutable. -
trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
r627 r655 28 28 29 29 /** 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}. 32 33 */ 33 34 public boolean equalsEpsilon(LatLon other) { -
trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
r647 r655 12 12 13 13 /** 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. 16 17 * 17 18 * @author Raphael Mack <ramack@raphael-mack.de> -
trunk/src/org/openstreetmap/josm/data/gpx/WayPoint.java
r647 r655 33 33 34 34 /** 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 37 36 */ 38 37 public void setTime () { -
trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
r627 r655 28 28 29 29 /** 30 * User that created th os changeset, as specified by the server.30 * User that created this changeset, as specified by the server. 31 31 * Never changed by JOSM. 32 32 */ -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r627 r655 16 16 * saved, (up/down/disk)loaded etc. 17 17 * 18 * Note ,that DataSet is not an osm-primitive and so has no key association18 * Note that DataSet is not an osm-primitive and so has no key association 19 19 * but a few members to store some information. 20 20 * … … 49 49 /** 50 50 * A list of listeners to selection changed events. The list is static, 51 * as listeners register themsel ffor any dataset selection changes that52 * occ our, regardless of the current active dataset. (However, the51 * as listeners register themselves for any dataset selection changes that 52 * occur, regardless of the current active dataset. (However, the 53 53 * selection does only change in the active layer) 54 54 */ … … 91 91 /** 92 92 * Remove the selection of the whole dataset. 93 * @deprecated Use setSelected() instead. 93 * @deprecated Use {@link #setSelected(Collection) setSelected} 94 * instead. 94 95 */ 95 96 @Deprecated -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r629 r655 22 22 * 23 23 * 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 26 25 * by the server environment and not an extendible data stuff. 27 26 * … … 36 35 37 36 /** 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. 39 38 * An id of 0 means an unknown id. The object has not been uploaded yet to 40 39 * know what id it will get. … … 48 47 49 48 /** 50 * <code>true</code> ,if the object has been modified since it was loaded from49 * <code>true</code> if the object has been modified since it was loaded from 51 50 * the server. In this case, on next upload, this object will be updated. 52 51 * Deleted objects are deleted from the server. If the objects are added (id=0), … … 83 82 84 83 /** 85 * true if this object has direction depend ant tags (e.g. oneway)84 * true if this object has direction dependent tags (e.g. oneway) 86 85 */ 87 86 public boolean hasDirectionKeys = false; … … 113 112 /** 114 113 * Contains the version number as returned by the API. Needed to 115 * ensure update consist ancy114 * ensure update consistency 116 115 */ 117 116 public int version = -1; … … 125 124 126 125 /** 127 * Contains a list of direction-dependent keys that do notmake an object126 * Contains a list of direction-dependent keys that make an object 128 127 * direction dependent. 129 128 */ … … 132 131 133 132 /** 134 * Implementation of the visitor scheme. Subclas es have to call the correct133 * Implementation of the visitor scheme. Subclasses have to call the correct 135 134 * visitor function. 136 135 * @param visitor The visitor from which the visit() function must be called. … … 174 173 175 174 /** 176 * Return the id plus the class type encoded as hashcode or super s hashcode if id is 0.175 * Return the id plus the class type encoded as hashcode or super's hashcode if id is 0. 177 176 * 178 * An primitive has the same hashcode as its incomplete counter 177 * An primitive has the same hashcode as its incomplete counterpart. 179 178 */ 180 179 @Override public final int hashCode() { -
trunk/src/org/openstreetmap/josm/data/osm/User.java
r627 r655 7 7 * A simple class to keep a list of user names. 8 8 * 9 * Instead of storing user names as strings with every OSM prim tive, we store9 * Instead of storing user names as strings with every OSM primitive, we store 10 10 * a reference to an user object, and make sure that for each username there 11 11 * is only one user object. -
trunk/src/org/openstreetmap/josm/data/osm/visitor/AddVisitor.java
r627 r655 8 8 9 9 /** 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. 11 11 * 12 12 * Is not capable of adding keys. -
trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
r627 r655 10 10 11 11 /** 12 * Calculates the total bounding rectangle of a serie of OsmPrimitives, using the12 * Calculates the total bounding rectangle of a series of OsmPrimitives, using the 13 13 * EastNorth values as reference. 14 14 * @author imi -
trunk/src/org/openstreetmap/josm/data/osm/visitor/DeleteVisitor.java
r627 r655 8 8 9 9 /** 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. 11 11 * 12 12 * Is not capable of adding keys. -
trunk/src/org/openstreetmap/josm/data/projection/Projection.java
r627 r655 6 6 7 7 /** 8 * Classes subclassthis are able to convert lat/lon values to9 * plan ear screen coordinates.8 * Classes implementing this are able to convert lat/lon values to 9 * planar screen coordinates. 10 10 * 11 11 * @author imi … … 13 13 public interface Projection { 14 14 15 /** 16 * Maximum latitude representable. 17 */ 15 18 public static final double MAX_LAT = 85.05112877980659; // Mercator squares the world 19 20 /** 21 * Maximum longditude representable. 22 */ 16 23 public static final double MAX_LON = 180; 24 25 /** 26 * Minimum difference in location to not be represented as the same position. 27 */ 17 28 public static final double MAX_SERVER_PRECISION = 1e12; 18 29 19 30 /** 20 * List of all available Projections.31 * List of all available projections. 21 32 */ 22 33 public static Projection[] allProjections = new Projection[]{ -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r627 r655 58 58 // (By the eager loaded plugins) 59 59 // 60 // These strings cannot be translated. That's li ve. Really. Sorry.60 // These strings cannot be translated. That's life. Really. Sorry. 61 61 // 62 62 // Imi. … … 83 83 // get the preferences. 84 84 final File prefDir = new File(Main.pref.getPreferencesDir()); 85 86 85 // check if preferences directory has moved (TODO: Update code. Remove this after some time) 87 86 File oldPrefDir = new File(System.getProperty("user.home")+"/.josm"); -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r632 r655 111 111 Collection<OsmPrimitive> osmStatus; 112 112 /** 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. 114 114 */ 115 115 private int oldModifiers; … … 251 251 /** 252 252 * Construct a new MapStatus and attach it to the map view. 253 * @param m v The MapViewthe status line is part of.253 * @param mapFrame The MapFrame the status line is part of. 254 254 */ 255 255 public MapStatus(final MapFrame mapFrame) { -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r627 r655 105 105 /** 106 106 * Return the point on the screen where this Coordinate would be. 107 * @param p ointThe point, where this geopoint would be drawn.107 * @param p The point, where this geopoint would be drawn. 108 108 * @return The point on screen where "point" would be drawn, relative 109 109 * to the own top/left. … … 117 117 /** 118 118 * 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. 121 120 * @param scale The scale to use. 122 121 */ … … 235 234 * 236 235 * @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. 238 237 */ 239 238 public OsmPrimitive getNearest(Point p) { -
trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
r627 r655 62 62 /** 63 63 * 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. 65 65 * @param alt Whether the alt key was pressed 66 66 * @param shift Whether the shift key was pressed … … 107 107 * Create a new SelectionManager. 108 108 * 109 * @param actionListener The action listener that receives the event when109 * @param selectionEndedListener The action listener that receives the event when 110 110 * the left button is released. 111 111 * @param aspectRatio If true, the selection window must obtain the aspect -
trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r627 r655 242 242 243 243 /** 244 * @param row245 244 * @param key 246 245 * @param allData -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r627 r655 98 98 */ 99 99 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 106 101 abstract public void visitBoundingBox(BoundingXYVisitor v); 107 102 -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r638 r655 224 224 * after a successfull upload. 225 225 * 226 * @param processed A list of all objects ,that were actually uploaded.226 * @param processed A list of all objects that were actually uploaded. 227 227 * May be <code>null</code>, which means nothing has been uploaded but 228 228 * saved to disk instead. Note that an empty collection for "processed" -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
r627 r655 177 177 * created from the parameters given. 178 178 * 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 181 180 * @param relativePath An path to use for constructing relative URLs or 182 181 * <code>null</code> for no relative URLs -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerProducers.java
r627 r655 19 19 * given input data, or <code>null</code> otherwise. 20 20 * 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 23 22 * @param relativePath An path to use for constructing relative URLs or 24 23 * <code>null</code> for no relative URLs -
trunk/src/org/openstreetmap/josm/io/MyHttpHandler.java
r627 r655 23 23 } 24 24 public MyHttpHandler(String proxy, int port) { 25 proxy = proxy;25 this.proxy = proxy; 26 26 proxyPort = port; 27 27 } -
trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
r653 r655 18 18 19 19 /** 20 * Method to download single Objects from OSM server. ways, relations, nodes21 * @param id 22 * @param type 20 * Method to download single objects from OSM server. ways, relations, nodes 21 * @param id Object ID 22 * @param type way node relation 23 23 * @param full download with or without child objects 24 * @return 24 * @return the data requested 25 25 * @throws SAXException 26 26 * @throws IOException 27 27 */ 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 { 29 29 try { 30 30 -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r627 r655 26 26 * Open a connection to the given url and return a reader on the input stream 27 27 * 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 29 30 * @return An reader reading the input stream (servers answer) or <code>null</code>. 30 31 */ -
trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java
r627 r655 140 140 /** 141 141 * To get the Url of the playing or recently played audio. 142 * @return surl - could be null142 * @return url - could be null 143 143 */ 144 144 public static URL url() { … … 148 148 /** 149 149 * Whether or not we are paused. 150 * @return sboolean whether or not paused150 * @return boolean whether or not paused 151 151 */ 152 152 public static boolean paused() { … … 156 156 /** 157 157 * Whether or not we are playing. 158 * @return sboolean whether or not playing158 * @return boolean whether or not playing 159 159 */ 160 160 public static boolean playing() { … … 164 164 /** 165 165 * How far we are through playing, in seconds. 166 * @return sdouble seconds166 * @return double seconds 167 167 */ 168 168 public static double position() { … … 172 172 /** 173 173 * Speed at which we will play. 174 * @return sdouble, speed multiplier174 * @return double, speed multiplier 175 175 */ 176 176 public static double speed() { -
trunk/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java
r627 r655 33 33 34 34 /** 35 * An exception handler , that askthe user to send a bug report.35 * An exception handler that asks the user to send a bug report. 36 36 * 37 37 * @author imi … … 60 60 int answer = JOptionPane.showConfirmDialog( 61 61 Main.parent, 62 tr("An unexpected exception occurred , that may come from inthe ''{0}'' plugin.", plugin.info.name)+"\n"+62 tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)+"\n"+ 63 63 (plugin.info.author != null ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author) : "")+"\n"+ 64 64 tr("Should the plugin be disabled?"), -
trunk/test/unit/org/openstreetmap/josm/data/osm/visitor/MergeVisitorTest.java
r626 r655 315 315 316 316 /** 317 * The merger should auto-resolve items ,that have not changed but are marked as317 * The merger should auto-resolve items that have not changed but are marked as 318 318 * changed. In the case where an unmodified newer item is merged over an modified 319 319 * older, the modified-flag should be removed and the newer timestamp is used.
Note:
See TracChangeset
for help on using the changeset viewer.