Changeset 13076 in josm
- Timestamp:
- 2017-11-04T11:19:54+01:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
r12912 r13076 671 671 * @param foundMatches The number of matches added to the result. 672 672 * @param setting The setting used. 673 * @param parent parent component 673 674 */ 674 675 void receiveSearchResult(DataSet ds, Collection<OsmPrimitive> result, int foundMatches, SearchSetting setting, Component parent); -
trunk/src/org/openstreetmap/josm/data/Preferences.java
r13023 r13076 39 39 import org.openstreetmap.josm.Main; 40 40 import org.openstreetmap.josm.data.preferences.BooleanProperty; 41 import org.openstreetmap.josm.data.preferences.ColorInfo; 41 42 import org.openstreetmap.josm.data.preferences.DoubleProperty; 42 43 import org.openstreetmap.josm.data.preferences.IntegerProperty; 43 import org.openstreetmap.josm.data.preferences.ColorInfo;44 44 import org.openstreetmap.josm.data.preferences.LongProperty; 45 45 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 46 46 import org.openstreetmap.josm.data.preferences.PreferencesReader; 47 47 import org.openstreetmap.josm.data.preferences.PreferencesWriter; 48 import org.openstreetmap.josm.io.OfflineAccessException; 49 import org.openstreetmap.josm.io.OnlineResource; 48 50 import org.openstreetmap.josm.spi.preferences.AbstractPreferences; 51 import org.openstreetmap.josm.spi.preferences.Config; 49 52 import org.openstreetmap.josm.spi.preferences.IBaseDirectories; 50 53 import org.openstreetmap.josm.spi.preferences.IPreferences; … … 54 57 import org.openstreetmap.josm.spi.preferences.Setting; 55 58 import org.openstreetmap.josm.spi.preferences.StringSetting; 56 import org.openstreetmap.josm.io.OfflineAccessException;57 import org.openstreetmap.josm.io.OnlineResource;58 import org.openstreetmap.josm.spi.preferences.Config;59 59 import org.openstreetmap.josm.tools.CheckParameterUtil; 60 60 import org.openstreetmap.josm.tools.ColorHelper; … … 336 336 337 337 /** 338 * @param key preference key 339 * @return listener list for this key 338 340 * @deprecated deprecated private method 339 341 */ … … 383 385 384 386 /** 387 * @param key preference key 388 * @param oldValue old value 389 * @param newValue new value 385 390 * @deprecated deprecated private method 386 391 */ … … 431 436 432 437 /** 438 * @param createIfMissing if true, automatically creates this directory, 439 * in case it is missing 440 * @return the preferences directory 433 441 * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} 434 442 */ … … 451 459 452 460 /** 461 * @param createIfMissing if true, automatically creates this directory, 462 * in case it is missing 463 * @return the user data directory 453 464 * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} 454 465 */ … … 496 507 497 508 /** 509 * @param createIfMissing if true, automatically creates this directory, 510 * in case it is missing 511 * @return the cache directory 498 512 * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()} 499 513 */ … … 945 959 /** 946 960 * only for preferences 961 * @param o color key 962 * @return translated color name 947 963 * @deprecated (since 12987) no longer supported 948 964 */ -
trunk/src/org/openstreetmap/josm/gui/widgets/PopupMenuButton.java
r12955 r13076 6 6 import java.awt.Graphics; 7 7 import java.awt.Graphics2D; 8 import java.awt.event.ActionEvent; 8 9 import java.awt.event.ActionListener; 9 import java.awt.event.ActionEvent;10 10 import java.awt.geom.Path2D; 11 11 … … 23 23 24 24 /** 25 * Constructs a new {@code PopupMenuButton}. 25 26 * @see JButton#JButton() 26 27 */ … … 31 32 32 33 /** 34 * Constructs a new {@code PopupMenuButton}. 35 * @param a the <code>Action</code> used to specify the new button 33 36 * @see JButton#JButton(Action) 34 37 */ … … 39 42 40 43 /** 44 * Constructs a new {@code PopupMenuButton}. 45 * @param i the Icon image to display on the button 41 46 * @see JButton#JButton(Icon) 42 47 */ … … 47 52 48 53 /** 54 * Constructs a new {@code PopupMenuButton}. 55 * @param t the text of the button 49 56 * @see JButton#JButton(String) 50 57 */ … … 55 62 56 63 /** 64 * Constructs a new {@code PopupMenuButton}. 65 * @param t the text of the button 66 * @param i the Icon image to display on the button 57 67 * @see JButton#JButton(String, Icon) 58 68 */ … … 64 74 /** 65 75 * Pass-through to {@link JButton#JButton()} allowing associated popup menu to be set 76 * @param m the associated popup menu 66 77 */ 67 78 public PopupMenuButton(JPopupMenu m) { … … 72 83 /** 73 84 * Pass-through to {@link JButton#JButton(Action)} allowing associated popup menu to be set 85 * @param a the <code>Action</code> used to specify the new button 86 * @param m the associated popup menu 74 87 */ 75 88 public PopupMenuButton(Action a, JPopupMenu m) { … … 80 93 /** 81 94 * Pass-through to {@link JButton#JButton(Icon)} allowing associated popup menu to be set 95 * @param i the Icon image to display on the button 96 * @param m the associated popup menu 82 97 */ 83 98 public PopupMenuButton(Icon i, JPopupMenu m) { … … 88 103 /** 89 104 * Pass-through to {@link JButton#JButton(String)} allowing associated popup menu to be set 105 * @param t the text of the button 106 * @param m the associated popup menu 90 107 */ 91 108 public PopupMenuButton(String t, JPopupMenu m) { … … 96 113 /** 97 114 * Pass-through to {@link JButton#JButton(String, Icon)} allowing associated popup menu to be set 115 * @param t the text of the button 116 * @param i the Icon image to display on the button 117 * @param m the associated popup menu 98 118 */ 99 119 public PopupMenuButton(String t, Icon i, JPopupMenu m) { … … 113 133 /** 114 134 * Get the popup menu associated with this button 135 * @return the popup menu associated with this button 115 136 */ 116 137 public JPopupMenu getPopupMenu() { -
trunk/src/org/openstreetmap/josm/tools/template_engine/Condition.java
r13003 r13076 15 15 private final List<TemplateEntry> entries; 16 16 17 /** 18 * Constructs a new {@code Condition} with predefined template entries. 19 * @param entries template entries 20 */ 17 21 public Condition(Collection<TemplateEntry> entries) { 18 22 this.entries = new ArrayList<>(entries); 19 23 } 20 24 25 /** 26 * Constructs a new {@code Condition}. 27 */ 21 28 public Condition() { 22 29 this.entries = new ArrayList<>(); … … 24 31 25 32 /** 33 * Returns template entries. 34 * @return template entries 26 35 * @deprecated (since 13003) use constructor {@link #Condition(java.util.Collection)} to set the entries 27 36 */
Note:
See TracChangeset
for help on using the changeset viewer.