source: josm/trunk/src/org/openstreetmap/josm/gui/conflict

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @4478   8 years Don-vip fix #5374 and #6315 - NPE in relations conflict manager
(edit) @4387   8 years bastiK fixed #6746 - paste properties in new layer results in nullpointer …
(edit) @4310   8 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4223   8 years stoecker fix #6570 (revert change in r4215, see #6547), i18n update, fix typo …
(edit) @4191   8 years stoecker remove old debug stuff
(edit) @4163   8 years stoecker improve color names of last checkin
(edit) @4162   8 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4116   8 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4115   8 years stoecker fix #4564 - conflict manager: highlight conflict on properties
(edit) @4112   8 years stoecker fix #4162 - patch by Hojoe - Mouseover in combine tags dialog wrong
(edit) @4072   9 years jttt Fix #6301 Check for null mandatory in …
(edit) @3995   9 years mjulius fix #3590 - Primitives or objects: Pick one
(edit) @3844   9 years stoecker see #5899 - support different display of closed ways and areas
(edit) @3786   9 years Upliner remove OperationCancelledException class which is unused since [3362]
(edit) @3766   9 years stoecker fix help
(edit) @3719   9 years bastiK added missing license information
(edit) @3530   9 years stoecker fix array preferences
(edit) @3501   9 years bastiK fixed #4632 - Button Help puts help window under main window
(edit) @3479   9 years jttt cosmetics
(edit) @3408   9 years jttt Show only actions that can work on all selected layers in …
(edit) @3385   9 years jttt Fix warnings
(edit) @3362   9 years stoecker fix #5182 - Conflict system simplification - patch by Upliner
(edit) @3218   10 years stoecker typos, close #4989 - patch by mikalaari
(edit) @3210   10 years bastiK autocompletion rework; breaks tageditor plugin and possibly other …
(edit) @3083   10 years bastiK added svn:eol-style=native to source files
(edit) @3061   10 years jttt Fix #4612 delete members while relation dialog is open leads to data …
(edit) @3034   10 years jttt Fix #4467 Don't silently drop locally deleted member primitives from …
(edit) @3025   10 years jttt Fix tests
(edit) @2996   10 years jttt Fix #4406 tags disapear: merging node with ID:0 and tag to existing …
(edit) @2991   10 years Gubaer Updated two tooltip texts
(edit) @2990   10 years jttt Fix some eclipse warnings
(edit) @2983   10 years Gubaer see #4054: Improving user feedback when trying to merge a deleted …
(edit) @2982   10 years jttt Calculate bbox for relations, use it in mappaint.
(edit) @2949   10 years jttt Show only one message box in conflicts dialog when multiple members …
(edit) @2945   10 years jttt Improvements in conflicts gui
(edit) @2940   10 years mjulius display list of referrers in ConflictResolutionDialog
(edit) @2938   10 years jttt Addition to #4408 (don't require to merge coordinates after primitive …
(edit) @2936   10 years jttt Fixed #4408 confict manager: do not have to solve tag- and …
(edit) @2882   10 years jttt Fixed #4409 after confict management: nodes are not selectable
(edit) @2881   10 years jttt Fixed #4412 after confict management: selecting a relation does not …
(edit) @2846   10 years mjulius fix messages for gui/conflict
(edit) @2814   10 years mjulius fixes #4347 - merging 2 nodes produces ERROR
(edit) @2779   10 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2726   10 years framm fix message text
(edit) @2712   10 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
(edit) @2711   10 years stoecker fix bad line endings
(edit) @2655   10 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2626   10 years jttt Fixed some of the warnings found by FindBugs
(edit) @2624   10 years mjulius fixes #4088,#4155 - when after conflict resolving the primitive has …
(edit) @2612   10 years mjulius Fixes #4083 - exception when copying relation with incomplete node …
(edit) @2569   10 years Gubaer fixed #3684: Add "chunked" upload mode Removed support for API "0.5" …
(edit) @2565   10 years Gubaer Removed BackReferenceDataSet and CollectBackReferenceVisitor because …
(edit) @2512   10 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2326   10 years Gubaer Slightly improved dialogs for way combining and node merging. Added …
(edit) @2285   10 years Gubaer Improved Download Location Dialog and created …
(edit) @2273   10 years jttt Replace testing for id <= 0 with isNew() method
(edit) @2237   10 years stoecker removed translation conflict (now also compiles)
(edit) @2236   10 years stoecker removed translation conflict
(edit) @2220   10 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2181   10 years stoecker lots of i18n fixes
(edit) @2165   10 years stoecker applied #3532 - path by Dave Hansen - infrastructure for faster data access
(edit) @2164   10 years stoecker fixed typo
(edit) @2157   10 years Gubaer fixed #3534: Merge dialog "remembers" old relations
(edit) @2141   10 years Gubaer applied #3513: patch by Claudius Henrichs : Typos and unifying …
(edit) @2115   10 years Gubaer new: reading open changesets from the server new: reading user info …
(edit) @2104   10 years Gubaer fixed #3402: Conflict in created_by when merging nodes or ways …
(edit) @2103   10 years Gubaer fixing bug member conflict handling
(edit) @2099   10 years Gubaer added auto completion to combine way dialog fixed #3461: Value …
(edit) @2095   10 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
(edit) @2083   10 years Gubaer Removed deprecated constructors in ExtendedDialog Turned most of the …
(edit) @2070   10 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2039   10 years Gubaer applied #3377: patch by xeen: Less warnings for JOSM
(edit) @2017   10 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(edit) @2008   10 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
(edit) @1990   10 years Gubaer fixed #3261: Use the "name:$CURRENT_LOCALE" name in the JOSM UI …
(edit) @1989   10 years Gubaer fixed #3281: OsmPrimitiveType fails for fusional and/or agglutinative …
(edit) @1954   10 years Gubaer Moved package org.openstreetmap.josm.gui.conflict to …
(edit) @1942   10 years Gubaer fixed #3230: Bug affecting conflict resolving
(edit) @1938   10 years jttt Replace some occurrences of RelationMember.member with getters
(edit) @1930   10 years jttt Replace RelationMember.role with RelationMember.getRole() and …
(edit) @1928   10 years jttt Make parameterless RelationMember constructor deprecated
(edit) @1925   10 years jttt Replaced Relation.members with Relation.getMembers()
(edit) @1911   10 years Gubaer fixed #3193: No layer is left highlighted when the bottom most one is …
(edit) @1904   10 years Gubaer fixed #3141: conflict resolution: "apply partial resolution" doesn't work
(edit) @1898   10 years jttt Way refactoring - rewritten another parts of code to the new nodes api
(edit) @1847   10 years Gubaer replaced calls to JOptionPane.* by calls to OptionPaneUtil.*
(edit) @1843   10 years jttt Use OsmPrimitive methods instead of direct access to keys field when …
(edit) @1811   10 years jttt PleaseWait refactoring. Progress is now reported using ProgressMonitor …
(edit) @1790   10 years Gubaer Relation Editor: complete rework Relation Editor: had to temporarily …
(edit) @1692   10 years Gubaer
(edit) @1690   10 years Gubaer new: MultiFetchServerObjectReader using APIs Multi Fetch method …
(edit) @1676   10 years stoecker fix typos
(edit) @1669   10 years stoecker updated i18n
(edit) @1666   10 years Gubaer bug fix: wrong merge state
(edit) @1655   10 years stoecker better i18n of new conflict stuff
(edit) @1654   10 years Gubaer added merge support for coordinate conflicts added merge support for …
(edit) @1653   10 years stoecker add support for compressed OSM files (bzip2, gzip)
(edit) @1650   10 years Gubaer added concept of "merge pairs" (my vs. merged, my vs. their, their vs. …
(edit) @1642   10 years Gubaer added row numbers and synchronized scrolling in conflict resolution …
(edit) @1640   10 years stoecker little bit more refactoring of coordinate access - patch by jttt
Note: See TracRevisionLog for help on using the revision log.