Changeset 16657 in josm
- Timestamp:
- 2020-06-16T18:58:46+02:00 (4 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java
r16453 r16657 489 489 * Builds a default tooltip text for the primitive <code>primitive</code>. 490 490 * 491 * @param primitive the primit mive491 * @param primitive the primitive 492 492 * @return the tooltip text 493 493 */ … … 647 647 * Builds a default tooltip text for an HistoryOsmPrimitive <code>primitive</code>. 648 648 * 649 * @param primitive the primit mive649 * @param primitive the primitive 650 650 * @return the tooltip text 651 651 */ -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
r16438 r16657 673 673 /** 674 674 * Selects all members which refer to {@link OsmPrimitive}s in the collections 675 * <code>primit mives</code>. Does nothing is primitives is null.675 * <code>primitives</code>. Does nothing is primitives is null. 676 676 * 677 677 * @param primitives the collection of primitives -
trunk/test/unit/org/openstreetmap/josm/data/osm/DataSetMergerTest.java
r14922 r16657 74 74 75 75 /** 76 * two identical nodes, even in id and version. No conf ict expected.76 * two identical nodes, even in id and version. No conflict expected. 77 77 * 78 78 * Can happen if data is loaded in two layers and then merged from one layer -
trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
r16617 r16657 490 490 TimeZone.setDefault(DateUtils.UTC); 491 491 492 // Force log hand ers to reacquire reference to (junit's fake) stdout/stderr492 // Force log handlers to reacquire reference to (junit's fake) stdout/stderr 493 493 for (Handler handler : Logging.getLogger().getHandlers()) { 494 494 if (handler instanceof Logging.ReacquiringConsoleHandler) { … … 700 700 701 701 /** 702 * The junit timeout statement has problems when switch ting timezones. This one does not.702 * The junit timeout statement has problems when switching timezones. This one does not. 703 703 * @author Michael Zangl 704 704 */
Note:
See TracChangeset
for help on using the changeset viewer.