[josm] 03/28: Merge tag 'upstream/0.0.svn8800+dfsg1'

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Oct 9 22:27:00 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 09a5b90fbca72c202e3a12c7bec0e9fc9b0d77b2
Merge: 90a0815 560f79d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Oct 9 12:44:22 2015 +0200

    Merge tag 'upstream/0.0.svn8800+dfsg1'
    
    Upstream version 0.0.svn8800+dfsg1

 .checkstyle                                        |    28 +
 .classpath                                         |    59 +-
 .project                                           |    19 +-
 .settings/edu.umd.cs.findbugs.core.prefs           |    18 +-
 .settings/org.eclipse.jdt.core.prefs               |    23 +
 .settings/org.eclipse.jdt.groovy.core.prefs        |     2 +-
 .settings/org.eclipse.jdt.ui.prefs                 |    10 +-
 ...eclipse.wst.common.project.facet.core.prefs.xml |    15 -
 .../org.eclipse.wst.common.project.facet.core.xml  |     5 -
 .settings/org.sonar.ide.eclipse.core.prefs         |     6 +
 .settings/sf.eclipse.javacc.prefs                  |     2 +
 README                                             |     5 +-
 REVISION                                           |     8 +-
 build.xml                                          |   101 +-
 data/defaultpresets.xml                            |   635 +-
 data/maps.xsd                                      |    20 +-
 data/overpass-turbo-ffs.js                         |     1 +
 data/projection/epsg                               |   360 +-
 data/validator/combinations.mapcss                 |    79 +-
 data/validator/deprecated.mapcss                   |    71 +-
 data/validator/geometry.mapcss                     |    90 +-
 data/validator/numeric.mapcss                      |    23 +-
 data/validator/opening_hours.js                    |  6598 +---
 data/validator/relation.mapcss                     |     2 +-
 .../projection-regression-test-data-java9.csv      |   726 +
 data_nodist/projection-regression-test-data.csv    |  1408 +-
 data_nodist/trans/ast.lang                         |   Bin 9399 -> 8893 bytes
 data_nodist/trans/be.lang                          |   Bin 0 -> 15437 bytes
 data_nodist/trans/bg.lang                          |   Bin 2806 -> 2804 bytes
 data_nodist/trans/ca-valencia.lang                 |   Bin 8323 -> 8068 bytes
 data_nodist/trans/ca.lang                          |   Bin 9737 -> 9810 bytes
 data_nodist/trans/cs.lang                          |   Bin 9742 -> 9583 bytes
 data_nodist/trans/da.lang                          |   Bin 5205 -> 8809 bytes
 data_nodist/trans/de.lang                          |   Bin 9781 -> 9665 bytes
 data_nodist/trans/el.lang                          |   Bin 1395 -> 1393 bytes
 data_nodist/trans/en.lang                          |   Bin 8247 -> 8111 bytes
 data_nodist/trans/en_AU.lang                       |   Bin 1671 -> 1669 bytes
 data_nodist/trans/en_GB.lang                       |   Bin 2259 -> 2091 bytes
 data_nodist/trans/es.lang                          |   Bin 10692 -> 10613 bytes
 data_nodist/trans/et.lang                          |   Bin 1428 -> 1426 bytes
 data_nodist/trans/fi.lang                          |   Bin 2605 -> 2449 bytes
 data_nodist/trans/fr.lang                          |   Bin 9453 -> 9774 bytes
 data_nodist/trans/gl.lang                          |   Bin 3230 -> 3170 bytes
 data_nodist/trans/hu.lang                          |   Bin 10662 -> 10003 bytes
 data_nodist/trans/id.lang                          |   Bin 7149 -> 6911 bytes
 data_nodist/trans/it.lang                          |   Bin 10263 -> 10313 bytes
 data_nodist/trans/ja.lang                          |   Bin 11523 -> 10784 bytes
 data_nodist/trans/km.lang                          |   Bin 17419 -> 16168 bytes
 data_nodist/trans/lt.lang                          |   Bin 708 -> 1942 bytes
 data_nodist/trans/nl.lang                          |   Bin 9085 -> 10415 bytes
 data_nodist/trans/pl.lang                          |   Bin 2855 -> 2923 bytes
 data_nodist/trans/pt.lang                          |   Bin 12660 -> 12597 bytes
 data_nodist/trans/pt_BR.lang                       |   Bin 8869 -> 8361 bytes
 data_nodist/trans/ru.lang                          |   Bin 15654 -> 15485 bytes
 data_nodist/trans/sk.lang                          |   Bin 9163 -> 8972 bytes
 data_nodist/trans/sv.lang                          |   Bin 1332 -> 1330 bytes
 data_nodist/trans/uk.lang                          |   Bin 16154 -> 15842 bytes
 data_nodist/trans/vi.lang                          |   Bin 0 -> 10761 bytes
 data_nodist/trans/zh_CN.lang                       |   Bin 5411 -> 6060 bytes
 data_nodist/trans/zh_TW.lang                       |   Bin 4866 -> 4828 bytes
 data_nodist/wms-cache.xsd                          |    55 -
 i18n/build.xml                                     |     2 +-
 i18n/convpreset.pl                                 |     1 +
 i18n/launchpad.pl                                  |     6 +-
 i18n/po/af.po                                      |  2145 +-
 i18n/po/am.po                                      |  2145 +-
 i18n/po/ar.po                                      |  2421 +-
 i18n/po/ast.po                                     |  2951 +-
 i18n/po/az.po                                      |  2145 +-
 i18n/po/be.po                                      | 19372 +++++++-----
 i18n/po/bg.po                                      |  2301 +-
 i18n/po/bn.po                                      |  2145 +-
 i18n/po/br.po                                      |  2145 +-
 i18n/po/bs.po                                      |  2145 +-
 i18n/po/ca.po                                      |  2202 +-
 i18n/po/ca at valencia.po                             |  2310 +-
 i18n/po/cs.po                                      |  2074 +-
 i18n/po/cy.po                                      |  2145 +-
 i18n/po/da.po                                      |  4736 +--
 i18n/po/de.po                                      |  3090 +-
 i18n/po/de_DE.po                                   |  2145 +-
 i18n/po/el.po                                      |  2835 +-
 i18n/po/en_AU.po                                   |  4781 +--
 i18n/po/en_CA.po                                   |  2145 +-
 i18n/po/en_GB.po                                   |  4916 +--
 i18n/po/eo.po                                      |  2143 +-
 i18n/po/es.po                                      |  2404 +-
 i18n/po/et.po                                      |  2500 +-
 i18n/po/eu.po                                      |  2171 +-
 i18n/po/fa.po                                      |  2263 +-
 i18n/po/fi.po                                      |  2632 +-
 i18n/po/fil.po                                     |  2145 +-
 i18n/po/fo.po                                      |  2145 +-
 i18n/po/fr.po                                      |  2730 +-
 i18n/po/ga.po                                      | 30291 ++++++++++++++++++
 i18n/po/gl.po                                      |  2131 +-
 i18n/po/he.po                                      |  2249 +-
 i18n/po/hi.po                                      |  2145 +-
 i18n/po/hr.po                                      |  2265 +-
 i18n/po/ht.po                                      |  2145 +-
 i18n/po/hu.po                                      |  2524 +-
 i18n/po/hy.po                                      |  2145 +-
 i18n/po/ia.po                                      |  2145 +-
 i18n/po/id.po                                      |  2304 +-
 i18n/po/is.po                                      |  2279 +-
 i18n/po/it.po                                      |  2672 +-
 i18n/po/ja.po                                      |  2522 +-
 i18n/po/ka.po                                      |  2145 +-
 i18n/po/km.po                                      |  2312 +-
 i18n/po/ko.po                                      |  2294 +-
 i18n/po/ky.po                                      |  2147 +-
 i18n/po/lo.po                                      |  2145 +-
 i18n/po/lt.po                                      |  4586 +--
 i18n/po/lv.po                                      |  2145 +-
 i18n/po/mk.po                                      |  2145 +-
 i18n/po/mr.po                                      | 30334 +++++++++++++++++++
 i18n/po/ms.po                                      |  2145 +-
 i18n/po/nb.po                                      |  2671 +-
 i18n/po/nds.po                                     |  2145 +-
 i18n/po/nl.po                                      |  4201 ++-
 i18n/po/nn.po                                      |  2145 +-
 i18n/po/oc.po                                      |  2265 +-
 i18n/po/pa.po                                      |  2145 +-
 i18n/po/pl.po                                      |  2747 +-
 i18n/po/pt.po                                      |  2682 +-
 i18n/po/pt_BR.po                                   |  2786 +-
 i18n/po/rm.po                                      |  2145 +-
 i18n/po/ro.po                                      |  2263 +-
 i18n/po/ru.po                                      |  2093 +-
 i18n/po/sk.po                                      |  2101 +-
 i18n/po/sl.po                                      |  2185 +-
 i18n/po/sq.po                                      |  2145 +-
 i18n/po/sr.po                                      |  2145 +-
 i18n/po/sv.po                                      |  2951 +-
 i18n/po/ta.po                                      |  2141 +-
 i18n/po/te.po                                      |  2145 +-
 i18n/po/th.po                                      |  2145 +-
 i18n/po/tr.po                                      |  2250 +-
 i18n/po/ug.po                                      |  2145 +-
 i18n/po/uk.po                                      |  2376 +-
 i18n/po/ur.po                                      |  2145 +-
 i18n/po/vi.po                                      | 19575 ++++++------
 i18n/po/zh_CN.po                                   |  4285 +--
 i18n/po/zh_TW.po                                   |  2275 +-
 images/Mf_closedway.png                            |   Bin 368 -> 0 bytes
 images/Mf_closedway.svg                            |     8 +
 images/Mf_node.png                                 |   Bin 203 -> 0 bytes
 images/Mf_node.svg                                 |     5 +
 images/Mf_relation.png                             |   Bin 203 -> 0 bytes
 images/Mf_relation.svg                             |     8 +
 images/Mf_way.png                                  |   Bin 428 -> 0 bytes
 images/Mf_way.svg                                  |     8 +
 images/audio-back.png                              |   Bin 247 -> 0 bytes
 images/audio-back.svg                              |     4 +
 images/audio-faster.png                            |   Bin 261 -> 0 bytes
 images/audio-faster.svg                            |     4 +
 images/audio-fwd.png                               |   Bin 247 -> 0 bytes
 images/audio-fwd.svg                               |     4 +
 images/audio-next.png                              |   Bin 220 -> 0 bytes
 images/audio-next.svg                              |     4 +
 images/audio-playpause.png                         |   Bin 233 -> 0 bytes
 images/audio-playpause.svg                         |     4 +
 images/audio-prev.png                              |   Bin 221 -> 0 bytes
 images/audio-prev.svg                              |     4 +
 images/audio-slower.png                            |   Bin 264 -> 0 bytes
 images/audio-slower.svg                            |     4 +
 images/audio-sync.png                              |   Bin 244 -> 0 bytes
 images/audio-sync.svg                              |     4 +
 images/dialogs/add_wmts.png                        |   Bin 0 -> 454 bytes
 images/dialogs/layerlist/gamma.png                 |   Bin 0 -> 489 bytes
 images/dialogs/minimap.png                         |   Bin 0 -> 1086 bytes
 images/dialogs/sort_below.png                      |   Bin 0 -> 249 bytes
 images/dialogs/taginfo.png                         |   Bin 0 -> 240 bytes
 images/download-overpass.png                       |   Bin 0 -> 1516 bytes
 images/icons/power_tower_high2.n.16.png            |   Bin 0 -> 704 bytes
 images/icons/power_tower_low.n.16.png              |   Bin 0 -> 483 bytes
 images/logo.svg                                    |     2 +-
 images/misc/gray_check.png                         |   Bin 0 -> 282 bytes
 images/oauth/oauth-logo.png                        |   Bin 1388 -> 0 bytes
 images/oauth/oauth-logo.svg                        |    34 +
 images/oauth/oauth-small.svg                       |     6 +
 images/oauth/oauth.png                             |   Bin 628 -> 0 bytes
 images/presets/JusticeScales.png                   |   Bin 495 -> 0 bytes
 images/presets/bollard.png                         |   Bin 274 -> 303 bytes
 images/presets/field_hockey.png                    |   Bin 0 -> 304 bytes
 images/presets/ford.png                            |   Bin 607 -> 0 bytes
 images/presets/{Hockey.png => ice_hockey.png}      |   Bin
 images/presets/pharmacy.png                        |   Bin 113 -> 0 bytes
 images/presets/prison.png                          |   Bin 135 -> 0 bytes
 images/presets/recycling.png                       |   Bin 456 -> 0 bytes
 images/presets/safety_training.png                 |   Bin 674 -> 0 bytes
 images/svpDown.png                                 |   Bin 81 -> 0 bytes
 images/svpDown.svg                                 |     4 +
 images/svpLeft.png                                 |   Bin 88 -> 0 bytes
 images/svpLeft.svg                                 |     4 +
 images/svpRight.png                                |   Bin 87 -> 0 bytes
 images/svpRight.svg                                |     4 +
 images/svpUp.png                                   |   Bin 83 -> 0 bytes
 images/svpUp.svg                                   |     4 +
 linux/latest/usr/bin/josm-latest                   |    14 +
 .../usr/share/applications/josm-latest.desktop     |     2 +-
 linux/tested/usr/bin/josm                          |    14 +
 linux/tested/usr/share/applications/josm.desktop   |     2 +-
 netbeans/nbbuild.xml                               |    21 +-
 presets_lang.pl                                    |     2 +-
 scripts/taginfoextract.groovy                      |    68 +-
 src/JOSM.java                                      |     9 +-
 src/org/apache/commons/jcs/JCS.java                |   212 +
 .../commons/jcs/access/AbstractCacheAccess.java    |   203 +
 src/org/apache/commons/jcs/access/CacheAccess.java |   309 +
 .../commons/jcs/access/GroupCacheAccess.java       |   211 +
 .../commons/jcs/access/PartitionedCacheAccess.java |   846 +
 .../commons/jcs/access/behavior/ICacheAccess.java  |   167 +
 .../access/behavior/ICacheAccessManagement.java    |   111 +
 .../jcs/access/behavior/IGroupCacheAccess.java     |    89 +
 .../jcs/access/exception/CacheException.java       |    66 +
 .../access/exception/ConfigurationException.java   |    44 +
 .../access/exception/InvalidArgumentException.java |    47 +
 .../access/exception/InvalidGroupException.java    |    47 +
 .../access/exception/InvalidHandleException.java   |    48 +
 .../access/exception/ObjectExistsException.java    |    53 +
 .../access/exception/ObjectNotFoundException.java  |    51 +
 src/org/apache/commons/jcs/access/package.html     |    27 +
 .../apache/commons/jcs/admin/CacheElementInfo.java |   124 +
 .../apache/commons/jcs/admin/CacheRegionInfo.java  |   180 +
 .../jcs/admin/CountingOnlyOutputStream.java        |    84 +
 src/org/apache/commons/jcs/admin/JCSAdmin.jsp      |   310 +
 src/org/apache/commons/jcs/admin/JCSAdminBean.java |   436 +
 src/org/apache/commons/jcs/admin/JCSJMXBean.java   |    90 +
 .../commons/jcs/admin/servlet/JCSAdminServlet.java |   181 +
 .../jcs/admin/servlet/JCSAdminServletDefault.vm    |    64 +
 .../admin/servlet/JCSAdminServletRegionDetail.vm   |    50 +
 .../jcs/auxiliary/AbstractAuxiliaryCache.java      |   210 +
 .../AbstractAuxiliaryCacheAttributes.java          |   130 +
 .../AbstractAuxiliaryCacheEventLogging.java        |   353 +
 .../auxiliary/AbstractAuxiliaryCacheFactory.java   |    72 +
 .../commons/jcs/auxiliary/AuxiliaryCache.java      |    77 +
 .../jcs/auxiliary/AuxiliaryCacheAttributes.java    |    95 +
 .../jcs/auxiliary/AuxiliaryCacheConfigurator.java  |   128 +
 .../jcs/auxiliary/AuxiliaryCacheFactory.java       |    71 +
 .../jcs/auxiliary/disk/AbstractDiskCache.java      |   872 +
 .../disk/AbstractDiskCacheAttributes.java          |   233 +
 .../commons/jcs/auxiliary/disk/LRUMapJCS.java      |    75 +
 .../jcs/auxiliary/disk/PurgatoryElement.java       |   157 +
 .../disk/behavior/IDiskCacheAttributes.java        |   131 +
 .../jcs/auxiliary/disk/block/BlockDisk.java        |   524 +
 .../jcs/auxiliary/disk/block/BlockDiskCache.java   |   739 +
 .../disk/block/BlockDiskCacheAttributes.java       |   118 +
 .../disk/block/BlockDiskCacheFactory.java          |    66 +
 .../disk/block/BlockDiskElementDescriptor.java     |   132 +
 .../auxiliary/disk/block/BlockDiskKeyStore.java    |   471 +
 .../jcs/auxiliary/disk/indexed/IndexedDisk.java    |   282 +
 .../auxiliary/disk/indexed/IndexedDiskCache.java   |  1773 ++
 .../disk/indexed/IndexedDiskCacheAttributes.java   |   209 +
 .../disk/indexed/IndexedDiskCacheFactory.java      |    66 +
 .../auxiliary/disk/indexed/IndexedDiskDumper.java  |    57 +
 .../disk/indexed/IndexedDiskElementDescriptor.java |   118 +
 .../jcs/auxiliary/disk/jdbc/JDBCDiskCache.java     |  1158 +
 .../disk/jdbc/JDBCDiskCacheAttributes.java         |   290 +
 .../auxiliary/disk/jdbc/JDBCDiskCacheFactory.java  |   182 +
 .../disk/jdbc/JDBCDiskCachePoolAccess.java         |   271 +
 .../jdbc/JDBCDiskCachePoolAccessAttributes.java    |   179 +
 .../disk/jdbc/JDBCDiskCachePoolAccessManager.java  |   211 +
 .../jcs/auxiliary/disk/jdbc/ShrinkerThread.java    |   169 +
 .../jcs/auxiliary/disk/jdbc/TableState.java        |   114 +
 .../disk/jdbc/hsql/HSQLDiskCacheFactory.java       |   206 +
 .../auxiliary/disk/jdbc/mysql/MySQLDiskCache.java  |   168 +
 .../disk/jdbc/mysql/MySQLDiskCacheAttributes.java  |   107 +
 .../disk/jdbc/mysql/MySQLDiskCacheFactory.java     |   193 +
 .../disk/jdbc/mysql/MySQLTableOptimizer.java       |   325 +
 .../disk/jdbc/mysql/util/ScheduleParser.java       |    96 +
 .../apache/commons/jcs/auxiliary/disk/package.html |    27 +
 .../jcs/auxiliary/lateral/LateralCache.java        |   457 +
 .../auxiliary/lateral/LateralCacheAttributes.java  |   313 +
 .../jcs/auxiliary/lateral/LateralCacheMonitor.java |   285 +
 .../jcs/auxiliary/lateral/LateralCacheNoWait.java  |   436 +
 .../lateral/LateralCacheNoWaitFacade.java          |   533 +
 .../jcs/auxiliary/lateral/LateralCommand.java      |    47 +
 .../lateral/LateralElementDescriptor.java          |    83 +
 .../lateral/behavior/ILateralCacheAttributes.java  |   202 +
 .../lateral/behavior/ILateralCacheListener.java    |    51 +
 .../commons/jcs/auxiliary/lateral/package.html     |    26 +
 .../lateral/socket/tcp/LateralTCPCacheFactory.java |   435 +
 .../socket/tcp/LateralTCPDiscoveryListener.java    |   343 +
 .../lateral/socket/tcp/LateralTCPListener.java     |   774 +
 .../lateral/socket/tcp/LateralTCPSender.java       |   272 +
 .../lateral/socket/tcp/LateralTCPService.java      |   458 +
 .../socket/tcp/TCPLateralCacheAttributes.java      |   399 +
 .../tcp/behavior/ITCPLateralCacheAttributes.java   |   218 +
 src/org/apache/commons/jcs/auxiliary/package.html  |    25 +
 .../remote/AbstractRemoteAuxiliaryCache.java       |   718 +
 .../remote/AbstractRemoteCacheListener.java        |   350 +
 .../remote/AbstractRemoteCacheNoWaitFacade.java    |   472 +
 .../remote/CommonRemoteCacheAttributes.java        |   323 +
 .../commons/jcs/auxiliary/remote/RemoteCache.java  |   186 +
 .../auxiliary/remote/RemoteCacheAttributes.java    |   261 +
 .../jcs/auxiliary/remote/RemoteCacheFactory.java   |   165 +
 .../remote/RemoteCacheFailoverRunner.java          |   488 +
 .../jcs/auxiliary/remote/RemoteCacheListener.java  |   121 +
 .../jcs/auxiliary/remote/RemoteCacheManager.java   |   612 +
 .../jcs/auxiliary/remote/RemoteCacheMonitor.java   |   224 +
 .../jcs/auxiliary/remote/RemoteCacheNoWait.java    |   529 +
 .../auxiliary/remote/RemoteCacheNoWaitFacade.java  |   102 +
 .../jcs/auxiliary/remote/RemoteCacheRestore.java   |   129 +
 .../commons/jcs/auxiliary/remote/RemoteUtils.java  |   251 +
 .../behavior/ICommonRemoteCacheAttributes.java     |   177 +
 .../remote/behavior/IRemoteCacheAttributes.java    |   178 +
 .../remote/behavior/IRemoteCacheClient.java        |    61 +
 .../remote/behavior/IRemoteCacheConstants.java     |    70 +
 .../remote/behavior/IRemoteCacheDispatcher.java    |    46 +
 .../remote/behavior/IRemoteCacheListener.java      |    81 +
 .../http/behavior/IRemoteHttpCacheConstants.java   |    31 +
 .../remote/http/client/AbstractHttpClient.java     |   193 +
 .../remote/http/client/RemoteHttpCache.java        |   116 +
 .../http/client/RemoteHttpCacheAttributes.java     |   228 +
 .../remote/http/client/RemoteHttpCacheClient.java  |   496 +
 .../http/client/RemoteHttpCacheDispatcher.java     |   231 +
 .../remote/http/client/RemoteHttpCacheFactory.java |    94 +
 .../remote/http/client/RemoteHttpCacheManager.java |   266 +
 .../remote/http/client/RemoteHttpCacheMonitor.java |   248 +
 .../http/client/RemoteHttpClientListener.java      |    53 +
 .../client/behavior/IRemoteHttpCacheClient.java    |    51 +
 .../http/server/AbstractRemoteCacheService.java    |   603 +
 .../http/server/RemoteCacheServiceAdaptor.java     |   174 +
 .../server/RemoteHttpCacheServerAttributes.java    |   115 +
 .../remote/http/server/RemoteHttpCacheService.java |   270 +
 .../remote/http/server/RemoteHttpCacheServlet.java |   264 +
 .../http/server/RemoteHttpCacheSeviceFactory.java  |    91 +
 .../commons/jcs/auxiliary/remote/package.html      |    25 +
 .../remote/server/RegistryKeepAliveRunner.java     |   189 +
 .../auxiliary/remote/server/RemoteCacheServer.java |  1725 ++
 .../remote/server/RemoteCacheServerAttributes.java |   211 +
 .../remote/server/RemoteCacheServerFactory.java    |   539 +
 .../remote/server/RemoteCacheStartupServlet.java   |   216 +
 .../TimeoutConfigurableRMISocketFactory.java       |   111 +
 .../remote/server/behavior/IRemoteCacheServer.java |    37 +
 .../behavior/IRemoteCacheServerAttributes.java     |   118 +
 .../remote/server/behavior/RemoteType.java         |    32 +
 .../remote/util/RemoteCacheRequestFactory.java     |   254 +
 .../auxiliary/remote/value/RemoteCacheRequest.java |   187 +
 .../remote/value/RemoteCacheResponse.java          |   105 +
 .../auxiliary/remote/value/RemoteRequestType.java  |    53 +
 .../jcs/engine/AbstractCacheEventQueue.java        |   499 +
 .../apache/commons/jcs/engine/CacheAdaptor.java    |   143 +
 .../apache/commons/jcs/engine/CacheConstants.java  |    34 +
 .../apache/commons/jcs/engine/CacheElement.java    |   160 +
 .../commons/jcs/engine/CacheElementSerialized.java |    77 +
 .../apache/commons/jcs/engine/CacheEventQueue.java |   418 +
 .../commons/jcs/engine/CacheEventQueueFactory.java |    88 +
 src/org/apache/commons/jcs/engine/CacheGroup.java  |    59 +
 src/org/apache/commons/jcs/engine/CacheInfo.java   |    47 +
 .../apache/commons/jcs/engine/CacheListeners.java  |    82 +
 src/org/apache/commons/jcs/engine/CacheStatus.java |    37 +
 .../commons/jcs/engine/CacheWatchRepairable.java   |   200 +
 .../jcs/engine/CompositeCacheAttributes.java       |   447 +
 .../commons/jcs/engine/ElementAttributes.java      |   469 +
 .../commons/jcs/engine/PooledCacheEventQueue.java  |   228 +
 .../commons/jcs/engine/ZombieCacheService.java     |   156 +
 .../jcs/engine/ZombieCacheServiceNonLocal.java     |   313 +
 .../commons/jcs/engine/ZombieCacheWatch.java       |    73 +
 .../apache/commons/jcs/engine/behavior/ICache.java |   141 +
 .../commons/jcs/engine/behavior/ICacheElement.java |    74 +
 .../engine/behavior/ICacheElementSerialized.java   |    41 +
 .../jcs/engine/behavior/ICacheEventQueue.java      |   147 +
 .../jcs/engine/behavior/ICacheListener.java        |    86 +
 .../commons/jcs/engine/behavior/ICacheManager.java |    42 +
 .../jcs/engine/behavior/ICacheObserver.java        |    78 +
 .../commons/jcs/engine/behavior/ICacheRestore.java |    37 +
 .../commons/jcs/engine/behavior/ICacheService.java |   117 +
 .../jcs/engine/behavior/ICacheServiceAdmin.java    |    51 +
 .../jcs/engine/behavior/ICacheServiceNonLocal.java |   118 +
 .../commons/jcs/engine/behavior/ICacheType.java    |    49 +
 .../engine/behavior/ICompositeCacheAttributes.java |   246 +
 .../engine/behavior/ICompositeCacheManager.java    |    64 +
 .../jcs/engine/behavior/IElementAttributes.java    |   203 +
 .../jcs/engine/behavior/IElementSerializer.java    |    50 +
 .../jcs/engine/behavior/IProvideScheduler.java     |    38 +
 .../jcs/engine/behavior/IRequireScheduler.java     |    39 +
 .../jcs/engine/behavior/IShutdownObservable.java   |    55 +
 .../jcs/engine/behavior/IShutdownObserver.java     |    41 +
 .../commons/jcs/engine/behavior/IZombie.java       |    30 +
 .../commons/jcs/engine/behavior/package.html       |    25 +
 .../commons/jcs/engine/control/CompositeCache.java |  1848 ++
 .../engine/control/CompositeCacheConfigurator.java |   664 +
 .../jcs/engine/control/CompositeCacheManager.java  |  1025 +
 .../jcs/engine/control/event/ElementEvent.java     |    74 +
 .../engine/control/event/ElementEventQueue.java    |   203 +
 .../control/event/behavior/ElementEventType.java   |    54 +
 .../control/event/behavior/IElementEvent.java      |    42 +
 .../event/behavior/IElementEventHandler.java       |    40 +
 .../control/event/behavior/IElementEventQueue.java |    48 +
 .../jcs/engine/control/group/GroupAttrName.java    |   117 +
 .../commons/jcs/engine/control/group/GroupId.java  |   103 +
 .../apache/commons/jcs/engine/control/package.html |    25 +
 .../commons/jcs/engine/logging/CacheEvent.java     |   177 +
 .../logging/CacheEventLoggerDebugLogger.java       |   113 +
 .../jcs/engine/logging/behavior/ICacheEvent.java   |    77 +
 .../engine/logging/behavior/ICacheEventLogger.java |    91 +
 .../jcs/engine/match/KeyMatcherPatternImpl.java    |    66 +
 .../jcs/engine/match/behavior/IKeyMatcher.java     |    36 +
 .../AbstractDoubleLinkedListMemoryCache.java       |   805 +
 .../jcs/engine/memory/AbstractMemoryCache.java     |   339 +
 .../jcs/engine/memory/behavior/IMemoryCache.java   |   187 +
 .../jcs/engine/memory/fifo/FIFOMemoryCache.java    |    60 +
 .../jcs/engine/memory/lru/LHMLRUMemoryCache.java   |   361 +
 .../jcs/engine/memory/lru/LRUMemoryCache.java      |    67 +
 .../commons/jcs/engine/memory/lru/package.html     |    25 +
 .../jcs/engine/memory/mru/MRUMemoryCache.java      |    63 +
 .../commons/jcs/engine/memory/mru/package.html     |    26 +
 .../apache/commons/jcs/engine/memory/package.html  |    25 +
 .../engine/memory/shrinking/ShrinkerThread.java    |   222 +
 .../memory/util/MemoryElementDescriptor.java       |    47 +
 src/org/apache/commons/jcs/engine/package.html     |    25 +
 .../commons/jcs/engine/stats/CacheStats.java       |   116 +
 .../commons/jcs/engine/stats/StatElement.java      |   104 +
 src/org/apache/commons/jcs/engine/stats/Stats.java |    99 +
 .../jcs/engine/stats/behavior/ICacheStats.java     |    51 +
 .../jcs/engine/stats/behavior/IStatElement.java    |    54 +
 .../commons/jcs/engine/stats/behavior/IStats.java  |    63 +
 .../jcs/io/ObjectInputStreamClassLoaderAware.java  |    62 +
 src/org/apache/commons/jcs/package.html            |    26 +
 .../jcs/utils/access/AbstractJCSWorkerHelper.java  |    59 +
 .../apache/commons/jcs/utils/access/JCSWorker.java |   306 +
 .../commons/jcs/utils/access/JCSWorkerHelper.java  |    61 +
 .../commons/jcs/utils/config/OptionConverter.java  |   427 +
 .../commons/jcs/utils/config/PropertySetter.java   |   300 +
 .../jcs/utils/config/PropertySetterException.java  |    75 +
 .../apache/commons/jcs/utils/config/package.html   |    28 +
 .../jcs/utils/discovery/DiscoveredService.java     |   183 +
 .../jcs/utils/discovery/UDPCleanupRunner.java      |    97 +
 .../utils/discovery/UDPDiscoveryAttributes.java    |   231 +
 .../jcs/utils/discovery/UDPDiscoveryManager.java   |   114 +
 .../jcs/utils/discovery/UDPDiscoveryMessage.java   |   166 +
 .../jcs/utils/discovery/UDPDiscoveryReceiver.java  |   380 +
 .../jcs/utils/discovery/UDPDiscoverySender.java    |   292 +
 .../utils/discovery/UDPDiscoverySenderThread.java  |   199 +
 .../jcs/utils/discovery/UDPDiscoveryService.java   |   438 +
 .../discovery/behavior/IDiscoveryListener.java     |    44 +
 .../apache/commons/jcs/utils/net/HostNameUtil.java |   147 +
 .../jcs/utils/props/AbstractPropertyContainer.java |   190 +
 .../commons/jcs/utils/props/PropertiesFactory.java |    36 +
 .../jcs/utils/props/PropertiesFactoryFileImpl.java |    40 +
 .../commons/jcs/utils/props/PropertyLoader.java    |   174 +
 .../utils/serialization/CompressingSerializer.java |   126 +
 .../serialization/SerializationConversionUtil.java |   147 +
 .../utils/serialization/StandardSerializer.java    |    91 +
 .../utils/servlet/JCSServletContextListener.java   |    87 +
 .../commons/jcs/utils/struct/AbstractLRUMap.java   |   671 +
 .../commons/jcs/utils/struct/BoundedQueue.java     |    94 +
 .../commons/jcs/utils/struct/DoubleLinkedList.java |   303 +
 .../jcs/utils/struct/DoubleLinkedListNode.java     |    62 +
 .../jcs/utils/struct/LRUElementDescriptor.java     |    60 +
 .../apache/commons/jcs/utils/struct/LRUMap.java    |    60 +
 .../commons/jcs/utils/struct/LRUMapEntry.java      |    82 +
 .../commons/jcs/utils/struct/SingleLinkedList.java |   137 +
 .../jcs/utils/struct/SortedPreferentialArray.java  |   612 +
 .../jcs/utils/threadpool/DaemonThreadFactory.java  |    74 +
 .../jcs/utils/threadpool/PoolConfiguration.java    |   268 +
 .../jcs/utils/threadpool/ThreadPoolManager.java    |   465 +
 .../commons/jcs/utils/timing/ElapsedTimer.java     |    58 +
 .../apache/commons/jcs/utils/timing/SleepUtil.java |    50 +
 .../commons/jcs/utils/zip/CompressionUtil.java     |   203 +
 src/org/openstreetmap/josm/Main.java               |   187 +-
 .../openstreetmap/josm/actions/AboutAction.java    |    26 +-
 .../josm/actions/AbstractInfoAction.java           |    42 +-
 .../josm/actions/AbstractMergeAction.java          |     4 +-
 .../josm/actions/AbstractSelectAction.java         |    48 +-
 .../josm/actions/AddImageryLayerAction.java        |    42 +-
 .../openstreetmap/josm/actions/AddNodeAction.java  |     8 +-
 .../josm/actions/AlignInCircleAction.java          |   120 +-
 .../josm/actions/AlignInLineAction.java            |   127 +-
 .../josm/actions/AutoScaleAction.java              |    14 +-
 .../josm/actions/CloseChangesetAction.java         |     9 +-
 .../josm/actions/CombineWayAction.java             |    49 +-
 src/org/openstreetmap/josm/actions/CopyAction.java |     5 +-
 .../josm/actions/CopyCoordinatesAction.java        |     2 +-
 .../josm/actions/CreateCircleAction.java           |    34 +-
 .../josm/actions/CreateMultipolygonAction.java     |    62 +-
 .../josm/actions/DialogsToggleAction.java          |     2 +-
 .../josm/actions/DiskAccessAction.java             |    24 +-
 .../josm/actions/DistributeAction.java             |    36 +-
 .../openstreetmap/josm/actions/DownloadAction.java |     6 +-
 .../josm/actions/DownloadAlongAction.java          |    14 +-
 .../josm/actions/DownloadNotesInViewAction.java    |     5 +-
 .../josm/actions/DownloadPrimitiveAction.java      |    10 +-
 .../josm/actions/DownloadReferrersAction.java      |     2 +-
 .../josm/actions/ExtensionFileFilter.java          |    13 +-
 .../josm/actions/FullscreenToggleAction.java       |     2 +-
 .../josm/actions/GpxExportAction.java              |     7 +-
 src/org/openstreetmap/josm/actions/HelpAction.java |     2 +-
 .../josm/actions/HistoryInfoWebAction.java         |    13 +-
 .../josm/actions/ImageryAdjustAction.java          |    36 +-
 .../openstreetmap/josm/actions/InfoWebAction.java  |    47 +-
 .../josm/actions/JoinAreasAction.java              |   107 +-
 .../josm/actions/JoinNodeWayAction.java            |    10 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |     9 +-
 .../openstreetmap/josm/actions/JumpToAction.java   |    56 +-
 .../josm/actions/MapRectifierWMSmenuAction.java    |    27 +-
 .../josm/actions/MergeLayerAction.java             |     2 +-
 .../josm/actions/MergeNodesAction.java             |     9 +-
 .../josm/actions/MergeSelectionAction.java         |     4 +-
 .../openstreetmap/josm/actions/MirrorAction.java   |     4 +-
 src/org/openstreetmap/josm/actions/MoveAction.java |     6 +-
 .../openstreetmap/josm/actions/MoveNodeAction.java |     2 +-
 .../openstreetmap/josm/actions/OpenFileAction.java |    25 +-
 .../josm/actions/OpenLocationAction.java           |     9 +-
 .../josm/actions/OrthogonalizeAction.java          |    75 +-
 .../josm/actions/OsmPrimitiveAction.java           |     2 +-
 .../josm/actions/OverpassDownloadAction.java       |   249 +
 .../josm/actions/ParameterizedAction.java          |     2 +-
 .../josm/actions/ParameterizedActionDecorator.java |     7 +-
 .../openstreetmap/josm/actions/PasteAction.java    |    31 +-
 .../josm/actions/PasteTagsAction.java              |    32 +-
 .../josm/actions/PreferencesAction.java            |     2 +-
 .../openstreetmap/josm/actions/PurgeAction.java    |    18 +-
 .../josm/actions/RenameLayerAction.java            |     4 +-
 .../openstreetmap/josm/actions/RestartAction.java  |   147 +-
 .../josm/actions/ReverseWayAction.java             |     2 +-
 src/org/openstreetmap/josm/actions/SaveAction.java |     6 +-
 .../openstreetmap/josm/actions/SaveActionBase.java |    12 +-
 .../josm/actions/SearchNotesDownloadAction.java    |    18 +-
 .../josm/actions/SelectAllAction.java              |     7 +-
 .../actions/SelectNonBranchingWaySequences.java    |     7 +-
 .../josm/actions/SessionLoadAction.java            |     5 +-
 .../josm/actions/SessionSaveAsAction.java          |    15 +-
 .../josm/actions/ShowStatusReportAction.java       |    71 +-
 .../josm/actions/SimplifyWayAction.java            |    26 +-
 .../openstreetmap/josm/actions/SplitWayAction.java |    49 +-
 .../openstreetmap/josm/actions/ToggleAction.java   |    16 +-
 .../openstreetmap/josm/actions/UnGlueAction.java   |    10 +-
 .../josm/actions/UnJoinNodeWayAction.java          |    10 +-
 .../josm/actions/UpdateDataAction.java             |    20 +-
 .../josm/actions/UpdateSelectionAction.java        |     9 +-
 .../openstreetmap/josm/actions/UploadAction.java   |     7 +-
 .../josm/actions/UploadNotesAction.java            |     9 +-
 .../josm/actions/UploadSelectionAction.java        |    15 +-
 .../openstreetmap/josm/actions/ValidateAction.java |     7 +-
 .../josm/actions/WireframeToggleAction.java        |     2 +-
 .../openstreetmap/josm/actions/ZoomInAction.java   |     2 +-
 .../openstreetmap/josm/actions/ZoomToAction.java   |    18 +-
 .../josm/actions/audio/AudioFastSlowAction.java    |     2 +-
 .../josm/actions/audio/AudioPlayPauseAction.java   |     5 +-
 .../downloadtasks/AbstractDownloadTask.java        |    31 +-
 .../actions/downloadtasks/DownloadGpsTask.java     |     8 +-
 .../downloadtasks/DownloadNotesUrlBoundsTask.java  |     7 +-
 .../downloadtasks/DownloadNotesUrlIdTask.java      |     2 +-
 .../downloadtasks/DownloadOsmChangeTask.java       |    12 +-
 .../actions/downloadtasks/DownloadOsmTask.java     |     8 +-
 .../downloadtasks/DownloadReferrersTask.java       |    24 +-
 .../actions/downloadtasks/DownloadSessionTask.java |    10 +-
 .../josm/actions/downloadtasks/DownloadTask.java   |     4 +-
 .../actions/downloadtasks/PostDownloadHandler.java |    12 +-
 .../josm/actions/mapmode/DeleteAction.java         |    72 +-
 .../josm/actions/mapmode/DrawAction.java           |   502 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |   104 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    11 +-
 .../actions/mapmode/ImproveWayAccuracyHelper.java  |    17 +-
 .../josm/actions/mapmode/MapMode.java              |    44 +-
 .../josm/actions/mapmode/ModifiersSpec.java        |     8 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    24 +-
 .../josm/actions/mapmode/ParallelWays.java         |     9 +-
 .../josm/actions/mapmode/PlayHeadDragMode.java     |     6 +-
 .../josm/actions/mapmode/SelectAction.java         |   126 +-
 .../actions/relation/AbstractRelationAction.java   |     2 +-
 .../actions/relation/DeleteRelationsAction.java    |     6 +-
 .../actions/relation/DownloadMembersAction.java    |     2 +-
 .../DownloadSelectedIncompleteMembersAction.java   |     4 +-
 .../actions/relation/DuplicateRelationAction.java  |     2 +-
 .../relation/SelectInRelationListAction.java       |     2 +-
 .../josm/actions/relation/SelectMembersAction.java |     5 +-
 .../actions/relation/SelectRelationAction.java     |     8 +-
 .../josm/actions/search/PushbackTokenizer.java     |    13 +-
 .../josm/actions/search/SearchAction.java          |    95 +-
 .../josm/actions/search/SearchCompiler.java        |   313 +-
 .../actions/upload/ApiPreconditionCheckerHook.java |    10 +-
 .../upload/CyclicUploadDependencyException.java    |    14 +-
 .../josm/actions/upload/FixDataHook.java           |    32 +-
 .../actions/upload/RelationUploadOrderHook.java    |     8 +-
 .../josm/actions/upload/UploadHook.java            |     2 +-
 .../josm/actions/upload/UploadNotesTask.java       |    13 +-
 .../josm/actions/upload/ValidateUploadHook.java    |     4 +-
 src/org/openstreetmap/josm/command/AddCommand.java |    27 +-
 .../josm/command/AddPrimitivesCommand.java         |    51 +-
 .../openstreetmap/josm/command/ChangeCommand.java  |    33 +-
 .../josm/command/ChangeNodesCommand.java           |    33 +-
 .../josm/command/ChangePropertyCommand.java        |    46 +-
 .../josm/command/ChangePropertyKeyCommand.java     |    48 +-
 .../command/ChangeRelationMemberRoleCommand.java   |    46 +
 src/org/openstreetmap/josm/command/Command.java    |    74 +-
 .../openstreetmap/josm/command/DeleteCommand.java  |    59 +-
 .../openstreetmap/josm/command/MoveCommand.java    |    69 +-
 .../openstreetmap/josm/command/PseudoCommand.java  |     3 +
 .../openstreetmap/josm/command/PurgeCommand.java   |    64 +-
 .../josm/command/RemoveNodesCommand.java           |    33 +-
 .../openstreetmap/josm/command/RotateCommand.java  |    38 +-
 .../openstreetmap/josm/command/ScaleCommand.java   |    38 +-
 .../openstreetmap/josm/command/SelectCommand.java  |    31 +
 .../josm/command/SequenceCommand.java              |    36 +-
 .../josm/command/TransformNodesCommand.java        |    36 +-
 .../josm/command/conflict/ConflictAddCommand.java  |    29 +-
 .../command/conflict/ConflictResolveCommand.java   |    31 +-
 .../conflict/CoordinateConflictResolveCommand.java |    37 +-
 .../DeletedStateConflictResolveCommand.java        |    28 +
 .../conflict/ModifiedConflictResolveCommand.java   |    27 +-
 .../RelationMemberConflictResolverCommand.java     |    41 +-
 .../conflict/TagConflictResolveCommand.java        |    42 +-
 .../conflict/VersionConflictResolveCommand.java    |    27 +-
 .../conflict/WayNodesConflictResolverCommand.java  |    33 +-
 .../josm/corrector/CorrectionTable.java            |     5 +-
 .../josm/corrector/CorrectionTableModel.java       |     4 +-
 .../josm/corrector/ReverseWayNoTagCorrector.java   |     3 +-
 .../josm/corrector/ReverseWayTagCorrector.java     |    23 +-
 .../openstreetmap/josm/corrector/TagCorrector.java |    13 +-
 src/org/openstreetmap/josm/data/APIDataSet.java    |    12 +-
 src/org/openstreetmap/josm/data/AutosaveTask.java  |     9 +-
 src/org/openstreetmap/josm/data/Bounds.java        |    13 +-
 .../josm/data/CustomConfigurator.java              |   180 +-
 src/org/openstreetmap/josm/data/Data.java          |     6 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   276 +-
 .../openstreetmap/josm/data/ProjectionBounds.java  |    17 +-
 .../josm/data/SelectionChangedListener.java        |     2 +-
 .../josm/data/SystemOfMeasurement.java             |    86 +-
 .../openstreetmap/josm/data/UndoRedoHandler.java   |    18 +-
 src/org/openstreetmap/josm/data/Version.java       |     8 +-
 .../josm/data/cache/BufferedImageCacheEntry.java   |    20 +-
 .../openstreetmap/josm/data/cache/CacheEntry.java  |     8 +-
 .../josm/data/cache/CacheEntryAttributes.java      |   138 +-
 .../josm/data/cache/HostLimitQueue.java            |   165 +
 .../josm/data/cache/ICachedLoaderJob.java          |    32 +-
 .../josm/data/cache/ICachedLoaderListener.java     |    12 +-
 .../josm/data/cache/JCSCacheManager.java           |    81 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |   382 +-
 .../openstreetmap/josm/data/conflict/Conflict.java |     2 +-
 .../josm/data/conflict/ConflictCollection.java     |    47 +-
 .../josm/data/conflict/IConflictListener.java      |     5 +-
 .../openstreetmap/josm/data/coor/CachedLatLon.java |    31 +-
 .../josm/data/coor/CoordinateFormat.java           |     2 +-
 .../openstreetmap/josm/data/coor/EastNorth.java    |    60 +-
 src/org/openstreetmap/josm/data/coor/LatLon.java   |    18 +-
 .../openstreetmap/josm/data/coor/QuadTiling.java   |    27 +-
 .../openstreetmap/josm/data/gpx/GpxConstants.java  |    78 +-
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |    29 +-
 src/org/openstreetmap/josm/data/gpx/GpxTrack.java  |     3 +
 .../josm/data/gpx/GpxTrackSegment.java             |     3 +
 .../josm/data/gpx/ImmutableGpxTrack.java           |     2 +-
 .../josm/data/gpx/ImmutableGpxTrackSegment.java    |     4 +-
 src/org/openstreetmap/josm/data/gpx/WayPoint.java  |     6 +-
 .../josm/data/gpx/WithAttributes.java              |     4 +-
 .../CachedAttributionBingAerialTileSource.java     |    91 +
 .../josm/data/imagery/CachedTileLoaderFactory.java |    95 +
 .../josm/data/imagery/GeorefImage.java             |   256 -
 .../josm/data/imagery/ImageryInfo.java             |   263 +-
 .../josm/data/imagery/ImageryLayerInfo.java        |    24 +-
 .../josm/data/imagery/OffsetBookmark.java          |     8 +-
 src/org/openstreetmap/josm/data/imagery/Shape.java |    17 +-
 .../josm/data/imagery/TMSCachedTileLoader.java     |   116 +-
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |   329 +-
 .../josm/data/imagery/TemplatedWMSTileSource.java  |   378 +
 .../josm/data/imagery/TileLoaderFactory.java       |    29 +
 .../josm/data/imagery/WMSCachedTileLoader.java     |    43 +
 .../josm/data/imagery/WMSCachedTileLoaderJob.java  |    46 +
 .../josm/data/imagery/WMTSTileSource.java          |   687 +
 .../openstreetmap/josm/data/imagery/WmsCache.java  |   586 -
 .../openstreetmap/josm/data/notes/NoteComment.java |     8 +-
 .../josm/data/oauth/OAuthParameters.java           |     4 +
 .../josm/data/oauth/OsmPrivileges.java             |     9 +
 .../josm/data/osm/AbstractPrimitive.java           |   107 +-
 src/org/openstreetmap/josm/data/osm/BBox.java      |    14 +-
 src/org/openstreetmap/josm/data/osm/Changeset.java |    14 +-
 .../josm/data/osm/ChangesetCache.java              |     8 +-
 .../josm/data/osm/ChangesetCacheEvent.java         |     4 +-
 .../josm/data/osm/ChangesetDataSet.java            |    13 +-
 src/org/openstreetmap/josm/data/osm/DataSet.java   |    28 +-
 .../openstreetmap/josm/data/osm/DataSetMerger.java |    41 +-
 .../josm/data/osm/DefaultChangesetCacheEvent.java  |     3 +
 .../openstreetmap/josm/data/osm/FilterMatcher.java |     2 +-
 src/org/openstreetmap/josm/data/osm/Hash.java      |     6 +-
 src/org/openstreetmap/josm/data/osm/INode.java     |     3 +
 .../openstreetmap/josm/data/osm/IPrimitive.java    |    25 +-
 src/org/openstreetmap/josm/data/osm/IRelation.java |     4 +-
 src/org/openstreetmap/josm/data/osm/IWay.java      |     3 +-
 .../josm/data/osm/MultipolygonBuilder.java         |    15 +-
 .../openstreetmap/josm/data/osm/NameFormatter.java |     5 +
 src/org/openstreetmap/josm/data/osm/Node.java      |    30 +-
 src/org/openstreetmap/josm/data/osm/NodeData.java  |    23 +-
 src/org/openstreetmap/josm/data/osm/NoteData.java  |    21 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |   119 +-
 .../josm/data/osm/OsmPrimitiveType.java            |     2 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    26 +-
 .../openstreetmap/josm/data/osm/PrimitiveData.java |     4 +-
 .../josm/data/osm/PrimitiveDeepCopy.java           |     2 +
 .../openstreetmap/josm/data/osm/PrimitiveId.java   |     2 +-
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |    76 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |    76 +-
 .../openstreetmap/josm/data/osm/RelationData.java  |     9 +-
 .../josm/data/osm/RelationMember.java              |     6 +-
 .../josm/data/osm/RelationMemberData.java          |     2 +-
 .../josm/data/osm/RelationToChildReference.java    |     3 +-
 .../josm/data/osm/SimplePrimitiveId.java           |    65 +-
 src/org/openstreetmap/josm/data/osm/Storage.java   |    36 +-
 src/org/openstreetmap/josm/data/osm/Tag.java       |     2 +-
 .../openstreetmap/josm/data/osm/TagCollection.java |    56 +-
 src/org/openstreetmap/josm/data/osm/Tagged.java    |     4 +-
 .../openstreetmap/josm/data/osm/TigerUtils.java    |     2 +-
 src/org/openstreetmap/josm/data/osm/User.java      |    33 +-
 src/org/openstreetmap/josm/data/osm/UserInfo.java  |    11 +
 src/org/openstreetmap/josm/data/osm/Way.java       |    51 +-
 src/org/openstreetmap/josm/data/osm/WayData.java   |    11 +-
 .../openstreetmap/josm/data/osm/WaySegment.java    |     2 +-
 .../josm/data/osm/event/DataSetListener.java       |     2 +-
 .../josm/data/osm/event/DatasetEventManager.java   |   131 +-
 .../josm/data/osm/event/SelectionEventManager.java |     2 +-
 .../josm/data/osm/history/History.java             |    18 +-
 .../josm/data/osm/history/HistoryDataSet.java      |    12 +-
 .../data/osm/history/HistoryNameFormatter.java     |     2 +
 .../josm/data/osm/history/HistoryNode.java         |     3 +-
 .../josm/data/osm/history/HistoryOsmPrimitive.java |    14 +-
 .../josm/data/osm/history/HistoryRelation.java     |     6 +-
 .../josm/data/osm/history/HistoryWay.java          |     2 +-
 .../josm/data/osm/visitor/AllNodesVisitor.java     |     9 +-
 .../josm/data/osm/visitor/BoundingXYVisitor.java   |    21 +-
 .../osm/visitor/MergeSourceBuildingVisitor.java    |     2 +-
 .../osm/visitor/paint/AbstractMapRenderer.java     |    22 +-
 .../josm/data/osm/visitor/paint/LineClip.java      |    40 +-
 .../data/osm/visitor/paint/MapRendererFactory.java |    25 +-
 .../josm/data/osm/visitor/paint/PaintColors.java   |    10 +-
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   384 +-
 .../osm/visitor/paint/WireframeMapRenderer.java    |    21 +-
 .../osm/visitor/paint/relations/Multipolygon.java  |    22 +-
 .../visitor/paint/relations/MultipolygonCache.java |    38 +-
 .../josm/data/preferences/ColorProperty.java       |     9 +-
 .../josm/data/preferences/IntegerProperty.java     |     5 +-
 .../josm/data/projection/AbstractProjection.java   |    24 +-
 .../josm/data/projection/CustomProjection.java     |   152 +-
 .../josm/data/projection/Ellipsoid.java            |    66 +-
 .../josm/data/projection/Projection.java           |    19 +
 .../ProjectionConfigurationException.java          |    25 +-
 .../josm/data/projection/Projections.java          |    72 +-
 .../josm/data/projection/datum/NTV2GridShift.java  |     5 +
 .../data/projection/datum/NTV2GridShiftFile.java   |    58 +-
 .../projection/datum/NTV2GridShiftFileWrapper.java |     4 +
 .../josm/data/projection/datum/NTV2SubGrid.java    |    88 +-
 .../josm/data/projection/datum/NTV2Util.java       |    12 +-
 .../data/projection/datum/SevenParameterDatum.java |     8 +-
 .../projection/proj/LambertConformalConic.java     |    41 +-
 .../josm/data/projection/proj/LonLat.java          |     4 +-
 .../josm/data/projection/proj/Mercator.java        |     5 +-
 .../josm/data/projection/proj/Proj.java            |     1 -
 .../josm/data/projection/proj/ProjParameters.java  |     7 +-
 .../data/projection/proj/SwissObliqueMercator.java |    32 +-
 .../data/projection/proj/TransverseMercator.java   |     7 +-
 .../josm/data/validation/FixableTestError.java     |    89 +-
 .../josm/data/validation/OsmValidator.java         |     6 +-
 .../josm/data/validation/PaintVisitor.java         |    10 +-
 .../josm/data/validation/Severity.java             |     2 +-
 .../openstreetmap/josm/data/validation/Test.java   |    15 +-
 .../josm/data/validation/TestError.java            |    84 +-
 .../josm/data/validation/ValidatorVisitor.java     |     5 +-
 .../data/validation/routines/DomainValidator.java  |    19 +-
 .../data/validation/routines/EmailValidator.java   |     2 +-
 .../validation/routines/InetAddressValidator.java  |     4 +-
 .../data/validation/routines/RegexValidator.java   |    25 +-
 .../data/validation/routines/UrlValidator.java     |     8 +-
 .../josm/data/validation/tests/Addresses.java      |    10 +-
 .../data/validation/tests/BarriersEntrances.java   |     4 +-
 .../josm/data/validation/tests/Coastlines.java     |     7 +-
 .../data/validation/tests/ConditionalKeys.java     |    11 +-
 .../josm/data/validation/tests/CrossingWays.java   |     7 +-
 .../josm/data/validation/tests/DuplicateNode.java  |    42 +-
 .../data/validation/tests/DuplicateRelation.java   |    37 +-
 .../josm/data/validation/tests/DuplicateWay.java   |    33 +-
 .../data/validation/tests/DuplicatedWayNodes.java  |     2 +-
 .../josm/data/validation/tests/Highways.java       |    25 +-
 .../josm/data/validation/tests/InternetTags.java   |     2 +-
 .../josm/data/validation/tests/Lanes.java          |     2 +-
 .../josm/data/validation/tests/LongSegment.java    |     9 +-
 .../data/validation/tests/MapCSSTagChecker.java    |    37 +-
 .../data/validation/tests/MultipolygonTest.java    |    23 +-
 .../josm/data/validation/tests/NameMismatch.java   |     9 +-
 .../data/validation/tests/OpeningHourTest.java     |    22 +-
 .../data/validation/tests/OverlappingWays.java     |    11 +-
 .../josm/data/validation/tests/PowerLines.java     |    12 +-
 .../data/validation/tests/RelationChecker.java     |    24 +-
 .../data/validation/tests/SelfIntersectingWay.java |     2 +-
 .../data/validation/tests/SimilarNamedWays.java    |    17 +-
 .../josm/data/validation/tests/TagChecker.java     |   226 +-
 .../data/validation/tests/TurnrestrictionTest.java |    13 +-
 .../josm/data/validation/tests/UnclosedWays.java   |    28 +-
 .../data/validation/tests/UnconnectedWays.java     |    25 +-
 .../josm/data/validation/tests/UntaggedNode.java   |    80 +-
 .../josm/data/validation/tests/UntaggedWay.java    |    30 +-
 .../data/validation/tests/WayConnectedToArea.java  |     4 +-
 .../data/validation/tests/WronglyOrderedWays.java  |     2 +-
 .../util/AggregatePrimitivesVisitor.java           |     2 +-
 .../josm/data/validation/util/Entities.java        |     6 +-
 .../data/validation/util/MultipleNameVisitor.java  |     6 +-
 .../josm/data/validation/util/NameVisitor.java     |     5 +-
 .../josm/data/validation/util/ValUtil.java         |     8 +-
 .../josm/gui/ConditionalOptionPaneUtil.java        |    27 +-
 .../josm/gui/DefaultNameFormatter.java             |    65 +-
 .../josm/gui/ExceptionDialogUtil.java              |    42 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |    53 +-
 src/org/openstreetmap/josm/gui/FileDrop.java       |   579 +-
 src/org/openstreetmap/josm/gui/GettingStarted.java |     5 +-
 .../josm/gui/HelpAwareOptionPane.java              |    23 +-
 src/org/openstreetmap/josm/gui/HideableButton.java |     7 +
 .../openstreetmap/josm/gui/IconToggleButton.java   |    12 +-
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |    32 +-
 .../josm/gui/JosmUserIdentityManager.java          |     8 +-
 .../openstreetmap/josm/gui/MainApplication.java    |   125 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |   163 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |   174 +-
 .../openstreetmap/josm/gui/MapFrameListener.java   |     4 +-
 src/org/openstreetmap/josm/gui/MapMover.java       |    16 +-
 src/org/openstreetmap/josm/gui/MapScaler.java      |     6 +-
 src/org/openstreetmap/josm/gui/MapSlider.java      |     8 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |   344 +-
 src/org/openstreetmap/josm/gui/MapView.java        |   740 +-
 src/org/openstreetmap/josm/gui/MenuScroller.java   |    13 +-
 .../openstreetmap/josm/gui/NameFormatterHook.java  |     8 +-
 .../josm/gui/NavigatableComponent.java             |   331 +-
 .../openstreetmap/josm/gui/NoteInputDialog.java    |     4 +-
 src/org/openstreetmap/josm/gui/Notification.java   |     4 +-
 .../josm/gui/NotificationManager.java              |    16 +-
 .../josm/gui/OsmPrimitivRenderer.java              |    15 +-
 .../openstreetmap/josm/gui/PleaseWaitDialog.java   |    20 +-
 .../openstreetmap/josm/gui/PleaseWaitRunnable.java |    12 +-
 .../openstreetmap/josm/gui/PopupMenuHandler.java   |    14 +-
 src/org/openstreetmap/josm/gui/ScrollViewport.java |    11 +-
 .../openstreetmap/josm/gui/SelectionManager.java   |   241 +-
 .../josm/gui/ShowHideButtonListener.java           |     5 +-
 src/org/openstreetmap/josm/gui/SideButton.java     |     6 +-
 src/org/openstreetmap/josm/gui/SplashScreen.java   |   357 +-
 .../josm/gui/actionsupport/AlignImageryPanel.java  |    80 -
 .../DeleteFromRelationConfirmationDialog.java      |   360 -
 .../josm/gui/actionsupport/LogShowDialog.java      |    53 -
 .../openstreetmap/josm/gui/bbox/BBoxChooser.java   |     4 +-
 .../openstreetmap/josm/gui/bbox/SizeButton.java    |    22 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   101 +-
 .../josm/gui/bbox/SlippyMapControler.java          |     5 +-
 .../openstreetmap/josm/gui/bbox/SourceButton.java  |    15 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |   101 +-
 .../openstreetmap/josm/gui/bbox/package-info.java  |     6 +
 .../josm/gui/conflict/ConflictColors.java          |    32 +-
 .../josm/gui/conflict/pair/ConflictResolver.java   |    23 +-
 .../josm/gui/conflict/pair/IConflictResolver.java  |     2 +-
 .../josm/gui/conflict/pair/ListMergeModel.java     |    90 +-
 .../josm/gui/conflict/pair/ListMerger.java         |    87 +-
 .../josm/gui/conflict/pair/PairTable.java          |     3 +-
 .../conflict/pair/nodes/NodeListMergeModel.java    |     4 +-
 .../gui/conflict/pair/nodes/NodeListMerger.java    |    12 +-
 .../pair/nodes/NodeListTableCellRenderer.java      |    12 +-
 .../pair/properties/PropertiesMergeModel.java      |    28 +-
 .../conflict/pair/properties/PropertiesMerger.java |    52 +-
 .../relation/RelationMemberListMergeModel.java     |     8 +-
 .../pair/relation/RelationMemberMerger.java        |    21 +-
 .../relation/RelationMemberTableCellEditor.java    |     2 +-
 .../relation/RelationMemberTableCellRenderer.java  |     8 +-
 .../pair/tags/MergedTableCellRenderer.java         |     7 +-
 .../conflict/pair/tags/MineTableCellRenderer.java  |     2 +-
 .../josm/gui/conflict/pair/tags/TagMergeItem.java  |     2 -
 .../josm/gui/conflict/pair/tags/TagMergeModel.java |    26 +-
 .../pair/tags/TagMergeTableCellRenderer.java       |     5 +-
 .../josm/gui/conflict/pair/tags/TagMerger.java     |    66 +-
 .../conflict/pair/tags/TheirTableCellRenderer.java |     2 +-
 .../tags/CombinePrimitiveResolverDialog.java       |    15 +-
 .../gui/conflict/tags/MultiValueCellEditor.java    |    15 +-
 .../gui/conflict/tags/MultiValueCellRenderer.java  |    11 +-
 .../tags/MultiValueResolutionDecision.java         |     5 +-
 .../tags/PasteTagsConflictResolverDialog.java      |    78 +-
 .../tags/RelationMemberConflictDecision.java       |     7 +-
 .../tags/RelationMemberConflictDecisionEditor.java |     2 +-
 .../RelationMemberConflictDecisionRenderer.java    |     5 +-
 .../tags/RelationMemberConflictResolver.java       |     6 +-
 .../tags/RelationMemberConflictResolverModel.java  |    20 +-
 .../tags/RelationMemberConflictResolverTable.java  |     2 +-
 .../conflict/tags/TagConflictResolutionUtil.java   |    17 +-
 .../gui/conflict/tags/TagConflictResolver.java     |     2 +-
 .../conflict/tags/TagConflictResolverModel.java    |    20 +-
 .../conflict/tags/TagConflictResolverTable.java    |     4 +-
 .../josm/gui/dialogs/ChangesetDialog.java          |    14 +-
 .../josm/gui/dialogs/CommandStackDialog.java       |    41 +-
 .../josm/gui/dialogs/ConflictDialog.java           |    30 +-
 .../josm/gui/dialogs/ConflictResolutionDialog.java |     6 +-
 .../DeleteFromRelationConfirmationDialog.java      |   363 +
 .../josm/gui/dialogs/DialogsPanel.java             |    27 +-
 .../josm/gui/dialogs/FilterDialog.java             |    49 +-
 .../josm/gui/dialogs/FilterTableModel.java         |     8 +-
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |   100 +-
 .../josm/gui/dialogs/LatLonDialog.java             |   281 +-
 .../josm/gui/dialogs/LayerListDialog.java          |   322 +-
 .../josm/gui/dialogs/LayerListPopup.java           |    12 +-
 .../josm/gui/dialogs/LogShowDialog.java            |    60 +
 .../josm/gui/dialogs/MapPaintDialog.java           |    52 +-
 .../josm/gui/dialogs/MinimapDialog.java            |    71 +
 .../josm/gui/dialogs/NotesDialog.java              |    57 +-
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |    30 +-
 .../josm/gui/dialogs/RelationListDialog.java       |    41 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |    75 +-
 .../josm/gui/dialogs/ToggleDialog.java             |    94 +-
 .../josm/gui/dialogs/UserListDialog.java           |    35 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |    75 +-
 .../dialogs/changeset/ChangesetCacheManager.java   |    15 +-
 .../changeset/ChangesetCacheManagerModel.java      |     4 +-
 .../changeset/ChangesetCacheTableCellRenderer.java |     2 +-
 .../changeset/ChangesetContentDownloadTask.java    |    20 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |    12 +-
 .../ChangesetContentTableCellRenderer.java         |     4 +-
 .../changeset/ChangesetContentTableModel.java      |     3 +-
 .../dialogs/changeset/ChangesetDetailPanel.java    |    10 +-
 .../changeset/ChangesetDiscussionPanel.java        |     6 +-
 .../ChangesetDiscussionTableCellRenderer.java      |     8 +-
 .../dialogs/changeset/ChangesetDownloadTask.java   |     2 +
 .../changeset/ChangesetHeaderDownloadTask.java     |     8 +-
 .../changeset/ChangesetListCellRenderer.java       |    11 +-
 .../gui/dialogs/changeset/ChangesetListModel.java  |    16 +-
 .../gui/dialogs/changeset/ChangesetTagsPanel.java  |     6 +-
 .../ChangesetsInActiveDataLayerListModel.java      |    31 +-
 .../changeset/SingleChangesetDownloadPanel.java    |     7 +-
 .../josm/gui/dialogs/changeset/package-info.java   |     6 +
 .../query/AdvancedChangesetQueryPanel.java         |   133 +-
 .../changeset/query/BasicChangesetQueryPanel.java  |    32 +-
 .../changeset/query/ChangesetQueryDialog.java      |     2 +-
 .../changeset/query/ChangesetQueryTask.java        |    33 +-
 .../changeset/query/UrlBasedQueryPanel.java        |    22 +-
 .../gui/dialogs/changeset/query/package-info.java  |     6 +
 .../josm/gui/dialogs/package-info.java             |    11 +
 .../dialogs/properties/PropertiesCellRenderer.java |    41 +-
 .../gui/dialogs/properties/PropertiesDialog.java   |   167 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |    99 +-
 .../josm/gui/dialogs/properties/package-info.java  |     6 +
 .../gui/dialogs/relation/ChildRelationBrowser.java |    34 +-
 .../relation/DownloadRelationMemberTask.java       |     6 +-
 .../gui/dialogs/relation/DownloadRelationTask.java |     7 +-
 .../dialogs/relation/GenericRelationEditor.java    |   116 +-
 .../gui/dialogs/relation/MemberRoleCellEditor.java |     4 +-
 .../josm/gui/dialogs/relation/MemberTable.java     |    10 +-
 .../dialogs/relation/MemberTableCellRenderer.java  |     4 +-
 .../relation/MemberTableLinkedCellRenderer.java    |    44 +-
 .../gui/dialogs/relation/MemberTableModel.java     |    51 +-
 .../relation/ParentRelationLoadingTask.java        |     4 +-
 .../relation/ReferringRelationsBrowser.java        |     2 +-
 .../dialogs/relation/RelationDialogManager.java    |    17 +-
 .../josm/gui/dialogs/relation/RelationEditor.java  |     4 +-
 .../josm/gui/dialogs/relation/RelationTree.java    |    22 +-
 .../dialogs/relation/RelationTreeCellRenderer.java |     8 +-
 .../gui/dialogs/relation/RelationTreeModel.java    |    12 +-
 .../josm/gui/dialogs/relation/RunnableAction.java  |     3 -
 .../josm/gui/dialogs/relation/SelectionTable.java  |     2 +-
 .../relation/SelectionTableCellRenderer.java       |     8 +-
 .../gui/dialogs/relation/SelectionTableModel.java  |     2 +-
 .../josm/gui/dialogs/relation/package-info.java    |     6 +
 .../gui/dialogs/relation/sort/RelationNodeMap.java |    69 +-
 .../dialogs/relation/sort/RelationSortUtils.java   |    12 +-
 .../gui/dialogs/relation/sort/RelationSorter.java  |    46 +-
 .../dialogs/relation/sort/WayConnectionType.java   |     2 +-
 .../relation/sort/WayConnectionTypeCalculator.java |    34 +-
 .../gui/dialogs/validator/ValidatorTreePanel.java  |    71 +-
 .../dialogs/validator/ValidatorTreeRenderer.java   |     2 +-
 .../josm/gui/dialogs/validator/package-info.java   |     6 +
 .../josm/gui/download/BookmarkList.java            |    45 +-
 .../josm/gui/download/BookmarkSelection.java       |    27 +-
 .../josm/gui/download/BoundingBoxSelection.java    |    68 +-
 .../josm/gui/download/DownloadDialog.java          |    51 +-
 .../josm/gui/download/DownloadSelection.java       |     2 +-
 .../josm/gui/download/PlaceSelection.java          |    65 +-
 .../josm/gui/download/SlippyMapChooser.java        |    15 +-
 .../josm/gui/download/TileSelection.java           |     5 +-
 .../josm/gui/download/package-info.java            |     6 +
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |    52 +-
 .../josm/gui/help/HelpBrowserHistory.java          |     7 +-
 .../josm/gui/help/HelpContentReader.java           |    16 +-
 src/org/openstreetmap/josm/gui/help/HelpUtil.java  |    26 +-
 .../openstreetmap/josm/gui/help/package-info.java  |     6 +
 .../josm/gui/history/CoordinateInfoViewer.java     |    52 +-
 .../josm/gui/history/DiffTableModel.java           |     3 +-
 .../josm/gui/history/HistoryBrowserDialog.java     |     7 +-
 .../gui/history/HistoryBrowserDialogManager.java   |    13 +-
 .../josm/gui/history/HistoryBrowserModel.java      |    41 +-
 .../josm/gui/history/HistoryLoadTask.java          |     6 +-
 .../josm/gui/history/HistoryViewerPanel.java       |    10 +-
 .../gui/history/NodeListTableCellRenderer.java     |     6 +-
 .../josm/gui/history/NodeListViewer.java           |    21 +-
 .../RelationMemberListTableCellRenderer.java       |    21 +-
 .../josm/gui/history/RelationMemberListViewer.java |     2 +-
 .../josm/gui/history/SelectionSynchronizer.java    |    12 +-
 .../josm/gui/history/TagTableCellRenderer.java     |     8 +-
 .../josm/gui/history/TwoColumnDiff.java            |    38 +-
 .../josm/gui/history/VersionInfoPanel.java         |    31 +-
 .../josm/gui/history/VersionTable.java             |    38 +-
 .../josm/gui/history/package-info.java             |     6 +
 .../josm/gui/io/AbstractUploadTask.java            |    37 +-
 .../josm/gui/io/ActionFlagsTableCell.java          |    11 +-
 .../josm/gui/io/BasicUploadSettingsPanel.java      |     6 +-
 .../josm/gui/io/ChangesetCellRenderer.java         |     6 +-
 .../josm/gui/io/ChangesetCommentModel.java         |     2 +-
 .../josm/gui/io/ChangesetManagementPanel.java      |    21 +-
 .../josm/gui/io/CloseChangesetDialog.java          |     6 +-
 .../josm/gui/io/CloseChangesetTask.java            |     4 +-
 .../io/ConfigurationParameterRequestHandler.java   |     1 +
 .../josm/gui/io/CredentialDialog.java              |    45 +-
 .../josm/gui/io/DownloadFileTask.java              |    44 +-
 .../josm/gui/io/DownloadOpenChangesetsTask.java    |    16 +-
 .../josm/gui/io/DownloadPrimitivesTask.java        |    14 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |    36 +-
 .../josm/gui/io/LayerNameAndFilePathTableCell.java |    32 +-
 .../josm/gui/io/OpenChangesetComboBoxModel.java    |     6 +-
 .../josm/gui/io/RecentlyOpenedFilesMenu.java       |     2 +-
 .../openstreetmap/josm/gui/io/SaveLayerTask.java   |     8 +-
 .../josm/gui/io/SaveLayersDialog.java              |    37 +-
 .../openstreetmap/josm/gui/io/SaveLayersModel.java |    11 +-
 .../openstreetmap/josm/gui/io/SaveLayersTable.java |     2 +-
 .../josm/gui/io/SaveLayersTableColumnModel.java    |    21 +-
 .../josm/gui/io/TagSettingsPanel.java              |    12 +-
 .../josm/gui/io/UpdatePrimitivesTask.java          |    12 +-
 .../josm/gui/io/UploadAndSaveProgressRenderer.java |    23 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |    18 +-
 .../openstreetmap/josm/gui/io/UploadLayerTask.java |    25 +-
 .../josm/gui/io/UploadNoteLayerTask.java           |    51 +
 .../josm/gui/io/UploadParameterSummaryPanel.java   |    60 +-
 .../josm/gui/io/UploadPrimitivesTask.java          |    32 +-
 .../josm/gui/io/UploadSelectionDialog.java         |    46 +-
 .../openstreetmap/josm/gui/io/UploadStrategy.java  |     8 +-
 .../josm/gui/io/UploadStrategySelectionPanel.java  |    73 +-
 .../josm/gui/io/UploadStrategySpecification.java   |     4 +-
 .../josm/gui/io/UploadedObjectsSummaryPanel.java   |    42 +-
 .../openstreetmap/josm/gui/io/package-info.java    |     6 +
 .../gui/layer/AbstractCachedTileSourceLayer.java   |   139 +
 .../josm/gui/layer/AbstractTileSourceLayer.java    |  1719 ++
 .../josm/gui/layer/AlignImageryPanel.java          |    79 +
 .../josm/gui/layer/CustomizeColor.java             |    15 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |    50 +-
 .../josm/gui/layer/ImageProcessor.java             |    24 +
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |   178 +-
 .../josm/gui/layer/JumpToMarkerActions.java        |     3 +-
 src/org/openstreetmap/josm/gui/layer/Layer.java    |    51 +-
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |    69 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |    55 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |  1465 +-
 .../josm/gui/layer/ValidatorLayer.java             |    13 +-
 src/org/openstreetmap/josm/gui/layer/WMSLayer.java |  1128 +-
 .../openstreetmap/josm/gui/layer/WMTSLayer.java    |   133 +
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |   375 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |   146 +-
 .../josm/gui/layer/geoimage/ImageDisplay.java      |    43 +-
 .../josm/gui/layer/geoimage/ImageEntry.java        |    25 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    30 +-
 .../josm/gui/layer/geoimage/JpegFileFilter.java    |    29 -
 .../gui/layer/geoimage/ShowThumbnailAction.java    |     4 +-
 .../josm/gui/layer/geoimage/ThumbsLoader.java      |    61 +-
 .../josm/gui/layer/geoimage/package-info.java      |     6 +
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |    21 +-
 .../gui/layer/gpx/ConvertToDataLayerAction.java    |     9 +-
 .../josm/gui/layer/gpx/CustomizeDrawingAction.java |     3 +-
 .../josm/gui/layer/gpx/DateFilterPanel.java        |    42 +-
 .../josm/gui/layer/gpx/DownloadAlongPanel.java     |    12 +-
 .../gui/layer/gpx/DownloadAlongTrackAction.java    |     1 +
 .../gui/layer/gpx/DownloadWmsAlongTrackAction.java |    23 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    54 +-
 .../josm/gui/layer/gpx/ImportAudioAction.java      |    17 +-
 .../josm/gui/layer/gpx/ImportImagesAction.java     |    10 +-
 .../josm/gui/layer/gpx/package-info.java           |     6 +
 .../josm/gui/layer/markerlayer/AudioMarker.java    |     4 +-
 .../josm/gui/layer/markerlayer/ButtonMarker.java   |     3 +-
 .../josm/gui/layer/markerlayer/ImageMarker.java    |    12 +-
 .../josm/gui/layer/markerlayer/Marker.java         |    31 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    67 +-
 .../josm/gui/layer/markerlayer/PlayHeadMarker.java |    42 +-
 .../josm/gui/layer/markerlayer/WebMarker.java      |     9 +-
 .../josm/gui/layer/markerlayer/package-info.java   |     6 +
 .../openstreetmap/josm/gui/layer/package-info.java |     6 +
 .../josm/gui/mappaint/BoxTextElemStyle.java        |    11 +-
 .../openstreetmap/josm/gui/mappaint/Cascade.java   |    20 +-
 .../openstreetmap/josm/gui/mappaint/ElemStyle.java |    48 +-
 .../josm/gui/mappaint/ElemStyles.java              |    22 +-
 .../josm/gui/mappaint/Environment.java             |    16 +-
 .../openstreetmap/josm/gui/mappaint/Keyword.java   |     3 +-
 .../gui/mappaint/LabelCompositionStrategy.java     |    14 +-
 .../josm/gui/mappaint/LineElemStyle.java           |    24 +-
 .../josm/gui/mappaint/LineTextElemStyle.java       |     3 +-
 .../josm/gui/mappaint/MapPaintMenu.java            |     1 +
 .../josm/gui/mappaint/MapPaintStyles.java          |    18 +-
 .../josm/gui/mappaint/MultiCascade.java            |     2 +-
 .../josm/gui/mappaint/NodeElemStyle.java           |    23 +-
 .../josm/gui/mappaint/RepeatImageElemStyle.java    |     2 +-
 .../josm/gui/mappaint/StyleCache.java              |    38 +-
 .../josm/gui/mappaint/StyleSetting.java            |     7 +-
 .../josm/gui/mappaint/StyleSource.java             |     6 +-
 .../josm/gui/mappaint/TextElement.java             |    28 +-
 .../josm/gui/mappaint/mapcss/Condition.java        |   316 +-
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   101 +-
 .../josm/gui/mappaint/mapcss/Instruction.java      |     8 +-
 .../gui/mappaint/mapcss/LiteralExpression.java     |     2 +-
 .../josm/gui/mappaint/mapcss/MapCSSParser.jj       |    14 +-
 .../gui/mappaint/mapcss/MapCSSStyleSource.java     |    50 +-
 .../josm/gui/mappaint/mapcss/Selector.java         |    54 +-
 .../josm/gui/mappaint/mapcss/Subpart.java          |    18 +-
 .../josm/gui/mappaint/mapcss/package-info.java     |     8 +
 .../josm/gui/mappaint/package-info.java            |    11 +
 .../josm/gui/mappaint/xml/AreaPrototype.java       |     6 +-
 .../josm/gui/mappaint/xml/IconPrototype.java       |     9 +-
 .../josm/gui/mappaint/xml/LinePrototype.java       |    10 +-
 .../josm/gui/mappaint/xml/LinemodPrototype.java    |    24 +-
 .../josm/gui/mappaint/xml/Prototype.java           |    12 +-
 .../josm/gui/mappaint/xml/XmlCondition.java        |     8 +-
 .../josm/gui/mappaint/xml/XmlStyleSource.java      |    21 +-
 .../gui/mappaint/xml/XmlStyleSourceHandler.java    |    48 +-
 .../josm/gui/mappaint/xml/package-info.java        |     7 +
 .../josm/gui/oauth/AccessTokenInfoPanel.java       |     4 +-
 .../gui/oauth/AdvancedOAuthPropertiesPanel.java    |    20 +-
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |    46 +-
 .../gui/oauth/FullyAutomaticPropertiesPanel.java   |     6 +-
 .../josm/gui/oauth/ManualAuthorizationUI.java      |    19 +-
 .../josm/gui/oauth/OAuthAuthorizationWizard.java   |    39 +-
 .../josm/gui/oauth/OsmLoginFailedException.java    |     2 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |   110 +-
 .../josm/gui/oauth/OsmPrivilegesPanel.java         |     4 +-
 .../josm/gui/oauth/RetrieveAccessTokenTask.java    |     8 +-
 .../josm/gui/oauth/RetrieveRequestTokenTask.java   |    10 +-
 .../gui/oauth/SemiAutomaticAuthorizationUI.java    |    71 +-
 .../josm/gui/oauth/TestAccessTokenTask.java        |    28 +-
 .../openstreetmap/josm/gui/oauth/package-info.java |     7 +
 .../preferences/DefaultTabPreferenceSetting.java   |    18 +-
 .../josm/gui/preferences/PreferenceDialog.java     |     8 +-
 .../josm/gui/preferences/PreferenceSetting.java    |     2 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |   256 +-
 .../josm/gui/preferences/SourceEditor.java         |   116 +-
 .../josm/gui/preferences/SourceEntry.java          |     2 +-
 .../josm/gui/preferences/SourceProvider.java       |     2 +-
 .../josm/gui/preferences/SubPreferenceSetting.java |     2 +-
 .../josm/gui/preferences/TabPreferenceSetting.java |    26 +-
 .../josm/gui/preferences/ToolbarPreferences.java   |   399 +-
 .../preferences/advanced/AdvancedPreference.java   |    85 +-
 .../preferences/advanced/ExportProfileAction.java  |    14 +-
 .../josm/gui/preferences/advanced/ListEditor.java  |    14 +-
 .../gui/preferences/advanced/ListListEditor.java   |    16 +-
 .../gui/preferences/advanced/MapListEditor.java    |    24 +-
 .../josm/gui/preferences/advanced/PrefEntry.java   |     2 +-
 .../gui/preferences/advanced/PreferencesTable.java |    25 +-
 .../gui/preferences/advanced/StringEditor.java     |     6 +-
 .../gui/preferences/audio/AudioPreference.java     |    43 +-
 .../gui/preferences/display/ColorPreference.java   |    68 +-
 .../gui/preferences/display/DisplayPreference.java |     5 +-
 .../gui/preferences/display/DrawingPreference.java |    43 +-
 .../gui/preferences/display/GPXSettingsPanel.java  |   176 +-
 .../gui/preferences/display/LafPreference.java     |    14 +-
 .../preferences/display/LanguagePreference.java    |    17 +-
 .../gui/preferences/imagery/AddImageryPanel.java   |    37 +-
 .../gui/preferences/imagery/AddTMSLayerPanel.java  |     6 +-
 .../gui/preferences/imagery/AddWMSLayerPanel.java  |     6 +-
 .../gui/preferences/imagery/AddWMTSLayerPanel.java |    42 +
 .../preferences/imagery/CacheContentsPanel.java    |   255 +
 .../preferences/imagery/CommonSettingsPanel.java   |    72 +-
 .../gui/preferences/imagery/ImageryPreference.java |    87 +-
 .../gui/preferences/imagery/TMSSettingsPanel.java  |    53 +-
 .../gui/preferences/imagery/WMSSettingsPanel.java  |    66 +-
 .../josm/gui/preferences/map/BackupPreference.java |    19 +-
 .../gui/preferences/map/MapPaintPreference.java    |     6 +-
 .../josm/gui/preferences/map/MapPreference.java    |     9 +-
 .../preferences/map/TaggingPresetPreference.java   |    77 +-
 .../gui/preferences/plugin/PluginListPanel.java    |    31 +-
 .../gui/preferences/plugin/PluginPreference.java   |    74 +-
 .../preferences/plugin/PluginPreferencesModel.java |    15 +-
 .../plugin/PluginUpdatePolicyPanel.java            |    35 +-
 .../projection/CodeProjectionChoice.java           |    13 +-
 .../projection/CustomProjectionChoice.java         |    58 +-
 .../projection/GaussKruegerProjectionChoice.java   |     4 +-
 .../LambertCC9ZonesProjectionChoice.java           |    26 +-
 .../projection/LambertProjectionChoice.java        |    12 +-
 .../projection/ListProjectionChoice.java           |     2 +-
 .../projection/ProjectionPreference.java           |    63 +-
 .../projection/PuwgProjectionChoice.java           |     4 +-
 .../projection/SingleProjectionChoice.java         |     2 +-
 .../projection/UTMFranceDOMProjectionChoice.java   |    12 +-
 .../projection/UTMProjectionChoice.java            |    17 +-
 .../remotecontrol/RemoteControlPreference.java     |     4 +-
 .../gui/preferences/server/ApiUrlTestTask.java     |    14 +-
 .../server/AuthenticationPreferencesPanel.java     |     5 +-
 .../BasicAuthenticationPreferencesPanel.java       |    10 +-
 .../josm/gui/preferences/server/FeaturesPanel.java |    13 +-
 .../preferences/server/OAuthAccessTokenHolder.java |     8 +-
 .../OAuthAuthenticationPreferencesPanel.java       |    60 +-
 .../preferences/server/OsmApiUrlInputPanel.java    |    11 +-
 .../server/ProxyPreferenceListener.java            |     2 +-
 .../preferences/server/ProxyPreferencesPanel.java  |    52 +-
 .../preferences/server/ServerAccessPreference.java |     9 +-
 .../gui/preferences/server/UserNameValidator.java  |     2 +-
 .../josm/gui/preferences/shortcut/PrefJPanel.java  |    76 +-
 .../preferences/validator/ValidatorPreference.java |     2 +-
 .../validator/ValidatorTestsPreference.java        |    15 +-
 .../josm/gui/progress/AbstractProgressMonitor.java |    14 +-
 .../gui/progress/PleaseWaitProgressMonitor.java    |    49 +-
 .../josm/gui/progress/ProgressMonitor.java         |    14 +-
 .../josm/gui/progress/ProgressMonitorExecutor.java |    11 +-
 .../josm/gui/progress/ProgressRenderer.java        |     4 +
 .../progress/SwingRenderingProgressMonitor.java    |     2 +-
 .../josm/gui/progress/package-info.java            |     6 +
 .../josm/gui/tagging/PresetHandler.java            |     7 +-
 .../josm/gui/tagging/TagCellEditor.java            |    12 +-
 .../josm/gui/tagging/TagCellRenderer.java          |    13 +-
 .../josm/gui/tagging/TagEditorModel.java           |    57 +-
 .../josm/gui/tagging/TagEditorPanel.java           |    21 +-
 .../openstreetmap/josm/gui/tagging/TagModel.java   |     8 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |    64 +-
 .../josm/gui/tagging/TaggingPreset.java            |    46 +-
 .../josm/gui/tagging/TaggingPresetItems.java       |   166 +-
 .../josm/gui/tagging/TaggingPresetListener.java    |     2 +-
 .../josm/gui/tagging/TaggingPresetMenu.java        |    53 +-
 .../gui/tagging/TaggingPresetNameTemplateList.java |     4 +-
 .../josm/gui/tagging/TaggingPresetReader.java      |    91 +-
 .../TaggingPresetSearchPrimitiveDialog.java        |     4 +-
 .../josm/gui/tagging/TaggingPresetSelector.java    |    45 +-
 .../josm/gui/tagging/TaggingPresetType.java        |    30 +-
 .../josm/gui/tagging/TaggingPresets.java           |    12 +-
 .../gui/tagging/ac/AutoCompletingComboBox.java     |    46 +-
 .../gui/tagging/ac/AutoCompletingTextField.java    |    25 +-
 .../gui/tagging/ac/AutoCompletionItemPriority.java |     2 +-
 .../josm/gui/tagging/ac/AutoCompletionList.java    |     6 +-
 .../gui/tagging/ac/AutoCompletionListItem.java     |    23 +-
 .../josm/gui/tagging/ac/AutoCompletionManager.java |    44 +-
 .../josm/gui/tagging/ac/package-info.java          |     6 +
 .../josm/gui/tagging/package-info.java             |     7 +
 .../josm/gui/util/AdjustmentSynchronizer.java      |    19 +-
 .../josm/gui/util/AdvancedKeyPressDetector.java    |    70 +-
 .../josm/gui/util/CellEditorSupport.java           |    11 +-
 .../openstreetmap/josm/gui/util/CursorManager.java |    89 +
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |    60 +-
 .../josm/gui/util/HighlightHelper.java             |    12 +-
 .../josm/gui/util/KeyPressReleaseListener.java     |     5 +-
 .../josm/gui/util/ModifierListener.java            |     2 +-
 .../josm/gui/util/RedirectInputMap.java            |     2 +-
 .../openstreetmap/josm/gui/util/RotationAngle.java |    14 +-
 .../openstreetmap/josm/gui/util/TableHelper.java   |     6 +-
 .../openstreetmap/josm/gui/util/package-info.java  |     6 +
 .../josm/gui/widgets/AbstractFileChooser.java      |    13 +-
 .../widgets/AbstractTextComponentValidator.java    |    16 +-
 .../gui/widgets/BoundingBoxSelectionPanel.java     |    57 +-
 .../josm/gui/widgets/ChangesetIdTextField.java     |    15 +-
 .../josm/gui/widgets/ComboBoxHistory.java          |     8 +-
 .../josm/gui/widgets/DateEditorWithSlider.java     |    26 +-
 .../DisableShortcutsOnFocusGainedTextField.java    |    29 +-
 .../josm/gui/widgets/EditableList.java             |     5 +-
 .../josm/gui/widgets/FileChooserManager.java       |     8 +-
 .../josm/gui/widgets/HistoryChangedListener.java   |     2 +-
 .../josm/gui/widgets/HistoryComboBox.java          |     8 +-
 .../openstreetmap/josm/gui/widgets/ImageLabel.java |     6 +-
 .../josm/gui/widgets/JosmComboBox.java             |    14 +-
 .../josm/gui/widgets/JosmEditorPane.java           |     2 +-
 .../josm/gui/widgets/JosmHTMLEditorKit.java        |    20 +-
 .../josm/gui/widgets/JosmPasswordField.java        |     2 +-
 .../josm/gui/widgets/JosmTextField.java            |     4 +-
 .../josm/gui/widgets/MultiSplitLayout.java         |   462 +-
 .../josm/gui/widgets/MultiSplitPane.java           |    43 +-
 .../josm/gui/widgets/NativeFileChooser.java        |     4 +
 .../josm/gui/widgets/OsmIdTextField.java           |     2 +-
 .../josm/gui/widgets/OsmPrimitivesTableModel.java  |     4 +-
 .../josm/gui/widgets/PopupMenuLauncher.java        |    19 +-
 .../josm/gui/widgets/QuadStateCheckBox.java        |    88 +-
 .../widgets/SelectAllOnFocusGainedDecorator.java   |     2 +-
 .../josm/gui/widgets/TextContextualPopupMenu.java  |     1 +
 .../openstreetmap/josm/gui/widgets/UrlLabel.java   |     8 +-
 .../josm/gui/widgets/package-info.java             |     6 +
 src/org/openstreetmap/josm/io/AbstractParser.java  |    40 +-
 src/org/openstreetmap/josm/io/AbstractReader.java  |    13 +-
 .../openstreetmap/josm/io/AllFormatsImporter.java  |    13 +-
 .../josm/io/BoundingBoxDownloader.java             |    51 +-
 .../openstreetmap/josm/io/CacheCustomContent.java  |     7 +-
 src/org/openstreetmap/josm/io/CacheFiles.java      |   379 -
 src/org/openstreetmap/josm/io/CachedFile.java      |    86 +-
 src/org/openstreetmap/josm/io/Capabilities.java    |    22 +-
 .../josm/io/ChangesetClosedException.java          |     2 +-
 src/org/openstreetmap/josm/io/ChangesetQuery.java  |    89 +-
 src/org/openstreetmap/josm/io/Compression.java     |    10 +-
 .../josm/io/DefaultProxySelector.java              |    10 +-
 .../openstreetmap/josm/io/DiffResultProcessor.java |    18 +-
 src/org/openstreetmap/josm/io/FileWatcher.java     |     8 +-
 src/org/openstreetmap/josm/io/GeoJSONWriter.java   |     2 +-
 src/org/openstreetmap/josm/io/GpxExporter.java     |    46 +-
 src/org/openstreetmap/josm/io/GpxReader.java       |    29 +-
 src/org/openstreetmap/josm/io/GpxWriter.java       |     8 +-
 .../josm/io/InvalidXmlCharacterFilter.java         |     2 +-
 src/org/openstreetmap/josm/io/JpgImporter.java     |     6 +-
 src/org/openstreetmap/josm/io/MessageNotifier.java |    15 +-
 .../josm/io/MissingOAuthAccessTokenException.java  |     2 +-
 .../josm/io/MultiFetchServerObjectReader.java      |    80 +-
 src/org/openstreetmap/josm/io/NMEAImporter.java    |    14 +-
 src/org/openstreetmap/josm/io/NmeaReader.java      |   171 +-
 src/org/openstreetmap/josm/io/NoteReader.java      |    34 +-
 src/org/openstreetmap/josm/io/NoteWriter.java      |    10 +-
 src/org/openstreetmap/josm/io/OnlineResource.java  |     2 +-
 src/org/openstreetmap/josm/io/OsmApi.java          |    90 +-
 src/org/openstreetmap/josm/io/OsmApiException.java |    44 +-
 .../josm/io/OsmApiPrimitiveGoneException.java      |     2 +-
 .../openstreetmap/josm/io/OsmChangeBuilder.java    |     4 +-
 .../openstreetmap/josm/io/OsmChangeImporter.java   |     5 +-
 src/org/openstreetmap/josm/io/OsmChangeReader.java |     1 +
 .../josm/io/OsmChangesetContentParser.java         |     6 +-
 .../openstreetmap/josm/io/OsmChangesetParser.java  |    21 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |     8 +-
 .../openstreetmap/josm/io/OsmHistoryReader.java    |     2 +-
 src/org/openstreetmap/josm/io/OsmImporter.java     |     3 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |    52 +-
 .../josm/io/OsmServerBackreferenceReader.java      |    16 +-
 .../josm/io/OsmServerChangesetReader.java          |    26 +-
 .../josm/io/OsmServerHistoryReader.java            |     4 +-
 .../josm/io/OsmServerLocationReader.java           |     4 +-
 .../josm/io/OsmServerObjectReader.java             |    16 +-
 .../josm/io/OsmServerReadPostprocessor.java        |     3 +-
 src/org/openstreetmap/josm/io/OsmServerReader.java |    34 +-
 .../josm/io/OsmServerUserInfoReader.java           |    48 +-
 .../josm/io/OsmServerWritePostprocessor.java       |     3 +-
 src/org/openstreetmap/josm/io/OsmServerWriter.java |    60 +-
 .../josm/io/OsmTransferCanceledException.java      |     8 +-
 src/org/openstreetmap/josm/io/OsmWriter.java       |    20 +-
 .../openstreetmap/josm/io/OsmWriterFactory.java    |     1 +
 .../josm/io/OverpassDownloadReader.java            |   153 +
 .../openstreetmap/josm/io/ProgressInputStream.java |     4 +-
 .../josm/io/UTFInputStreamReader.java              |     5 +-
 .../openstreetmap/josm/io/WMSLayerExporter.java    |    19 +-
 .../openstreetmap/josm/io/WMSLayerImporter.java    |    70 +-
 src/org/openstreetmap/josm/io/XmlWriter.java       |     2 +-
 .../josm/io/auth/AbstractCredentialsAgent.java     |     4 +-
 .../josm/io/auth/CredentialsAgent.java             |     3 +-
 .../josm/io/auth/CredentialsAgentException.java    |    28 +-
 .../josm/io/auth/CredentialsAgentResponse.java     |     3 +-
 .../josm/io/auth/CredentialsManager.java           |     7 +-
 .../josm/io/auth/DefaultAuthenticator.java         |     6 +-
 .../io/auth/JosmPreferencesCredentialAgent.java    |    16 +-
 .../openstreetmap/josm/io/imagery/HTMLGrabber.java |    58 -
 .../josm/io/imagery/ImageryReader.java             |    44 +-
 .../josm/io/imagery/WMSException.java              |    59 -
 .../openstreetmap/josm/io/imagery/WMSGrabber.java  |   312 -
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |    23 +-
 .../openstreetmap/josm/io/imagery/WMSRequest.java  |   154 -
 .../josm/io/remotecontrol/AddTagsDialog.java       |    72 +-
 .../josm/io/remotecontrol/DNSName.java             |    22 +-
 .../remotecontrol/PermissionPrefWithDefault.java   |     4 +-
 .../josm/io/remotecontrol/RemoteControl.java       |    14 +-
 .../io/remotecontrol/RemoteControlHttpServer.java  |     9 +-
 .../io/remotecontrol/RemoteControlHttpsServer.java |    31 +-
 .../josm/io/remotecontrol/RequestProcessor.java    |    33 +-
 .../io/remotecontrol/handler/AddNodeHandler.java   |    30 +-
 .../io/remotecontrol/handler/AddWayHandler.java    |    12 +-
 .../io/remotecontrol/handler/FeaturesHandler.java  |    18 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |    14 +-
 .../io/remotecontrol/handler/ImportHandler.java    |     9 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |    14 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |     2 +-
 .../io/remotecontrol/handler/OpenFileHandler.java  |     5 -
 .../io/remotecontrol/handler/RequestHandler.java   |    44 +-
 .../io/remotecontrol/handler/VersionHandler.java   |     2 +-
 .../josm/io/session/GeoImageSessionExporter.java   |     3 +-
 .../josm/io/session/GeoImageSessionImporter.java   |    19 +-
 .../josm/io/session/GpxTracksSessionExporter.java  |     8 +-
 .../josm/io/session/GpxTracksSessionImporter.java  |     3 +-
 .../josm/io/session/ImagerySessionExporter.java    |    17 +-
 .../josm/io/session/ImagerySessionImporter.java    |    23 +-
 .../josm/io/session/MarkerSessionExporter.java     |     3 +-
 .../josm/io/session/MarkerSessionImporter.java     |     3 +-
 .../josm/io/session/OsmDataSessionExporter.java    |    12 +-
 .../josm/io/session/OsmDataSessionImporter.java    |     3 +-
 .../josm/io/session/SessionImporter.java           |     3 +-
 .../josm/io/session/SessionReader.java             |    21 +-
 .../josm/io/session/SessionWriter.java             |    11 +-
 src/org/openstreetmap/josm/plugins/Plugin.java     |    11 +-
 .../josm/plugins/PluginDownloadTask.java           |    19 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |   287 +-
 .../josm/plugins/PluginInformation.java            |    39 +-
 .../josm/plugins/PluginListParser.java             |    12 +-
 .../openstreetmap/josm/plugins/PluginProxy.java    |     2 +-
 .../plugins/ReadLocalPluginInformationTask.java    |    20 +-
 .../plugins/ReadRemotePluginInformationTask.java   |    43 +-
 .../josm/tools/AlphanumComparator.java             |     3 +-
 src/org/openstreetmap/josm/tools/AudioPlayer.java  |    50 +-
 src/org/openstreetmap/josm/tools/Base64.java       |    24 +-
 .../josm/tools/BugReportExceptionHandler.java      |   174 +-
 .../josm/tools/CheckParameterUtil.java             |    35 +-
 src/org/openstreetmap/josm/tools/ColorHelper.java  |    13 +-
 src/org/openstreetmap/josm/tools/ColorScale.java   |    37 +-
 .../openstreetmap/josm/tools/CompositeList.java    |     4 +-
 src/org/openstreetmap/josm/tools/CopyList.java     |     4 +-
 src/org/openstreetmap/josm/tools/Destroyable.java  |     2 +-
 src/org/openstreetmap/josm/tools/Diff.java         |   231 +-
 .../openstreetmap/josm/tools/ExceptionUtil.java    |    33 +-
 src/org/openstreetmap/josm/tools/ExifReader.java   |    23 +-
 src/org/openstreetmap/josm/tools/FontsManager.java |     2 +-
 src/org/openstreetmap/josm/tools/GBC.java          |     4 +-
 .../openstreetmap/josm/tools/GeoPropertyIndex.java |     8 +-
 src/org/openstreetmap/josm/tools/Geometry.java     |    91 +-
 src/org/openstreetmap/josm/tools/I18n.java         |   150 +-
 src/org/openstreetmap/josm/tools/ImageOverlay.java |    27 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |    73 +-
 .../openstreetmap/josm/tools/ImageResource.java    |     4 +-
 .../openstreetmap/josm/tools/InputMapUtils.java    |    12 +-
 src/org/openstreetmap/josm/tools/LanguageInfo.java |    42 +-
 src/org/openstreetmap/josm/tools/MultiMap.java     |     4 +-
 .../josm/tools/MultikeyActionsHandler.java         |   160 +-
 .../josm/tools/MultikeyShortcutAction.java         |    10 +-
 src/org/openstreetmap/josm/tools/OpenBrowser.java  |     3 +-
 .../openstreetmap/josm/tools/OsmUrlToBounds.java   |    10 +-
 .../josm/tools/OverpassTurboQueryWizard.java       |    83 +
 src/org/openstreetmap/josm/tools/Pair.java         |    10 +-
 src/org/openstreetmap/josm/tools/PlatformHook.java |    32 +-
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |    10 +-
 .../josm/tools/PlatformHookUnixoid.java            |    66 +-
 .../josm/tools/PlatformHookWindows.java            |    27 +-
 src/org/openstreetmap/josm/tools/Predicate.java    |     2 +-
 src/org/openstreetmap/josm/tools/Predicates.java   |     1 +
 src/org/openstreetmap/josm/tools/Property.java     |     4 +-
 .../josm/tools/RightAndLefthandTraffic.java        |    15 +-
 src/org/openstreetmap/josm/tools/Shortcut.java     |   108 +-
 .../openstreetmap/josm/tools/TextTagParser.java    |    91 +-
 src/org/openstreetmap/josm/tools/Utils.java        |   352 +-
 src/org/openstreetmap/josm/tools/WikiReader.java   |    16 +-
 .../openstreetmap/josm/tools/WindowGeometry.java   |    59 +-
 .../openstreetmap/josm/tools/XmlObjectParser.java  |    17 +-
 .../josm/tools/XmlParsingException.java            |     3 +-
 .../openstreetmap/josm/tools/date/DateUtils.java   |   123 +-
 .../josm/tools/date/FallbackDateParser.java        |     5 +
 .../josm/tools/date/PrimaryDateParser.java         |    41 +-
 .../template_engine/CompoundTemplateEntry.java     |     5 +-
 .../josm/tools/template_engine/Condition.java      |     8 +-
 .../template_engine/ContextSwitchTemplate.java     |    23 +-
 .../josm/tools/template_engine/ParseError.java     |     3 +-
 .../template_engine/SearchExpressionCondition.java |     3 +-
 .../TemplateEngineDataProvider.java                |     2 +
 .../josm/tools/template_engine/TemplateEntry.java  |     1 +
 .../josm/tools/template_engine/TemplateParser.java |     3 +-
 .../josm/tools/template_engine/Tokenizer.java      |    13 +-
 .../josm/tools/template_engine/Variable.java       |     7 +-
 styles/standard/elemstyles.mapcss                  |   136 +-
 test/data/regress/11548/tiles/1/1/1.png            |   Bin 0 -> 4056 bytes
 test/data/regress/11548/tiles/2/1/1.png            |   Bin 0 -> 8447 bytes
 test/data/regress/11548/tiles/2/1/2.png            |   Bin 0 -> 5270 bytes
 test/data/regress/11548/tiles/2/1/3.png            |   Bin 0 -> 2096 bytes
 test/data/regress/11548/tiles/2/2/1.png            |   Bin 0 -> 12812 bytes
 test/data/regress/11548/tiles/2/2/2.png            |   Bin 0 -> 3537 bytes
 test/data/regress/11548/tiles/2/2/3.png            |   Bin 0 -> 1406 bytes
 test/data/regress/11548/tiles/2/3/1.png            |   Bin 0 -> 7789 bytes
 test/data/regress/11548/tiles/2/3/2.png            |   Bin 0 -> 4913 bytes
 test/data/regress/11548/tiles/2/3/3.png            |   Bin 0 -> 1563 bytes
 test/data/regress/11548/tiles/3/1/1.png            |   Bin 0 -> 9646 bytes
 test/data/regress/11548/tiles/3/1/2.png            |   Bin 0 -> 3848 bytes
 test/data/regress/11548/tiles/3/1/3.png            |   Bin 0 -> 5977 bytes
 test/data/regress/11548/tiles/3/1/4.png            |   Bin 0 -> 297 bytes
 test/data/regress/11548/tiles/3/1/5.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/1/6.png            |   Bin 0 -> 1642 bytes
 test/data/regress/11548/tiles/3/1/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/2/1.png            |   Bin 0 -> 8674 bytes
 test/data/regress/11548/tiles/3/2/2.png            |   Bin 0 -> 8859 bytes
 test/data/regress/11548/tiles/3/2/3.png            |   Bin 0 -> 7443 bytes
 test/data/regress/11548/tiles/3/2/4.png            |   Bin 0 -> 7095 bytes
 test/data/regress/11548/tiles/3/2/5.png            |   Bin 0 -> 4742 bytes
 test/data/regress/11548/tiles/3/2/6.png            |   Bin 0 -> 2687 bytes
 test/data/regress/11548/tiles/3/2/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/3/1.png            |   Bin 0 -> 4133 bytes
 test/data/regress/11548/tiles/3/3/2.png            |   Bin 0 -> 4620 bytes
 test/data/regress/11548/tiles/3/3/3.png            |   Bin 0 -> 5787 bytes
 test/data/regress/11548/tiles/3/3/4.png            |   Bin 0 -> 1899 bytes
 test/data/regress/11548/tiles/3/3/5.png            |   Bin 0 -> 341 bytes
 test/data/regress/11548/tiles/3/3/6.png            |   Bin 0 -> 1639 bytes
 test/data/regress/11548/tiles/3/3/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/4/1.png            |   Bin 0 -> 5117 bytes
 test/data/regress/11548/tiles/3/4/2.png            |   Bin 0 -> 13981 bytes
 test/data/regress/11548/tiles/3/4/3.png            |   Bin 0 -> 12784 bytes
 test/data/regress/11548/tiles/3/4/4.png            |   Bin 0 -> 8417 bytes
 test/data/regress/11548/tiles/3/4/5.png            |   Bin 0 -> 171 bytes
 test/data/regress/11548/tiles/3/4/6.png            |   Bin 0 -> 1464 bytes
 test/data/regress/11548/tiles/3/4/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/5/1.png            |   Bin 0 -> 4670 bytes
 test/data/regress/11548/tiles/3/5/2.png            |   Bin 0 -> 4692 bytes
 test/data/regress/11548/tiles/3/5/3.png            |   Bin 0 -> 9583 bytes
 test/data/regress/11548/tiles/3/5/4.png            |   Bin 0 -> 921 bytes
 test/data/regress/11548/tiles/3/5/5.png            |   Bin 0 -> 520 bytes
 test/data/regress/11548/tiles/3/5/6.png            |   Bin 0 -> 1510 bytes
 test/data/regress/11548/tiles/3/5/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/6/1.png            |   Bin 0 -> 3398 bytes
 test/data/regress/11548/tiles/3/6/2.png            |   Bin 0 -> 3379 bytes
 test/data/regress/11548/tiles/3/6/3.png            |   Bin 0 -> 11240 bytes
 test/data/regress/11548/tiles/3/6/4.png            |   Bin 0 -> 5059 bytes
 test/data/regress/11548/tiles/3/6/5.png            |   Bin 0 -> 773 bytes
 test/data/regress/11548/tiles/3/6/6.png            |   Bin 0 -> 1003 bytes
 test/data/regress/11548/tiles/3/6/7.png            |   Bin 0 -> 103 bytes
 test/data/regress/11548/tiles/3/7/1.png            |   Bin 0 -> 2555 bytes
 test/data/regress/11548/tiles/3/7/2.png            |   Bin 0 -> 3983 bytes
 test/data/regress/11548/tiles/3/7/3.png            |   Bin 0 -> 1924 bytes
 test/data/regress/11548/tiles/3/7/4.png            |   Bin 0 -> 6262 bytes
 test/data/regress/11548/tiles/3/7/5.png            |   Bin 0 -> 1012 bytes
 test/data/regress/11548/tiles/3/7/6.png            |   Bin 0 -> 2313 bytes
 test/data/regress/11548/tiles/3/7/7.png            |   Bin 0 -> 103 bytes
 test/data/wmts/WMTSCapabilities-Ontario.xml        |   457 +
 ...WMTSCapabilities-Wallonie-nomatrixdimension.xml |   212 +
 test/data/wmts/WMTSCapabilities-Wallonie.xml       |   246 +
 test/data/wmts/getCapabilities-wien.xml            |   359 +
 test/data/wmts/getcapabilities-ORTO.xml            |   779 +
 test/data/wmts/getcapabilities-TOPO.xml            |   890 +
 test/data/wmts/getcapabilities-pseudo-mercator.xml |   165 +
 .../conflict/pair/nodes/NodeListMergerTest.java    |    10 +-
 .../pair/properties/PropertiesMergerTest.java      |     6 +-
 .../pair/relation/RelationMemberMergerTest.java    |     4 +-
 .../josm/gui/conflict/pair/tags/TagMergerTest.java |    13 +-
 .../gui/dialogs/ConflictResolutionDialogTest.java  |     6 +-
 .../changeset/ChangesetCacheManagerTest.java       |     6 +-
 .../changeset/query/ChangesetQueryDialogTest.java  |     6 +-
 .../josm/gui/history/HistoryBrowserTest.java       |    12 +-
 .../josm/io/MultiFetchServerObjectReaderTest.java  |    81 +-
 .../josm/io/OsmServerBackreferenceReaderTest.java  |    32 +-
 .../josm/io/OsmServerHistoryReaderTest.java        |     3 +-
 .../josm/io/UploadStrategySelectionPanelTest.java  |     7 +-
 .../openstreetmap/josm/PerformanceTestUtils.java   |    44 +
 .../josm/data/osm/KeyValuePerformanceTest.java     |   204 +
 .../josm/data/osm/OsmDataGenerator.java            |   274 +
 .../paint/StyledMapRendererPerformanceTest.java    |     6 +-
 .../mapcss/MapCSSStyleSourceFilterTest.java        |   145 +
 test/unit/org/CustomMatchers.java                  |    43 +-
 test/unit/org/openstreetmap/josm/JOSMFixture.java  |    13 +-
 test/unit/org/openstreetmap/josm/MainTest.java     |    15 +
 test/unit/org/openstreetmap/josm/TestUtils.java    |    25 +-
 .../openstreetmap/josm/actions/CopyActionTest.java |    13 +-
 .../josm/actions/CreateCircleActionTest.java       |    14 +-
 .../josm/actions/SplitWayActionTest.java           |    16 +-
 .../josm/actions/UnJoinNodeWayActionTest.java      |     7 +-
 .../josm/actions/mapmode/SelectActionTest.java     |   234 +
 .../josm/actions/search/SearchCompilerTest.java    |     1 +
 .../org/openstreetmap/josm/data/BoundsTest.java    |    27 +-
 .../data/cache/JCSCachedTileLoaderJobTest.java     |   118 +
 .../data/imagery/TemplatedWMSTileSourceTest.java   |   213 +
 .../josm/data/imagery/WMTSTileSourceTest.java      |   234 +
 .../josm/data/osm/APIDataSetTest.java              |    27 +-
 .../josm/data/osm/ChangesetCacheTest.groovy        |   317 +-
 .../josm/data/osm/DataSetMergerTest.java           |   514 +-
 .../openstreetmap/josm/data/osm/FilterTest.java    |     8 +-
 .../josm/data/osm/OsmPrimitiveKeyHandlingTest.java |    49 +-
 .../josm/data/osm/OsmPrimitiveTest.java            |     3 +-
 .../openstreetmap/josm/data/osm/OsmUtilsTest.java  |     3 +-
 .../openstreetmap/josm/data/osm/RelationTest.java  |     2 +-
 .../josm/data/osm/SimplePrimitiveIdTest.groovy     |    25 +
 .../josm/data/osm/history/HistoryNodeTest.java     |    13 +-
 .../josm/data/osm/history/HistoryWayTest.java      |     9 +-
 .../visitor/MergeSourceBuildingVisitorTest.java    |   107 +-
 .../josm/data/projection/EllipsoidTest.java        |     8 +-
 .../josm/data/projection/ProjectionRefTest.java    |     2 +-
 .../data/projection/ProjectionRegressionTest.java  |    36 +-
 .../josm/data/projection/ProjectionTest.java       |    14 +-
 .../josm/data/projection/SwissGridTest.java        |   271 +-
 .../validation/tests/MapCSSTagCheckerTest.java     |     3 +
 .../validation/tests/MultipolygonTestTest.java     |     2 +-
 .../data/validation/tests/NameMismatchTest.java    |    52 +-
 .../data/validation/tests/OpeningHourTestTest.java |    50 +-
 .../josm/data/validation/tests/TagCheckerTest.java |    68 +
 .../josm/gui/DefaultNameFormatterTest.java         |    38 +-
 .../josm/gui/JosmUserIdentityManagerTest.groovy    |   428 +-
 .../josm/gui/NavigatableComponentTest.java         |   187 +
 .../josm/gui/SystemOfMeasurementTest.java          |     1 +
 .../gui/conflict/nodes/NodeListMergeModelTest.java |    82 +-
 .../properties/PropertiesMergeModelTest.java       |    10 +-
 .../josm/gui/conflict/tags/TagMergeItemTest.java   |    30 +-
 .../josm/gui/conflict/tags/TagMergeModelTest.java  |    13 +-
 .../josm/gui/dialogs/LatLonDialogTest.java         |    13 +-
 .../dialogs/relation/sort/RelationSorterTest.java  |     2 +-
 .../sort/WayConnectionTypeCalculatorTest.java      |     2 +-
 .../mapcss/ChildOrParentSelectorTest.groovy        |    20 +-
 .../gui/mappaint/mapcss/KeyConditionTest.groovy    |     4 +-
 .../mappaint/mapcss/KeyValueConditionTest.groovy   |     4 +-
 .../gui/mappaint/mapcss/MapCSSParserTest.groovy    |   110 +-
 .../gui/preferences/ToolbarPreferencesTest.java    |    21 +-
 .../gui/tagging/PresetClassificationsTest.java     |    16 +-
 .../josm/gui/tagging/TaggingPresetReaderTest.java  |     2 +-
 .../josm/gui/util/RotationAngleTest.java           |     1 +
 .../josm/io/ChangesetQueryUrlParserTest.groovy     |   358 +-
 .../josm/io/DiffResultProcessorTest.groovy         |   307 +-
 .../josm/io/OsmChangeBuilderTest.groovy            |   390 +-
 .../josm/io/OsmChangesetContentParserTest.groovy   |   344 +-
 .../josm/io/ParseWithChangesetReaderTest.groovy    |   246 +-
 .../josm/io/remotecontrol/RemoteControlTest.java   |     4 +-
 .../remotecontrol/handler/ImportHandlerTest.java   |     7 +-
 .../remotecontrol/handler/RequestHandlerTest.java  |    16 +-
 .../josm/io/session/SessionReaderTest.java         |    12 +-
 .../josm/io/session/SessionWriterTest.java         |     4 +-
 .../josm/tools/AlphanumComparatorTest.groovy       |     2 +-
 .../josm/tools/BugReportExceptionHandlerTest.java  |     3 +-
 .../openstreetmap/josm/tools/ExifReaderTest.java   |    11 +-
 .../org/openstreetmap/josm/tools/GeometryTest.java |    11 +-
 .../josm/tools/OsmUrlToBoundsTest.java             |    49 +-
 .../josm/tools/OverpassTurboQueryWizardTest.java   |    44 +
 .../josm/tools/TextTagParserTest.java              |    20 +-
 .../org/openstreetmap/josm/tools/UtilsTest.java    |    20 +-
 .../josm/tools/date/DateUtilsTest.java             |     4 +-
 .../tools/template_engine/TemplateEngineTest.java  |    12 +-
 tools/checkstyle/josm_checks.xml                   |   117 +
 tools/checkstyle/josm_filters.xml                  |    22 +
 tools/findbugs/josm-filter.xml                     |     6 +
 1592 files changed, 294862 insertions(+), 108077 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list