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

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @7129   10 years simon04 see #10018 - Avoid broken relations after combining ways
(edit) @7027   10 years Don-vip fix more warnings (-Xlint:rawtypes), remove deprecated method and …
(edit) @7022   10 years Don-vip see #8465 - enable and fix more warnings
(edit) @7017   10 years Don-vip see #8465 - fix easy compilation warnings
(edit) @7015   10 years Don-vip see #8465 - fix generics for JComboBox/JList
(edit) @7005   10 years Don-vip see #8465 - use diamond operator where applicable
(edit) @7001   10 years Don-vip see #8465 - switch core to Java 7
(edit) @6991   10 years Balaitous fix little bug: In TagConflictResolver dialog, when user select a …
(edit) @6912   10 years Don-vip Refactor duplicated code
(edit) @6890   10 years Don-vip fix some Sonar issues (Constructor Calls Overridable Method)
(edit) @6889   10 years Don-vip fix some Sonar issues (JLS order)
(edit) @6883   10 years Don-vip fix some Sonar issues
(edit) @6806   10 years Don-vip fix some Sonar issues introduced recently
(edit) @6802   10 years simon04 fix #9655 - Merge operations loosing tags (regression of r6770) …
(edit) @6792   10 years Don-vip Sonar - fix various issues
(edit) @6770   10 years simon04 see #9104 - Do not suggest to combine conflicting values in order to …
(edit) @6739   10 years simon04 Fix NPE when cycling through conflicts with Tab key
(edit) @6715   10 years Don-vip fix #6633 - Needless 'No conflicts to resolve' dialog
(edit) @6699   10 years Don-vip fix #9547 - Remove multiple whitespaces inside values
(edit) @6679   10 years stoecker see #9110 - fix singular forms, even if they are useless
(edit) @6623   10 years Don-vip fix Sonar issues
(edit) @6616   10 years Don-vip fix #4073 - colour coding of conflicting tags/memberships in way …
(edit) @6524   10 years Don-vip global use of Utils.joinAsHtmlUnorderedList()
(edit) @6507   10 years simon04 fix #9110 - i18n: fix errors in usage of plural forms
(edit) @6388   10 years simon04 fix #9111 - fix wording/typos in English strings
(edit) @6362   10 years Don-vip Checkstyle: - private constructors for util classes - final classes - …
(edit) @6340   10 years Don-vip refactor of some GUI/widgets classes (impacts some plugins): - …
(edit) @6316   11 years Don-vip Sonar/FindBugs - Loose coupling
(edit) @6264   11 years Don-vip Sonar/FindBugs - Performance - Method concatenates strings using + in …
(edit) @6258   11 years Don-vip Sonar/Findbugs - Performance - Inefficient use of keySet iterator …
(edit) @6093   11 years akks see #8902 - collection size ==/!= 0 -> isEmpty()/!isEmpty() (patch by …
(edit) @6087   11 years Don-vip see #8902 - string.equals("") => string.isEmpty() (patch by shinigami)
(edit) @6084   11 years bastiK see #8902 - add missing @Override annotations (patch by shinigami)
(edit) @6070   11 years stoecker see #8853 remove tabs, trailing spaces, windows line ends, strange …
(edit) @5998   11 years Don-vip fix #8775 - IllegalComponentStateException when remembering position …
(edit) @5988   11 years Don-vip fix EDT violations observed while merging nodes
(edit) @5832   11 years stoecker i18n update and javadoc fixes
(edit) @5792   11 years Don-vip code style - fix non-static access to static member
(edit) @5700   11 years stoecker remove hardcoded created_by
(edit) @5451   12 years Don-vip fix #7978 - Merging nodes and upload were broken due to improper …
(edit) @5450   12 years Don-vip fix #7917 - Control the number of items displayed at once in all …
(edit) @5429   12 years Don-vip fix #7917 - Control the number of items displayed at once in all …
(edit) @5400   12 years Don-vip fix #7925 - tag conflict dialog shows wrong information in title
(edit) @5266   12 years bastiK fixed majority of javadoc warnings by replacing "{@see" by "{@link"
(edit) @5132   12 years simon04 fix #7513 - Warn non-experts when combining ways with conflicting tags …
(edit) @5090   12 years simon04 fix #4842 - Combine ways silently combines when tag is not present on …
(edit) @4387   13 years bastiK fixed #6746 - paste properties in new layer results in nullpointer …
(edit) @4310   13 years stoecker fix #6680, fix #6677 - i18n issues
(edit) @4223   13 years stoecker fix #6570 (revert change in r4215, see #6547), i18n update, fix typo …
(edit) @4191   13 years stoecker remove old debug stuff
(edit) @4162   13 years stoecker fix #4140 - make colors in conflict dialog configurable
(edit) @4112   13 years stoecker fix #4162 - patch by Hojoe - Mouseover in combine tags dialog wrong
(edit) @4072   13 years jttt Fix #6301 Check for null mandatory in …
(edit) @3719   13 years bastiK added missing license information
(edit) @3501   14 years bastiK fixed #4632 - Button Help puts help window under main window
(edit) @3479   14 years jttt cosmetics
(edit) @3385   14 years jttt Fix warnings
(edit) @3210   14 years bastiK autocompletion rework; breaks tageditor plugin and possibly other …
(edit) @3083   14 years bastiK added svn:eol-style=native to source files
(edit) @2996   14 years jttt Fix #4406 tags disapear: merging node with ID:0 and tag to existing …
(edit) @2990   14 years jttt Fix some eclipse warnings
(edit) @2846   14 years mjulius fix messages for gui/conflict
(edit) @2814   14 years mjulius fixes #4347 - merging 2 nodes produces ERROR
(edit) @2779   14 years mjulius fixes #4253 - Combine way conflict dialog - check box for "Show tags …
(edit) @2726   14 years framm fix message text
(edit) @2712   14 years mjulius fixes #4252 - Handling relations of way combining unintuitive For both …
(edit) @2655   14 years jttt Fixed #4161 Major slowdown in recent versions, used correct pattern …
(edit) @2626   14 years jttt Fixed some of the warnings found by FindBugs
(edit) @2565   14 years Gubaer Removed BackReferenceDataSet and CollectBackReferenceVisitor because …
(edit) @2512   14 years stoecker i18n updated, fixed files to reduce problems when applying patches, …
(edit) @2326   15 years Gubaer Slightly improved dialogs for way combining and node merging. Added …
(edit) @2237   15 years stoecker removed translation conflict (now also compiles)
(edit) @2236   15 years stoecker removed translation conflict
(edit) @2220   15 years Gubaer fixed #3556: False positive conflicts when merging nodes fixed #3460: …
(edit) @2181   15 years stoecker lots of i18n fixes
(edit) @2164   15 years stoecker fixed typo
(edit) @2157   15 years Gubaer fixed #3534: Merge dialog "remembers" old relations
(edit) @2141   15 years Gubaer applied #3513: patch by Claudius Henrichs : Typos and unifying …
(edit) @2115   15 years Gubaer new: reading open changesets from the server new: reading user info …
(edit) @2104   15 years Gubaer fixed #3402: Conflict in created_by when merging nodes or ways …
(edit) @2103   15 years Gubaer fixing bug member conflict handling
(edit) @2099   15 years Gubaer added auto completion to combine way dialog fixed #3461: Value …
(edit) @2095   15 years Gubaer rewrite of MergeNodesAction new: new conflict resolution dialog for …
(edit) @2070   15 years Gubaer new: rewrite of CombineWay action new: conflict resolution dialog for …
(edit) @2017   15 years Gubaer removed OptionPaneUtil cleanup of deprecated Layer API cleanup of …
(add) @2008   15 years Gubaer new: tag conflict resolution when pasting tags (only if necessary) …
Note: See TracRevisionLog for help on using the revision log.