Changeset 8470 in josm
- Timestamp:
- 2015-06-06T04:32:00+02:00 (10 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 71 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java
r8443 r8470 78 78 * Replies all primitives of type <code>type</code> in the current selection. 79 79 * 80 * @param <T>81 80 * @param type the type 82 81 * @return all primitives of type <code>type</code> in the current selection. 83 82 */ 84 protected <T extends PrimitiveData>Collection<? extends PrimitiveData> getSourcePrimitivesByType(OsmPrimitiveType type) {83 protected Collection<? extends PrimitiveData> getSourcePrimitivesByType(OsmPrimitiveType type) { 85 84 return PrimitiveData.getFilteredList(source, type); 86 85 } … … 90 89 * selection 91 90 * 92 * @param <T>93 91 * @param type the type 94 92 * @return the collection of tags for all primitives of type <code>type</code> in the current 95 93 * selection 96 94 */ 97 protected <T extends OsmPrimitive>TagCollection getSourceTagsByType(OsmPrimitiveType type) {95 protected TagCollection getSourceTagsByType(OsmPrimitiveType type) { 98 96 return TagCollection.unionOfAllPrimitives(getSourcePrimitivesByType(type)); 99 97 } … … 103 101 * type <code>type</code> 104 102 * 105 * @param <T>106 103 * @param type the type 107 104 * @return true if there is at least one tag in the current selection for primitives of 108 105 * type <code>type</code> 109 106 */ 110 protected <T extends OsmPrimitive>boolean hasSourceTagsByType(OsmPrimitiveType type) {107 protected boolean hasSourceTagsByType(OsmPrimitiveType type) { 111 108 return !getSourceTagsByType(type).isEmpty(); 112 109 } … … 177 174 * is in the target collection 178 175 * 179 * @param <T>180 176 * @param type the type to look for 181 177 * @return true if there is at least one primitive of type <code>type</code> in the collection 182 178 * <code>selection</code> 183 179 */ 184 protected <T extends OsmPrimitive> boolean hasTargetPrimitives(Class<T> type) {180 protected boolean hasTargetPrimitives(Class<? extends OsmPrimitive> type) { 185 181 return !OsmPrimitive.getFilteredList(target, type).isEmpty(); 186 182 } … … 301 297 /** 302 298 * Create and execute SequenceCommand with descriptive title 303 * @param commands 299 * @param commands the commands to perform in a sequential command 304 300 */ 305 301 private static void commitCommands(Collection<OsmPrimitive> selection, List<Command> commands) { -
trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
r8308 r8470 35 35 * 36 36 * The user can click on an object, which gets deleted if possible. When Ctrl is 37 * pressed when releasing the button, the objects and all its references are 38 * deleted. 37 * pressed when releasing the button, the objects and all its references are deleted. 39 38 * 40 39 * If the user did not press Ctrl and the object has any references, the user … … 47 46 */ 48 47 public class DeleteAction extends MapMode implements ModifierListener { 49 // Cache previous mouse event (needed when only the modifier keys are 50 // pressed but the mouse isn't moved) 48 // Cache previous mouse event (needed when only the modifier keys are pressed but the mouse isn't moved) 51 49 private MouseEvent oldEvent = null; 52 50 … … 181 179 /** 182 180 * handles everything related to highlighting primitives and way 183 * segments for the given pointer position (via MouseEvent) and 184 * modifiers. 185 * @param e 186 * @param modifiers 181 * segments for the given pointer position (via MouseEvent) and modifiers. 182 * @param e current mouse event 183 * @param modifiers mouse modifiers, not necessarly taken from the given mouse event 187 184 */ 188 185 private void addHighlighting(MouseEvent e, int modifiers) { … … 202 199 Command delCmd = buildDeleteCommands(e, modifiers, true); 203 200 if(delCmd != null) { 204 // all other cases delete OsmPrimitives directly, so we can 205 // safely do the following 201 // all other cases delete OsmPrimitives directly, so we can safely do the following 206 202 for(OsmPrimitive osm : delCmd.getParticipatingPrimitives()) { 207 203 newHighlights.add(osm); … … 236 232 237 233 /** 238 * This function handles all work related to updating the cursor and 239 * highlights 234 * This function handles all work related to updating the cursor and highlights 240 235 * 241 * @param e 242 * @param modifiers 236 * @param e current mouse event 237 * @param modifiers mouse modifiers, not necessarly taken from the given mouse event 243 238 */ 244 239 private void updateCursor(MouseEvent e, int modifiers) { … … 260 255 * mouse is not moved and only modifier keys are pressed, no mouse event 261 256 * occurs. We can use AWTEvent to catch those but still lack a proper 262 * mouseevent. Instead we copy the previous event and only update the 263 * modifiers. 257 * mouseevent. Instead we copy the previous event and only update the modifiers. 264 258 */ 265 259 private void giveUserFeedback(MouseEvent e, int modifiers) { … … 279 273 /** 280 274 * If user clicked with the left button, delete the nearest object. 281 * position.282 275 */ 283 276 @Override … … 372 365 * @param e MouseEvent from which modifiers and position are taken 373 366 * @param modifiers For explanation, see {@link #updateCursor} 374 * @param silent Set to true if the user should not be bugged with additional 375 * dialogs 367 * @param silent Set to true if the user should not be bugged with additional dialogs 376 368 * @return delete command 377 369 */ -
trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
r8465 r8470 369 369 * to appropriate {@link #mode}, depending on Ctrl/Alt/Shift modifiers and 370 370 * {@link #dualAlignEnabled}. 371 * @param e 371 * @param e current mouse event 372 372 */ 373 373 @Override … … 448 448 /** 449 449 * Performs action depending on what {@link #mode} we're in. 450 * @param e 450 * @param e current mouse event 451 451 */ 452 452 @Override … … 510 510 /** 511 511 * Does anything that needs to be done, then switches back to select mode. 512 * @param e 512 * @param e current mouse event 513 513 */ 514 514 @Override … … 711 711 /** 712 712 * This method tests if {@code node} has other ways apart from the given one. 713 * @param node 714 * @param myWay 713 * @param node node to test 714 * @param myWay way known to contain this node 715 715 * @return {@code true} if {@code node} belongs only to {@code myWay}, false if there are more ways. 716 716 */ … … 1141 1141 * Draws given reference segment. 1142 1142 * @param g2 the Graphics2D object used to draw on 1143 * @param mv 1143 * @param mv map view 1144 1144 * @param seg the reference segment 1145 1145 */ -
trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java
r8378 r8470 17 17 * Lowercase signifies off and '?' means unknown/optional. 18 18 * Order is Alt, Shift, Ctrl 19 * @param str 19 * @param str 3 letters string defining modifiers 20 20 */ 21 21 public ModifiersSpec(String str) { -
trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
r8444 r8470 666 666 * selectables nearby. Everything has to be pre-determined for this 667 667 * function; its main purpose is to centralize what the modifiers do. 668 * @param hasSelectionNearby 668 * @param hasSelectionNearby {@code true} if some primitves are selectable nearby 669 669 */ 670 670 private void determineMapMode(boolean hasSelectionNearby) { -
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r8426 r8470 410 410 411 411 /** 412 * Launches the dialog for specifying search criteria and runs 413 * a search 412 * Launches the dialog for specifying search criteria and runs a search 414 413 */ 415 414 public static void search() { … … 424 423 * search history and performs the search. 425 424 * 426 * @param s 425 * @param s search settings 427 426 */ 428 427 public static void searchWithHistory(SearchSetting s) { … … 432 431 } 433 432 433 /** 434 * Performs the search specified by the settings in <code>s</code> without saving it to search history. 435 * 436 * @param s search settings 437 */ 434 438 public static void searchWithoutHistory(SearchSetting s) { 435 439 lastSearch = new SearchSetting(s); … … 486 490 487 491 /** 488 * Version of getSelection that is customized for filter, but should 489 * also work in other context. 492 * Version of getSelection that is customized for filter, but should also work in other context. 490 493 * 491 494 * @param s the search settings -
trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
r8466 r8470 83 83 /** 84 84 * Add (register) MatchFactory with SearchCompiler 85 * @param factory 85 * @param factory match factory 86 86 */ 87 87 public static void addMatchFactory(MatchFactory factory) { … … 1355 1355 * 1356 1356 * @return match determined by search string 1357 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError 1357 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed 1358 1358 */ 1359 1359 public Match parse() throws ParseError { … … 1370 1370 * 1371 1371 * @return match determined by parsing expression 1372 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError 1372 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed 1373 1373 */ 1374 1374 private Match parseExpression() throws ParseError { … … 1397 1397 * @param errorMessage to display if parsing error occurs 1398 1398 * @return match determined by parsing expression 1399 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError 1399 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed 1400 1400 * @see #parseExpression() 1401 1401 */ … … 1412 1412 * 1413 1413 * @return match determined by parsing factor string 1414 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError 1414 * @throws org.openstreetmap.josm.actions.search.SearchCompiler.ParseError if search expression cannot be parsed 1415 1415 */ 1416 1416 private Match parseFactor() throws ParseError { -
trunk/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
r8443 r8470 169 169 * Tests whether way can be reversed without semantic change, i.e., whether tags have to be changed. 170 170 * Looks for keys like oneway, oneway:bicycle, cycleway:right:oneway, left/right. 171 * @param way 171 * @param way way to test 172 172 * @return false if tags should be changed to keep semantic, true otherwise. 173 173 */ -
trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
r8461 r8470 955 955 * @param tmpPref - preferences to fill from JS 956 956 * @param varInJS - JS variable name, where preferences are stored 957 * @throws ScriptException 957 * @throws ScriptException if the evaluation fails 958 958 */ 959 959 public static void readPrefsFromJS(ScriptEngine engine, Preferences tmpPref, String varInJS) throws ScriptException { … … 1040 1040 * @param whereToPutInJS - variable name to store preferences in JS 1041 1041 * @param includeDefaults - include known default values to JS objects 1042 * @throws ScriptException 1042 * @throws ScriptException if the evaluation fails 1043 1043 */ 1044 1044 public static void loadPrefsToJS(ScriptEngine engine, Preferences tmpPref, String whereToPutInJS, boolean includeDefaults) throws ScriptException { -
trunk/src/org/openstreetmap/josm/data/cache/BufferedImageCacheEntry.java
r8344 r8470 34 34 * 35 35 * @return BufferedImage of cache entry content 36 * @throws IOException 36 * @throws IOException if an error occurs during reading. 37 37 */ 38 38 public BufferedImage getImage() throws IOException { -
trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderJob.java
r8440 r8470 37 37 38 38 /** 39 * Submit job for background fetch, and listener will be 40 * fed with value object 39 * Submit job for background fetch, and listener will be fed with value object 41 40 * 42 * @param listener 41 * @param listener cache loader listener 43 42 * @param force true if the load should skip all the caches (local & remote) 44 43 */ -
trunk/src/org/openstreetmap/josm/data/cache/ICachedLoaderListener.java
r8403 r8470 6 6 /** 7 7 * Result of download 8 *9 8 */ 10 9 enum LoadResult { … … 13 12 CANCELED 14 13 } 14 15 15 /** 16 16 * Will be called when K object processed. The result might be: … … 19 19 * LoadResult.REJECTED when job was rejected because of full queue 20 20 * 21 * @param data 22 * @param attributes 23 * @param result 21 * @param data cache entry contents 22 * @param attributes cache entry attributes 23 * @param result load result (success, failure, canceled) 24 24 */ 25 25 public void loadingFinished(CacheEntry data, CacheEntryAttributes attributes, LoadResult result); 26 27 26 } -
trunk/src/org/openstreetmap/josm/data/imagery/WmsCache.java
r8384 r8470 504 504 * 505 505 * @param img Used only when overlapping is used, when not used, used raw from imageData 506 * @param imageData 507 * @param projection 508 * @param pixelPerDegree 509 * @param east 510 * @param north 511 * @throws IOException 506 * @param imageData input stream to raw image data 507 * @param projection current projection 508 * @param pixelPerDegree number of pixels per degree 509 * @param east easting 510 * @param north northing 511 * @throws IOException if any I/O error occurs 512 512 */ 513 public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north) throws IOException { 513 public synchronized void saveToCache(BufferedImage img, InputStream imageData, Projection projection, double pixelPerDegree, double east, double north) 514 throws IOException { 514 515 ProjectionEntries projectionEntries = getProjectionEntries(projection); 515 516 CacheEntry entry = findEntry(projectionEntries, pixelPerDegree, east, north); … … 523 524 mimeType = URLConnection.guessContentTypeFromStream(imageData); 524 525 } 525 entry = new CacheEntry(pixelPerDegree, east, north, tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType)); 526 entry = new CacheEntry(pixelPerDegree, east, north, 527 tileSize,generateFileName(projectionEntries, pixelPerDegree, projection, east, north, mimeType)); 526 528 entry.lastUsed = System.currentTimeMillis(); 527 529 entry.lastModified = entry.lastUsed; -
trunk/src/org/openstreetmap/josm/data/osm/BBox.java
r8393 r8470 33 33 * Result is minimal BBox containing both points. 34 34 * 35 * @param a 36 * @param b 35 * @param a first point 36 * @param b second point 37 37 */ 38 38 public BBox(LatLon a, LatLon b) { -
trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
r8338 r8470 954 954 /** 955 955 * Show message and stack trace in log in case primitive is not found 956 * @param primitiveId 956 * @param primitiveId primitive id to look for 957 957 * @return Primitive by id. 958 958 */ -
trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
r8444 r8470 45 45 private static final String SPECIAL_VALUE_LOCAL_NAME = "localname"; 46 46 47 48 47 /** 49 48 * An object can be disabled by the filter mechanism. … … 115 114 * If <code>list</code> is null, replies an empty list. 116 115 * 117 * @param <T> 116 * @param <T> type of data (must be one of the {@link OsmPrimitive} types 118 117 * @param list the original list 119 118 * @param type the type to filter for 120 119 * @return the sub-list of OSM primitives of type <code>type</code> 121 120 */ 122 public static <T extends OsmPrimitive> 121 public static <T extends OsmPrimitive> List<T> getFilteredList(Collection<OsmPrimitive> list, Class<T> type) { 123 122 if (list == null) return Collections.emptyList(); 124 123 List<T> ret = new LinkedList<>(); … … 249 248 * 250 249 * @param id the id 251 * @param allowNegativeId 250 * @param allowNegativeId {@code true} to allow negative id 252 251 * @throws IllegalArgumentException if id < 0 and allowNegativeId is false 253 252 */ … … 278 277 * If id is not > 0 version is ignored and set to 0. 279 278 * 280 * @param id 281 * @param version 282 * @param allowNegativeId 279 * @param id the id 280 * @param version the version (positive integer) 281 * @param allowNegativeId {@code true} to allow negative id 283 282 * @throws IllegalArgumentException if id < 0 and allowNegativeId is false 284 283 */ … … 288 287 setIncomplete(id > 0 && version == 0); 289 288 } 290 291 289 292 290 /*---------- … … 313 311 /** 314 312 * This method should never ever by called from somewhere else than Dataset.addPrimitive or removePrimitive methods 315 * @param dataSet 313 * @param dataSet the parent dataset 316 314 */ 317 315 void setDataset(DataSet dataSet) { … … 1175 1173 1176 1174 /** 1177 * Replies true if this primitive and other are equal with respect to their 1178 * semantic attributes. 1175 * Replies true if this primitive and other are equal with respect to their semantic attributes. 1179 1176 * <ol> 1180 1177 * <li>equal id</li> … … 1182 1179 * <li>both have the same tags</li> 1183 1180 * </ol> 1184 * @param other 1185 * @return true if this primitive and other are equal with respect to their 1186 * semantic attributes. 1181 * @param other other primitive to compare 1182 * @return true if this primitive and other are equal with respect to their semantic attributes. 1187 1183 */ 1188 1184 public boolean hasEqualSemanticAttributes(OsmPrimitive other) { … … 1197 1193 1198 1194 /** 1199 * Replies true if this primitive and other are equal with respect to their 1200 * technical attributes.The attributes:1195 * Replies true if this primitive and other are equal with respect to their technical attributes. 1196 * The attributes: 1201 1197 * <ol> 1202 1198 * <li>deleted</li> … … 1209 1205 * have to be equal 1210 1206 * @param other the other primitive 1211 * @return true if this primitive and other are equal with respect to their 1212 * technical attributes 1207 * @return true if this primitive and other are equal with respect to their technical attributes 1213 1208 */ 1214 1209 public boolean hasEqualTechnicalAttributes(OsmPrimitive other) { 1215 1210 if (other == null) return false; 1216 1211 1217 return 1218 isDeleted() == other.isDeleted() 1212 return isDeleted() == other.isDeleted() 1219 1213 && isModified() == other.isModified() 1220 1214 && timestamp == other.timestamp -
trunk/src/org/openstreetmap/josm/data/osm/Relation.java
r8444 r8470 109 109 /** 110 110 * Replace member at position specified by index. 111 * @param index 112 * @param member 111 * @param index index (positive integer) 112 * @param member relation member to set 113 113 * @return Member that was at the position 114 114 */ … … 133 133 /** 134 134 * Removes member at specified position. 135 * @param index 135 * @param index index (positive integer) 136 136 * @return Member that was at the position 137 137 */ … … 218 218 /** 219 219 * Creates new relation 220 * @param id 221 * @param version 220 * @param id the id 221 * @param version version number (positive integer) 222 222 */ 223 223 public Relation(long id, int version) { -
trunk/src/org/openstreetmap/josm/data/osm/Storage.java
r8384 r8470 130 130 /** 131 131 * constructor 132 * @param ha 133 * @param capacity 132 * @param ha hash 133 * @param capacity capacity 134 134 * @param safeIterator If set to false, you must not modify the Storage 135 135 * while iterating over it. If set to true, you can safely -
trunk/src/org/openstreetmap/josm/data/osm/User.java
r8444 r8470 148 148 * Adds a user name to the list if it is not there, yet. 149 149 * 150 * @param name 150 * @param name User name 151 151 */ 152 152 public void addName(String name) { … … 157 157 * Returns true if the name is in the names list 158 158 * 159 * @param name 159 * @param name User name 160 160 * @return <code>true</code> if the name is in the names list 161 161 */ -
trunk/src/org/openstreetmap/josm/data/osm/visitor/BoundingXYVisitor.java
r8395 r8470 107 107 * equal <code>null</code>) this method does not do anything. 108 108 * 109 * @param enlargeDegree 109 * @param enlargeDegree number of degrees to enlarge on each side 110 110 */ 111 111 public void enlargeBoundingBox(double enlargeDegree) { … … 141 141 * equal <code>null</code>) this method does not do anything. 142 142 * 143 * @param maxEnlargePercent 143 * @param maxEnlargePercent maximum enlargement in percentage (100.0 for 100%) 144 144 */ 145 145 public void enlargeBoundingBoxLogarithmically(double maxEnlargePercent) { -
trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
r8444 r8470 857 857 * highlights a given GeneralPath using the settings from BasicStroke to match the line's 858 858 * style. Width of the highlight is hard coded. 859 * @param path 860 * @param line 859 * @param path path to draw 860 * @param line line style 861 861 */ 862 862 private void drawPathHighlight(GeneralPath path, BasicStroke line) { -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
r8415 r8470 99 99 * @param in Grid Shift File InputStream 100 100 * @param loadAccuracy is Accuracy data to be loaded as well as shift data? 101 * @throws IOException 101 * @throws IOException if any I/O error occurs 102 102 */ 103 103 public void loadGridShiftFile(InputStream in, boolean loadAccuracy) throws IOException { -
trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java
r8406 r8470 69 69 * @param bigEndian is the file bigEndian? 70 70 * @param loadAccuracy is the node Accuracy data to be loaded? 71 * @throws IOException 71 * @throws IOException if any I/O error occurs 72 72 */ 73 73 public NTV2SubGrid(InputStream in, boolean bigEndian, boolean loadAccuracy) throws IOException { … … 283 283 /** 284 284 * Set an array of Sub Grids of this sub grid 285 * @param subGrid 285 * @param subGrid subgrids 286 286 */ 287 287 public void setSubGridArray(NTV2SubGrid[] subGrid) { -
trunk/src/org/openstreetmap/josm/data/validation/Test.java
r8378 r8470 251 251 * Fixes the error with the appropriate command 252 252 * 253 * @param testError 253 * @param testError error to fix 254 254 * @return The command to fix the error 255 255 */ -
trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
r8461 r8470 9 9 import java.awt.event.ActionListener; 10 10 import java.io.BufferedReader; 11 import java.io.FileNotFoundException;12 11 import java.io.IOException; 13 12 import java.io.InputStream; … … 154 153 * by the nearest + word before this. 155 154 * 156 * @throws FileNotFoundException 157 * @throws IOException 155 * @throws IOException if any I/O error occurs 158 156 */ 159 157 private static void initializeData() throws IOException { -
trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
r7434 r8470 188 188 */ 189 189 public static void explainNestedInvocationTargetException(Exception e) { 190 InvocationTargetException ex = getNestedException(e, InvocationTargetException.class);190 InvocationTargetException ex = ExceptionUtil.getNestedException(e, InvocationTargetException.class); 191 191 if (ex != null) { 192 192 // Users should be able to submit a bug report for an invocation target exception … … 404 404 405 405 /** 406 * Replies the first nested exception of type <code>nestedClass</code> (including407 * the root exception <code>e</code>) or null, if no such exception is found.408 *409 * @param <T>410 * @param e the root exception411 * @param nestedClass the type of the nested exception412 * @return the first nested exception of type <code>nestedClass</code> (including413 * the root exception <code>e</code>) or null, if no such exception is found.414 */415 protected static <T> T getNestedException(Exception e, Class<T> nestedClass) {416 Throwable t = e;417 while (t != null && !(nestedClass.isInstance(t))) {418 t = t.getCause();419 }420 if (t == null)421 return null;422 else if (nestedClass.isInstance(t))423 return nestedClass.cast(t);424 return null;425 }426 427 /**428 406 * Explains an {@link OsmTransferException} to the user. 429 407 * … … 431 409 */ 432 410 public static void explainOsmTransferException(OsmTransferException e) { 433 if ( getNestedException(e, SecurityException.class) != null) {411 if (ExceptionUtil.getNestedException(e, SecurityException.class) != null) { 434 412 explainSecurityException(e); 435 413 return; 436 414 } 437 if ( getNestedException(e, SocketException.class) != null) {415 if (ExceptionUtil.getNestedException(e, SocketException.class) != null) { 438 416 explainNestedSocketException(e); 439 417 return; 440 418 } 441 if ( getNestedException(e, UnknownHostException.class) != null) {419 if (ExceptionUtil.getNestedException(e, UnknownHostException.class) != null) { 442 420 explainNestedUnkonwnHostException(e); 443 421 return; 444 422 } 445 if ( getNestedException(e, IOException.class) != null) {423 if (ExceptionUtil.getNestedException(e, IOException.class) != null) { 446 424 explainNestedIOException(e); 447 425 return; 448 426 } 449 if ( getNestedException(e, IllegalDataException.class) != null) {427 if (ExceptionUtil.getNestedException(e, IllegalDataException.class) != null) { 450 428 explainNestedIllegalDataException(e); 451 429 return; 452 430 } 453 if ( getNestedException(e, OfflineAccessException.class) != null) {431 if (ExceptionUtil.getNestedException(e, OfflineAccessException.class) != null) { 454 432 explainNestedOfflineAccessException(e); 455 433 return; … … 534 512 */ 535 513 public static void explainException(Exception e) { 536 if ( getNestedException(e, InvocationTargetException.class) != null) {514 if (ExceptionUtil.getNestedException(e, InvocationTargetException.class) != null) { 537 515 explainNestedInvocationTargetException(e); 538 516 return; -
trunk/src/org/openstreetmap/josm/gui/MapFrame.java
r8399 r8470 592 592 593 593 /** 594 * Replies the instance of a toggle dialog of type <code>type</code> managed by this 595 * map frame 594 * Replies the instance of a toggle dialog of type <code>type</code> managed by this map frame 596 595 * 597 * @param <T> 596 * @param <T> toggle dialog type 598 597 * @param type the class of the toggle dialog, i.e. UserListDialog.class 599 598 * @return the instance of a toggle dialog of type <code>type</code> managed by this … … 618 617 if (dialogsPanel.isVisible()) { 619 618 Main.pref.putInteger("toggleDialogs.width", splitPane.getWidth()-splitPane.getDividerLocation()); 620 }619 } 621 620 } 622 621 -
trunk/src/org/openstreetmap/josm/gui/MapStatus.java
r8426 r8470 396 396 * keep the popup on screen and shows a vertical scrollbar, if the 397 397 * screen is too small. 398 * @param content 399 * @param ms 398 * @param content popup content 399 * @param ms mouse state 400 400 * @return popup 401 401 */ … … 432 432 /** 433 433 * Calls this to update the element that is shown in the statusbar 434 * @param ms 434 * @param ms mouse state 435 435 */ 436 436 private void statusBarElementUpdate(MouseState ms) { -
trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
r8459 r8470 329 329 330 330 /** 331 * @param r 331 * @param r rectangle 332 332 * @return Minimum bounds that will cover rectangle 333 333 */ -
trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
r8426 r8470 107 107 /** 108 108 * Sets a custom text line below currentAction. Can be used to display additional information 109 * @param text 109 * @param text custom text 110 110 */ 111 111 @Override -
trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
r8393 r8470 92 92 /** 93 93 * Plugins that wish to add custom tile sources to slippy map choose should call this method 94 * @param tileSourceProvider 94 * @param tileSourceProvider new tile source provider 95 95 */ 96 96 public static void addTileSourceProvider(TileSourceProvider tileSourceProvider) { … … 237 237 238 238 /** 239 * Callback for the OsmMapControl. (Re-)Sets the start and end point of the 240 * selection rectangle. 239 * Callback for the OsmMapControl. (Re-)Sets the start and end point of the selection rectangle. 241 240 * 242 * @param aStart 243 * @param aEnd 241 * @param aStart selection start 242 * @param aEnd selection end 244 243 */ 245 244 public void setSelection(Point aStart, Point aEnd) { -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
r8444 r8470 126 126 127 127 /** 128 * 129 * @param entry 128 * Replies primitive from my dataset referenced by entry 129 * @param entry entry 130 130 * @return Primitive from my dataset referenced by entry 131 131 */ -
trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
r8444 r8470 401 401 /** 402 402 * Constructs a new {@code ListMerger}. 403 * @param model 403 * @param model list merger model 404 404 */ 405 405 public ListMerger(ListMergeModel<T> model) { -
trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
r8444 r8470 182 182 * Replies the decision at position <code>row</code> 183 183 * 184 * @param row 184 * @param row position 185 185 * @return the decision at position <code>row</code> 186 186 */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r8449 r8470 301 301 * map frame 302 302 * 303 * @param <T> 303 * @param <T> toggle dialog type 304 304 * @param type the class of the toggle dialog, i.e. UserListDialog.class 305 305 * @return the instance of a toggle dialog of type <code>type</code> managed by this -
trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java
r8390 r8470 501 501 * is the editor's business. 502 502 * 503 * @param row 503 * @param row position 504 504 */ 505 505 private void editMembership(int row) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java
r8345 r8470 61 61 private final List<Integer> notSortable = new ArrayList<>(); 62 62 63 public static Node firstOnewayNode(RelationMember m) {63 public static Node firstOnewayNode(RelationMember m) { 64 64 if(!m.isWay()) return null; 65 65 if("backward".equals(m.getRole())) { … … 69 69 } 70 70 71 public static Node lastOnewayNode(RelationMember m) {71 public static Node lastOnewayNode(RelationMember m) { 72 72 if(!m.isWay()) return null; 73 73 if("backward".equals(m.getRole())) { … … 267 267 /** 268 268 * find next node in nw NodeWays structure, if the node is found delete and return it 269 * @param nw 270 * @param n 269 * @param nw nodes and ways 270 * @param n node 271 271 * @return node next to n 272 272 */ 273 private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n) {273 private Integer deleteAndGetAdjacentNode(NodesWays nw, Node n) { 274 274 Integer j = findAdjacentWay(nw, n); 275 275 if(j == null) return null; … … 284 284 } 285 285 286 private void deleteWayNode(NodesWays nw, Integer way, Node n) {286 private void deleteWayNode(NodesWays nw, Integer way, Node n) { 287 287 if(nw.oneWay) { 288 288 doneOneway(way); -
trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
r8444 r8470 281 281 282 282 /** 283 * Invoked by284 * @param b 283 * Starts download for the given bounding box 284 * @param b bounding box to download 285 285 */ 286 286 public void startDownload(Bounds b) { -
trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
r7528 r8470 125 125 /** 126 126 * Sets the current history. 127 * @param history 127 * @param history current history 128 128 */ 129 129 protected void setHistory(History history) { -
trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java
r8394 r8470 173 173 * Recursive unzipping function 174 174 * TODO: May be placed somewhere else - Tools.Utils? 175 * @param file 176 * @param dir 177 * @throws IOException 175 * @param file zip file 176 * @param dir output directory 177 * @throws IOException if any I/O error occurs 178 178 */ 179 179 public static void unzipFileRecursively(File file, String dir) throws IOException { -
trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
r8464 r8470 353 353 * {@link ImageryType#BING}, {@link ImageryType#SCANEX}. 354 354 * 355 * @param info 355 * @param info imagery info 356 356 * @return a new TileSource instance or null if no TileSource for the ImageryInfo/ImageryType could be found. 357 * @throws IllegalArgumentException 357 * @throws IllegalArgumentException if url from imagery info is null or invalid 358 358 */ 359 359 public static TileSource getTileSource(ImageryInfo info) { -
trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
r8444 r8470 433 433 434 434 /** 435 * 436 * @param xIndex 437 * @param yIndex 435 * Returns east/north for a x/y couple. 436 * @param xIndex x index 437 * @param yIndex y index 438 438 * @return Real EastNorth of given tile. dx/dy is not counted in 439 439 */ … … 531 531 532 532 /** 533 * 534 * @param request 533 * Replies request priority. 534 * @param request WMS request 535 535 * @return -1 if request is no longer needed, otherwise priority of request (lower number <=> more important request) 536 536 */ … … 719 719 * not update existing tiles, only new ones will be subject to the new settings. 720 720 * 721 * @param layer 721 * @param layer WMS layer 722 722 * @param snap Set to true if the resolution should snap to certain values instead of 723 723 * matching the current zoom level perfectly … … 739 739 * false they will be removed instantly (and redrawn only after the new resolution 740 740 * image has been loaded). 741 * @param layer 741 * @param layer WMS layer 742 742 * @param snap Set to true if the resolution should snap to certain values instead of 743 743 * matching the current zoom level perfectly -
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
r8393 r8470 45 45 /** 46 46 * draws a primitive 47 * @param primitive 48 * @param paintSettings 49 * @param painter 47 * @param primitive primitive to draw 48 * @param paintSettings paint settings 49 * @param painter painter 50 50 * @param selected true, if primitive is selected 51 51 * @param outermember true, if primitive is not selected and outer member of a selected multipolygon relation -
trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java
r8444 r8470 39 39 * If null, no label is rendered. 40 40 * @param font the font to be used. Must not be null. 41 * @param xOffset 42 * @param yOffset 41 * @param xOffset x offset 42 * @param yOffset y offset 43 43 * @param color the color to be used. Must not be null 44 * @param haloRadius 45 * @param haloColor 44 * @param haloRadius halo radius 45 * @param haloColor halo color 46 46 */ 47 47 public TextElement(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) { -
trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
r8461 r8470 158 158 * Add validation listener to currently open preferences dialog. Calling to removeValidationListener is not necessary, all listeners will 159 159 * be automatically removed when dialog is closed 160 * @param validationListener 160 * @param validationListener validation listener to add 161 161 */ 162 162 public void addValidationListener(ValidationListener validationListener) { -
trunk/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
r8291 r8470 51 51 * next time JOSM is used. 52 52 * 53 * @param saveToPreferences 53 * @param saveToPreferences {@code true} to save to preferences file 54 54 */ 55 55 public void setSaveToPreferences(boolean saveToPreferences) { … … 87 87 * Sets the access token secret. Pass in null to remove the current access token secret. 88 88 * 89 * @param accessTokenSecret 89 * @param accessTokenSecret access token secret, or null 90 90 */ 91 91 public void setAccessTokenSecret(String accessTokenSecret) { -
trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
r5891 r8470 116 116 * @param title Can be {@code null}, in that case task title is not changed 117 117 */ 118 void subTask(String title); 118 119 119 void subTask(String title);120 120 /** 121 121 * Shows additional text 122 * @param text custom text 122 123 */ 124 void setCustomText(String text); 123 125 124 void setCustomText(String text);125 126 /** 126 * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB 127 * already downloaded 128 * @param text 127 * Show extra text after normal task title. Hack for ProgressInputStream to show number of kB already downloaded 128 * @param text extra text 129 129 */ 130 130 void setExtraText(String text); -
trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
r8444 r8470 474 474 475 475 /** 476 * @param autoCompletionList 476 * Sets the editor autocompletion list 477 * @param autoCompletionList autocompletion list 477 478 */ 478 479 public void setAutoCompletionList(AutoCompletionList autoCompletionList) { … … 520 521 * Inject a tag cell editor in the tag table 521 522 * 522 * @param editor 523 * @param editor tag cell editor 523 524 */ 524 525 public void setTagCellEditor(TagCellEditor editor) { -
trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManager.java
r7748 r8470 271 271 * an empty list if key is null or if key is not in {@link #getKeys()}. 272 272 * 273 * @param key 273 * @param key OSM key 274 274 * @return the list of auto completion values 275 275 */ -
trunk/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
r8465 r8470 1116 1116 /** 1117 1117 * Dividers can't have a weight, they don't grow or shrink. 1118 * @throws UnsupportedOperationException 1118 * @throws UnsupportedOperationException always 1119 1119 */ 1120 1120 @Override -
trunk/src/org/openstreetmap/josm/io/CachedFile.java
r8443 r8470 136 136 /** 137 137 * Set the caching strategy. Only applies to URLs. 138 * @param cachingStrategy 138 * @param cachingStrategy caching strategy 139 139 * @return this object 140 140 */ -
trunk/src/org/openstreetmap/josm/io/Compression.java
r7937 r8470 55 55 * Returns an un-compressing {@link InputStream} for {@code in}. 56 56 * 57 * @throws IOException 57 * @throws IOException if any I/O error occurs 58 58 */ 59 59 public InputStream getUncompressedInputStream(InputStream in) throws IOException { … … 74 74 * Returns an un-compressing {@link InputStream} for the {@link File} {@code file}. 75 75 * 76 * @throws IOException 76 * @throws IOException if any I/O error occurs 77 77 */ 78 78 @SuppressWarnings("resource") … … 84 84 * Returns an un-compressing {@link InputStream} for the {@link URL} {@code url}. 85 85 * 86 * @throws IOException 86 * @throws IOException if any I/O error occurs 87 87 */ 88 88 public static InputStream getUncompressedURLInputStream(URL url) throws IOException { … … 93 93 * Returns a compressing {@link OutputStream} for {@code out}. 94 94 * 95 * @throws IOException 95 * @throws IOException if any I/O error occurs 96 96 */ 97 97 public OutputStream getCompressedOutputStream(OutputStream out) throws IOException { … … 112 112 * Returns a compressing {@link OutputStream} for the {@link File} {@code file}. 113 113 * 114 * @throws IOException 114 * @throws IOException if any I/O error occurs 115 115 */ 116 116 @SuppressWarnings("resource") -
trunk/src/org/openstreetmap/josm/io/GpxReader.java
r8461 r8470 534 534 * @return true if file was properly parsed, false if there was error during 535 535 * parsing but some data were parsed anyway 536 * @throws SAXException 537 * @throws IOException 536 * @throws SAXException if any SAX parsing error occurs 537 * @throws IOException if any I/O error occurs 538 538 */ 539 539 public boolean parse(boolean tryToFinish) throws SAXException, IOException { -
trunk/src/org/openstreetmap/josm/io/NoteReader.java
r8377 r8470 197 197 * Initializes the reader with a given InputStream 198 198 * @param source - InputStream containing Notes XML 199 * @throws IOException 199 * @throws IOException if any I/O error occurs 200 200 */ 201 201 public NoteReader(InputStream source) throws IOException { … … 206 206 * Initializes the reader with a string as a source 207 207 * @param source UTF-8 string containing Notes XML to parse 208 * @throws IOException 208 * @throws IOException if any I/O error occurs 209 209 */ 210 210 public NoteReader(String source) throws IOException { … … 216 216 * the resulting Note objects 217 217 * @return List of Notes parsed from the input data 218 * @throws SAXException 219 * @throws IOException 218 * @throws SAXException if any SAX parsing error occurs 219 * @throws IOException if any I/O error occurs 220 220 */ 221 221 public List<Note> parse() throws SAXException, IOException { -
trunk/src/org/openstreetmap/josm/io/OsmApi.java
r8415 r8470 802 802 * @param monitor Progress monitor 803 803 * @return Note as it exists on the server after creation (ID assigned) 804 * @throws OsmTransferException 804 * @throws OsmTransferException if any error occurs during dialog with OSM API 805 805 */ 806 806 public Note createNote(LatLon latlon, String text, ProgressMonitor monitor) throws OsmTransferException { … … 824 824 * @param monitor Progress monitor 825 825 * @return Note returned by the API after the comment was added 826 * @throws OsmTransferException 826 * @throws OsmTransferException if any error occurs during dialog with OSM API 827 827 */ 828 828 public Note addCommentToNote(Note note, String comment, ProgressMonitor monitor) throws OsmTransferException { … … 842 842 * @param monitor Progress monitor 843 843 * @return Note returned by the API after the close operation 844 * @throws OsmTransferException 844 * @throws OsmTransferException if any error occurs during dialog with OSM API 845 845 */ 846 846 public Note closeNote(Note note, String closeMessage, ProgressMonitor monitor) throws OsmTransferException { … … 864 864 * @param monitor Progress monitor 865 865 * @return Note returned by the API after the reopen operation 866 * @throws OsmTransferException 866 * @throws OsmTransferException if any error occurs during dialog with OSM API 867 867 */ 868 868 public Note reopenNote(Note note, String reactivateMessage, ProgressMonitor monitor) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
r8390 r8470 149 149 * 150 150 * @return the data set 151 * @throws OsmTransferException 151 * @throws OsmTransferException if any error occurs during dialog with OSM API 152 152 */ 153 153 protected DataSet getReferringWays(ProgressMonitor progressMonitor) throws OsmTransferException { … … 160 160 * @param progressMonitor the progress monitor 161 161 * @return the data set 162 * @throws OsmTransferException 162 * @throws OsmTransferException if any error occurs during dialog with OSM API 163 163 */ 164 164 protected DataSet getReferringRelations(ProgressMonitor progressMonitor) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java
r8443 r8470 106 106 * @param progressMonitor the progress monitor. Set to {@link NullProgressMonitor#INSTANCE} if null 107 107 * @return the downloaded data 108 * @throws OsmTransferException 108 * @throws OsmTransferException if any error occurs during dialog with OSM API 109 109 */ 110 110 @Override -
trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
r8415 r8470 366 366 * Downloads notes from a given raw URL. The URL is assumed to be complete and no API limits are added 367 367 * 368 * @param progressMonitor 368 * @param progressMonitor progress monitor 369 369 * @return A list of notes parsed from the URL 370 * @throws OsmTransferException 370 * @throws OsmTransferException if any error occurs during dialog with OSM API 371 371 */ 372 372 public List<Note> parseRawNotes(final ProgressMonitor progressMonitor) throws OsmTransferException { … … 376 376 /** 377 377 * Download notes from a URL that contains a bzip2 compressed notes dump file 378 * @param progressMonitor 378 * @param progressMonitor progress monitor 379 379 * @return A list of notes parsed from the URL 380 * @throws OsmTransferException 380 * @throws OsmTransferException if any error occurs during dialog with OSM API 381 381 */ 382 382 public List<Note> parseRawNotesBzip2(final ProgressMonitor progressMonitor) throws OsmTransferException { -
trunk/src/org/openstreetmap/josm/io/ProgressInputStream.java
r8394 r8470 78 78 /** 79 79 * Increase ticker (progress counter and displayed text) by the given amount. 80 * @param amount 80 * @param amount number of ticks 81 81 */ 82 82 private void advanceTicker(int amount) { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpServer.java
r8342 r8470 113 113 * Stops the HTTP server 114 114 * 115 * @throws IOException 115 * @throws IOException if any I/O error occurs 116 116 */ 117 117 public void stopServer() throws IOException { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java
r8404 r8470 114 114 * @param v value 115 115 * @return which one 116 * @throws IOException 116 * @throws IOException if any I/O error occurs 117 117 */ 118 118 private static GeneralName createGeneralName(String t, String v) throws IOException { -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/AddNodeHandler.java
r8464 r8470 76 76 /** 77 77 * Adds a node, implements the GET /add_node?lon=...&lat=... request. 78 * @param args 78 * @param args request arguments 79 79 */ 80 80 private void addNode(Map<String, String> args){ -
trunk/src/org/openstreetmap/josm/io/remotecontrol/handler/RequestHandler.java
r8415 r8470 57 57 * Check permission and parameters and handle request. 58 58 * 59 * @throws RequestHandlerForbiddenException 60 * @throws RequestHandlerBadRequestException 61 * @throws RequestHandlerErrorException 59 * @throws RequestHandlerForbiddenException if request is forbidden by preferences 60 * @throws RequestHandlerBadRequestException if request is invalid 61 * @throws RequestHandlerErrorException if an error occurs while processing request 62 62 */ 63 63 public final void handle() throws RequestHandlerForbiddenException, RequestHandlerBadRequestException, RequestHandlerErrorException { … … 70 70 /** 71 71 * Validates the request before attempting to perform it. 72 * @throws RequestHandlerBadRequestException 72 * @throws RequestHandlerBadRequestException if request is invalid 73 73 * @since 5678 74 74 */ … … 80 80 * This method of the subclass will do the real work. 81 81 * 82 * @throws RequestHandlerErrorException 83 * @throws RequestHandlerBadRequestException 82 * @throws RequestHandlerErrorException if an error occurs while processing request 83 * @throws RequestHandlerBadRequestException if request is invalid 84 84 */ 85 85 protected abstract void handleRequest() throws RequestHandlerErrorException, RequestHandlerBadRequestException; … … 133 133 134 134 /** 135 * Check permissions in preferences and display error message 136 * or ask for permission. 137 * 138 * @throws RequestHandlerForbiddenException 135 * Check permissions in preferences and display error message or ask for permission. 136 * 137 * @throws RequestHandlerForbiddenException if request is forbidden by preferences 139 138 */ 140 139 public final void checkPermission() throws RequestHandlerForbiddenException { -
trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
r8404 r8470 492 492 /** 493 493 * Sets the name 494 * @param name 494 * @param name Plugin name 495 495 */ 496 496 public void setName(String name) { -
trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java
r8390 r8470 32 32 * @param manifest the plugin manifest 33 33 * @return a plugin information object 34 * @throws PluginListParseException 34 * @throws PluginListParseException if plugin manifest cannot be parsed 35 35 */ 36 36 protected static PluginInformation createInfo(String name, String url, String manifest) throws PluginListParseException{ -
trunk/src/org/openstreetmap/josm/tools/CompositeList.java
r8290 r8470 9 9 * 10 10 * Extremely simple single-purpose implementation. 11 * @param <T> 11 * @param <T> item type 12 12 * @since 7109 13 13 */ -
trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
r7596 r8470 614 614 * the root exception <code>e</code>) or null, if no such exception is found. 615 615 * 616 * @param <T> 616 * @param <T> nested exception type 617 617 * @param e the root exception 618 618 * @param nestedClass the type of the nested exception 619 619 * @return the first nested exception of type <code>nestedClass</code> (including 620 620 * the root exception <code>e</code>) or null, if no such exception is found. 621 */ 622 protected static <T> T getNestedException(Exception e, Class<T> nestedClass) { 621 * @since 8470 622 */ 623 public static <T> T getNestedException(Exception e, Class<T> nestedClass) { 623 624 Throwable t = e; 624 625 while (t != null && !(nestedClass.isInstance(t))) { -
trunk/src/org/openstreetmap/josm/tools/ExifReader.java
r8364 r8470 121 121 * @param dirGps The EXIF GPS directory 122 122 * @return The lat/lon read in the EXIF section, or {@code null} if {@code dirGps} is null 123 * @throws MetadataException 123 * @throws MetadataException if invalid metadata is given 124 124 * @since 6209 125 125 */ -
trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
r8416 r8470 51 51 * Create new GeoPropertyIndex. 52 52 * @param geoProp the input property that should be made faster by this index 53 * @param maxLevel 53 * @param maxLevel max level 54 54 */ 55 55 public GeoPropertyIndex(GeoProperty<T> geoProp, int maxLevel) { -
trunk/src/org/openstreetmap/josm/tools/Geometry.java
r8459 r8470 227 227 * @param lineP2 second point in path 228 228 * @param lineP3 third point in path 229 * @param testPoint 229 * @param testPoint point to test 230 230 * @return true if to the right side, false otherwise 231 231 */ … … 714 714 * Returns angle of a segment defined with 2 point coordinates. 715 715 * 716 * @param p1 717 * @param p2 716 * @param p1 first point 717 * @param p2 second point 718 718 * @return Angle in radians (-pi, pi] 719 719 */ … … 729 729 * Returns angle of a corner defined with 3 point coordinates. 730 730 * 731 * @param p1 731 * @param p1 first point 732 732 * @param p2 Common endpoint 733 * @param p3 733 * @param p3 third point 734 734 * @return Angle in radians (-pi, pi] 735 735 */ -
trunk/src/org/openstreetmap/josm/tools/TextTagParser.java
r8468 r8470 195 195 /** 196 196 * Apply different methods to extract tag-value pairs from arbitrary text 197 * @param buf 197 * @param buf buffer 198 198 * @return null if no format is suitable 199 199 */ 200 201 200 public static Map<String,String> readTagsFromText(String buf) { 202 201 Map<String,String> tags;
Note:
See TracChangeset
for help on using the changeset viewer.