Changeset 14273 in josm
- Timestamp:
- 2018-09-26T18:29:26+02:00 (6 years ago)
- Location:
- trunk
- Files:
-
- 71 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/data/validator/numeric.mapcss
r13357 r14273 30 30 31 31 *[building:levels][building:levels !~ /^(([0-9]|[1-9][0-9]*)(\.5)?)$/], 32 *[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values sep erated by a ; */32 *[level][level !~ /^((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5)(;((((-*[1-9]|[0-9])|-*[1-9][0-9]*)(\.5)?)|-0\.5))*$/] { /* all numbers from -∞ to ∞ in 0.5 steps, optional multiple values separated by a ; */ 33 33 throwWarning: tr("{0} should have numbers only with optional .5 increments", "{0.key}"); 34 34 assertMatch: "node level=one"; -
trunk/src/javax/json/stream/JsonGenerator.java
r13231 r14273 100 100 * <p> 101 101 * Other JSON values (that are not JSON objects or arrays) can be created 102 * by calling the approp iate {@code write} methods.102 * by calling the appropriate {@code write} methods. 103 103 * <p> 104 104 * The following example shows how to generate a JSON string: -
trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
r14153 r14273 99 99 * @param buttonText text of button used to select target layer 100 100 * @param buttonIcon icon name of button used to select target layer 101 * @return cho osen target layer101 * @return chosen target layer 102 102 */ 103 103 @SuppressWarnings("unchecked") -
trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java
r14153 r14273 152 152 153 153 /** 154 * Returns the last exception that occur ed.155 * @return the last exception that occur ed, or {@code null}154 * Returns the last exception that occurred. 155 * @return the last exception that occurred, or {@code null} 156 156 */ 157 157 public Exception getLastException() { -
trunk/src/org/openstreetmap/josm/actions/JosmAction.java
r14153 r14273 228 228 229 229 /** 230 * Overwrite this if {@link #updateEnabledState()} should be called when the active / availab e layers change. Default is true.230 * Overwrite this if {@link #updateEnabledState()} should be called when the active / available layers change. Default is true. 231 231 * @return <code>true</code> if a {@link LayerChangeListener} and a {@link ActiveLayerChangeListener} should be registered. 232 232 * @since 10353 -
trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
r14153 r14273 737 737 738 738 // If ALT is pressed, a new way should be created and that new way should get 739 // selected. This works every time unless the ways the nodes get inserted into739 // selected. This works every time unless the ways the nodes get inserted into 740 740 // are already selected. This is the case when creating a self-overlapping way 741 741 // but pressing ALT prevents this. Therefore we must de-select the way manually -
trunk/src/org/openstreetmap/josm/command/RotateCommand.java
r10663 r14273 35 35 /** 36 36 * Creates a RotateCommand. 37 * Assign the initial object set, compute pivot point and init al rotation angle.37 * Assign the initial object set, compute pivot point and initial rotation angle. 38 38 * @param objects objects to fetch nodes from 39 39 * @param currentEN cuurent eats/north -
trunk/src/org/openstreetmap/josm/data/Version.java
r14138 r14273 155 155 156 156 /** 157 * Replies true if this is a local build, i.e. an inofficial development build.158 * 159 * @return true if this is a local build, i.e. an inofficial development build.157 * Replies true if this is a local build, i.e. an unofficial development build. 158 * 159 * @return true if this is a local build, i.e. an unofficial development build. 160 160 */ 161 161 public boolean isLocalBuild() { -
trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
r14270 r14273 384 384 return true; 385 385 } else { 386 Logging.debug("JCS - failure during load - re ponse is not loadable nor cached as empty");386 Logging.debug("JCS - failure during load - response is not loadable nor cached as empty"); 387 387 return false; 388 388 } -
trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
r14153 r14273 490 490 supportedMimeTypes.add("image/png8"); // used by geoserver 491 491 if (supportedMimeTypes.contains("image/jpeg")) { 492 supportedMimeTypes.add("image/jpg"); // sometimes mis pelled by Arcgis492 supportedMimeTypes.add("image/jpg"); // sometimes misspelled by Arcgis 493 493 } 494 494 Collection<String> unsupportedFormats = new ArrayList<>(); -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r11408 r14273 15 15 /** 16 16 * A Set-like class that allows looking up equivalent preexising instance. 17 * It is useful where ever one would use self-mapping construct like17 * It is useful wherever one would use self-mapping construct like 18 18 * <code>Map<T,T>.put(t,t)</code>, that is, for caches, uniqueness filters or similar. 19 19 * -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java
r12154 r14273 31 31 * @param path The path to append the arrow to. 32 32 * @param point The point to paint the tip at 33 * @param fromDirection The direction the line is com ming from.33 * @param fromDirection The direction the line is coming from. 34 34 */ 35 35 public void paintArrowAt(MapPath2D path, MapViewPoint point, MapViewPoint fromDirection) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r14202 r14273 162 162 // Invert the sign bit, so that negative numbers are lower 163 163 value ^= 0x80000000L; 164 // Now do the shift. Do it before accounting for negative numbers (sym etry)164 // Now do the shift. Do it before accounting for negative numbers (symmetry) 165 165 if (totalBits < 32) { 166 166 value >>= (32 - totalBits); -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
r13627 r14273 46 46 * Loading an InputStream places all the required node information 47 47 * (accuracy data is optional) into heap based Java arrays. This is the 48 * highest perfo mance option, and is useful for large volume transformations.48 * highest performance option, and is useful for large volume transformations. 49 49 * Non-file data sources (eg using an SQL Blob) are also supported through 50 50 * InputStream. The RandonAccessFile option has a much smaller memory -
trunk/src/org/openstreetmap/josm/data/projection/proj/AbstractProj.java
r13598 r14273 112 112 * Calculates the meridian distance. This is the distance along the central 113 113 * meridian from the equator to {@code phi}. Accurate to < 1e-5 meters 114 * when used in conju ction with typical major axis values.114 * when used in conjunction with typical major axis values. 115 115 * 116 116 * @param phi latitude to calculate meridian distance for. … … 133 133 * Determines phi to TOL (1e-11) radians, about 1e-6 seconds. 134 134 * 135 * @param arg meridian distance to cal ulate latitude for.135 * @param arg meridian distance to calculate latitude for. 136 136 * @return the latitude of the meridian distance. 137 137 * @throws RuntimeException if the itteration does not converge. -
trunk/src/org/openstreetmap/josm/data/projection/proj/EquidistantCylindrical.java
r13622 r14273 37 37 @Override 38 38 public String getName() { 39 return tr("Equidistant Cylindrical (Plate Car ee)");39 return tr("Equidistant Cylindrical (Plate Carrée)"); 40 40 } 41 41 -
trunk/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
r12445 r14273 142 142 143 143 /** 144 * The azimuth of the central line passing through tthe centre of the projection, in radians.144 * The azimuth of the central line passing through the centre of the projection, in radians. 145 145 */ 146 146 protected double azimuth; -
trunk/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
r13634 r14273 16 16 * Instead of being tangent to the equator (or to an other standard latitude), 17 17 * it is tangent to a central meridian. Deformation are more important as we 18 * are going fu ther from the central meridian. The Transverse Mercator19 * projection is appropriate for region w ich have a greater extent north-south18 * are going further from the central meridian. The Transverse Mercator 19 * projection is appropriate for region which have a greater extent north-south 20 20 * than east-west. 21 21 * <p> -
trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
r14267 r14273 1881 1881 */ 1882 1882 public enum ArrayType { 1883 /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing addit onal generic TLDs */1883 /** Update (or get a copy of) the GENERIC_TLDS_PLUS table containing additional generic TLDs */ 1884 1884 GENERIC_PLUS, 1885 1885 /** Update (or get a copy of) the GENERIC_TLDS_MINUS table containing deleted generic TLDs */ 1886 1886 GENERIC_MINUS, 1887 /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing addit onal country code TLDs */1887 /** Update (or get a copy of) the COUNTRY_CODE_TLDS_PLUS table containing additional country code TLDs */ 1888 1888 COUNTRY_CODE_PLUS, 1889 1889 /** Update (or get a copy of) the COUNTRY_CODE_TLDS_MINUS table containing deleted country code TLDs */ -
trunk/src/org/openstreetmap/josm/data/validation/routines/package.html
r13494 r14273 20 20 </head> 21 21 <body bgcolor="white"> 22 <p>This package contains <i>independ ant</i> validation routines adapted from Apache Commons Validator 1.5.0.</p>22 <p>This package contains <i>independent</i> validation routines adapted from Apache Commons Validator 1.5.0.</p> 23 23 <h1>Table of Contents</h1> 24 24 -
trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
r13974 r14273 263 263 checkForDuplicate(r); 264 264 if (r.hasTag("type", ASSOCIATED_STREET)) { 265 // Used to count occur ences of each house number in order to find duplicates265 // Used to count occurrences of each house number in order to find duplicates 266 266 Map<String, List<OsmPrimitive>> map = new HashMap<>(); 267 267 // Used to detect different street names -
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r14214 r14273 248 248 /** Checks successfully parsed */ 249 249 public final List<TagCheck> parseChecks; 250 /** Errors that occur ed during parsing */250 /** Errors that occurred during parsing */ 251 251 public final Collection<Throwable> parseErrors; 252 252 … … 254 254 * Constructs a new {@code ParseResult}. 255 255 * @param parseChecks Checks successfully parsed 256 * @param parseErrors Errors that occur ed during parsing256 * @param parseErrors Errors that occurred during parsing 257 257 */ 258 258 public ParseResult(List<TagCheck> parseChecks, Collection<Throwable> parseErrors) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
r14214 r14273 266 266 * @param n relation to validate 267 267 * @param allroles contains presets for specified relation 268 * @param map contains statistics of occur ances of specified role types in relation268 * @param map contains statistics of occurrences of specified role types in relation 269 269 */ 270 270 private void checkRoles(Relation n, Map<Role, String> allroles, Map<String, RoleInfo> map) { -
trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
r14119 r14273 115 115 // 1. Not yet written - but so isn't the interval variable, so it gets updated anyway 116 116 // 2. Cannot be written (e.g. while developing). Obviously we don't want to update 117 // every time because of something we can't read.117 // every time because of something we can't read. 118 118 return (Config.getPref().getInt("cache.motd.html.version", -999) == myVersion) 119 119 && Config.getPref().get("cache.motd.html.java").equals(myJava) -
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r14253 r14273 978 978 && !"true".equals(Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"))) { 979 979 // never set this to false, only true! 980 Logging.info(tr("Try enabling IPv6 network, prefer ing IPv6 over IPv4 (only works on early startup)."));980 Logging.info(tr("Try enabling IPv6 network, preferring IPv6 over IPv4 (only works on early startup).")); 981 981 } 982 982 Utils.updateSystemProperty("http.agent", Version.getInstance().getAgentString()); … … 1193 1193 Utils.updateSystemProperty("java.net.preferIPv6Addresses", "true"); 1194 1194 if (!wasv6) { 1195 Logging.info(tr("Detected useable IPv6 network, prefer ing IPv6 over IPv4 after next restart."));1195 Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4 after next restart.")); 1196 1196 } else { 1197 Logging.info(tr("Detected useable IPv6 network, prefer ing IPv6 over IPv4."));1197 Logging.info(tr("Detected useable IPv6 network, preferring IPv6 over IPv4.")); 1198 1198 } 1199 1199 hasv6 = true; … … 1207 1207 } 1208 1208 if (wasv6 && !hasv6) { 1209 Logging.info(tr("Detected no useable IPv6 network, prefer ing IPv4 over IPv6 after next restart."));1209 Logging.info(tr("Detected no useable IPv6 network, preferring IPv4 over IPv6 after next restart.")); 1210 1210 Config.getPref().putBoolean("validated.ipv6", hasv6); // be sure it is stored before the restart! 1211 1211 try { -
trunk/src/org/openstreetmap/josm/gui/MainFrame.java
r13658 r14273 62 62 /** 63 63 * Create a new main window. The parameter will be removed in the future. 64 * @param geometry The init al geometry to use.64 * @param geometry The initial geometry to use. 65 65 * @since 12127 66 66 */ -
trunk/src/org/openstreetmap/josm/gui/MapViewState.java
r14120 r14273 362 362 * <p> 363 363 * The view is moved so that the center is the same as the old center. 364 * @param posit on The new location to use.364 * @param position The new location to use. 365 365 * @return The new state. 366 366 * @since 10375 367 367 */ 368 public MapViewState usingLocation(JComponent posit on) {368 public MapViewState usingLocation(JComponent position) { 369 369 EastNorth center = this.getCenter().getEastNorth(); 370 return new MapViewState(posit on, this).usingCenter(center);370 return new MapViewState(position, this).usingCenter(center); 371 371 } 372 372 … … 541 541 /** 542 542 * Gets the direction in which this point is outside of the given view rectangle. 543 * @param rect The rectangle to check agains .543 * @param rect The rectangle to check against. 544 544 * @return The direction in which it is outside of the view, as OUTSIDE_... flags. 545 545 * @since 10827 -
trunk/src/org/openstreetmap/josm/gui/bbox/BBoxChooser.java
r8512 r14273 27 27 /** 28 28 * Replies the currently selected bounding box in this BBoxChooser. 29 * Replies null, if currently there isn't a bbox cho osen in this29 * Replies null, if currently there isn't a bbox chosen in this 30 30 * BBoxChooser. 31 31 * -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r14153 r14273 371 371 /** 372 372 * Sets the current bounding box in this bbox chooser without 373 * emit ing a property change event.373 * emitting a property change event. 374 374 * 375 375 * @param bbox the bounding box. null to reset the bounding box -
trunk/src/org/openstreetmap/josm/gui/bugreport/DebugTextDisplay.java
r12770 r14273 35 35 36 36 /** 37 * Creates a new text area with an init al text to display37 * Creates a new text area with an initial text to display 38 38 * @param textToDisplay The text to display. 39 39 */ -
trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java
r14138 r14273 76 76 */ 77 77 private void displayError() { 78 testedVersionField.setText(tr("An error occur ed while checking if your JOSM instance is up to date."));78 testedVersionField.setText(tr("An error occurred while checking if your JOSM instance is up to date.")); 79 79 showUpdateButton(); 80 80 } -
trunk/src/org/openstreetmap/josm/gui/datatransfer/data/LayerTransferData.java
r10801 r14273 41 41 42 42 /** 43 * Gets the layer to be transfer ed.43 * Gets the layer to be transferred. 44 44 * @return The layer 45 45 */ -
trunk/src/org/openstreetmap/josm/gui/datatransfer/data/PrimitiveTransferData.java
r12725 r14273 22 22 23 23 /** 24 * A list of primitives that are transfer ed. The list allows you to implicitly add primitives.24 * A list of primitives that are transferred. The list allows you to implicitly add primitives. 25 25 * It distinguishes between primitives that were directly added and implicitly added ones. 26 26 * @author Michael Zangl -
trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r14250 r14273 559 559 * Replies the collection of OSM primitives currently selected in the view of this model 560 560 * 561 * @return cho osen elements in the view561 * @return chosen elements in the view 562 562 */ 563 563 public synchronized Collection<OsmPrimitive> getSelected() { -
trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
r14153 r14273 269 269 if (!canceled) { 270 270 // Nominatim sometimes returns garbage, see #5934, #10643 271 Logging.log(Logging.LEVEL_WARN, tr("Error occur ed with query ''{0}'': ''{1}''", urlString, e.getMessage()), e);271 Logging.log(Logging.LEVEL_WARN, tr("Error occurred with query ''{0}'': ''{1}''", urlString, e.getMessage()), e); 272 272 GuiHelper.runInEDTAndWait(() -> HelpAwareOptionPane.showOptionDialog( 273 273 MainApplication.getMainFrame(), -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
r14214 r14273 211 211 212 212 /** 213 * Should be called every time either reference of current changes to update the diff.213 * Should be called every time either reference of current changes to update the diff. 214 214 * TODO: Maybe rename to reflect this? eg. updateNodeListTableModels 215 215 */ -
trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
r13924 r14273 235 235 236 236 /** 237 * Returns the last exception that occur ed during loading, if any.238 * @return the last exception that occur ed during loading, or {@code null}237 * Returns the last exception that occurred during loading, if any. 238 * @return the last exception that occurred during loading, or {@code null} 239 239 */ 240 240 public Exception getLastException() { -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r14119 r14273 230 230 * Updates the content of this panel based on the changeset information given by {@code primitive}. 231 231 * @param primitive the primitive to extract the changeset information from 232 * @param isLatest whether this relates to a not yet commit ed changeset232 * @param isLatest whether this relates to a not yet committed changeset 233 233 */ 234 234 public void update(final OsmPrimitive primitive, final boolean isLatest) { … … 239 239 * Updates the content of this panel based on the changeset information given by {@code cs}. 240 240 * @param cs the changeset information 241 * @param isLatest whether this relates to a not yet commit ed changeset241 * @param isLatest whether this relates to a not yet committed changeset 242 242 * @param timestamp the timestamp 243 243 * @param version the version of the primitive -
trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
r14153 r14273 107 107 // a username/password-pair. 108 108 // 109 // Downgrade your knowle ge about its identity if we've assumed that he was fully109 // Downgrade your knowledge about its identity if we've assumed that he was fully 110 110 // identified. Otherwise, if he is anonymous or partially identified, keep our level 111 // of knowle ge.111 // of knowledge. 112 112 // 113 113 if (im.isFullyIdentified()) { -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r14153 r14273 655 655 if (numProblems == 0) 656 656 return; 657 Logging.warn(numProblems + " problems occur ed during upload/save");657 Logging.warn(numProblems + " problems occurred during upload/save"); 658 658 String msg = trn( 659 659 "<html>An upload and/or save operation of one layer with modifications<br>" -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r14269 r14273 840 840 * Zoom out from map. 841 841 * 842 * @return true, if zoom increasing was successful l, false othervise842 * @return true, if zoom increasing was successful, false othervise 843 843 */ 844 844 public boolean decreaseZoomLevel() { -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongPanel.java
r14153 r14273 110 110 111 111 /** 112 * Gets the "download near" cho osen value113 * @return the "download near" cho osen value (0: track only, 1: waypoints only, 2: both)112 * Gets the "download near" chosen value 113 * @return the "download near" chosen value (0: track only, 1: waypoints only, 2: both) 114 114 */ 115 115 public final int getNear() { -
trunk/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
r14120 r14273 113 113 * Gets the position of the tile inside the map view. 114 114 * @param tile The tile 115 * @return The posit on as a rectangle in screen coordinates115 * @return The position as a rectangle in screen coordinates 116 116 */ 117 117 public Rectangle2D getRectangleForTile(Tile tile) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
r13845 r14273 141 141 142 142 /** 143 * Log an error that occur ed with this style.143 * Log an error that occurred with this style. 144 144 * @param e error 145 145 */ … … 149 149 150 150 /** 151 * Log a warning that occur ed with this style.151 * Log a warning that occurred with this style. 152 152 * @param w warnings 153 153 */ … … 157 157 158 158 /** 159 * Replies the collection of errors that occur ed with this style.159 * Replies the collection of errors that occurred with this style. 160 160 * @return collection of errors 161 161 */ … … 165 165 166 166 /** 167 * Replies the collection of warnings that occur ed with this style.167 * Replies the collection of warnings that occurred with this style. 168 168 * @return collection of warnings 169 169 */ -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSException.java
r11562 r14273 7 7 public class MapCSSException extends RuntimeException { 8 8 9 /** line number at which the parse error occur ed */9 /** line number at which the parse error occurred */ 10 10 protected Integer line; 11 /** column number at which the parse error occur ed */11 /** column number at which the parse error occurred */ 12 12 protected Integer column; 13 13 … … 30 30 31 31 /** 32 * Sets the column number at which the parse error occur ed.33 * @param column the column number at which the parse error occur ed32 * Sets the column number at which the parse error occurred. 33 * @param column the column number at which the parse error occurred 34 34 */ 35 35 public void setColumn(int column) { … … 38 38 39 39 /** 40 * Sets the line number at which the parse error occur ed.41 * @param line the line number at which the parse error occur ed40 * Sets the line number at which the parse error occurred. 41 * @param line the line number at which the parse error occurred 42 42 */ 43 43 public void setLine(int line) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/placement/OnLineStrategy.java
r12506 r14273 134 134 }); 135 135 136 // find the segment with the best quality. If there are several with best quality, the one close to the center is prefer ed.136 // find the segment with the best quality. If there are several with best quality, the one close to the center is preferred. 137 137 return longHalfSegment.stream().max( 138 138 Comparator.comparingDouble(segment -> segment.quality - 1e-5 * Math.abs(segment.offset - length / 2))); -
trunk/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java
r12646 r14273 14 14 15 15 /** 16 * Combo box that lets the user choose one of the ava liable {@link AuthorizationProcedure}s.16 * Combo box that lets the user choose one of the available {@link AuthorizationProcedure}s. 17 17 */ 18 18 public class AuthorizationProcedureComboBox extends JosmComboBox<AuthorizationProcedure> { -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
r14153 r14273 420 420 if (task != null) { 421 421 // if we have to launch a plugin download task we do it asynchronously, followed 422 // by the remaining "save preferences" activit es run on the Swing EDT.422 // by the remaining "save preferences" activities run on the Swing EDT. 423 423 MainApplication.worker.submit(task); 424 424 MainApplication.worker.submit(() -> GuiHelper.runInEDT(continuation)); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
r12762 r14273 712 712 713 713 /** 714 * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be commit ed.714 * A listener that is called whenever the cells may be updated from outside the editor and the editor should thus be committed. 715 715 * @since 10604 716 716 */ -
trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java
r13849 r14273 48 48 49 49 /** 50 * Finds and returns the first occur ence of preset with template name matching the given primitive50 * Finds and returns the first occurrence of preset with template name matching the given primitive 51 51 * @param primitive The primitive to match 52 * @return the first occur ence of preset with template name matching the primitive52 * @return the first occurrence of preset with template name matching the primitive 53 53 */ 54 54 public TaggingPreset findPresetTemplate(IPrimitive primitive) { -
trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java
r14153 r14273 366 366 367 367 /** 368 * Determines if the bug affecting getMaximumWindowBounds() occur ed.368 * Determines if the bug affecting getMaximumWindowBounds() occurred. 369 369 * 370 370 * @param maxbounds result of getMaximumWindowBounds() -
trunk/src/org/openstreetmap/josm/gui/widgets/JosmPasswordField.java
r12630 r14273 130 130 pasteAction.actionPerformed(e); 131 131 } catch (NullPointerException npe) { // NOPMD 132 Logging.log(Logging.LEVEL_ERROR, "NullPointerException occur ed because of JDK bug 6322854. "132 Logging.log(Logging.LEVEL_ERROR, "NullPointerException occurred because of JDK bug 6322854. " 133 133 +"Copy/Paste operation has not been performed. Please complain to Oracle: "+ 134 134 "https://bugs.openjdk.java.net/browse/JDK-6322854", npe); -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r13265 r14273 592 592 * 593 593 * If the Dividers are "floating" then set the bounds of each 594 * node to accom odate the preferred size of all of the594 * node to accommodate the preferred size of all of the 595 595 * Leaf's java.awt.Components. Otherwise, just set the bounds 596 596 * of each Leaf/Split node so that it's to the left of (for -
trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java
r14214 r14273 205 205 206 206 /** 207 * Determines if proxy errors have occur ed.208 * @return {@code true} if errors have occur ed, {@code false} otherwise.207 * Determines if proxy errors have occurred. 208 * @return {@code true} if errors have occurred, {@code false} otherwise. 209 209 * @since 6523 210 210 */ -
trunk/src/org/openstreetmap/josm/io/NetworkManager.java
r14121 r14273 59 59 60 60 /** 61 * Returns the network errors that occur ed until now.62 * @return the network errors that occur ed until now, indexed by URL61 * Returns the network errors that occurred until now. 62 * @return the network errors that occurred until now, indexed by URL 63 63 */ 64 64 public static Map<String, Throwable> getNetworkErrors() { -
trunk/src/org/openstreetmap/josm/io/OsmApiException.java
r13499 r14273 24 24 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header 25 25 * @param errorBody The error body, as transmitted in the HTTP response body 26 * @param accessedUrl The complete URL accessed when this error occur ed26 * @param accessedUrl The complete URL accessed when this error occurred 27 27 * @param login the login used to connect to OSM API (can be null) 28 28 * @param contentType the response content-type … … 44 44 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header 45 45 * @param errorBody The error body, as transmitted in the HTTP response body 46 * @param accessedUrl The complete URL accessed when this error occur ed46 * @param accessedUrl The complete URL accessed when this error occurred 47 47 * @param login the login used to connect to OSM API (can be null) 48 48 * @since 12992 … … 58 58 * @param errorHeader The error header, as transmitted in the {@code Error} field of the HTTP response header 59 59 * @param errorBody The error body, as transmitted in the HTTP response body 60 * @param accessedUrl The complete URL accessed when this error occur ed60 * @param accessedUrl The complete URL accessed when this error occurred 61 61 * @since 5584 62 62 */ … … 216 216 217 217 /** 218 * Sets the complete URL accessed when this error occur ed.218 * Sets the complete URL accessed when this error occurred. 219 219 * This is distinct from the one set with {@link #setUrl}, which is generally only the base URL of the server. 220 * @param url the complete URL accessed when this error occur ed.220 * @param url the complete URL accessed when this error occurred. 221 221 */ 222 222 public void setAccessedUrl(String url) { … … 225 225 226 226 /** 227 * Replies the complete URL accessed when this error occur ed.227 * Replies the complete URL accessed when this error occurred. 228 228 * This is distinct from the one returned by {@link #getUrl}, which is generally only the base URL of the server. 229 * @return the complete URL accessed when this error occur ed.229 * @return the complete URL accessed when this error occurred. 230 230 */ 231 231 public String getAccessedUrl() { -
trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
r13493 r14273 3 3 4 4 /** 5 * Exception thrown when a communication error occur ed with the OSM server during API initialization.5 * Exception thrown when a communication error occurred with the OSM server during API initialization. 6 6 * @see OsmApi#initialize 7 7 */ -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddWayHandler.java
r14221 r14273 47 47 48 48 /** 49 * The place to reme ber already added nodes (they are reused if needed @since 584549 * The place to remember already added nodes (they are reused if needed @since 5845 50 50 */ 51 51 private Map<LatLon, Node> addedNodes; -
trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java
r14149 r14273 213 213 214 214 /** 215 * Replies the last exception that occur ed during download, or {@code null}.216 * @return the last exception that occur ed during download, or {@code null}215 * Replies the last exception that occurred during download, or {@code null}. 216 * @return the last exception that occurred during download, or {@code null} 217 217 * @since 9621 218 218 */ -
trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
r14237 r14273 271 271 272 272 /** 273 * All exceptions that occur ed during plugin loading273 * All exceptions that occurred during plugin loading 274 274 */ 275 275 static final Map<String, Throwable> pluginLoadingExceptions = new HashMap<>(); … … 1419 1419 Throwable cause = current.getCause(); 1420 1420 if (cause != null && seen.contains(cause)) { 1421 break; // circular refer nce1421 break; // circular reference 1422 1422 } 1423 1423 current = cause; -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r14144 r14273 366 366 // https://en.wikipedia.org/wiki/Line%E2%80%93line_intersection 367 367 // However, large numbers lead to rounding errors (see #10286). 368 // To avoid this, p1 is first sub stracted from each of the points:368 // To avoid this, p1 is first subtracted from each of the points: 369 369 // p1' = 0 370 370 // p2' = p2 - p1 -
trunk/src/org/openstreetmap/josm/tools/Logging.java
r14074 r14273 461 461 462 462 /** 463 * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is prefer ed.463 * Provides direct access to the logger used. Use of methods like {@link #warn(String)} is preferred. 464 464 * @return The logger 465 465 */ -
trunk/src/org/openstreetmap/josm/tools/MemoryManager.java
r12624 r14273 116 116 * Gets the content of this memory area. 117 117 * <p> 118 * This method should be the prefer ed access to the memory since it will do error checking when {@link #free()} was called.118 * This method should be the preferred access to the memory since it will do error checking when {@link #free()} was called. 119 119 * @return The memory area content. 120 120 */ -
trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
r14144 r14273 60 60 61 61 /** 62 * The preStartupHook will be called extrem ly early. It is62 * The preStartupHook will be called extremely early. It is 63 63 * guaranteed to be called before the GUI setup has started. 64 64 * -
trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
r14161 r14273 430 430 } catch (ArrayIndexOutOfBoundsException e) { 431 431 // catch error of JDK-8172244 as bug seems to not be fixed anytime soon 432 Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occur ed. Abort HTTPS setup", e);432 Logging.log(Logging.LEVEL_ERROR, "JDK-8172244 occurred. Abort HTTPS setup", e); 433 433 return false; 434 434 } -
trunk/src/org/openstreetmap/josm/tools/XmlParsingException.java
r8846 r14273 41 41 42 42 /** 43 * Sets the location (line/column) where the exception occur ed.44 * @param locator object giving the location (line/column) where the exception occur ed43 * Sets the location (line/column) where the exception occurred. 44 * @param locator object giving the location (line/column) where the exception occurred 45 45 * @return {@code this} 46 46 */ … … 65 65 66 66 /** 67 * Returns the column number where the exception occur ed.68 * @return the column number where the exception occur ed67 * Returns the column number where the exception occurred. 68 * @return the column number where the exception occurred 69 69 */ 70 70 public int getColumnNumber() { … … 73 73 74 74 /** 75 * Returns the line number where the exception occur ed.76 * @return the line number where the exception occur ed75 * Returns the line number where the exception occurred. 76 * @return the line number where the exception occurred 77 77 */ 78 78 public int getLineNumber() { -
trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportSender.java
r14119 r14273 161 161 162 162 /** 163 * Returns the error message that could have occur ed during bug sending.163 * Returns the error message that could have occurred during bug sending. 164 164 * @return the error message, or {@code null} if successful 165 165 */ -
trunk/test/unit/org/openstreetmap/josm/data/projection/ProjectionRefTest.java
r14138 r14273 117 117 Collection<RefEntry> result = new ArrayList<>(); 118 118 if (!new File(REFERENCE_DATA_FILE).exists()) { 119 System.err.println("Warning: ref rence file does not exist.");119 System.err.println("Warning: reference file does not exist."); 120 120 return result; 121 121 } -
trunk/test/unit/org/openstreetmap/josm/data/validation/tests/TagCheckerTest.java
r13489 r14273 42 42 43 43 /** 44 * Check for mis pelled key.44 * Check for misspelled key. 45 45 * @throws IOException if any I/O error occurs 46 46 */ … … 55 55 56 56 /** 57 * Check for mis pelled key.57 * Check for misspelled key. 58 58 * @throws IOException if any I/O error occurs 59 59 */ … … 68 68 69 69 /** 70 * Check for mis pelled key where the suggested alternative is in use. The error should not be fixable.70 * Check for misspelled key where the suggested alternative is in use. The error should not be fixable. 71 71 * @throws IOException if any I/O error occurs 72 72 */ … … 94 94 95 95 /** 96 * Check for mis pelled value.96 * Check for misspelled value. 97 97 * @throws IOException if any I/O error occurs 98 98 */ -
trunk/test/unit/org/openstreetmap/josm/gui/layer/MainLayerManagerTest.java
r13434 r14273 139 139 140 140 /** 141 * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from be eing added twice.141 * Test if {@link MainLayerManager#addActiveLayerChangeListener(ActiveLayerChangeListener)} prevents listener from being added twice. 142 142 */ 143 143 @Test(expected = IllegalArgumentException.class) -
trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
r14207 r14273 411 411 /** 412 412 * Set up before running a test 413 * @throws InitializationError If an error occur ed while creating the required environment.413 * @throws InitializationError If an error occurred while creating the required environment. 414 414 * @throws ReflectiveOperationException if a reflective access error occurs 415 415 */
Note:
See TracChangeset
for help on using the changeset viewer.