[josm] branch upstream updated (ad2a39a -> 9f1f6c4)

[Sebastiaan Couwenberg]

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

sebastic pushed a change to branch upstream
in repository josm.

      from  ad2a39a   Imported Upstream version 0.0.svn9224+dfsg
       new  9f1f6c4   Imported Upstream version 0.0.svn9229+dfsg

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 REVISION                                           |  6 +--
 .../josm/actions/DistributeAction.java             |  4 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    | 12 +++---
 .../josm/gui/oauth/OsmLoginFailedException.java    | 24 +++++------
 .../gui/oauth/OsmOAuthAuthorizationClient.java     | 14 ++-----
 .../gui/oauth/OsmOAuthAuthorizationException.java  | 28 +++++++------
 .../openstreetmap/josm/io/ProgressInputStream.java |  5 ++-
 src/org/openstreetmap/josm/tools/ColorHelper.java  |  5 ++-
 src/org/openstreetmap/josm/tools/HttpClient.java   | 33 +++++++++-------
 .../josm/actions/CombineWayActionTest.java         | 13 ++++++
 .../josm/actions/ExtensionFileFilterTest.java      | 21 ++++++++++
 .../command/conflict/ConflictAddCommandTest.java   | 17 ++++++++
 .../conflict/ConflictResolveCommandTest.java       | 27 +++++++++++++
 .../CoordinateConflictResolveCommandTest.java      | 17 ++++++++
 .../josm/data/oauth/OAuthParametersTest.java       |  2 +
 .../gui/oauth/OsmOAuthAuthorizationClientTest.java | 46 ++++++++++++++++++++++
 .../openstreetmap/josm/tools/ColorHelperTest.java  | 28 +++++++++++++
 17 files changed, 235 insertions(+), 67 deletions(-)
 create mode 100644 test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
 create mode 100644 test/unit/org/openstreetmap/josm/command/conflict/ConflictResolveCommandTest.java
 create mode 100644 test/unit/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClientTest.java
 create mode 100644 test/unit/org/openstreetmap/josm/tools/ColorHelperTest.java

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