Fix removed upstream functions #39
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is required to support source level 1.8 in some versions of NetBeans IDE. See https://netbeans.org/bugzilla/show_bug.cgi?id=243330
…terScale() This function was removed from upstream code, see https://josm.openstreetmap.de/changeset/11774/josm Use zoomAfterDownload parameter of DownloadTask() constructor instead of it.
Old upstream code maintained one global instance of the dialog using CombinePrimitiveResolverDialog.getInstance(). This method was removed and launchIfNecessary() creates new unique instance in every call now. So, do the same in CombineTagsResolver's copy of this method.
All MapMode constructors containing mapFrame parameter are marked as deprecated and this parameter is ignored in them. So, remove mapFrame parameter in Tracer code too.
mkyral
reviewed
Apr 9, 2017
| @@ -90,7 +86,7 @@ | |||
| final Set<Relation> parentRelations = new HashSet<>(); | |||
|
|
|||
| // Build conflict resolution dialog | |||
| final CombinePrimitiveResolverDialog dialog = CombinePrimitiveResolverDialog.getInstance(); | |||
| final CombinePrimitiveResolverDialog dialog = new CombinePrimitiveResolverDialog (Main.parent); | |||
There was a problem hiding this comment.
Heh. Tak přesně tohle jsem zkoušel, ale nefungovalo mi to, protože mi tam chyběl ten import josm.Main
Vůbec mi to nedošlo :-(
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes dropped and deprecated upstream functions. Namely tags conflict resolution dialog, download OSM areas task and MapMode constructor.
Review and test please!